Merge pull request #27 from 4xmen/master

fix test

.env.example

@@ -60,7 +60,7 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-ZARINPAL_MERCHANT='12000000-0220-0000-0220-220000000001'
+ZARINPAL_MERCHANT='test'
 PAY_GATWAY=zarinpal
 
 THUMBNAIL_SIZE=600x600

app/Http/Controllers/Admin/TransportController.php

@@ -12,9 +12,11 @@ class TransportController extends Controller
 {
 
     function createOrUpdate(Transport $transport,TransportSaveRequest $request){
+
         $transport->price = $request->price;
         $transport->title = $request->title;
         $transport->description = $request->description;
+        $transport->is_default = $request->has('is_default');
         if ($request->has('is_default')){
             Transport::where('is_default')->update([
                 'is_default' =>  0,

app/Http/Controllers/WebsiteController.php

@@ -65,7 +65,7 @@ class WebsiteController extends Controller
 //        $vid = Clip::latest()->where('active', 1)->first();
 
         $discount = Discount::whereNotNull('expire')
-            ->where('expire', '>', \DB::raw('NOW()'))
+            ->where('expire', '>', date('Y-m-d'))
             ->whereNotNull('product_id')->pluck('product_id')->toArray();
         $disPros = Product::whereIn('id', $discount)->get();
 

app/Models/Product.php

@@ -300,7 +300,7 @@ class Product extends Model implements HasMedia
 
     function hasDiscount()
     {
-        return $this->discounts()->where('expire', '>', \DB::raw('NOW()'))->count() > 0;
+        return $this->discounts()->where('expire', '>', date('Y-m-d'))->count() > 0;
     }
 
     public function isFav()

public/css/app.css

@@ -730,6 +730,32 @@ li.no_results {
   display: none;
 }
 
+.cats-x3 {
+  -moz-column-count: 4;
+       column-count: 4;
+}
+
+/*-1000px width*/
+@media (max-width: 1000px) {
+  .cats-x3 {
+    -moz-column-count: 3;
+         column-count: 3;
+  }
+}
+/*-600px width*/
+@media (max-width: 600px) {
+  .cats-x3 {
+    -moz-column-count: 2;
+         column-count: 2;
+  }
+}
+/*-300px width*/
+@media (max-width: 300px) {
+  .cats-x3 {
+    -moz-column-count: 1;
+         column-count: 1;
+  }
+}
 .wizard .steps {
   display: flex;
   position: relative;
@@ -906,6 +932,10 @@ li.no_results {
   background: dodgerblue;
 }
 
+.select2-container {
+  max-width: 97%;
+}
+
 body {
   overflow-x: hidden;
   zoom: 100%;

public/css/theme.css

@@ -11437,6 +11437,48 @@ h3.textt{
     transform: scale(1);
   }
 }
+.color-pick .color {
+  display: inline-block;
+  opacity: 0.75;
+  margin-right: 4px;
+  border-radius: 15px;
+  border: 1px dotted silver;
+}
+
+.color-pick .color span {
+  display: inline-block;
+  mix-blend-mode: darken;
+  font-size: 11px;
+  padding-right: 4px;
+  padding-left: 4px;
+}
+
+.color-pick .color .cl {
+  float: left;
+  min-width: 25px;
+  height: 25px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  cursor: pointer;
+}
+
+.color-pick .color.active {
+  opacity: 1;
+  border: 1px solid black;
+  position: relative;
+  padding-right: 15px;
+}
+
+.color-pick .color.active .cl:after {
+  content: "✓";
+  right: 20%;
+  top: 5%;
+  position: absolute;
+  color: white;
+  mix-blend-mode: difference;
+}
+
 .x-mega-menu {
   background: #eeeeee;
   display: grid;

resources/js/components/MetaPrice.vue

@@ -125,7 +125,12 @@ export default {
     },
     methods: {
         changeImg:function ($k) {
+            // console.log($k);
+            // console.log(this.onSelectImage);
+            // console.log(this.quantities);
             this.quantities[this.onSelectImage].image = $k;
+            // console.log(this.quantities);
+            this.$forceUpdate();
         },
         showModal: function (i) {
             // this.showModal(i);
@@ -212,12 +217,16 @@ export default {
     background: #FFFFFF99;
     z-index: 999;
     overflow-y: scroll;
+    backdrop-filter: blur(3px);
 }
 
 
 #overlay img {
     max-width: 100%;
+    width: 100%;
     opacity: .75;
+    height: 150px;
+    object-fit: cover;
 }
 
 #overlay img.selected {

resources/js/customer.js

@@ -1,5 +1,6 @@
 var data = require('./plugins/data');
 var isSendSms = false;
+var step = 1;
 
 function nocomma(num) {
     a = num.toString().replace(/\,/g, ''); // 1125, but a string, so convert it to number
@@ -268,5 +269,38 @@ jQuery(function ($) {
             });
         }
     }, 500);
+
+    $(".next-step").bind('click', function () {
+        step++;
+        $(".step" + step).click();
+    });
+
+    $(".progress-step .step").click(function () {
+        $(".progress-step .step").removeClass('done');
+        $($(this).data('done')).addClass('done');
+        $("#card-steps .active").slideUp(300).removeClass('active');
+        $('#' + $(this).data('id')).slideDown(500).addClass('active');
+        step = parseInt($(this).data('id').substr(4, 1));
+        if ($(this).data('id') == 'step3') {
+            $(".last-step").slideDown(300);
+            $(".next-step").slideUp(300);
+        } else {
+            $(".last-step").slideUp(300);
+            $(".next-step").slideDown(300);
+        }
+    });
+
+    if ($('.card-submit').length > 0){
+        if ($("input.transport:checked").length == 0){
+            $('.card-submit').removeAttr('disabled');
+        }else{
+
+            $("input.transport").bind('change',function () {
+                console.log('fire');
+                $('.card-submit').removeAttr('disabled');
+            });
+        }
+    }
+
 });
 

resources/sass/card.scss

@@ -403,3 +403,49 @@
         transform: scale(1);
     }
 }
+
+
+.color-pick {
+
+}
+
+.color-pick .color {
+    display: inline-block;
+    opacity: .75;
+    margin-right: 4px;
+    border-radius: 15px;
+    border: 1px dotted silver;
+}
+.color-pick .color span {
+    display: inline-block;
+    mix-blend-mode: darken;
+    font-size: 11px;
+    padding-right: 4px;
+    padding-left: 4px;
+}
+
+.color-pick .color .cl{
+    float: left;
+    min-width: 25px;
+    height: 25px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    cursor: pointer;
+}
+
+.color-pick .color.active {
+    opacity: 1;
+    border: 1px solid black;
+    position: relative;
+    padding-right: 15px;
+}
+
+.color-pick .color.active .cl:after {
+    content: '✓';
+    right: 20%;
+    top:5%;
+    position: absolute;
+    color: white;
+    mix-blend-mode: difference;
+}

resources/sass/fix-libs.scss

@@ -1,3 +1,7 @@
 .multiselect__tag{
     background: dodgerblue;
 }
+
+.select2-container{
+    max-width: 97%;
+}

resources/sass/props.scss

@@ -2,3 +2,29 @@
 #xls-file,#optionz{
     display: none;
 }
+
+.cats-x3{
+    column-count: 4
+}
+
+/*-1000px width*/
+@media (max-width: 1000px) {
+    .cats-x3{
+        column-count: 3
+    }
+}
+
+/*-600px width*/
+@media (max-width: 600px) {
+    .cats-x3{
+        column-count: 2
+    }
+}
+
+/*-300px width*/
+@media (max-width: 300px) {
+    .cats-x3{
+        column-count: 1
+    }
+}
+

resources/theme/js/theme.js

@@ -381,8 +381,8 @@ jQuery(function ($) {
     try {
         if ($('#qnt').length != 0) {
             sizes = {};
-            qnt = JSON.parse($('#qnt').val());
-            // console.log(qnt);
+            let qnt = JSON.parse($('#qnt').val());
+            console.log(qnt);
             let txt = '';
             for( const q of qnt) {
                 if (q.count > 0){
@@ -401,17 +401,17 @@ jQuery(function ($) {
             setTimeout(function () {
                 $("#size-pick .size:first-child").click();
             },50);
-            $("#size-pick .size").bind('click.select',function () {
-                $("#size-pick .size").removeClass('active');
+            // $("#size-pick .size").bind('click.select',function () {
+            //     $("#size-pick .size").removeClass('active');
                 let colorNames  = {};
                 try {
                     colorNames = JSON.parse($("#colors").val());
                 } catch {
                 }
 
-                $(this).addClass('active');
+                // $(this).addClass('active');
                 let colors = sizes[$(this).data('id')];
-                let txt = '';
+                txt = '';
                 let cl = '';
                 for( const c of colors) {
                     cl = colorNames[c.color];
@@ -439,7 +439,7 @@ jQuery(function ($) {
                     $("#counting").text($(this).data('count'));
                     $(".product-count").attr('max',$(this).data('count')).val(1);
                 });
-            });
+            // });
 
         }
     } catch (e) {

resources/theme/theme.js

@@ -1,69 +1 @@
-axios = require('axios');
-window.axios = axios;
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-
-alertify = require('alertifyjs');
-require('../js/bootstrap');
-window._ = require('lodash');
-require('bootstrap/dist/js/bootstrap.bundle')
-require('chart.js/dist/chart.min')
-var $ = window.jQuery = jQuery = require('jquery');
-require('lightbox2/dist/js/lightbox.min');
-require('owl.carousel/dist/owl.carousel.min');
-require('xzoom/dist/xzoom.min');
-
-window.Vue = require('vue').default;
-
-// require('./js/gsap.min.js');
-// require('./js/Physics2DPlugin3.min');
-// require('./js/mega-menu.js');
-require('./js/product.js');
-require('./js/theme.js');
-require('./js/chart.js');
-require('../js/customer.js');
-
-
-
-
-// require('../js/')
-Vue.component('example-component', require('../js/components/ExampleComponent.vue').default);
-Vue.component('meta-price', require('../js/components/MetaPrice.vue').default);
-Vue.component('currency', require('../js/components/CurrencyInput.vue').default);
-Vue.component('meta-element', require('../js/components/MetaElement.vue').default);
-Vue.component('meta-search', require('../js/components/MetaSearch').default);
-
-var app = new Vue({
-    el: '#app',
-    data: {
-        metaz: '123',
-        jdata: [],
-        def: [],
-    },
-    mounted() {
-
-    },
-    created() {
-        if (document.querySelector('#jDataSrc') !== undefined && document.querySelector('#jDataSrc') != null){
-            try {
-                this.jdata = JSON.parse(document.querySelector('#jDataSrc').value);
-                this.def = JSON.parse(document.querySelector('#jDef').value);
-            } catch {
-                console.log('json error: for meta product page');
-            }
-        }
-    },
-    methods: {
-    },
-    watch:{
-        jdata:{
-            handler: function(n) {
-                this.$refs.metaEl.updateJdata(n);
-                // this.$refs.metaPr.updateJdata(n);
-            },
-            deep: true
-        },
-    }
-});
-window.app = app;
-
-
+axios = require('axios');
window.axios = axios;
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';

alertify = require('alertifyjs');
require('../js/bootstrap');
window._ = require('lodash');
require('bootstrap/dist/js/bootstrap.bundle')
require('chart.js/dist/chart.min')
var $ = window.jQuery = jQuery = require('jquery');
require('lightbox2/dist/js/lightbox.min');
require('owl.carousel/dist/owl.carousel.min');
require('xzoom/dist/xzoom.min');

window.Vue = require('vue').default;

// require('./js/gsap.min.js');
// require('./js/Physics2DPlugin3.min');
// require('./js/mega-menu.js');
require('./js/product.js');
require('./js/theme.js');
require('./js/chart.js');
require('../js/customer.js');




// require('../js/')
Vue.component('example-component', require('../js/components/ExampleComponent.vue').default);
Vue.component('meta-price', require('../js/components/MetaPrice.vue').default);
Vue.component('currency', require('../js/components/CurrencyInput.vue').default);
Vue.component('meta-element', require('../js/components/MetaElement.vue').default);
Vue.component('meta-search', require('../js/components/MetaSearch').default);

var app = new Vue({
    el: '#app',
    data: {
        metaz: '123',
        jdata: [],
        def: [],
    },
    mounted() {

    },
    created() {
        if (document.querySelector('#jDataSrc') !== undefined && document.querySelector('#jDataSrc') != null){
            try {
                this.jdata = JSON.parse(document.querySelector('#jDataSrc').value);
                this.def = JSON.parse(document.querySelector('#jDef').value);
            } catch {
                console.log('json error: for meta product page');
            }
        }
    },
    methods: {
    },
    watch:{
        jdata:{
            handler: function(n) {
                this.$refs.metaEl.updateJdata(n);
                // this.$refs.metaPr.updateJdata(n);
            },
            deep: true
        },
    }
});
window.app = app;

resources/views/admin/product/form/publishProductForm.blade.php

@@ -2,18 +2,13 @@
     <div class="row">
         <div class="col-md-6 mt-3">
             <div class="form-group pt-3" >
-                <br>
-                <label for="active">
-                    {{__('Active')}}
-                </label>
-                <input name="active" type="checkbox" id="active"
 
-                       class="float-left ml-4 mt-1 form-check-inline @error('active') is-invalid @enderror"
-                       @if (old('active',$product->active??0) != 0)
-                       checked
-                       @endif
-                       value="1"/>
-            </div>
+                <div class="form-check form-switch">
+                    <input name="active" class="form-check-input @error('active') is-invalid @enderror" type="checkbox" value="1"  id="active"  @if (old('active',$product->active??0) != 0)
+                        checked
+                        @endif>
+                    <label class="form-check-label" for="active">{{__('Active')}}</label>
+                </div>
         </div>
     </div>
 

resources/views/admin/props/propForm.blade.php

@@ -15,9 +15,9 @@
         @include('starter-kit::component.err')
         <form
             @if(isset($p))
-            action="{{route('admin.props.update',$p->id)}}"
+                action="{{route('admin.props.update',$p->id)}}"
             @else
-            action="{{route('admin.props.store')}}"
+                action="{{route('admin.props.store')}}"
             @endif
             method="post" enctype="multipart/form-data">
             @csrf
@@ -35,7 +35,7 @@
             <div class="form-group">
                 <label for="width">{{__("Width")}}:</label>
                 <input type="text" placeholder="{{__("Width")}}" name="width" class="form-control" id="width" required
-                       value="{{old('width',$p->width??null)}}">
+                       value="{{old('width',$p->width??'col-md-12')}}">
             </div>
 
             <div class="form-group">
@@ -63,7 +63,7 @@
             </div>
             <div class="form-group">
                 <label for="xtype">{{__("Type")}}:</label>
-                <select   name="type" id="xtype" class="form-control" required>
+                <select name="type" id="xtype" class="form-control" required>
                     <option
                         value="text" {{ old('type',$p->type??null) == 'text' ? 'selected' : '' }} > {{__("Text type")}}</option>
                     <option
@@ -80,29 +80,43 @@
                         value="singlemulti" {{ old('type',$p->type??null) == 'singlemulti' ? 'selected' : '' }}>{{__("Single Select & multi search")}}</option>
                 </select>
             </div>
-                        <div class="form-group">
-                            <label for="category">{{__("Category")}}</label>
-                            <select
-                                multiple
-                                name="category[]"
-                                id="category"
-                                class="form-control"
-                                data-placeholder="Select category"
-                                required>
-                                <option value=""></option>
-                                @foreach($allCategories as $cat)
-                                    <option value="{{ $cat->id }}"
-                                            @if(isset($cats) && in_array($cat->id,$cats)) selected @endif > {{$cat->name}} </option>
-                                @endforeach
-                            </select>
+            <div class="form-group">
+                <label>{{__("Category")}}</label>
+                {{--                            <select--}}
+                {{--                                multiple--}}
+                {{--                                name="category[]"--}}
+                {{--                                id="category"--}}
+                {{--                                class="form-control"--}}
+                {{--                                data-placeholder="Select category"--}}
+                {{--                                required>--}}
+                {{--                                <option value=""></option>--}}
+                {{--                                @foreach($allCategories as $cat)--}}
+                {{--                                    <option value="{{ $cat->id }}"--}}
+                {{--                                            @if(isset($cats) && in_array($cat->id,$cats)) selected @endif > {{$cat->name}} </option>--}}
+                {{--                                @endforeach--}}
+                {{--                            </select>--}}
+                {{--                            --}}
+                <div class="cats-x3">
+                    @foreach($allCategories as $k => $cat)
+
+                        <div class="form-check form-switch">
+                            <input class="form-check-input" value="{{ $cat->id }}"
+                                   @if(isset($cats) && in_array($cat->id,$cats)) checked @endif  name="category[]"
+                                   type="checkbox" id="c{{$k}}">
+                            <label class="form-check-label" for="c{{$k}}"> {{$cat->name}} </label>
                         </div>
+                    @endforeach
+                </div>
+
+            </div>
             <div>
             </div>
             <div class="form-group">
                 <label>
                     {{__("Is effective price?")}}
                 </label>
-                <input type="checkbox" @if( isset($p) && $p->priceable) checked @endif name="priceable" class="form-check">
+                <input type="checkbox" @if( isset($p) && $p->priceable) checked @endif name="priceable"
+                       class="form-check">
             </div>
             <div class="card-header">
                 {{__("Icon")}}
@@ -137,7 +151,9 @@
                 </h2>
                 <div class="content">
                 </div>
-                <div class="btn btn-success m-2" style="float: left" id="add-options"> <div class="fa fa-plus"></div></div>
+                <div class="btn btn-success m-2" style="float: left" id="add-options">
+                    <div class="fa fa-plus"></div>
+                </div>
             </div>
             <div class="clearfix"></div>
             <div class="form-group">

resources/views/admin/transport/transportForm.blade.php

@@ -45,16 +45,19 @@
                         <label for="description">
                             {{__('Description')}}
                         </label>
-                        <textarea name="description" rows="4" class="form-control @error('description') is-invalid @enderror" placeholder="{{__('Description')}}"  >{{old('description',$transport->description??null)}}</textarea>
+                        <textarea name="description" rows="4" class="form-control @error('description') is-invalid @enderror" placeholder="{{__('Description')}}" @if( isset($transport) && $transport->is_default) checked @endif  >{{old('description',$transport->description??null)}}</textarea>
                     </div>
                 </div>
                 <div class="col-md-12 mt-3 mr-5">
                     <div class="form-group">
-                        <input id="is_default" name="is_default" type="checkbox" class="form-check-input @error('is_default') is-invalid @enderror" @if( isset($transport) && $transport->is_default) checked @endif/>
-                        <label class="form-check-label" for="is_default">
-                            {{__('Is default')}}
-                        </label>
+
+                        <div class="form-check form-switch">
+                            <input value="1" class="form-check-input  @error('is_default') is-invalid @enderror" name="is_default" @if( isset($transport) && $transport->is_default) checked @endif type="checkbox" id="is_default">
+                            <label class="form-check-label" for="is_default"> {{__('Is default')}}</label>
+                        </div>
                     </div>
+
+
                 </div>
                 <div class="col-md-12">
                     <label> &nbsp; </label>

resources/views/website/card.blade.php

@@ -13,11 +13,13 @@
                             <i class="fa fa-shopping-bag"></i>
                             سبد خرید
                         </div>
-                        <div class="step step2" data-id="step2" data-done=".progress-step .step1,.progress-step  .step2">
+                        <div class="step step2" data-id="step2"
+                             data-done=".progress-step .step1,.progress-step  .step2">
                             <i class="fa fa-truck-fast"></i>
                             اطلاعات ارسال
                         </div>
-                        <div class="step step3" data-id="step3"  data-done=".progress-step .step1,.progress-step .step2, .progress-step .step3">
+                        <div class="step step3" data-id="step3"
+                             data-done=".progress-step .step1,.progress-step .step2, .progress-step .step3">
                             <i class="fa fa-credit-card"></i>
                             اطلاعات پرداخت
                         </div>
@@ -29,7 +31,7 @@
                         <div class="row">
                             <div class="col-md-9">
                                 <div id="card-steps">
-                                    <div id="step1" class="step active" >
+                                    <div id="step1" class="step active">
                                         <div class="text-center" id="card">
                                             <table class="table table-hover table-responsive-lg"
                                                    id="card-table">
@@ -74,7 +76,8 @@
                                                                     @endif
                                                                 @endforeach
                                                             @else
-                                                                <span class="active" data-count="{{$pro->stock_quantity}}"></span>
+                                                                <span class="active"
+                                                                      data-count="{{$pro->stock_quantity}}"></span>
                                                                 @foreach(\App\Helpers\getPriceableMeta($pro) as $k => $meta)
                                                                     <div class="meta">
                                                                         {{\App\Helpers\getPropLabel($k)}}
@@ -89,7 +92,8 @@
                                                                 @endforeach
                                                             @endif
                                                         </td>
-                                                        <td colspan="2" class="price-td" data-price="{{$pro->getPurePrice()}}">
+                                                        <td colspan="2" class="price-td"
+                                                            data-price="{{$pro->getPurePrice()}}">
                                                             @if($pro->getPurePrice() == 0)
                                                                 {{__("We call you about price soon.")}}
                                                             @else
@@ -105,8 +109,10 @@
                                                                 <div class="btn btn-info count-inc">
                                                                     <i class="fa fa-plus"></i>
                                                                 </div>
-                                                                <input type="number" data-stock="{{$pro->stock_quantity}}"
-                                                                       max="{{$pro->stock_quantity}}" name="count[{{$pro->id}}]"
+                                                                <input type="number"
+                                                                       data-stock="{{$pro->stock_quantity}}"
+                                                                       max="{{$pro->stock_quantity}}"
+                                                                       name="count[{{$pro->id}}]"
                                                                        min="1"
                                                                        data-price="{{str_replace(',','',$pro->getPurePrice())}}"
                                                                        class="form-control product-count"
@@ -117,7 +123,8 @@
                                                             </div>
                                                         </td>
                                                         <td>
-                                                            <a href="{{route('card.rem',$pro->slug)}}" class="btn btn-outline-danger">
+                                                            <a href="{{route('card.rem',$pro->slug)}}"
+                                                               class="btn btn-outline-danger">
                                                                 <i class="fa fa-times"></i>
                                                             </a>
                                                         </td>
@@ -129,7 +136,8 @@
                                                         <td>
 
                                                             <a href="{{route('product',$qpro->product->slug)}}">
-                                                                <img src="{{$qpro->product->thumbUrl()}}" class="img-64" alt="">
+                                                                <img src="{{$qpro->product->thumbUrl()}}" class="img-64"
+                                                                     alt="">
                                                             </a>
                                                         </td>
                                                         <td colspan="2">
@@ -137,14 +145,15 @@
                                                         </td>
                                                         <td colspan="2">
                                                             @php($data = json_decode($qpro->data))
-                                                            <span class="badge badge-inverse" style="background: {{$data->color}};">
+                                                            <span class="badge badge-inverse"
+                                                                  style="background: {{$data->color}};">
                                             <b>
                                                 {{\App\Helpers\getColorName($data->color)}}
                                             </b>
                                         </span>
-                                                            <span class="badge bg-dark">
-                                             {{$data->size}}
-                                        </span>
+{{--                                                            <span class="badge bg-dark">--}}
+{{--                                             {{$data->size}}--}}
+{{--                                        </span>--}}
                                                         </td>
                                                         <td colspan="2" class="price-td" data-price="{{$qpro->price}}">
                                                             @if($qpro->price == 0)
@@ -162,7 +171,8 @@
                                                                 <div class="btn btn-info count-inc">
                                                                     <i class="fa fa-plus"></i>
                                                                 </div>
-                                                                <input type="number" data-stock="{{$qpro->count}}" max="{{$qpro->count}}"
+                                                                <input type="number" data-stock="{{$qpro->count}}"
+                                                                       max="{{$qpro->count}}"
                                                                        name="qcount[{{$qpro->id}}]"
                                                                        min="1"
                                                                        data-price="{{$qpro->price}}"
@@ -174,7 +184,8 @@
                                                             </div>
                                                         </td>
                                                         <td>
-                                                            <a href="{{route('card.remq',$qpro->id)}}" class="btn btn-outline-danger">
+                                                            <a href="{{route('card.remq',$qpro->id)}}"
+                                                               class="btn btn-outline-danger">
                                                                 <i class="fa fa-times"></i>
                                                             </a>
                                                         </td>
@@ -183,16 +194,19 @@
                                                 @endforeach
                                             </table>
                                         </div>
-                                        <div class="alert alert-success text-center">
-                                            شما می‌توانید محصولات را رزرو کنید , برای اینکار به مرحله بعدی بروید و
-                                            <b>
-                                                گزینه فعال سازی
-                                                حالت
-                                                رزرو
-                                            </b>
+                                        @if(\App\Helpers\getSetting('reserve') != null )
 
-                                            را انتخاب کنید
-                                        </div>
+                                            <div class="alert alert-success text-center">
+                                                شما می‌توانید محصولات را رزرو کنید , برای اینکار به مرحله بعدی بروید و
+                                                <b>
+                                                    گزینه فعال سازی
+                                                    حالت
+                                                    رزرو
+                                                </b>
+
+                                                را انتخاب کنید
+                                            </div>
+                                        @endif
                                     </div>
                                     <div id="step2" class="step">
                                         @if(count($transports) > 0)
@@ -207,6 +221,7 @@
                                                         <input id="tns{{$k}}" type="radio" name="transport_id"
                                                                data-price="{{$t->price}}"
                                                                value="{{$t->id}}"
+                                                               required
                                                                onclick="$('.product-count').change();"
                                                                @if ($t->is_default) checked
                                                                @endif class="form-check-input transport">
@@ -215,8 +230,13 @@
                                                             {{$t->title}}
                                                         </label>
                                                         @if(strlen($t->description) > 1)
-                                                            <p class="preline alert alert-info mt-1">{{$t->description}} <span
-                                                                    class="float-end">@if($t->price > 0){{number_format($t->price)}} @else {{__("Free")}} @endif</span>
+                                                            <p class="preline alert alert-info mt-1">{{$t->description}}
+                                                                <span
+                                                                    class="float-end">@if($t->price > 0)
+                                                                        {{number_format($t->price)}}
+                                                                    @else
+                                                                        {{__("Free")}}
+                                                                    @endif</span>
                                                             </p>
                                                         @endif
                                                     </li>
@@ -249,18 +269,21 @@
                                                     @endforeach
                                                 @endif
                                             </ul>
-                                            <div class="p-5 py-3" id="resv">
-                                                <div class="form-check form-switch">
-                                                    <input name="reserve" class="form-check-input" type="checkbox" role="switch"
-                                                           id="flexSwitchCheckDefault">
-                                                    <label class="form-check-label"
-                                                           for="flexSwitchCheckDefault">{{__("Reserve order for :H hours",['H'=>\App\Helpers\getSetting('reserve')])}}</label>
+                                            @if(\App\Helpers\getSetting('reserve') != null )
+                                                <div class="p-5 py-3" id="resv">
+                                                    <div class="form-check form-switch">
+                                                        <input name="reserve" class="form-check-input" type="checkbox"
+                                                               role="switch"
+                                                               id="flexSwitchCheckDefault">
+                                                        <label class="form-check-label"
+                                                               for="flexSwitchCheckDefault">{{__("Reserve order for :H hours",['H'=>\App\Helpers\getSetting('reserve')])}}</label>
+                                                    </div>
                                                 </div>
-                                            </div>
+                                            @endif
 
                                         @endif
                                         <div>
-                                            <div  class="text-left p-3">
+                                            <div class="text-left p-3">
                                                 @if(auth('customer')->check() && auth('customer')->user()->colleague == 1)
                                                     <div class="p-3 ">
                                                         اگر همکاری هستید آدرس مشتری را در این قسمت بنویسید
@@ -287,13 +310,14 @@
                                         </div>
                                     </div>
                                     <div id="step3" class="step">
-                                        <div >
+                                        <div>
                                             <label class="text-start d-block">
                                                 {{__("Discount code")}}
                                             </label>
                                             <div class="row">
                                                 <div class="col-md-6">
-                                                    <input type="text" class="form-control" id="discount-code" name="discount"
+                                                    <input type="text" class="form-control" id="discount-code"
+                                                           name="discount"
                                                            placeholder="{{__("Discount code")}}">
                                                 </div>
                                                 <div class="col-md-6">
@@ -360,18 +384,20 @@
                                                 تکمیل اطلاعات
                                             </a>
                                         @else
-                                            <button type="submit" class="btn btn-success float-end me-3 ms-3">
+                                            <button type="submit" class="btn btn-success float-end my-2 w-100 card-submit" >
                                                 <i class="far fa-credit-card"></i>
                                                 پرداخت از درگاه های آنلاین
                                             </button>
-                                            <button type="submit" class="btn btn-secondary  float-end " name="nopay" value="no-payment">
+                                            <button type="submit" class="btn btn-secondary  float-end w-100 card-submit" name="nopay"
+                                                    value="no-payment" >
                                                 <i class="far fa-credit-card"></i>
                                                 ثبت سفارش پرداخت اعتباری + آنلاین
                                             </button>
                                             <br>
                                             <br>
                                         @endif
-                                        &nbsp;@else
+                                        &nbsp;
+                                    @else
                                         {{--                                        {{__("Register or login to complete purchase")}}--}}
                                         <hr>
                                         <br>

resources/views/website/product.blade.php

@@ -139,17 +139,29 @@
                                     </th>
                                     <td>
                                         <div class="color-pick">
-                                            <input type="hidden" class="color" value="red"/>
-                                            @php $colors = json_decode(\App\Helpers\getProp('color')->options,'true'); @endphp
 
-                                            @foreach($colors as $c)
-                                                <div style="background: {{$c['value']}}" data-color="{{$c['value']}}"
-                                                     class="color @if($c['value'] == $pro->getMeta('color')) active @endif"></div>
-                                            @endforeach
                                         </div>
                                     </td>
                                 </tr>
                             @endif
+                            <tr>
+                                <th style="vertical-align: middle">
+                                    تعداد
+                                </th>
+                                <td>
+                                    {{--                                                <div id="counting" class="text-muted float-start mt-2"></div>--}}
+                                    <div class="product-count d-inline-block">
+                                        <div class="btn btn-info count-inc" style="padding: 2px 5px">
+                                            <i class="fa fa-plus"></i>
+                                        </div>
+                                        <input type="number" id="single-count" class="product-count"
+                                               value="1" max="1">
+                                        <div class="btn btn-info count-dec" style="padding: 2px 5px">
+                                            <i class="fa fa-minus"></i>
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
                             @if($pro->hasMeta('warranty'))
                                 <tr>
                                     <th>
@@ -199,8 +211,8 @@
                                 </a>
                             </div>
                             <div class="col">
-                                <a href="{{route('card.add',$pro->slug)}}"
-                                   class="add-to-card btn btn-primary w-100 mt-1">
+                                <a href="{{route('card.addq',['',''])}}"
+                                   class="add-to-card-q btn btn-primary w-100 mt-1">
                                     <img src="{{asset('images/basket.svg')}}" class="basket-icon" alt="">
                                     افزودن به سبد خرید
                                 </a>
@@ -219,6 +231,7 @@
                         </ul>
                         <div class="tab-container">
                             <div id="tab-detail" class="active">
+
                                 <table class="table table-bordered attribute ">
                                     @foreach($pro->getAllMeta() as $k => $meta)
                                         @if($k != 'color' && $k != 'warranty')
@@ -374,6 +387,7 @@
                     </div>
                 </div>
             </div>
+
         </section>
         <input type="hidden" id="qn" value="">
         <input type="hidden" id="qnt" value='{!! $pro->quantities()->orderBy('price')->get();!!}'>

tests/Feature/AdminWebPagesTest.php

@@ -208,7 +208,7 @@ class AdminWebPagesTest extends TestCase
         $response->assertStatus(200);
 
         if (Customer::count() != 0){
-            $response = $this->actingAs($user)->get(route('admin.customer.edit',Customer::first()->slug));
+            $response = $this->actingAs($user)->get(route('admin.customer.edit',Customer::first()->id));
             $response->assertStatus(200);
         }