recompiled

packages/Webkul/Admin/src/Resources/assets/sass/partials/_mobile.scss

@@ -153,7 +153,7 @@ $toggleColor: #3c41ff;
         min-width: 300px;
         max-width: 25vw;
         width: 100vw;
-        height: 100%;
+        height: 90vh;
         z-index: 1;
         padding-bottom: 10px;
         transition: transform 0.3s ease;

packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php

@@ -37,7 +37,7 @@
 
         @elseif ($field['type'] == 'number')
 
-            <input type="number" min="0" v-validate="'{{ $validations }}'" class="control" id="{{ $name }}" name="{{ $name }}" value="{{ old($nameKey) ?: core()->getConfigData($nameKey, $channel, $locale) }}" data-vv-as="&quot;{{ trans($field['title']) }}&quot;">
+            <input type="number" min="{{ $field['name'] == 'minimum_order_amount' ? 1 : 0 }}" v-validate="'{{ $validations }}'" class="control" id="{{ $name }}" name="{{ $name }}" value="{{ old($nameKey) ?: core()->getConfigData($nameKey, $channel, $locale) }}" data-vv-as="&quot;{{ trans($field['title']) }}&quot;">
 
         @elseif ($field['type'] == 'color')
 

packages/Webkul/Sales/src/Config/system.php

@@ -71,7 +71,7 @@ return [
             [
                 'name'          => 'minimum_order_amount',
                 'title'         => 'admin::app.admin.system.minimum-order-amount',
-                'type'          => 'text',
+                'type'          => 'number',
                 'validation'    => 'decimal',
                 'channel_based' => true,
                 'locale_based'  => true,

packages/Webkul/Shop/src/Http/Controllers/CartController.php

@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Log;
 use Webkul\Checkout\Contracts\Cart as CartModel;
 use Webkul\Customer\Repositories\WishlistRepository;
 use Webkul\Product\Repositories\ProductRepository;
+use Webkul\CartRule\Repositories\CartRuleCouponRepository;
 
 class CartController extends Controller
 {
@@ -16,11 +17,13 @@ class CartController extends Controller
      *
      * @param  \Webkul\Customer\Repositories\CartItemRepository  $wishlistRepository
      * @param  \Webkul\Product\Repositories\ProductRepository  $productRepository
+     * @param  \Webkul\CartRule\Repositories\CartRuleCouponRepository  $cartRuleCouponRepository
      * @return void
      */
     public function __construct(
         protected WishlistRepository $wishlistRepository,
-        protected ProductRepository $productRepository
+        protected ProductRepository $productRepository,
+        protected CartRuleCouponRepository $cartRuleCouponRepository
     )
     {
         $this->middleware('throttle:5,1')->only('applyCoupon');
@@ -177,16 +180,27 @@ class CartController extends Controller
 
         try {
             if (strlen($couponCode)) {
-                Cart::setCouponCode($couponCode)->collectTotals();
+                $coupon = $this->cartRuleCouponRepository->findOneByField('code', $couponCode);
 
-                if (Cart::getCart()->coupon_code == $couponCode) {
+                if ($coupon->cart_rule->status) {
-                    return response()->json([
+                    if (Cart::getCart()->coupon_code == $couponCode) {
-                        'success' => true,
+                        return response()->json([
-                        'message' => trans('shop::app.checkout.total.success-coupon'),
+                            'success' => false,
-                    ]);
+                            'message' => trans('shop::app.checkout.total.coupon-already-applied'),
+                        ]);
+                    }
+    
+                    Cart::setCouponCode($couponCode)->collectTotals();
+                  
+                    if (Cart::getCart()->coupon_code == $couponCode) {
+                        return response()->json([
+                            'success' => true,
+                            'message' => trans('shop::app.checkout.total.success-coupon'),
+                        ]);
+                    }
                 }
             }
-
+           
             return response()->json([
                 'success' => false,
                 'message' => trans('shop::app.checkout.total.invalid-coupon'),

packages/Webkul/Shop/src/Resources/lang/ar/app.php

@@ -625,6 +625,7 @@ return [
             'invalid-coupon'      => 'رمز القسيمة غير صالح.',
             'success-coupon'      => 'تم تطبيق رمز القسيمة بنجاح.',
             'coupon-apply-issue'  => 'لا يمكن تطبيق رمز القسيمة.',
+            'coupon-already-applied' => 'تم تطبيق رمز القسيمة بالفعل.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/ben/app.php

@@ -611,6 +611,7 @@ return [
             'invalid-coupon'      => 'কুপন কোড অবৈধ।',
             'success-coupon'      => 'কুপন কোড সফলভাবে প্রয়োগ করা হয়েছে।',
             'coupon-apply-issue'  => 'কুপন কোড প্রয়োগ করা যাবে না।',
+            'coupon-already-applied' => 'কুপন কোড ইতিমধ্যেই প্রয়োগ করা হয়েছে।',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/de/app.php

@@ -609,6 +609,7 @@ return [
             'invalid-coupon'      => 'Gutscheincode ist ungültig.',
             'success-coupon'      => 'Gutscheincode erfolgreich angewendet.',
             'coupon-apply-issue'  => 'Gutscheincode kann nicht angewendet werden.',
+            'coupon-already-applied' => 'Gutscheincode bereits angewendet.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/en/app.php

@@ -623,6 +623,7 @@ return [
             'invalid-coupon'      => 'Coupon code is invalid.',
             'success-coupon'      => 'Coupon code applied successfully.',
             'coupon-apply-issue'  => 'Coupon code can\'t be applied.',
+            'coupon-already-applied' => 'Coupon code already applied.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/es/app.php

@@ -614,6 +614,7 @@ return [
             'invalid-coupon'      => 'El código del cupón no es válido.',
             'success-coupon'      => 'Código del cupón aplicado correctamente.',
             'coupon-apply-issue'  => 'No se puede aplicar el código de cupón.',
+            'coupon-already-applied' => 'Código de cupón ya aplicado.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/fa/app.php

@@ -610,6 +610,7 @@ return [
             'invalid-coupon'      => 'کد کوپن نامعتبر است',
             'success-coupon'      => 'کد کوپن با موفقیت اعمال شد',
             'coupon-apply-issue'  => 'کد کوپن نمی تواند اعمال شود',
+            'coupon-already-applied' => 'کد کوپن قبلاً اعمال شده است.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/fr/app.php

@@ -613,6 +613,7 @@ return [
             'invalid-coupon'      => 'Le code promo n\'est pas valide.',
             'success-coupon'      => 'Code promo appliqué avec succès.',
             'coupon-apply-issue'  => 'Le code promo ne peut pas être appliqué.',
+            'coupon-already-applied' => 'Code promo déjà appliqué.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/he/app.php

@@ -610,6 +610,7 @@ return [
             'invalid-coupon'      => 'קוד הקופון אינו חוקי.',
             'success-coupon'      => 'קוד הקופון הוחל בהצלחה.',
             'coupon-apply-issue'  => 'לא ניתן להחיל קוד קופון.',
+            'coupon-already-applied' => 'קוד קופון כבר הוחל.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php

@@ -622,6 +622,7 @@ return [
             'invalid-coupon'      => 'कूपन कोड अमान्य है।',
             'success-coupon'      => 'कूपन कोड सफलतापूर्वक लागू किया गया।',
             'coupon-apply-issue'  => 'कूपन कोड लागू नहीं किया जा सकता',
+            'coupon-already-applied' => 'कूपन कोड पहले से ही लागू है।',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/it/app.php

@@ -612,6 +612,7 @@ return [
             'invalid-coupon'      => 'Il Codice Promo non è valido.',
             'success-coupon'      => 'Codice Promo applicato con successo.',
             'coupon-apply-issue'  => 'Il Codice Promo non può essere applicato.',
+            'coupon-already-applied' => 'Codice coupon già applicato.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/nl/app.php

@@ -619,6 +619,7 @@ return [
             'invalid-coupon'      => 'Couponcode is ongeldig.',
             'success-coupon'      => 'Couponcode succesvol toegepast.',
             'coupon-apply-issue'  => 'Coupon code can\'t be applied.',
+            'coupon-already-applied' => 'Couponcode reeds toegepast.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/pl/app.php

@@ -612,6 +612,7 @@ return [
             'invalid-coupon'      => 'Kod kuponu jest nieprawidłowy.',
             'success-coupon'      => 'Kod kuponu został pomyślnie zastosowany.',
             'coupon-apply-issue'  => 'Nie można zastosować kodu kuponu.',
+            'coupon-already-applied' => 'Kod kuponu został już zastosowany.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php

@@ -599,6 +599,7 @@ return [
             'invalid-coupon'      => 'Código do Cupom é inválido.',
             'success-coupon'      => 'Cupom aplicado com sucesso.',
             'coupon-apply-issue'  => 'Não foi possível aplicar esse Cupom',
+            'coupon-already-applied' => 'Coupon code already applied.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/ru/app.php

@@ -611,6 +611,7 @@ return [
             'invalid-coupon'      => 'Код купона недействителен.',
             'success-coupon'      => 'Код купона успешно применен.',
             'coupon-apply-issue'  => 'Код купона не может быть применен.',
+            'coupon-already-applied' => 'Coupon code already applied.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/sin/app.php

@@ -610,6 +610,7 @@ return [
             'invalid-coupon'      => 'කූපන් කේතය වලංගු නැත.',
             'success-coupon'      => 'කූපන් කේතය සාර්ථකව යොදන ලදී.',
             'coupon-apply-issue'  => 'කූපන් කේතය යෙදිය නොහැක.',
+            'coupon-already-applied' => 'Coupon code already applied.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/tr/app.php

@@ -611,6 +611,7 @@ return [
             'invalid-coupon'      => 'Kupon kodu geçersiz.',
             'success-coupon'      => 'Kupon kodu başarıyla uygulandı.',
             'coupon-apply-issue'  => 'Kupon kodu uygulanamaz.',
+            'coupon-already-applied' => 'Kupon kodu zaten uygulandı.',
         ],
 
         'success' => [

packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php

@@ -612,7 +612,8 @@ return [
             'cannot-apply-coupon' => '不能应用优惠券',
             'invalid-coupon' => '优惠券代码无效.',
             'success-coupon' => '优惠券代码已应用成功.',
-            'coupon-apply-issue' => '优惠券代码不能被应用.'
+            'coupon-apply-issue' => '优惠券代码不能被应用.',
+            'coupon-already-applied' => '優惠券代碼已應用',
         ],
 
         'success' => [

packages/Webkul/Ui/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/ui.js": "/js/ui.js?id=3200019bb5cc4b0a434e",
+    "/js/ui.js": "/js/ui.js?id=934e73015300b1ae35f5",
-    "/css/ui.css": "/css/ui.css?id=ea5749d0bf05163efd8e"
+    "/css/ui.css": "/css/ui.css?id=933372010d246f94f931"
 }

packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php

@@ -159,6 +159,7 @@ trait ProvideDataGridPlus
             'emptyValue'          => __('ui::app.datagrid.empty-value'),
             'active'              => __('ui::app.datagrid.active'),
             'inactive'            => __('ui::app.datagrid.inactive'),
+            'clearAll'            => __('ui::app.datagrid.clear-all'),
         ];
     }
 }

packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datagrid-plus.vue

@@ -47,6 +47,7 @@
                     :filters="filters"
                     :translations="translations"
                     @onRemoveFilter="removeFilter($event)"
+                    @onRemoveAllFilter="clearAllFilters()"
                 ></datagrid-filter-tags>
 
                 <div class="records-count-container">
@@ -455,6 +456,12 @@ export default {
                 }
             }
         },
+        
+        clearAllFilters() {
+            this.filters = [];
+
+            this.makeURL();
+        },
 
         changePage($event) {
             const { pageLink } = $event.data;
@@ -463,7 +470,7 @@ export default {
                 this.url = pageLink;
                 this.refresh();
             }
-        },
+        }
-    },
+    }
 };
 </script>

packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/partials/datagrid-filter-tags.vue

@@ -8,6 +8,8 @@
                 v-for="(filter, filterKey) in filters"
                 @onRemoveFilter="removeFilter(filter)"
             ></datagrid-filter-tag>
+            
+            <p @click="removeAllFilters" v-if="filters.length > 0">{{ translations.clearAll }}</p>
         </template>
     </div>
 </template>
@@ -29,6 +31,10 @@ export default {
     methods: {
         removeFilter(filter) {
             this.$emit('onRemoveFilter', { data: { filter } });
+        },
+
+        removeAllFilters() {
+            this.$emit('onRemoveAllFilter');
         }
     }
 };

packages/Webkul/Ui/src/Resources/assets/sass/includes/components.scss

@@ -72,6 +72,10 @@
     align-items: flex-start;
     flex-wrap: wrap;
     margin-bottom: 10px;
+    
+    p {
+        cursor: pointer;
+    }
 }
 
 .search-filter {

packages/Webkul/Ui/src/Resources/lang/ar/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'كل اللغات',
         'all-customer-groups'   => 'جميع مجموعات العملاء',
         'records-found'         => 'جميع مجموعات العملاء',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/ben/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/de/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Alle Lokalitäten',
         'all-customer-groups'   => 'Alle Kundengruppen',
         'records-found'         => 'Datensätze gefunden',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/en/app.php

@@ -59,5 +59,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/es/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Todas las localidades',
         'all-customer-groups'   => 'Todos los grupos de clientes',
         'records-found'         => 'Registro(s) encontrado(s)',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/fa/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'همه افراد محلی',
         'all-customer-groups'   => 'همه گروه های مشتری',
         'records-found'         => 'رکورد(های) یافت شده',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/fr/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/he/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/hi_IN/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/it/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Tutti i locali',
         'all-customer-groups'   => 'Tutti i gruppi di clienti',
         'records-found'         => 'Record trovati',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/ja/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/nl/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Alle locaties',
         'all-customer-groups'   => 'Alle klantgroepen',
         'records-found'         => 'Record(s) gevonden',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/pl/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Wszystkie lokalizacje',
         'all-customer-groups'   => 'Wszystkie grupy klientów',
         'records-found'         => 'Znaleziono rekord(y)',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Todos os locais',
         'all-customer-groups'   => 'Todos os grupos de clientes',
         'records-found'         => 'Registro(s) encontrado(s)',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/ru/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/sin/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'All Locales',
         'all-customer-groups'   => 'All Customer groups',
         'records-found'         => 'Record(s) found',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/tr/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => 'Tüm Yerel Ayarlar',
         'all-customer-groups'   => 'Tüm Müşteri grupları',
         'records-found'         => 'Kayıt(lar) bulundu',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Ui/src/Resources/lang/zh_CN/app.php

@@ -57,5 +57,6 @@ return [
         'all-locales'           => '所有語言環境',
         'all-customer-groups'   => '所有客戶組',
         'records-found'         => '找到記錄',
+        'clear-all'             => 'Clear All'
     ],
 ];

packages/Webkul/Velocity/publishable/assets/js/components.js.LICENSE.txt

@@ -16,8 +16,8 @@
  */
 
 /*!
- * Vue.js v2.7.8
+ * Vue.js v2.6.14
- * (c) 2014-2022 Evan You
+ * (c) 2014-2021 Evan You
  * Released under the MIT License.
  */
 
@@ -71,8 +71,6 @@
 
 /*! @preserve sweet-scroll v4.0.0 - tsuyoshiwada | MIT License */
 
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
-
 /**
   * vee-validate v2.2.15
   * (c) 2019 Abdelrahman Awad

packages/Webkul/Velocity/publishable/assets/js/manifest.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r,t,o,n={},i={};function a(e){var r=i[e];if(void 0!==r)return r.exports;var t=i[e]={id:e,loaded:!1,exports:{}};return n[e].call(t.exports,t,t.exports,a),t.loaded=!0,t.exports}a.m=n,e=[],a.O=(r,t,o,n)=>{if(!t){var i=1/0;for(c=0;c<e.length;c++){for(var[t,o,n]=e[c],l=!0,u=0;u<t.length;u++)(!1&n||i>=n)&&Object.keys(a.O).every((e=>a.O[e](t[u])))?t.splice(u--,1):(l=!1,n<i&&(i=n));if(l){e.splice(c--,1);var s=o();void 0!==s&&(r=s)}}return r}n=n||0;for(var c=e.length;c>0&&e[c-1][2]>n;c--)e[c]=e[c-1];e[c]=[t,o,n]},a.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return a.d(r,{a:r}),r},t=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,a.t=function(e,o){if(1&o&&(e=this(e)),8&o)return e;if("object"==typeof e&&e){if(4&o&&e.__esModule)return e;if(16&o&&"function"==typeof e.then)return e}var n=Object.create(null);a.r(n);var i={};r=r||[null,t({}),t([]),t(t)];for(var l=2&o&&e;"object"==typeof l&&!~r.indexOf(l);l=t(l))Object.getOwnPropertyNames(l).forEach((r=>i[r]=()=>e[r]));return i.default=()=>e,a.d(n,i),n},a.d=(e,r)=>{for(var t in r)a.o(r,t)&&!a.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},a.f={},a.e=e=>Promise.all(Object.keys(a.f).reduce(((r,t)=>(a.f[t](e,r),r)),[])),a.u=e=>"js/components.js",a.miniCssF=e=>({166:"css/velocity",362:"css/velocity-admin"}[e]+".css"),a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o={},a.l=(e,r,t,n)=>{if(o[e])o[e].push(r);else{var i,l;if(void 0!==t)for(var u=document.getElementsByTagName("script"),s=0;s<u.length;s++){var c=u[s];if(c.getAttribute("src")==e){i=c;break}}i||(l=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=e),o[e]=[r];var d=(r,t)=>{i.onerror=i.onload=null,clearTimeout(f);var n=o[e];if(delete o[e],i.parentNode&&i.parentNode.removeChild(i),n&&n.forEach((e=>e(t))),r)return r(t)},f=setTimeout(d.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=d.bind(null,i.onerror),i.onload=d.bind(null,i.onload),l&&document.head.appendChild(i)}},a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.p="/",(()=>{var e={929:0,166:0,362:0};a.f.j=(r,t)=>{var o=a.o(e,r)?e[r]:void 0;if(0!==o)if(o)t.push(o[2]);else if(/^(166|362|929)$/.test(r))e[r]=0;else{var n=new Promise(((t,n)=>o=e[r]=[t,n]));t.push(o[2]=n);var i=a.p+a.u(r),l=new Error;a.l(i,(t=>{if(a.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var n=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;l.message="Loading chunk "+r+" failed.\n("+n+": "+i+")",l.name="ChunkLoadError",l.type=n,l.request=i,o[1](l)}}),"chunk-"+r,r)}},a.O.j=r=>0===e[r];var r=(r,t)=>{var o,n,[i,l,u]=t,s=0;if(i.some((r=>0!==e[r]))){for(o in l)a.o(l,o)&&(a.m[o]=l[o]);if(u)var c=u(a)}for(r&&r(t);s<i.length;s++)n=i[s],a.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return a.O(c)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),a.nc=void 0})();
+(()=>{"use strict";var e,r,t,o,n={},i={};function a(e){var r=i[e];if(void 0!==r)return r.exports;var t=i[e]={id:e,loaded:!1,exports:{}};return n[e].call(t.exports,t,t.exports,a),t.loaded=!0,t.exports}a.m=n,e=[],a.O=(r,t,o,n)=>{if(!t){var i=1/0;for(c=0;c<e.length;c++){for(var[t,o,n]=e[c],l=!0,u=0;u<t.length;u++)(!1&n||i>=n)&&Object.keys(a.O).every((e=>a.O[e](t[u])))?t.splice(u--,1):(l=!1,n<i&&(i=n));if(l){e.splice(c--,1);var s=o();void 0!==s&&(r=s)}}return r}n=n||0;for(var c=e.length;c>0&&e[c-1][2]>n;c--)e[c]=e[c-1];e[c]=[t,o,n]},a.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return a.d(r,{a:r}),r},t=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,a.t=function(e,o){if(1&o&&(e=this(e)),8&o)return e;if("object"==typeof e&&e){if(4&o&&e.__esModule)return e;if(16&o&&"function"==typeof e.then)return e}var n=Object.create(null);a.r(n);var i={};r=r||[null,t({}),t([]),t(t)];for(var l=2&o&&e;"object"==typeof l&&!~r.indexOf(l);l=t(l))Object.getOwnPropertyNames(l).forEach((r=>i[r]=()=>e[r]));return i.default=()=>e,a.d(n,i),n},a.d=(e,r)=>{for(var t in r)a.o(r,t)&&!a.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},a.f={},a.e=e=>Promise.all(Object.keys(a.f).reduce(((r,t)=>(a.f[t](e,r),r)),[])),a.u=e=>"js/components.js",a.miniCssF=e=>({166:"css/velocity",362:"css/velocity-admin"}[e]+".css"),a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o={},a.l=(e,r,t,n)=>{if(o[e])o[e].push(r);else{var i,l;if(void 0!==t)for(var u=document.getElementsByTagName("script"),s=0;s<u.length;s++){var c=u[s];if(c.getAttribute("src")==e){i=c;break}}i||(l=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=e),o[e]=[r];var f=(r,t)=>{i.onerror=i.onload=null,clearTimeout(d);var n=o[e];if(delete o[e],i.parentNode&&i.parentNode.removeChild(i),n&&n.forEach((e=>e(t))),r)return r(t)},d=setTimeout(f.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=f.bind(null,i.onerror),i.onload=f.bind(null,i.onload),l&&document.head.appendChild(i)}},a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.p="/",(()=>{var e={929:0,166:0,362:0};a.f.j=(r,t)=>{var o=a.o(e,r)?e[r]:void 0;if(0!==o)if(o)t.push(o[2]);else if(/^(166|362|929)$/.test(r))e[r]=0;else{var n=new Promise(((t,n)=>o=e[r]=[t,n]));t.push(o[2]=n);var i=a.p+a.u(r),l=new Error;a.l(i,(t=>{if(a.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var n=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;l.message="Loading chunk "+r+" failed.\n("+n+": "+i+")",l.name="ChunkLoadError",l.type=n,l.request=i,o[1](l)}}),"chunk-"+r,r)}},a.O.j=r=>0===e[r];var r=(r,t)=>{var o,n,[i,l,u]=t,s=0;if(i.some((r=>0!==e[r]))){for(o in l)a.o(l,o)&&(a.m[o]=l[o]);if(u)var c=u(a)}for(r&&r(t);s<i.length;s++)n=i[s],a.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return a.O(c)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

packages/Webkul/Velocity/publishable/assets/js/velocity-core.js

@@ -1 +1 @@
-(self.webpackChunk=self.webpackChunk||[]).push([[847],{4389:(o,t,n)=>{"use strict";var e=n(538),d=n(9669),r=n.n(d);function a(){return document.querySelector('meta[name="base-url"]').content}function i(){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i|/mobi/i.test(navigator.userAgent)}function s(o,t){var n=document.createElement("script");n.setAttribute("src",o),document.body.appendChild(n),n.addEventListener("load",t,!1)}function l(o){return o.replace(/\/$/,"")}e.default.prototype.$http=r(),window.Vue=e.default,window.eventBus=new e.default,window.axios=r(),window.jQuery=window.$=n(9755),n(2293),window.BootstrapSass=n(3002),window.lazySize=n(7090),window.getBaseUrl=a,window.isMobile=i,window.loadDynamicScript=s,window.showAlert=function(o,t,n){if(o&&""!==n){var e=Math.floor(1e3*Math.random()),d='<div class="alert '.concat(o,' alert-dismissible" id="').concat(e,'">\n            <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>\n                <strong>').concat(t?t+"!":""," </strong> ").concat(n,".\n        </div>");$("#alert-container").append(d).ready((function(){window.setTimeout((function(){$("#alert-container #".concat(e)).remove()}),5e3)}))}},$((function(){var o=a(),t="themes/velocity/assets/js/velocity.js";i()&&l(o)===l(window.location.href)?document.addEventListener("touchstart",(function n(){var e=this;window.scrollTo(0,0),document.body.style.overflow="hidden",s("".concat(o,"/").concat(t),(function(){window.scrollTo(0,0),document.body.style.overflow="",e.removeEventListener("touchstart",n)}))}),!1):s("".concat(o,"/").concat(t),(function(){}))}))},2293:()=>{$((function(){function o(){if(dropdown=$(".dropdown-open"),!dropdown.find(".dropdown-list").hasClass("top-left")&&!dropdown.find(".dropdown-list").hasClass("top-right")&&dropdown.length){dropdown=dropdown.find(".dropdown-list"),height=dropdown.height()+50;var o=dropdown.offset().top-70,t=$(window).height()-o-dropdown.height();t>o||height<t?(dropdown.removeClass("bottom"),dropdown.hasClass("top-right")?(dropdown.removeClass("top-right"),dropdown.addClass("bottom-right")):dropdown.hasClass("top-left")&&(dropdown.removeClass("top-left"),dropdown.addClass("bottom-left"))):dropdown.hasClass("bottom-right")?(dropdown.removeClass("bottom-right"),dropdown.addClass("top-right")):dropdown.hasClass("bottom-left")&&(dropdown.removeClass("bottom-left"),dropdown.addClass("top-left"))}}$(document).click((function(o){var t=o.target;(!$(t).parents(".dropdown-open").length||$(t).is("li")||$(t).is("a"))&&($(".dropdown-list").hide(),$(".dropdown-toggle").removeClass("active"))})),$("body").delegate(".dropdown-toggle","click",(function(t){t.stopImmediatePropagation(),function(t){var n=$(t.currentTarget);$(".dropdown-list").hide(),n.hasClass("active")?n.removeClass("active"):(n.addClass("active"),n.parent().find(".dropdown-list").fadeIn(100),n.parent().addClass("dropdown-open"),o())}(t)})),$("div").scroll((function(){o()}))}))}},o=>{o.O(0,[339],(()=>{return t=4389,o(o.s=t);var t}));o.O()}]);
+(self.webpackChunk=self.webpackChunk||[]).push([[847],{4047:(o,t,n)=>{"use strict";var e=n(538),d=n(9669),r=n.n(d);function a(){return document.querySelector('meta[name="base-url"]').content}function i(){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i|/mobi/i.test(navigator.userAgent)}function s(o,t){var n=document.createElement("script");n.setAttribute("src",o),document.body.appendChild(n),n.addEventListener("load",t,!1)}function l(o){return o.replace(/\/$/,"")}e.default.prototype.$http=r(),window.Vue=e.default,window.eventBus=new e.default,window.axios=r(),window.jQuery=window.$=n(9755),n(3353),window.BootstrapSass=n(3002),window.lazySize=n(7090),window.getBaseUrl=a,window.isMobile=i,window.loadDynamicScript=s,window.showAlert=function(o,t,n){if(o&&""!==n){var e=Math.floor(1e3*Math.random()),d='<div class="alert '.concat(o,' alert-dismissible" id="').concat(e,'">\n            <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>\n                <strong>').concat(t?t+"!":""," </strong> ").concat(n,".\n        </div>");$("#alert-container").append(d).ready((function(){window.setTimeout((function(){$("#alert-container #".concat(e)).remove()}),5e3)}))}},$((function(){var o=a(),t="themes/velocity/assets/js/velocity.js";i()&&l(o)===l(window.location.href)?document.addEventListener("touchstart",(function n(){var e=this;window.scrollTo(0,0),document.body.style.overflow="hidden",s("".concat(o,"/").concat(t),(function(){window.scrollTo(0,0),document.body.style.overflow="",e.removeEventListener("touchstart",n)}))}),!1):s("".concat(o,"/").concat(t),(function(){}))}))},3353:()=>{$((function(){function o(){if(dropdown=$(".dropdown-open"),!dropdown.find(".dropdown-list").hasClass("top-left")&&!dropdown.find(".dropdown-list").hasClass("top-right")&&dropdown.length){dropdown=dropdown.find(".dropdown-list"),height=dropdown.height()+50;var o=dropdown.offset().top-70,t=$(window).height()-o-dropdown.height();t>o||height<t?(dropdown.removeClass("bottom"),dropdown.hasClass("top-right")?(dropdown.removeClass("top-right"),dropdown.addClass("bottom-right")):dropdown.hasClass("top-left")&&(dropdown.removeClass("top-left"),dropdown.addClass("bottom-left"))):dropdown.hasClass("bottom-right")?(dropdown.removeClass("bottom-right"),dropdown.addClass("top-right")):dropdown.hasClass("bottom-left")&&(dropdown.removeClass("bottom-left"),dropdown.addClass("top-left"))}}$(document).click((function(o){var t=o.target;(!$(t).parents(".dropdown-open").length||$(t).is("li")||$(t).is("a"))&&($(".dropdown-list").hide(),$(".dropdown-toggle").removeClass("active"))})),$("body").delegate(".dropdown-toggle","click",(function(t){t.stopImmediatePropagation(),function(t){var n=$(t.currentTarget);$(".dropdown-list").hide(),n.hasClass("active")?n.removeClass("active"):(n.addClass("active"),n.parent().find(".dropdown-list").fadeIn(100),n.parent().addClass("dropdown-open"),o())}(t)})),$("div").scroll((function(){o()}))}))}},o=>{o.O(0,[339],(()=>{return t=4047,o(o.s=t);var t}));o.O()}]);

packages/Webkul/Velocity/publishable/assets/mix-manifest.json

@@ -1,55 +1,14 @@
 {
-    "/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=49cf283b39e940ef66243de6b2f91383",
+    "/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
-    "/js/velocity-core.js": "/js/velocity-core.js?id=dcc312fe978be1aff63a33eaf7ad190c",
+    "/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
-    "/js/velocity.js": "/js/velocity.js?id=467af54e0d8f4cabef0750308394df2b",
+    "/js/velocity.js": "/js/velocity.js?id=ddd0cb9f4f4d91fa429dc35e46e69aed",
-    "/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d",
+    "/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
-    "/js/components.js": "/js/components.js?id=e41c3e8d43f6cb0d9ba4a2191c948b3b",
+    "/js/components.js": "/js/components.js?id=7dac540b23faac6e0b952390c4bdabe1",
-    "/css/velocity.css": "/css/velocity.css?id=8eae190fe7c375c7e85eec24b6d0d592",
+    "/css/velocity.css": "/css/velocity.css?id=b2059676ca2d28429fa69d30ded53e80",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
-    "/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
-    "/images/Icon-Arrow-Right.svg": "/images/Icon-Arrow-Right.svg?id=e30f624f1a70197dc9ad9011b240aa8e",
-    "/images/Icon-Search.png": "/images/Icon-Search.png?id=b596988549382624a230a9f16ba9efd3",
-    "/images/Icon-Velocity-Active.svg": "/images/Icon-Velocity-Active.svg?id=51ec2d59b9ec7c8cfa22038fbeeb6470",
-    "/images/Icon-Velocity.svg": "/images/Icon-Velocity.svg?id=27aa921a27734446fdd3e1bdf8e86e00",
-    "/images/Icon-remove.svg": "/images/Icon-remove.svg?id=e0b2612418461e14da7a84a5cbbc2dbd",
-    "/images/banner.png": "/images/banner.png?id=6d77549973b3036e8e1868f70a53ac96",
-    "/images/banner.webp": "/images/banner.webp?id=7f3cd4e49a364bc2bedc8ba0fbcb3aa4",
-    "/images/big-sale-banner.png": "/images/big-sale-banner.png?id=dc5351d2c3b34b453f84d725e81b78f0",
-    "/images/big-sale-banner.webp": "/images/big-sale-banner.webp?id=b65cd1e414767de2d38698284d7b0023",
-    "/images/deals.png": "/images/deals.png?id=4eef96209646f25e91cb87c5496edb17",
-    "/images/deals.webp": "/images/deals.webp?id=da71c36c3fc51ae8cba220ec3c35bb89",
-    "/images/flags/de.png": "/images/flags/de.png?id=ded818e1122171342a073f1f195b7bd6",
-    "/images/flags/en.png": "/images/flags/en.png?id=4c1caf099300206b0e364857879636e1",
-    "/images/flags/es.png": "/images/flags/es.png?id=ddc7cf223ef8c1d608127e9b1f72441a",
-    "/images/flags/fr.png": "/images/flags/fr.png?id=48a669b495d7b14dca989cdca1e44471",
-    "/images/flags/nl.png": "/images/flags/nl.png?id=82307d28d73a830b30738a0b016af496",
-    "/images/flags/tr.png": "/images/flags/tr.png?id=b090fbe0f7292ecb937a8268ba62eb35",
-    "/images/girl.png": "/images/girl.png?id=4635bdd5cb7bf4c992c9d032a6a783f9",
-    "/images/headphones.png": "/images/headphones.png?id=26e5acf17df84d7bd4aa26d557e9408a",
-    "/images/headphones.webp": "/images/headphones.webp?id=f44baaa36c21045fd23200aa09311f6a",
     "/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
     "/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
     "/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd99376bd4ba7bd5b",
     "/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c675df49d56fd5",
-    "/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b24952561263f1",
+    "/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b24952561263f1"
-    "/images/kids-2.png": "/images/kids-2.png?id=5b8fbafaf93ee7a3b4b2fd55147e5f5a",
-    "/images/kids-2.webp": "/images/kids-2.webp?id=8ea1782d2c75398d5c77c8f9f3ea5519",
-    "/images/kids.png": "/images/kids.png?id=d3fd13c123b40691a52d7de1b69b6f2e",
-    "/images/kids.webp": "/images/kids.webp?id=c643da512eb46b9352355e6c7cae4f53",
-    "/images/little-girl.png": "/images/little-girl.png?id=cae4004e8fa8792f87a606b58d3a873d",
-    "/images/logo-text.png": "/images/logo-text.png?id=b462bdc8769c073f451a5bace657e167",
-    "/images/placeholder-icon.svg": "/images/placeholder-icon.svg?id=8a133eee6f0c532cfbdd10d7fed66426",
-    "/images/seasons.png": "/images/seasons.png?id=e0b6719b6b84040d2930cd7f660f7c80",
-    "/images/seasons.webp": "/images/seasons.webp?id=6236cae7654e0438e5ea8f9a43d558f3",
-    "/images/static/broken-clock.png": "/images/static/broken-clock.png?id=09e8b1698841d2cba491b72b3ef8777b",
-    "/images/static/logo-text-white.png": "/images/static/logo-text-white.png?id=5e4b97f1479900eace562e5381afb21e",
-    "/images/static/logo.png": "/images/static/logo.png?id=d73adb4a543e16ee9d32ebe0563e07ae",
-    "/images/static/meduim-product-placeholder.png": "/images/static/meduim-product-placeholder.png?id=71aec3b74f80bb8d19adaa1f8d691ae5",
-    "/images/static/v-icon.png": "/images/static/v-icon.png?id=aaa7981475676369dc690ea116b19bc0",
-    "/images/toster.png": "/images/toster.png?id=45db8689db15417058605c22a19d0b7e",
-    "/images/toster.webp": "/images/toster.webp?id=520462dd1ddfc17e1e4ff164dec8afe3",
-    "/images/trimmer.png": "/images/trimmer.png?id=9d9430bc00204825a06fbb0917d144d9",
-    "/images/trimmer.webp": "/images/trimmer.webp?id=d9176893314733eeeb027a5f4a1182b9",
-    "/images/watch.png": "/images/watch.png?id=a43c1524c5b6bb0ae907106e6aa84fde",
-    "/images/watch.webp": "/images/watch.webp?id=57742bbf72172d644c65dfbef00e8102"
 }

packages/Webkul/Velocity/src/Resources/assets/js/UI/components/image-magnifier.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="outer-assets-container">
-        <div class="video-container" v-if="currentType == 'video'">
+        <div class="video-container" v-if="currentType == 'video' || currentType == 'videos'">
             <video :key="activeImageVideoURL" width="100%" controls>
                 <source :src="activeImageVideoURL" type="video/mp4" />
             </video>

packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php

@@ -62,7 +62,7 @@
                     :class="`thumb-frame ${index + 1 == 4 ? '' : 'mr5'} ${thumb.large_image_url == currentLargeImageUrl ? 'active' : ''}`"
                     >
 
-                    <video v-if="thumb.type == 'video'" width="110" height="110" controls>
+                    <video v-if="thumb.type == 'video' || thumb.type == 'videos'" width="110" height="110" controls>
                         <source :src="thumb.small_image_url" type="video/mp4">
                         {{ __('admin::app.catalog.products.not-support-video') }}
                     </video>

packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php

@@ -40,23 +40,21 @@
     @endauth
 
     @guest('customer')
-        <form
+        <form           
-            class="d-none"
             id="wishlist-{{ $product->product_id }}"
             action="{{ route('customer.wishlist.add', $product->product_id) }}"
             method="POST">
             @csrf
+            
+            <a
+                class="unset wishlist-icon {{ $addWishlistClass ?? '' }} text-right"
+                href="javascript:void(0);"
+                title="{{ __('velocity::app.shop.wishlist.add-wishlist-text') }}"
+                onclick="document.getElementById('wishlist-{{ $product->product_id }}').submit();">
+
+                <wishlist-component active="false"></wishlist-component>
+            </a>
         </form>
-
-        <a
-            class="unset wishlist-icon {{ $addWishlistClass ?? '' }} text-right"
-            href="javascript:void(0);"
-            title="{{ __('velocity::app.shop.wishlist.add-wishlist-text') }}"
-            onclick="document.getElementById('wishlist-{{ $product->product_id }}').submit();">
-
-            <wishlist-component active="false"></wishlist-component>
-
-        </a>
     @endauth
 
-{!! view_render_event('bagisto.shop.products.wishlist.after') !!}
+{!! view_render_event('bagisto.shop.products.wishlist.after') !!}