merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recompiled

This commit is contained in:
sanjeev 2022-08-29 12:22:55 +05:30
parent 15a2266a83 d273914769
commit c84d296fdf
27 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
View File

@ -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="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
<input type="text" v-validate="getOptionValidation(row,'')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
<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="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
<input type="text" v-validate="getOptionValidation(row,'')" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
<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' : '';
}
},

12
packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
View File

@ -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="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
<input type="text" v-validate="getOptionValidation(row, '')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
<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="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
<input type="text" v-validate="getOptionValidation(row, '')" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
<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' : '';
},
},
});

14
packages/Webkul/BookingProduct/src/Type/Booking.php
View File

@ -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

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=a03df6eadec81eea9b0b",
"/css/shop.css": "/css/shop.css?id=c19092d91aa03db12027"
"/css/shop.css": "/css/shop.css?id=f48c3d268309736e99d9"
}

3
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -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 {

1
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -496,6 +496,7 @@ return [
'missing_links' => 'الروابط القابلة للتنزيل مفقودة لهذا المنتج.',
'qty_missing' => 'يجب أن يحتوي منتج واحد على الأقل على كمية واحدة.',
'qty_impossible' => 'لا يمكن إضافة أكثر من واحد من هذه المنتجات إلى سلة التسوق',
'select_hourly_duration' => 'حدد مدة الفتحة لمدة ساعة واحدة.',
],
'create-error' => 'صادفت بعض القضايا أثناء صناعة السيارات',
'title' => 'عربة التسوق',

1
packages/Webkul/Shop/src/Resources/lang/ben/app.php
View File

@ -494,6 +494,7 @@ return [
'missing_links' => 'এই পণ্যটির জন্য ডাউনলোডযোগ্য লিঙ্কগুলি অনুপস্থিত৷',
'qty_missing' => 'অন্তত একটি পণ্যে 1 পরিমাণের বেশি হওয়া উচিত।',
'qty_impossible' => 'এই পণ্যগুলির একটির বেশি কার্টে যোগ করা যাবে না।',
'select_hourly_duration' => 'এক ঘন্টার একটি স্লট সময়কাল নির্বাচন করুন।',
],
'create-error' => 'কার্টের উদাহরণ তৈরি করার সময় কিছু সমস্যার সম্মুখীন হয়েছে৷',
'title' => 'বাজারের ব্যাগ',

1
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -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',

1
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -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',

1
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -491,6 +491,7 @@ return [
'missing_links' => 'لینک های قابل بارگیری برای این محصول وجود ندارد',
'qty_missing' => 'حداقل یک محصول باید بیش از 1 مقدار داشته باشد.',
'qty_impossible' => 'نمی توان بیش از یکی از این محصولات را به سبد خرید اضافه کرد',
'select_hourly_duration' => 'مدت زمان یک ساعت را انتخاب کنید.',
],
'create-error' => 'هنگام تهیه نمونه سبد خرید ، با برخی از شماره ها روبرو شد',
'title' => 'سبد خرید',

1
packages/Webkul/Shop/src/Resources/lang/fr/app.php
View File

@ -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.',

1
packages/Webkul/Shop/src/Resources/lang/he/app.php
View File

@ -493,6 +493,7 @@ return [
'missing_links' => 'חסרים קישורים להורדה למוצר זה.',
'qty_missing' => 'לפחות מוצר אחד צריך לכלול יותר מכמות אחת.',
'qty_impossible' => 'לא ניתן להוסיף יותר מאחד מהמוצרים האלה לעגלה.',
'select_hourly_duration' => 'בחר משך משבצת של שעה אחת.',
],
'create-error' => 'נתקלתי בבעיה כלשהי בעת יצירת מופע של עגלה.',
'title' => 'עגלת קניות',

1
packages/Webkul/Shop/src/Resources/lang/hi_IN/app.php
View File

@ -495,6 +495,7 @@ return [
'missing_links' => 'इस उत्पाद के लिए डाउनलोड करने योग्य लिंक गायब हैं।',
'qty_missing' => 'कम से कम एक उत्पाद में 1 से अधिक मात्रा होनी चाहिए।',
'qty_impossible' => 'कार्ट में इनमें से एक से अधिक उत्पाद नहीं जोड़े जा सकते हैं।',
'select_hourly_duration' => 'एक घंटे की स्लॉट अवधि चुनें।',
],
'create-error' => 'कार्ट इंस्टेंस बनाते समय कुछ समस्या आई।',
'title' => 'शॉपिंग कार्ट',

1
packages/Webkul/Shop/src/Resources/lang/it/app.php
View File

@ -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',

1
packages/Webkul/Shop/src/Resources/lang/ja/app.php
View File

@ -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' => 'カート',

1
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -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',

1
packages/Webkul/Shop/src/Resources/lang/pl/app.php
View File

@ -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',

1
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

@ -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',

1
packages/Webkul/Shop/src/Resources/lang/ru/app.php
View File

@ -494,6 +494,7 @@ return [
'missing_links' => 'Для этого продукта отсутствуют ссылки для скачивания.',
'qty_missing' => 'По крайней мере, у одного товара должно быть более 1 количества.',
'qty_impossible' => 'Невозможно добавить в корзину более одного из этих товаров.',
'select_hourly_duration' => 'Выберите продолжительность слота один час.',
],
'create-error' => 'Обнаружена проблема при создании экземпляра корзины.',
'title' => 'Корзина',

1
packages/Webkul/Shop/src/Resources/lang/sin/app.php
View File

@ -494,6 +494,7 @@ return [
'missing_links' => 'මෙම නිෂ්පාදනය සඳහා බාගත කළ හැකි සබැඳි නොමැත.',
'qty_missing' => 'අවම වශයෙන් එක් නිෂ්පාදනයක ප්‍රමාණය 1කට වඩා තිබිය යුතුය.',
'qty_impossible' => 'මෙම නිෂ්පාදන එකකට වඩා කරත්තයට එක් කළ නොහැක.',
'select_hourly_duration' => 'පැයක ස්ලට් කාල සීමාවක් තෝරන්න.',
],
'create-error' => 'කරත්ත නිදසුන සෑදීමේදී යම් ගැටලුවකට මුහුණ පෑමට සිදු විය.',
'title' => 'සාප්පු ට්රොලිය',

1
packages/Webkul/Shop/src/Resources/lang/tr/app.php
View File

@ -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',

3
packages/Webkul/Shop/src/Resources/lang/zh_CN/app.php
View File

@ -492,7 +492,8 @@ return [
'missing_options' => '此产品缺少选项.',
'missing_links' => '此产品缺少可下载链接.',
'qty_missing' => '至少一种产品的数量应超过 1 个.',
'qty_impossible' => '不能将这些产品中的一种以上添加到购物车.'
'qty_impossible' => '不能将这些产品中的一种以上添加到购物车.',
'select_hourly_duration' => '選擇一小時的時隙持續時間。',
],
'create-error' => '制作购物车实例时遇到一些问题.',
'title' => '购物车',

2
packages/Webkul/Velocity/publishable/assets/js/components.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -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=f1962fbe19365543e54b0e329f86b8ff",
"/css/velocity.css": "/css/velocity.css?id=b052a38bbdda8e29ff1dee8479d69d63",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

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

@ -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;