Resolved conflict
This commit is contained in:
Abhishek Kathuria
commit
4d9b4ff19e
|
|
@ -118,6 +118,22 @@ class ConfigurationController extends Controller
|
|||
if (! $atLeastOneCarrierEnabled) {
|
||||
session()->flash('error', trans('admin::app.configuration.enable-atleast-one-shipping'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
} elseif (isset($data['sales']['paymentmethods'])) {
|
||||
$atLeastOnePaymentMethodEnabled = false;
|
||||
|
||||
foreach ($data['sales']['paymentmethods'] as $paymentMethod) {
|
||||
if ($paymentMethod['active']) {
|
||||
$atLeastOnePaymentMethodEnabled = true;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (! $atLeastOnePaymentMethodEnabled) {
|
||||
session()->flash('error', trans('admin::app.configuration.enable-atleast-one-payment'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -741,6 +741,7 @@ return [
|
|||
'no' => 'لا.',
|
||||
'delete' => 'احذف',
|
||||
'enable-atleast-one-shipping' => 'تفعيل طريقة شحن واحدة على الأقل.',
|
||||
'enable-atleast-one-payment' => 'تفعيل طريقة دفع واحدة على الأقل.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'فئات الضرائب',
|
||||
|
|
|
|||
|
|
@ -747,6 +747,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -733,6 +733,8 @@ return [
|
|||
'no' => 'Nein',
|
||||
'delete' => 'Löschen',
|
||||
'enable-atleast-one-shipping' => 'Aktivieren Sie mindestens eine Versandart.',
|
||||
'enable-atleast-one-payment' => 'Aktivieren Sie mindestens eine Zahlungsmethode.',
|
||||
|
||||
'tax-categories' =>
|
||||
[
|
||||
'title' => 'Steuerkategorien',
|
||||
|
|
|
|||
|
|
@ -747,6 +747,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -743,6 +743,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Borrar',
|
||||
'enable-atleast-one-shipping' => 'Habilite al menos un método de envío.',
|
||||
'enable-atleast-one-payment' => 'Habilite al menos un método de pago.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Categorías de impuestos',
|
||||
|
|
|
|||
|
|
@ -726,6 +726,7 @@ return [
|
|||
'no' => 'خیر',
|
||||
'delete' => 'حذف',
|
||||
'enable-atleast-one-shipping' => 'حداقل یک روش حمل و نقل را فعال کنید.',
|
||||
'enable-atleast-one-payment' => 'حداقل یک روش پرداخت را فعال کنید.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'دسته بندی های مالیات',
|
||||
|
|
|
|||
|
|
@ -746,6 +746,7 @@ return [
|
|||
'no' => 'Non',
|
||||
'delete' => 'Effacer',
|
||||
'enable-atleast-one-shipping' => 'Activez au moins une méthode d\'expédition.',
|
||||
'enable-atleast-one-payment' => 'Activez au moins un mode de paiement.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Catégories de taxes',
|
||||
|
|
|
|||
|
|
@ -747,6 +747,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -744,6 +744,7 @@ return [
|
|||
'no' => 'नहीं',
|
||||
'delete' => 'हटाएं',
|
||||
'enable-atleast-one-shipping' => 'कम से कम एक शिपिंग विधि सक्षम करें।',
|
||||
'enable-atleast-one-payment' => 'कम से कम एक भुगतान विधि सक्षम करें।',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'कर श्रेणियाँ',
|
||||
|
|
|
|||
|
|
@ -731,6 +731,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Elimina',
|
||||
'enable-atleast-one-shipping' => 'Abilita almeno un metodo di spedizione.',
|
||||
'enable-atleast-one-payment' => 'Abilita almeno un metodo di pagamento.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Categorie IVA',
|
||||
|
|
|
|||
|
|
@ -747,6 +747,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -725,6 +725,7 @@ return [
|
|||
'no' => 'Nee',
|
||||
'delete' => 'Verwijder',
|
||||
'enable-atleast-one-shipping' => 'Schakel ten minste één verzendmethode in.',
|
||||
'enable-atleast-one-payment' => 'Schakel ten minste één betaalmethode in.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'BTW categorieën',
|
||||
|
|
|
|||
|
|
@ -726,6 +726,7 @@ return [
|
|||
'no' => 'Nie',
|
||||
'delete' => 'Usuń',
|
||||
'enable-atleast-one-shipping' => 'Włącz co najmniej jedną metodę wysyłki.',
|
||||
'enable-atleast-one-payment' => 'Włącz co najmniej jedną formę płatności.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Kategorie podatkowe',
|
||||
|
|
|
|||
|
|
@ -724,6 +724,7 @@ return [
|
|||
'no' => 'Não',
|
||||
'delete' => 'Deletar',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Categorias de Imposto',
|
||||
|
|
|
|||
|
|
@ -747,6 +747,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Включите хотя бы один способ доставки.',
|
||||
'enable-atleast-one-payment' => 'Включите хотя бы один способ оплаты.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -747,6 +747,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -731,6 +731,7 @@ return [
|
|||
'no' => 'Hayır',
|
||||
'delete' => 'Sil',
|
||||
'enable-atleast-one-shipping' => 'En az bir gönderim yöntemini etkinleştirin.',
|
||||
'enable-atleast-one-payment' => 'En az bir ödeme yöntemini etkinleştirin.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Vergi Kategorileri',
|
||||
|
|
|
|||
|
|
@ -726,6 +726,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => '删除',
|
||||
'enable-atleast-one-shipping' => '啟用至少一種運輸方式',
|
||||
'enable-atleast-one-payment' => '啟用至少一種付款方式。',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => '税分类',
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row,'')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<span class="control-error" v-if="errors.has(adminName(row))">@{{ errors.first(adminName(row)) }}</span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -329,7 +329,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required|numeric'" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row,'')" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<span class="control-error" v-if="errors.has(sortOrderName(row))">@{{ errors.first(sortOrderName(row)) }}</span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -458,7 +458,7 @@
|
|||
return '';
|
||||
}
|
||||
|
||||
return ('{{ app()->getLocale() }}' === localeCode) ? 'required' : '';
|
||||
return ('{{ app()->getLocale() }}' === localeCode) || localeCode == "" ? 'required' : '';
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row, '')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<span class="control-error" v-if="errors.has(adminName(row))" v-text="errors.first(adminName(row))"></span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -401,7 +401,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required|numeric'" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row, '')" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<span class="control-error" v-if="errors.has(sortOrderName(row))" v-text="errors.first(sortOrderName(row))"></span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -506,10 +506,12 @@
|
|||
'isDelete': false,
|
||||
};
|
||||
|
||||
if (option.label) {
|
||||
if (! option.label) {
|
||||
self.isNullOptionChecked = true;
|
||||
self.idNullOption = option.id;
|
||||
row['notRequired'] = true;
|
||||
} else {
|
||||
row['notRequired'] = false;
|
||||
}
|
||||
|
||||
option.translations.forEach((translation) => {
|
||||
|
|
@ -595,8 +597,8 @@
|
|||
if (row.notRequired === true) {
|
||||
return '';
|
||||
}
|
||||
|
||||
return (this.appLocale === localeCode) ? 'required' : '';
|
||||
|
||||
return ('{{ app()->getLocale() }}' === localeCode) || localeCode == "" ? 'required' : '';
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -172,7 +172,19 @@ class Booking extends Virtual
|
|||
|
||||
$bookingProduct = $this->getBookingProduct($data['product_id']);
|
||||
|
||||
if ($bookingProduct->type == 'event') {
|
||||
|
||||
if ($bookingProduct->type == 'rental') {
|
||||
if (isset($data['booking']['slot']['from'])) {
|
||||
$time = $data['booking']['slot']['to'] - $data['booking']['slot']['from'];
|
||||
$hours = floor($time / 60) / 60;
|
||||
|
||||
if ($hours > 1) {
|
||||
return trans('shop::app.checkout.cart.integrity.select_hourly_duration');
|
||||
}
|
||||
}
|
||||
|
||||
$products = parent::prepareForCart($data);
|
||||
} elseif ($bookingProduct->type == 'event') {
|
||||
if (
|
||||
Carbon::now() > $bookingProduct->available_from
|
||||
&& Carbon::now() > $bookingProduct->available_to
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@
|
|||
|
||||
.main-container-wrapper .product-card .product-image img {
|
||||
max-width: 100%;
|
||||
height: 260px;
|
||||
object-fit: cover;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -179,6 +179,7 @@ class WishlistController extends Controller
|
|||
$customer = auth()->guard('customer')->user();
|
||||
|
||||
$customerWishlistItems = $customer->wishlist_items;
|
||||
$referer = strtok(request()->headers->get('referer'), '?');
|
||||
|
||||
foreach ($customerWishlistItems as $customerWishlistItem) {
|
||||
if ($itemId == $customerWishlistItem->id) {
|
||||
|
|
@ -186,7 +187,7 @@ class WishlistController extends Controller
|
|||
|
||||
session()->flash('success', trans('customer::app.wishlist.removed'));
|
||||
|
||||
return redirect()->route('customer.wishlist.index');
|
||||
return redirect()->to($referer);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/shop.js": "/js/shop.js?id=34684ef2b5b3c24817b4",
|
||||
"/css/shop.css": "/css/shop.css?id=a7c7bfc61859923d2d79"
|
||||
"/js/shop.js": "/js/shop.js?id=c497b48c2b6bd04edeca",
|
||||
"/css/shop.css": "/css/shop.css?id=f48c3d268309736e99d9"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ input {
|
|||
}
|
||||
|
||||
.product-card {
|
||||
height: 480px;
|
||||
height: 400px;
|
||||
position: relative;
|
||||
padding: 15px;
|
||||
|
||||
|
|
@ -496,7 +496,6 @@ input {
|
|||
display: inline-flex;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
bottom: 5px;
|
||||
height: 40px;
|
||||
|
||||
.addtocart {
|
||||
|
|
|
|||
|
|
@ -496,6 +496,7 @@ return [
|
|||
'missing_links' => 'الروابط القابلة للتنزيل مفقودة لهذا المنتج.',
|
||||
'qty_missing' => 'يجب أن يحتوي منتج واحد على الأقل على كمية واحدة.',
|
||||
'qty_impossible' => 'لا يمكن إضافة أكثر من واحد من هذه المنتجات إلى سلة التسوق',
|
||||
'select_hourly_duration' => 'حدد مدة الفتحة لمدة ساعة واحدة.',
|
||||
],
|
||||
'create-error' => 'صادفت بعض القضايا أثناء صناعة السيارات',
|
||||
'title' => 'عربة التسوق',
|
||||
|
|
|
|||
|
|
@ -494,6 +494,7 @@ return [
|
|||
'missing_links' => 'এই পণ্যটির জন্য ডাউনলোডযোগ্য লিঙ্কগুলি অনুপস্থিত৷',
|
||||
'qty_missing' => 'অন্তত একটি পণ্যে 1 পরিমাণের বেশি হওয়া উচিত।',
|
||||
'qty_impossible' => 'এই পণ্যগুলির একটির বেশি কার্টে যোগ করা যাবে না।',
|
||||
'select_hourly_duration' => 'এক ঘন্টার একটি স্লট সময়কাল নির্বাচন করুন।',
|
||||
],
|
||||
'create-error' => 'কার্টের উদাহরণ তৈরি করার সময় কিছু সমস্যার সম্মুখীন হয়েছে৷',
|
||||
'title' => 'বাজারের ব্যাগ',
|
||||
|
|
|
|||
|
|
@ -496,6 +496,7 @@ return [
|
|||
'missing_links' => 'Downloadable links are missing for this product.',
|
||||
'qty_missing' => 'Atleast one product should have more than 1 quantity.',
|
||||
'qty_impossible' => 'Cannot add more than one of these products to cart.',
|
||||
'select_hourly_duration' => 'Select a slot duration of one hour.',
|
||||
],
|
||||
'create-error' => 'Encountered some issue while making cart instance.',
|
||||
'title' => 'Shopping Cart',
|
||||
|
|
|
|||
|
|
@ -495,6 +495,7 @@ return [
|
|||
'missing_links' => 'Faltan enlaces descargables para este producto.',
|
||||
'qty_missing' => 'Al menos un producto debe tener más de 1 cantidad.',
|
||||
'qty_impossible' => 'No se pueden agregar más de uno de estos productos al carrito.',
|
||||
'select_hourly_duration' => 'Seleccione una duración de ranura de una hora.',
|
||||
],
|
||||
'create-error' => 'Se encontraron problemas con el carrito de compra',
|
||||
'title' => 'Carrito de la compra',
|
||||
|
|
|
|||
|
|
@ -491,6 +491,7 @@ return [
|
|||
'missing_links' => 'لینک های قابل بارگیری برای این محصول وجود ندارد',
|
||||
'qty_missing' => 'حداقل یک محصول باید بیش از 1 مقدار داشته باشد.',
|
||||
'qty_impossible' => 'نمی توان بیش از یکی از این محصولات را به سبد خرید اضافه کرد',
|
||||
'select_hourly_duration' => 'مدت زمان یک ساعت را انتخاب کنید.',
|
||||
],
|
||||
'create-error' => 'هنگام تهیه نمونه سبد خرید ، با برخی از شماره ها روبرو شد',
|
||||
'title' => 'سبد خرید',
|
||||
|
|
|
|||
|
|
@ -489,6 +489,7 @@ return [
|
|||
'missing_links' => 'Il manque des liens téléchargeables pour ce produit.',
|
||||
'qty_missing' => 'Au moins un produit doit avoir plus d\'une quantité.',
|
||||
'qty_impossible' => 'Impossible d\'ajouter plus d\'un de ces produits au panier.',
|
||||
'select_hourly_duration' => 'Sélectionnez une durée de créneau d\'une heure.',
|
||||
],
|
||||
|
||||
'create-error' => 'J\'ai rencontré un problème lors de la création d\'une instance de panier.',
|
||||
|
|
|
|||
|
|
@ -493,6 +493,7 @@ return [
|
|||
'missing_links' => 'חסרים קישורים להורדה למוצר זה.',
|
||||
'qty_missing' => 'לפחות מוצר אחד צריך לכלול יותר מכמות אחת.',
|
||||
'qty_impossible' => 'לא ניתן להוסיף יותר מאחד מהמוצרים האלה לעגלה.',
|
||||
'select_hourly_duration' => 'בחר משך משבצת של שעה אחת.',
|
||||
],
|
||||
'create-error' => 'נתקלתי בבעיה כלשהי בעת יצירת מופע של עגלה.',
|
||||
'title' => 'עגלת קניות',
|
||||
|
|
|
|||
|
|
@ -495,6 +495,7 @@ return [
|
|||
'missing_links' => 'इस उत्पाद के लिए डाउनलोड करने योग्य लिंक गायब हैं।',
|
||||
'qty_missing' => 'कम से कम एक उत्पाद में 1 से अधिक मात्रा होनी चाहिए।',
|
||||
'qty_impossible' => 'कार्ट में इनमें से एक से अधिक उत्पाद नहीं जोड़े जा सकते हैं।',
|
||||
'select_hourly_duration' => 'एक घंटे की स्लॉट अवधि चुनें।',
|
||||
],
|
||||
'create-error' => 'कार्ट इंस्टेंस बनाते समय कुछ समस्या आई।',
|
||||
'title' => 'शॉपिंग कार्ट',
|
||||
|
|
|
|||
|
|
@ -492,6 +492,7 @@ return [
|
|||
'missing_links' => 'I link per il download di questo prodotto sono mancanti.',
|
||||
'qty_missing' => 'Almeno un prodotto dovrebbe avere una quantità superiore a 1.',
|
||||
'qty_impossible' => 'Non è possibile aggiungere più di un pezzo di questo articolo nel carrello.',
|
||||
'select_hourly_duration' => 'Seleziona una durata dello slot di un\'ora.',
|
||||
],
|
||||
'create-error' => 'Si è verificato un problema durante la visualizzazione del carrello.',
|
||||
'title' => 'Carrello',
|
||||
|
|
|
|||
|
|
@ -457,6 +457,7 @@ return [
|
|||
'missing_links' => 'Downloadable links are missing for this product.',
|
||||
'qty_missing' => 'Atleast one product should have more than 1 quantity.',
|
||||
'qty_impossible' => 'Cannot add more than one of these products to cart.',
|
||||
'select_hourly_duration' => 'Select a slot duration of one hour.',
|
||||
],
|
||||
'create-error' => 'カートで問題が発生しました',
|
||||
'title' => 'カート',
|
||||
|
|
|
|||
|
|
@ -499,6 +499,7 @@ return [
|
|||
'missing_links' => 'Downloadbare links ontbreken voor dit product.',
|
||||
'qty_missing' => 'Minstens één product moet meer dan 1 hoeveelheid bevatten.',
|
||||
'qty_impossible' => 'Kan niet meer dan één van deze producten toevoegen aan winkelwagen.',
|
||||
'select_hourly_duration' => 'Kies een slotduur van één uur.',
|
||||
],
|
||||
'create-error' => 'Er is een probleem opgetreden bij het maken van een winkelwageninstantie.',
|
||||
'title' => 'Winkelwagen',
|
||||
|
|
|
|||
|
|
@ -492,6 +492,7 @@ return [
|
|||
'missing_links' => 'Brak linków do pobrania dla tego produktu.',
|
||||
'qty_missing' => 'Przynajmniej jeden produkt powinien zawierać ilośćwiększą niż 1',
|
||||
'qty_impossible' => 'Nie można dodać więcej niż jednego z tych produktów do koszyka.',
|
||||
'select_hourly_duration' => 'Wybierz przedział czasu na jedną godzinę.',
|
||||
],
|
||||
'create-error' => 'Wystąpił problem podczas tworzenia instancji koszyka.',
|
||||
'title' => 'Koszyk zakupu',
|
||||
|
|
|
|||
|
|
@ -484,6 +484,7 @@ return [
|
|||
'missing_links' => 'Faltam links para download para este produto.',
|
||||
'qty_missing' => 'Pelo menos um produto deve ter mais de 1 quantidade.',
|
||||
'qty_impossible' => 'Não é possível adicionar mais do que um desse produto ao carrinho.',
|
||||
'select_hourly_duration' => 'Selecione uma duração de slot de uma hora.',
|
||||
],
|
||||
|
||||
'create-error' => 'Encontrou algum problema ao fazer a instância do carrinho',
|
||||
|
|
|
|||
|
|
@ -494,6 +494,7 @@ return [
|
|||
'missing_links' => 'Для этого продукта отсутствуют ссылки для скачивания.',
|
||||
'qty_missing' => 'По крайней мере, у одного товара должно быть более 1 количества.',
|
||||
'qty_impossible' => 'Невозможно добавить в корзину более одного из этих товаров.',
|
||||
'select_hourly_duration' => 'Выберите продолжительность слота один час.',
|
||||
],
|
||||
'create-error' => 'Обнаружена проблема при создании экземпляра корзины.',
|
||||
'title' => 'Корзина',
|
||||
|
|
|
|||
|
|
@ -494,6 +494,7 @@ return [
|
|||
'missing_links' => 'මෙම නිෂ්පාදනය සඳහා බාගත කළ හැකි සබැඳි නොමැත.',
|
||||
'qty_missing' => 'අවම වශයෙන් එක් නිෂ්පාදනයක ප්රමාණය 1කට වඩා තිබිය යුතුය.',
|
||||
'qty_impossible' => 'මෙම නිෂ්පාදන එකකට වඩා කරත්තයට එක් කළ නොහැක.',
|
||||
'select_hourly_duration' => 'පැයක ස්ලට් කාල සීමාවක් තෝරන්න.',
|
||||
],
|
||||
'create-error' => 'කරත්ත නිදසුන සෑදීමේදී යම් ගැටලුවකට මුහුණ පෑමට සිදු විය.',
|
||||
'title' => 'සාප්පු ට්රොලිය',
|
||||
|
|
|
|||
|
|
@ -492,6 +492,7 @@ return [
|
|||
'missing_links' => 'Bu ürün için indirilebilir linkler girilmemiş.',
|
||||
'qty_missing' => 'En az bir adet ürün girilmelidir.',
|
||||
'qty_impossible' => 'Bu üründen birden fazla adet girilemez.',
|
||||
'select_hourly_duration' => 'Bir saatlik bir slot süresi seçin.',
|
||||
],
|
||||
'create-error' => 'Alışveriş sepeti oluşturulurken hata meydana geldi!',
|
||||
'title' => 'Alışveriş Sepeti',
|
||||
|
|
|
|||
|
|
@ -492,7 +492,8 @@ return [
|
|||
'missing_options' => '此产品缺少选项.',
|
||||
'missing_links' => '此产品缺少可下载链接.',
|
||||
'qty_missing' => '至少一种产品的数量应超过 1 个.',
|
||||
'qty_impossible' => '不能将这些产品中的一种以上添加到购物车.'
|
||||
'qty_impossible' => '不能将这些产品中的一种以上添加到购物车.',
|
||||
'select_hourly_duration' => '選擇一小時的時隙持續時間。',
|
||||
],
|
||||
'create-error' => '制作购物车实例时遇到一些问题.',
|
||||
'title' => '购物车',
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=934e73015300b1ae35f5",
|
||||
"/js/ui.js": "/js/ui.js?id=2effb6ad469c2b8c5af2",
|
||||
"/css/ui.css": "/css/ui.css?id=933372010d246f94f931"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ export default {
|
|||
},
|
||||
|
||||
searchData($event) {
|
||||
const searchValue = $event.data.searchValue;
|
||||
const searchValue = $event.data.searchValue.trim();
|
||||
|
||||
this.formURL(
|
||||
'search',
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ export default {
|
|||
number: {
|
||||
isSelected: false,
|
||||
condition: null,
|
||||
value: 0
|
||||
value: null
|
||||
},
|
||||
|
||||
boolean: {
|
||||
|
|
@ -540,6 +540,10 @@ export default {
|
|||
case 'number': {
|
||||
let indexConditions = true;
|
||||
|
||||
if (! this.types.number.value) {
|
||||
this.switchSelectCondition('number');
|
||||
}
|
||||
|
||||
if (
|
||||
this.filterIndex === this.columnOrAlias &&
|
||||
(this.types.number.value === 0 ||
|
||||
|
|
@ -548,8 +552,6 @@ export default {
|
|||
indexConditions = false;
|
||||
|
||||
alert(this.translations.zeroIndex);
|
||||
} else {
|
||||
alert(this.translations.emptyValue);
|
||||
}
|
||||
|
||||
if (indexConditions) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -16,7 +16,7 @@
|
|||
*/
|
||||
|
||||
/*!
|
||||
* Vue.js v2.7.8
|
||||
* Vue.js v2.7.3
|
||||
* (c) 2014-2022 Evan You
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"/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=485e333fae6be00d598d85d1102c8896",
|
||||
"/js/velocity.js": "/js/velocity.js?id=5e563e0af3ea88a56b03a4a30fad0a92",
|
||||
"/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d",
|
||||
"/js/components.js": "/js/components.js?id=387078c4cd083fe68fe0ea12d359afe1",
|
||||
"/js/components.js": "/js/components.js?id=9cef6b659b9eeda222cf28fdb372abc1",
|
||||
"/css/velocity.css": "/css/velocity.css?id=d3e3d68ebf1870fc95c045ba29dc2b77",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
|
||||
"/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ export default {
|
|||
this.activeImage.removeData('elevateZoom');
|
||||
|
||||
/* getting url */
|
||||
this.activeImageVideoURL = largeImageUrl;
|
||||
this.activeImageVideoURL = smallImageUrl;
|
||||
|
||||
/* type checking for media type */
|
||||
this.currentType = currentType;
|
||||
|
|
|
|||
|
|
@ -87,17 +87,28 @@
|
|||
}
|
||||
}
|
||||
|
||||
#date-of-birth:after{
|
||||
background-image: url(../images/icon-calendar.svg);
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
content: "";
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
margin-left: -34px;
|
||||
pointer-events: none;
|
||||
position: absolute;
|
||||
top: 14%;
|
||||
#date-of-birth {
|
||||
display: block;
|
||||
position: relative;
|
||||
|
||||
.cross-icon {
|
||||
position: absolute;
|
||||
right: 34px;
|
||||
top: 8px;
|
||||
}
|
||||
|
||||
&::after {
|
||||
background-image: url(../images/icon-calendar.svg);
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
content: "";
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
pointer-events: none;
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
right: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.rtl{
|
||||
|
|
|
|||
|
|
@ -777,6 +777,7 @@
|
|||
|
||||
.rango-delete {
|
||||
margin-left: -2px;
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -639,6 +639,10 @@ body::after {
|
|||
.product-actions {
|
||||
display: inline-block;
|
||||
|
||||
form {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.compare-icon,
|
||||
.wishlist-icon {
|
||||
height: 38px;
|
||||
|
|
|
|||
|
|
@ -260,6 +260,10 @@
|
|||
float: left;
|
||||
}
|
||||
|
||||
form {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.compare-icon,
|
||||
.wishlist-icon {
|
||||
height: 46px;
|
||||
|
|
|
|||
|
|
@ -178,6 +178,14 @@ body {
|
|||
float: right;
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
.wishlist-icon {
|
||||
padding: 0px !important;
|
||||
}
|
||||
|
||||
.product-information {
|
||||
margin-right: 1%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -340,6 +348,10 @@ body {
|
|||
float: left;
|
||||
}
|
||||
|
||||
form {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.wishlist-icon {
|
||||
float: left;
|
||||
}
|
||||
|
|
@ -574,16 +586,16 @@ body {
|
|||
}
|
||||
}
|
||||
|
||||
.d-inline-block {
|
||||
.material-icons {
|
||||
float: right !important;
|
||||
margin-left: 4px !important;
|
||||
#date-of-birth {
|
||||
.cross-icon {
|
||||
right: unset;
|
||||
left: 34px;
|
||||
}
|
||||
|
||||
&:after {
|
||||
right: unset;
|
||||
left: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.rango-delete {
|
||||
float: right !important;
|
||||
margin-left: 4px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -430,6 +430,11 @@
|
|||
padding-left: 10px;
|
||||
}
|
||||
|
||||
form {
|
||||
display: inline-table;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
.product-price span:first-child, .product-price span:last-child {
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
|
|
|
|||
Loading…
Reference in New Issue