Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-02-07 15:22:29 +05:30
commit 79a8faa028
16 changed files with 252 additions and 148 deletions

View File

@ -283,7 +283,33 @@
data: function() {
return {
links: downloadableLinks
links: downloadableLinks,
old_links: @json(old('downloadable_links'))
}
},
created: function() {
var index = 0;
for (var key in this.old_links) {
var link = this.old_links[key];
if (key.indexOf('link_') !== -1) {
link['title'] = link["{{$locale}}"]['title'];
downloadableLinks.push(link);
} else {
for (var code in link) {
if (code === "{{$locale}}") {
downloadableLinks[index]['title'] = link[code]['title'];
} else {
downloadableLinks[index][code] = link[code];
}
}
}
index++;
}
},
@ -328,6 +354,30 @@
}
},
created: function() {
var index = 0;
for (var key in this.old_links) {
var link = this.old_links[key];
if (key.indexOf('link_') !== -1) {
link['title'] = link["{{$locale}}"]['title'];
downloadableLinks.push(link);
} else {
for (var code in link) {
if (code === "{{$locale}}") {
downloadableLinks[index]['title'] = link[code]['title'];
} else {
downloadableLinks[index][code] = link[code];
}
}
}
index++;
}
},
computed: {
linkInputTitleName: function () {
if (this.link.id)
@ -376,7 +426,33 @@
data: function() {
return {
samples: downloadableSamples
samples: downloadableSamples,
old_samples: @json(old('downloadable_samples'))
}
},
created: function() {
var index = 0;
for (var key in this.old_samples) {
var sample = this.old_samples[key];
if (key.indexOf('sample_') !== -1) {
sample['title'] = sample["{{$locale}}"]['title'];
downloadableSamples.push(sample);
} else {
for (var code in sample) {
if (code === "{{$locale}}") {
downloadableSamples[index]['title'] = sample[code]['title'];
} else {
downloadableSamples[index][code] = sample[code];
}
}
}
index++;
}
},

View File

@ -7,7 +7,7 @@
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.locales.store') }}" @submit.prevent="onSubmit">
<form method="POST" action="{{ route('admin.locales.store') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="page-header">
<div class="page-title">
<h1>

View File

@ -7,7 +7,7 @@
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.locales.update', $locale->id) }}" @submit.prevent="onSubmit">
<form method="POST" action="{{ route('admin.locales.update', $locale->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="page-header">
<div class="page-title">
<h1>

View File

@ -8,6 +8,7 @@ return [
'reviews' => 'المراجعات',
'wishlist' => 'قائمة الأمنيات',
'orders' => 'الطبات',
'downloadable-products' => 'المنتجات القابلة للتحميل',
],
'common' => [
@ -166,6 +167,9 @@ return [
'fname' => 'الاسم الأول',
'lname' => 'الاسم الأخير',
'gender' => 'نوع الجنس',
'other' => 'آخر',
'male' => 'الذكر',
'female' => 'أنثى',
'dob' => 'تاريخ الميلاد',
'phone' => 'الهاتف',
'email' => 'البريد الإلكتروني',
@ -194,7 +198,7 @@ return [
'contact' => 'معلومات الإتصال',
'confirm-delete' => 'هل تريد حقا حذف هذا العنوان؟',
'default-delete' => 'لا يمكن تغيير العنوان الافتراضي',
'enter-password' => 'Enter Your Password.',
'enter-password' => 'ادخل رقمك السري.',
],
'create' => [
@ -221,7 +225,7 @@ return [
'delete' => [
'success' => 'تم حذف العنوان بنجاح.',
'failure' => 'لا يمكن حذف العنوان',
'wrong-password' => 'Wrong Password !'
'wrong-password' => 'كلمة مرور خاطئة !'
]
],
@ -250,7 +254,7 @@ return [
'item-invoice' => '3-الفواتير(:qty_invoiced)',
'item-shipped' => 'شحنت(:qty_shipped)',
'item-canceled' => 'ملغاة(:qty_canceled)',
'item-refunded' => 'Refunded (:qty_refunded)',
'item-refunded' => 'ردها (:qty_refunded)',
'price' => 'السعر',
'total' => 'المجموع',
'subtotal' => 'المجموع الفرعي',
@ -285,7 +289,7 @@ return [
],
'wishlist' => [
'page-title' => 'Customer - Wishlist',
'page-title' => 'العملاء - قائمة الامنيات',
'title' => 'قائمة الأمنيات',
'deleteall' => 'احذف الكل',
'moveall' => 'نقل الكل إلى عربة التوسق',
@ -300,22 +304,22 @@ return [
'already' => 'العنصر موجود بالفعل في قائمة أمنياتك',
'removed' => 'البند حذف بنجاح من قائمة الأمنيات',
'remove-fail' => 'لا يمكن حذف العنصر من قائمة الأماني ، الرجاء المحاولة لاحقا',
'empty' => 'You do not have any items in your Wishlist',
'empty' => 'ليس لديك أي عناصر في قائمة الأمنيات',
'remove-all-success' => 'كل الأشياء من قائمة أمانيك قد أزيلت',
],
'downloadable_products' => [
'title' => 'Downloadable Products',
'order-id' => 'Order Id',
'date' => 'Date',
'name' => 'Title',
'status' => 'Status',
'pending' => 'Pending',
'available' => 'Available',
'expired' => 'Expired',
'remaining-downloads' => 'Remaining Downloads',
'unlimited' => 'Unlimited',
'download-error' => 'Download link has been expired.'
'title' => 'المنتجات القابلة للتحميل',
'order-id' => 'رقم التعريف الخاص بالطلب',
'date' => 'تاريخ',
'name' => 'عنوان',
'status' => 'الحالة',
'pending' => 'قيد الانتظار',
'available' => 'متاح',
'expired' => 'منتهية الصلاحية',
'remaining-downloads' => 'التنزيلات المتبقية',
'unlimited' => 'غير محدود',
'download-error' => 'انتهت صلاحية رابط التنزيل.'
],
'review' => [
@ -363,13 +367,13 @@ return [
'in-stock' => 'متوفر',
'out-of-stock' => 'غير متوفر',
'view-all' => 'عرض الكل',
'less-quantity' => 'Quantity can not be less than one.',
'starting-at' => 'Starting at',
'customize-options' => 'Customize Options',
'choose-selection' => 'Choose a selection',
'your-customization' => 'Your Customization',
'total-amount' => 'Total Amount',
'none' => 'None',
'less-quantity' => 'لا يمكن أن تكون الكمية أقل من واحدة.',
'starting-at' => 'يبدأ من',
'customize-options' => 'تخصيص الخيارات',
'choose-selection' => 'اختيار اختيار',
'your-customization' => 'التخصيص الخاص بك',
'total-amount' => 'المبلغ الإجمالي',
'none' => 'لا شيء',
'less-quantity' => 'الكمية لايمكن ان تكون أقل من واحد.'
],
@ -387,8 +391,8 @@ return [
'integrity' => [
'missing_fields' =>'إنتهاك سلامة نظام العربة ، بعض الحقول المطلوبة مفقودة',
'missing_options' =>'إنتهاك سلامة نظام العربة ، الخيارات مفقودة لمنتج قابل للتهيئة',
'missing_links' => 'Downloadable links are missing for this product.',
'qty_missing' => 'Atleast one product should have more than 1 quantity.'
'missing_links' => 'الروابط القابلة للتنزيل مفقودة لهذا المنتج.',
'qty_missing' => 'يجب أن يحتوي منتج واحد على الأقل على كمية واحدة.'
],
'create-error' => 'صادفت بعض القضايا أثناء صناعة السيارات',
'title' => 'عربة التسوق',

View File

@ -12,7 +12,7 @@ return [
'reviews' => 'Reviews',
'wishlist' => 'Wishlist',
'orders' => 'Orders',
'downloadable-products' => 'Downloadable Products',
'downloadable-products' => 'Downloadable Products'
],
'common' => [
@ -187,6 +187,9 @@ return [
'fname' => 'First Name',
'lname' => 'Last Name',
'gender' => 'Gender',
'other' => 'Other',
'male' => 'Male',
'female' => 'Female',
'dob' => 'Date Of Birth',
'phone' => 'Phone',
'email' => 'Email',

View File

@ -11,6 +11,7 @@ return [
'reviews' => 'Opiniones',
'wishlist' => 'Lista de deseos',
'orders' => 'Pedidos',
'downloadable-products' => 'Productos descargables'
],
'common' => [
@ -173,6 +174,9 @@ return [
'fname' => 'Nombre',
'lname' => 'Apellido',
'gender' => 'Género',
'other' => 'Otro',
'male' => 'Masculino',
'female' => 'Hembra',
'dob' => 'Fecha de nacimiento',
'phone' => 'Móvil',
'email' => 'Correo electrónico',
@ -261,7 +265,7 @@ return [
'item-canceled' => 'Cancelado (:qty_canceled)',
'price' => 'Precio',
'total' => 'Total',
'subtotal' => 'Subtotal',
'subtotal' => 'Total parcial',
'shipping-handling' => 'Envío y Manipulación',
'tax' => 'Impuesto',
'discount' => 'Descuento',
@ -289,7 +293,7 @@ return [
],
'wishlist' => [
'page-title' => 'Customer - Wishlist',
'page-title' => 'Cliente - Lista de deseos',
'title' => 'Lista de deseos',
'deleteall' => 'Eliminar todo',
'moveall' => 'Mover todos los productos a la cesta',
@ -309,17 +313,17 @@ return [
],
'downloadable_products' => [
'title' => 'Downloadable Products',
'order-id' => 'Order Id',
'date' => 'Date',
'name' => 'Title',
'status' => 'Status',
'pending' => 'Pending',
'available' => 'Available',
'expired' => 'Expired',
'remaining-downloads' => 'Remaining Downloads',
'unlimited' => 'Unlimited',
'download-error' => 'Download link has been expired.'
'title' => 'Productos descargables',
'order-id' => 'Solicitar ID',
'date' => 'Fecha',
'name' => 'Título',
'status' => 'Estado',
'pending' => 'Pendiente',
'available' => 'Disponible',
'expired' => 'Caducado',
'remaining-downloads' => 'Descargas restantes',
'unlimited' => 'Ilimitado',
'download-error' => 'El enlace de descarga ha caducado.'
],
'review' => [
@ -414,7 +418,7 @@ return [
'error-add' => 'El artículo no se puede añadir a la cesta, inténtelo más tarde',
],
'quantity-error' => 'La cantidad solicitada no está disponible',
'cart-subtotal' => 'Subtotal',
'cart-subtotal' => 'Total parcial',
'cart-remove-action' => '¿Realmente quieres hacer esto?',
'partial-cart-update' => 'Solo algunos de los productos se han actualizado',
],

View File

@ -11,11 +11,12 @@ return [
'reviews' => 'بررسی ها',
'wishlist' => 'لیست دلخواه',
'orders' => 'سفارشات',
'downloadable-products' => 'محصولات دانلودی'
],
'common' => [
'error' => 'مشکلی رخ داده است. لطفا بعدا دوباره امتحان کنید.',
'no-result-found' => 'We could not find any records.'
'no-result-found' => 'ما هیچ سابقه ای پیدا نکردیم.'
],
'home' => [
@ -174,6 +175,9 @@ return [
'fname' => 'نام کوچک',
'lname' => 'نام خانوادگی',
'gender' => 'جنسیت',
'other' => 'دیگر',
'male' => 'نر',
'female' => 'زن',
'dob' => 'تاریخ تولد',
'phone' => 'تلفن',
'email' => 'پست الکترونیک',
@ -202,7 +206,7 @@ return [
'contact' => 'تماس',
'confirm-delete' => 'آیا واقعاً می خواهید این آدرس را حذف کنید؟',
'default-delete' => 'آدرس پیش فرض تغییر نمی کند',
'enter-password' => 'Enter Your Password.',
'enter-password' => 'رمز ورود خود را وارد کنید',
],
'create' => [
@ -230,7 +234,7 @@ return [
'delete' => [
'success' => 'آدرس با موفقیت حذف شد',
'failure' => 'آدرس حذف نمی شود',
'wrong-password' => 'Wrong Password !'
'wrong-password' => 'گذرواژه اشتباه!'
]
],
@ -259,7 +263,7 @@ return [
'item-invoice' => 'صورتحساب (:qty_invoiced)',
'item-shipped' => 'حمل شده (:qty_shipped)',
'item-canceled' => 'لغو شد (:qty_canceled)',
'item-refunded' => 'Refunded (:qty_refunded)',
'item-refunded' => 'بازپرداخت (:qty_refunded)',
'price' => 'قیمت',
'total' => 'جمع',
'subtotal' => 'فرعی',
@ -287,14 +291,14 @@ return [
'ship-to' => 'حمل به',
'contact' => 'تماس',
'refunds' => 'Refunds',
'individual-refund' => 'Refund #:refund_id',
'adjustment-refund' => 'Adjustment Refund',
'adjustment-fee' => 'Adjustment Fee',
'individual-refund' => 'بازپرداخت #:refund_id',
'adjustment-refund' => 'بازپرداخت تنظیم',
'adjustment-fee' => 'هزینه تنظیم',
]
],
'wishlist' => [
'page-title' => 'Customer - Wishlist',
'page-title' => 'مشتری - لیست دلخواه',
'title' => 'لیست دلخواه',
'deleteall' => 'حذف همه',
'moveall' => 'انتقال همه محصولات به سبد خرید',
@ -314,17 +318,17 @@ return [
],
'downloadable_products' => [
'title' => 'Downloadable Products',
'order-id' => 'Order Id',
'date' => 'Date',
'name' => 'Title',
'status' => 'Status',
'pending' => 'Pending',
'available' => 'Available',
'expired' => 'Expired',
'remaining-downloads' => 'Remaining Downloads',
'unlimited' => 'Unlimited',
'download-error' => 'Download link has been expired.'
'title' => 'محصولات دانلودی',
'order-id' => 'شماره سفارش',
'date' => 'تاریخ',
'name' => 'عنوان',
'status' => 'وضعیت',
'pending' => 'در انتظار',
'available' => 'در دسترس',
'expired' => 'منقضی شده',
'remaining-downloads' => 'بارگیری های باقی مانده',
'unlimited' => 'نامحدود',
'download-error' => 'لینک دانلود منقضی شده است'
],
'review' => [
@ -376,12 +380,12 @@ return [
'view-all' => 'مشاهده همه',
'select-above-options' => 'لطفا ابتدا گزینه های بالا را انتخاب کنید',
'less-quantity' => 'کمیت نمی تواند کمتر از یک باشد.',
'starting-at' => 'Starting at',
'customize-options' => 'Customize Options',
'choose-selection' => 'Choose a selection',
'your-customization' => 'Your Customization',
'total-amount' => 'Total Amount',
'none' => 'None'
'starting-at' => 'شروع از',
'customize-options' => 'گزینه ها را سفارشی کنید',
'choose-selection' => 'انتخابی را انتخاب کنید',
'your-customization' => 'شخصی سازی شما',
'total-amount' => 'مقدار کل',
'none' => 'هیچ یک'
],
// 'reviews' => [
@ -398,8 +402,8 @@ return [
'integrity' => [
'missing_fields' =>'نقض یکپارچگی سیستم سبد خرید ، برخی از زمینه های لازم وجود ندارد',
'missing_options' =>'نقض یکپارچگی سیستم سبد خرید ، گزینه هایی برای محصول قابل تنظیم وجود ندارد',
'missing_links' => 'Downloadable links are missing for this product.',
'qty_missing' => 'Atleast one product should have more than 1 quantity.'
'missing_links' => 'لینک های قابل بارگیری برای این محصول وجود ندارد',
'qty_missing' => 'حداقل یک محصول باید بیش از 1 مقدار داشته باشد.'
],
'create-error' => 'هنگام تهیه نمونه سبد خرید ، با برخی از شماره ها روبرو شد',
@ -548,9 +552,9 @@ return [
'refund' => [
'heading' => 'Your Refund #:refund_id for Order #:order_id',
'subject' => 'Refund for your order #:order_id',
'summary' => 'Summary of Refund',
'adjustment-refund' => 'Adjustment Refund',
'adjustment-fee' => 'Adjustment Fee'
'summary' => 'خلاصه بازپرداخت',
'adjustment-refund' => 'بازپرداخت تنظیم',
'adjustment-fee' => 'هزینه تنظیم'
],
'forget-password' => [

View File

@ -8,6 +8,7 @@ return [
'reviews' => 'Avaliação',
'wishlist' => 'Lista de Desejos',
'orders' => 'Pedidos',
'downloadable-products' => 'Produtos para download'
],
'common' => [
@ -169,6 +170,9 @@ return [
'fname' => 'Nome',
'lname' => 'Sobrenome',
'gender' => 'Gênero',
'other' => 'De outros',
'male' => 'Masculino',
'female' => 'Fêmeo',
'dob' => 'Data de Nascimento',
'phone' => 'Telefone',
'email' => 'Email',
@ -309,17 +313,17 @@ return [
],
'downloadable_products' => [
'title' => 'Downloadable Products',
'order-id' => 'Order Id',
'date' => 'Date',
'name' => 'Title',
'title' => 'Produtos para download',
'order-id' => 'ID do pedido',
'date' => 'Encontro',
'name' => 'Título',
'status' => 'Status',
'pending' => 'Pending',
'available' => 'Available',
'expired' => 'Expired',
'remaining-downloads' => 'Remaining Downloads',
'unlimited' => 'Unlimited',
'download-error' => 'Download link has been expired.'
'pending' => 'Pendente',
'available' => 'acessível',
'expired' => 'Expirado',
'remaining-downloads' => 'Downloads restantes',
'unlimited' => 'Ilimitado',
'download-error' => 'O link para download expirou.'
],
'review' => [
@ -370,13 +374,13 @@ return [
'out-of-stock' => 'Fora de Estoque',
'view-all' => 'Ver Tudo',
'select-above-options' => 'Por favor, selecione as opções acima primeiro.',
'less-quantity' => 'Quantity can not be less than one.',
'starting-at' => 'Starting at',
'customize-options' => 'Customize Options',
'choose-selection' => 'Choose a selection',
'your-customization' => 'Your Customization',
'total-amount' => 'Total Amount',
'none' => 'None'
'less-quantity' => 'A quantidade não pode ser menor que um.',
'starting-at' => 'Começando às',
'customize-options' => 'Personalizar opções',
'choose-selection' => 'Escolha uma seleção',
'your-customization' => 'Sua personalização',
'total-amount' => 'Valor total',
'none' => 'Nenhum'
],
// 'reviews' => [
@ -518,9 +522,9 @@ return [
'refund' => [
'heading' => 'Your Refund #:refund_id for Order #:order_id',
'subject' => 'Refund for your order #:order_id',
'summary' => 'Summary of Refund',
'adjustment-refund' => 'Adjustment Refund',
'adjustment-fee' => 'Adjustment Fee'
'summary' => 'Resumo do reembolso',
'adjustment-refund' => 'Reembolso de ajuste',
'adjustment-fee' => 'Taxa de ajuste'
],
'shipment' => [

View File

@ -47,9 +47,9 @@
<select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
<option value="" @if ($customer->gender == "") selected @endif></option>
<option value="Other" @if ($customer->gender == "Other") selected @endif>Other</option>
<option value="Male" @if ($customer->gender == "Male") selected @endif>Male</option>
<option value="Female" @if ($customer->gender == "Female") selected @endif>Female</option>
<option value="Other" @if ($customer->gender == "Other") selected @endif>{{ __('shop::app.customer.account.profile.other') }}</option>
<option value="Male" @if ($customer->gender == "Male") selected @endif>{{ __('shop::app.customer.account.profile.male') }}</option>
<option value="Female" @if ($customer->gender == "Female") selected @endif>{{ __('shop::app.customer.account.profile.female') }}</option>
</select>
<span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
</div>

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=d4f31631ea9c862c6dc5",
"/js/ui.js": "/js/ui.js?id=56ae9c320b1bfcc09601",
"/css/ui.css": "/css/ui.css?id=0895b560bbc19259cee8"
}

View File

@ -47,8 +47,14 @@
if (! this.savedValues)
return;
let index = this.savedValues.indexOf(this.items[this.valueField].toString())
if(index !== -1) {
var self = this;
var found = this.savedValues.filter(function(value) {
if (value == self.items[self.valueField])
return true;
});
if(found.length) {
this.value.push(this.items);
}
},

View File

@ -22,59 +22,25 @@ class AdminHelper
public function saveLocaleImg($locale)
{
$uploadedImagePath = $this->uploadImage($locale, 'locale_image.image_0');
$data = request()->all();
$type = 'locale_image';
if ($uploadedImagePath) {
$locale->locale_image = $uploadedImagePath;
$locale->save();
}
$locale = $this->uploadImage($locale, $data, $type);
return $locale;
}
public function storeCategoryIcon($category)
{
$oldPath = null;
$iconName = 'category_icon_path.image_1';
$data = request()->all();
$type = 'category_icon_path';
$category = $this->categoryRepository->findOrFail($category);
if (gettype($category) !== "object") {
// getting id on update
$iconName = 'category_icon_path.image_0';
$category = $this->categoryRepository->findOrFail($category);
$oldPath = $category->category_icon_path;
}
$uploadedImagePath = $this->uploadImage($category, $iconName, $oldPath);
if ($uploadedImagePath) {
$category->category_icon_path = $uploadedImagePath;
$category->save();
}
$category = $this->uploadImage($category, $data, $type);
return $category;
}
public function uploadImage($record, $type, $oldPath = null)
{
$request = request();
$image = '';
$file = $type;
$dir = 'velocity/' . $type;
if ($request->hasFile($file)) {
if ($oldPath) {
Storage::delete($oldPath);
}
$image = $request->file($file)->store($dir);
return $image;
}
return false;
}
public function storeSliderDetails($slider)
{
$slider->slider_path = request()->get('slider_path');
@ -82,4 +48,33 @@ class AdminHelper
return true;
}
public function uploadImage($model, $data, $type) {
if (isset($data[$type])) {
$request = request();
foreach ($data[$type] as $imageId => $image) {
$file = $type . '.' . $imageId;
$dir = 'velocity/' . $type . '/' . $model->id;
if ($request->hasFile($file)) {
if ($model->{$type}) {
Storage::delete($model->{$type});
}
$model->{$type} = $request->file($file)->store($dir);
$model->save();
}
}
} else {
if ($model->{$type}) {
Storage::delete($model->{$type});
}
$model->{$type} = null;
$model->save();
}
return $model;
}
}

View File

@ -4,7 +4,7 @@
<image-wrapper
:multiple="false"
input-name="locale_image"
:images='"{{ url()->to('/') . '/storage/' . $locale->locale_image }}"'
:images='"{{ Storage:: url($locale->locale_image) }}"'
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'">
</image-wrapper>
@else

View File

@ -73,10 +73,6 @@
var slugs = JSON.parse(storedRecentlyViewed);
var updatedSlugs = {};
if (slugs.length > 3) {
slugs = slugs.slice(Math.max(slugs.length - 3, 1));
}
slugs = slugs.reverse();
slugs.forEach(slug => {

View File

@ -178,10 +178,22 @@
if (existingViewed.indexOf(currentProductId) == -1) {
existingViewed.push(currentProductId);
if (existingViewed.length > 4)
if (existingViewed.length > 3)
existingViewed = existingViewed.slice(Math.max(existingViewed.length - 4, 1));
window.localStorage.setItem('recentlyViewed', JSON.stringify(existingViewed));
} else {
var uniqueNames = [];
$.each(existingViewed, function(i, el){
if ($.inArray(el, uniqueNames) === -1) uniqueNames.push(el);
});
uniqueNames.push(currentProductId);
uniqueNames.splice(uniqueNames.indexOf(currentProductId), 1);
window.localStorage.setItem('recentlyViewed', JSON.stringify(uniqueNames));
}
},