resolved conflict

This commit is contained in:
Abhishek Kathuria 2022-08-02 11:02:31 +05:30
commit 95947c862d
44 changed files with 273 additions and 52 deletions

File diff suppressed because one or more lines are too long

View File

@ -5,7 +5,7 @@
<i class="icon notification-icon active" style="margin-left:0px"></i>
</div>
<div class="dropdown-list bottom-right notification">
<div class="dropdown-list bottom-right notification" ref="dropdownList">
<div class="dropdown-container">
<ul class="notif">
<div id="notif-title">{{ title }}</div>
@ -132,34 +132,38 @@ export default {
read: 0
};
let this_this = this;
let self = this;
this.$http.get(this.getNotificationUrl, {
params: params
})
.then(function (response) {
this_this.notifications = response.data.search_results.data;
this_this.totalUnRead = response.data.total_unread;
self.notifications = response.data.search_results.data;
self.totalUnRead = response.data.total_unread;
})
.catch(function (error) {})
},
readAll: function () {
let this_this = this;
let self = this;
let dropdownList = this.$refs.dropdownList;
this.$http.post(this.getReadAllUrl)
.then(function (response) {
this_this.notifications = response.data.search_results.data;
self.notifications = response.data.search_results.data;
this_this.totalUnRead = response.data.total_unread;
self.totalUnRead = response.data.total_unread;
window.flashMessages.push({
'type': 'alert-success',
'message': response.data.success_message
});
this_this.$root.addFlashMessages();
self.$root.addFlashMessages();
})
.catch(function (error) {})
dropdownList.style.display = "none";
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -239,4 +239,23 @@
}
}
}
}
}
body {
&.rtl {
.booking-information {
.icon {
position: absolute;
top: -4px;
}
.bp-location-icon {
right: 60px;
}
.bp-slot-icon {
right: 140px;
}
}
}
}

View File

@ -5,7 +5,7 @@
padding-left: 32px;
margin-bottom: 20px;
position: relative;
.icon {
position: absolute;
left: 0;
@ -278,6 +278,19 @@ body {
left: 80px !important;
right: inherit !important;
}
.icon {
position: absolute;
top: -4px;
}
.bp-location-icon {
right: 60px;
}
.bp-slot-icon {
right: 140px;
}
}
}
}

View File

@ -78,7 +78,7 @@ class CartRuleRepository extends Repository
$this->cartRuleCouponRepository->create([
'cart_rule_id' => $cartRule->id,
'code' => $data['coupon_code'],
'usage_limit' => $data['usage_per_customer'] ?? 0,
'usage_limit' => $data['uses_per_coupon'] ?? 0,
'usage_per_customer' => $data['usage_per_customer'] ?? 0,
'is_primary' => 1,
'expired_at' => $data['ends_till'] ?: null,

View File

@ -844,7 +844,7 @@ abstract class AbstractType
*/
public function prepareForCart($data)
{
$data['quantity'] = (int) $data['quantity'] ?? 1;
$data['quantity'] = $this->handleQuantity((int) $data['quantity']);
$data = $this->getQtyRequest($data);
@ -875,6 +875,19 @@ abstract class AbstractType
return $products;
}
/**
* Handle quantity.
*
* @param int $quantity
* @return int
*/
public function handleQuantity(int $quantity): int
{
return ! empty($quantity)
? $quantity
: 1;
}
/**
* Get request quantity.
*

View File

@ -434,7 +434,7 @@ class Bundle extends AbstractType
*/
public function prepareForCart($data)
{
$bundleQuantity = $data['quantity'];
$bundleQuantity = parent::handleQuantity((int) $data['quantity']);
if (isset($data['bundle_options'])) {
$data['bundle_options'] = array_filter($this->validateBundleOptionForCart($data['bundle_options']));

View File

@ -655,6 +655,8 @@ class Configurable extends AbstractType
*/
public function prepareForCart($data)
{
$data['quantity'] = parent::handleQuantity((int) $data['quantity']);
if (
! isset($data['selected_configurable_option'])
|| ! $data['selected_configurable_option']

View File

@ -158,6 +158,7 @@
<script type="text/x-template" id="quantity-changer-template">
<div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
<label class="required">{{ __('shop::app.products.quantity') }}</label>
<span class="quantity-container">
<button type="button" class="decrease" @click="decreaseQty()">-</button>
@ -171,9 +172,9 @@
@keyup="setQty($event)">
<button type="button" class="increase" @click="increaseQty()">+</button>
<span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
</span>
<span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
</div>
</script>

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=994a0d7537c0f196b1e0",
"/css/ui.css": "/css/ui.css?id=d5a5781ad0a890301ed3"
"/js/ui.js": "/js/ui.js?id=e341b90409ba0b1cc315",
"/css/ui.css": "/css/ui.css?id=d37fc925848045c24ee5"
}

View File

@ -119,9 +119,9 @@ trait ProvideDataGridPlus
public function getTranslations()
{
return [
'allChannels' => __('admin::app.admin.system.all-channels'),
'allLocales' => __('admin::app.admin.system.all-locales'),
'allCustomerGroups' => __('admin::app.admin.system.all-customer-groups'),
'allChannels' => __('ui::app.datagrid.all-channels'),
'allLocales' => __('ui::app.datagrid.all-locales'),
'allCustomerGroups' => __('ui::app.datagrid.all-customer-groups'),
'search' => __('ui::app.datagrid.search'),
'searchTitle' => __('ui::app.datagrid.search-title'),
'channel' => __('ui::app.datagrid.channel'),
@ -152,11 +152,13 @@ trait ProvideDataGridPlus
'filterExists' => __('ui::app.datagrid.filter-exists'),
'zeroIndex' => __('ui::app.datagrid.zero-index'),
'clickOnAction' => __('ui::app.datagrid.click_on_action'),
'recordsFound' => __('admin::app.admin.system.records-found'),
'recordsFound' => __('ui::app.datagrid.records-found'),
'norecords' => __('ui::app.datagrid.no-records'),
'massActionDelete' => __('ui::app.datagrid.massaction.delete'),
'emptyField' => __('ui::app.datagrid.empty-field'),
'emptyValue' => __('ui::app.datagrid.empty-value'),
'active' => __('ui::app.datagrid.active'),
'inactive' => __('ui::app.datagrid.inactive'),
];
}
}

View File

@ -45,6 +45,7 @@
<div class="filter-advance">
<datagrid-filter-tags
:filters="filters"
:translations="translations"
@onRemoveFilter="removeFilter($event)"
></datagrid-filter-tags>
@ -213,7 +214,7 @@ export default {
this.perPage = this.itemsPerPage;
},
formURL(column, condition, response, label) {
formURL(column, condition, response, label, type) {
let obj = {};
if (
@ -260,6 +261,7 @@ export default {
}
if (filterRepeated === false) {
obj.type = type;
obj.column = column;
obj.cond = condition;
obj.val = response;
@ -359,6 +361,7 @@ export default {
}
}
} else {
obj.type = type;
obj.column = column;
obj.cond = condition;
obj.val = encodeURIComponent(response);
@ -397,7 +400,8 @@ export default {
'search',
'all',
searchValue,
this.translations.searchTitle
this.translations.searchTitle,
'search'
);
},
@ -420,9 +424,9 @@ export default {
},
filterData($event) {
const { column, condition, response, label } = $event.data;
const { type, column, condition, response, label } = $event.data;
this.formURL(column, condition, response, label);
this.formURL(column, condition, response, label, type);
},
removeFilter($event) {

View File

@ -1,11 +1,11 @@
<template>
<span class="filter-tag" style="text-transform: capitalize">
<span class="filter-tag">
<span v-if="filter.column == 'perPage'">perPage</span>
<span v-else>{{ filter.label }}</span>
<span class="wrapper" v-if="filter.prettyValue">
{{ filter.prettyValue }}
{{ filter.prettyValue }}
<span
class="icon cross-icon"
v-on:click="removeFilter(filter)"
@ -13,7 +13,18 @@
</span>
<span class="wrapper" v-else>
{{ decodeURIComponent(filter.val) }}
<span v-if="filter.type == 'boolean'">
{{
filter.val == 1
? translations.active
: translations.inactive
}}
</span>
<span v-else>
{{ decodeURIComponent(filter.val) }}
</span>
<span
class="icon cross-icon"
v-on:click="removeFilter(filter)"
@ -24,7 +35,7 @@
<script>
export default {
props: ['filter'],
props: ['filter', 'translations'],
data() {
return {};

View File

@ -4,6 +4,7 @@
<datagrid-filter-tag
:key="filterKey"
:filter="filter"
:translations="translations"
v-for="(filter, filterKey) in filters"
@onRemoveFilter="removeFilter(filter)"
></datagrid-filter-tag>
@ -15,7 +16,7 @@
import DatagridFilterTag from './datagrid-filter-tag.vue';
export default {
props: ['filters'],
props: ['filters', 'translations'],
components: {
DatagridFilterTag

View File

@ -51,5 +51,11 @@ return [
'edit' => 'تعديل',
'delete' => 'حذف',
'view' => 'رأي',
'active' => 'نشيط',
'inactive' => 'غير نشط',
'all-channels' => 'جميع القنوات',
'all-locales' => 'كل اللغات',
'all-customer-groups' => 'جميع مجموعات العملاء',
'records-found' => 'جميع مجموعات العملاء',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'view' => 'View',
'edit' => 'Bearbeiten',
'delete' => 'Löschen',
'active' => 'Aktiv',
'inactive' => 'Inaktiv',
'all-channels' => 'Alle Kanäle',
'all-locales' => 'Alle Lokalitäten',
'all-customer-groups' => 'Alle Kundengruppen',
'records-found' => 'Datensätze gefunden',
],
];

View File

@ -53,5 +53,11 @@ return [
'view' => 'View',
'empty-field' => 'Please select the filter',
'empty-value' => 'Please enter the value',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Editar',
'delete' => 'Borrar',
'view' => 'Ver',
'active' => 'Activo',
'inactive' => 'Inactivo',
'all-channels' => 'Todos los canales',
'all-locales' => 'Todas las localidades',
'all-customer-groups' => 'Todos los grupos de clientes',
'records-found' => 'Registro(s) encontrado(s)',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'ویرایش کنید',
'delete' => 'حذف',
'view' => 'چشم انداز',
'active' => 'روشن کن',
'inactive' => 'غیر فعال',
'all-channels' => 'همه کانال ها',
'all-locales' => 'همه افراد محلی',
'all-customer-groups' => 'همه گروه های مشتری',
'records-found' => 'رکورد(های) یافت شده',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Modifica',
'delete' => 'Elimina',
'view' => 'Vedi',
'active' => 'accendere',
'inactive' => 'non attivo',
'all-channels' => 'Tutti i canali',
'all-locales' => 'Tutti i locali',
'all-customer-groups' => 'Tutti i gruppi di clienti',
'records-found' => 'Record trovati',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Actief',
'inactive' => 'Inactief',
'all-channels' => 'Alle kanalen',
'all-locales' => 'Alle locaties',
'all-customer-groups' => 'Alle klantgroepen',
'records-found' => 'Record(s) gevonden',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Usuń',
'view' => 'Widok',
'active' => 'Aktywny',
'inactive' => 'Nieaktywny',
'all-channels' => 'Wszystkie kanały',
'all-locales' => 'Wszystkie lokalizacje',
'all-customer-groups' => 'Wszystkie grupy klientów',
'records-found' => 'Znaleziono rekord(y)',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Editar',
'delete' => 'Excluir',
'view' => 'Visão',
'active' => 'Ativo',
'inactive' => 'Inativo',
'all-channels' => 'Todos os canais',
'all-locales' => 'Todos os locais',
'all-customer-groups' => 'Todos os grupos de clientes',
'records-found' => 'Registro(s) encontrado(s)',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Edit',
'delete' => 'Delete',
'view' => 'View',
'active' => 'Active',
'inactive' => 'Inactive',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'records-found' => 'Record(s) found',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => 'Düzenle',
'delete' => 'Sil',
'view' => 'Görüntüle',
'active' => 'Aktif',
'inactive' => 'etkin değil',
'all-channels' => 'Tüm kanallar',
'all-locales' => 'Tüm Yerel Ayarlar',
'all-customer-groups' => 'Tüm Müşteri grupları',
'records-found' => 'Kayıt(lar) bulundu',
],
];

View File

@ -51,5 +51,11 @@ return [
'edit' => '编辑',
'delete' => '删除',
'view' => '查看',
'active' => '積極的',
'inactive' => '不活躍',
'all-channels' => '所有頻道',
'all-locales' => '所有語言環境',
'all-customer-groups' => '所有客戶組',
'records-found' => '找到記錄',
],
];

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -16,8 +16,8 @@
*/
/*!
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Vue.js v2.7.8
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/
@ -71,6 +71,8 @@
/*! @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

File diff suppressed because one or more lines are too long

View File

@ -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 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))})()})();
(()=>{"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})();

View File

@ -1 +1 @@
(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()}]);
(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()}]);

View File

@ -1,14 +1,55 @@
{
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba57f77b9a4344",
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
"/js/components.js": "/js/components.js?id=13ebf112e40292178d2386143e9d75cd",
"/css/velocity.css": "/css/velocity.css?id=1dae4e9e1e8fd5ef9c66fe1a5aebb8ca",
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=49cf283b39e940ef66243de6b2f91383",
"/js/velocity-core.js": "/js/velocity-core.js?id=dcc312fe978be1aff63a33eaf7ad190c",
"/js/velocity.js": "/js/velocity.js?id=467af54e0d8f4cabef0750308394df2b",
"/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d",
"/js/components.js": "/js/components.js?id=e41c3e8d43f6cb0d9ba4a2191c948b3b",
"/css/velocity.css": "/css/velocity.css?id=777db319d7c4a932a4d423857f25e346",
"/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"
}

View File

@ -219,8 +219,9 @@
method="POST"
id="product-form"
@click="onSubmit($event)"
action="{{ route('cart.add', $product->product_id) }}">
@submit.enter.prevent="onSubmit($event)"
action="{{ route('cart.add', $product->product_id) }}"
>
<input type="hidden" name="is_buy_now" v-model="is_buy_now">
<slot v-if="slot"></slot>
@ -228,7 +229,6 @@
<div v-else>
<div class="spritespin"></div>
</div>
</form>
</script>