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

conflicts

This commit is contained in:
gusaindeepak54 2020-10-29 10:29:10 +05:30
parent dd321515ef
commit c717adf206
29 changed files with 297 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -40,7 +40,6 @@ jobs:
- name: Composer install
run: |
set -e
composer global require hirak/prestissimo
composer install --no-interaction --ansi --no-progress --no-suggest --optimize-autoloader
- name: Migrate database

4
packages/Webkul/API/Http/Controllers/Shop/InvoiceController.php
View File

@ -43,7 +43,9 @@ class InvoiceController extends Controller
$this->middleware('auth:' . $this->guard);
}
$this->repository = app($this->_config['repository']);
if ($this->_config) {
$this->repository = app($this->_config['repository']);
}
}
/**

20
packages/Webkul/API/Http/Controllers/Shop/ResourceController.php
View File

@ -12,7 +12,7 @@ class ResourceController extends Controller
* @var array
*/
protected $guard;
/**
* Contains route related configuration
*
@ -45,7 +45,9 @@ class ResourceController extends Controller
$this->middleware('auth:' . $this->guard);
}
$this->repository = app($this->_config['repository']);
if ($this->_config) {
$this->repository = app($this->_config['repository']);
}
}
/**
@ -58,8 +60,8 @@ class ResourceController extends Controller
$query = $this->repository->scopeQuery(function($query) {
if (isset($this->_config['authorization_required']) && $this->_config['authorization_required']) {
$query = $query->where('customer_id', auth()->user()->id );
}
}
foreach (request()->except(['page', 'limit', 'pagination', 'sort', 'order', 'token']) as $input => $value) {
$query = $query->whereIn($input, array_map('trim', explode(',', $value)));
}
@ -89,11 +91,11 @@ class ResourceController extends Controller
* @return \Illuminate\Http\Response
*/
public function get($id)
{
$query = isset($this->_config['authorization_required']) && $this->_config['authorization_required'] ?
$this->repository->where('customer_id', auth()->user()->id)->findOrFail($id) :
{
$query = isset($this->_config['authorization_required']) && $this->_config['authorization_required'] ?
$this->repository->where('customer_id', auth()->user()->id)->findOrFail($id) :
$this->repository->findOrFail($id);
return new $this->_config['resource']($query);
}
@ -108,7 +110,7 @@ class ResourceController extends Controller
$wishlistProduct = $this->repository->findOrFail($id);
$this->repository->delete($id);
return response()->json([
'message' => 'Item removed successfully.',
]);

139
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -2,7 +2,7 @@
return [
'save' => 'حفظ',
'create' => 'خلق',
'create' => 'إنشاء',
'update' => 'تحديث',
'delete' => 'حذف',
'copy-of' => 'نسخة من ',
@ -47,20 +47,20 @@ return [
'my-account' => 'حسابي',
'logout' => 'خروج',
'visit-shop' => 'قم بزيارة المتجر',
'dashboard' => 'لوحة العدادات',
'dashboard' => 'لوحة التحكم',
'sales' => 'المبيعات',
'orders' => 'الأوامر',
'orders' => 'الطلبات',
'shipments' => 'الشحنات',
'invoices' => 'الفواتير',
'catalog' => 'فهرس',
'products' => 'المنتجات',
'categories' => 'الفئات',
'attributes' => 'الصفات',
'attributes' => 'الخصائص',
'attribute-families' => 'وصف الأسر',
'customers' => 'زبائن',
'groups' => 'المجموعات',
'reviews' => 'باء-الاستعراضات',
'newsletter-subscriptions' => 'الاشتراك في الرسالة الإخبارية',
'reviews' => 'التقييمات',
'newsletter-subscriptions' => 'الاشتراك في النشرة البريدية',
'configure' => 'اضبط',
'settings' => 'إعدادات',
'locales' => 'لغات',
@ -81,9 +81,9 @@ return [
],
'acl' => [
'dashboard' => 'لوحة العدادات',
'dashboard' => 'لوحة التحكم',
'sales' => 'المبيعات',
'orders' => 'الأوامر',
'orders' => 'الطلبات',
'shipments' => 'الشحنات',
'invoices' => 'الفواتير',
'catalog' => 'فهرس',
@ -117,7 +117,7 @@ return [
],
'dashboard' => [
'title' => 'لوحة العدادات',
'title' => 'لوحة التحكم',
'from' => 'من',
'to' => 'إلى',
'total-customers' => 'مجموع الزبائن',
@ -140,10 +140,10 @@ return [
'datagrid' => [
'mass-ops' => [
'method-error' => 'خطأ! تم اكتشاف طريقة خاطئة ، الرجاء التحقق من تشكيل حركة الكتلة',
'delete-success' => "تم حذف المورد بنجاح :Selected",
'method-error' => 'خطأ! تم اكتشاف طريقة خاطئة، الرجاء التحقق من تشكيل حركة الكتلة',
'delete-success' => "تم الحذف بنجاح :Selected",
'partial-action' => 'ولم تنفذ بعض الإجراءات بسبب القيود المفروضة على النظام :resource',
'update-success' => "تم تحديث المورد بنجاح :Selected",
'update-success' => "تم التحديث بنجاح :Selected",
'no-resource' => 'المورد المقدم غير كاف للعمل',
],
@ -154,7 +154,7 @@ return [
'copy' => 'نسخ',
'name' => 'اسم',
'direction' => 'اتجاه',
'fullname' => 'الاسم الكامل',
'fullname' => 'الاسم بالكامل',
'type' => 'النوع',
'required' => 'مطلوب',
'unique' => 'فريد',
@ -171,10 +171,10 @@ return [
'layout' => 'نسق',
'url-key' => 'مفتاح URL',
'comment' => 'تعليق',
'product-name' => 'المنتج',
'product-name' => 'إسم المنتج',
'currency-name' => 'اسم العملة',
'exch-rate' => 'باء-سعر الصرف',
'priority' => 'Priority',
'priority' => 'الأولوية',
'subscribed' => 'مشترك',
'base-total' => 'المجموع الأساسي',
'grand-total' => 'المجموع الكلي',
@ -232,10 +232,10 @@ return [
'account' => [
'title' => 'حسابي',
'save-btn-title' => 'احفظ',
'general' => 'ألف-لمحة عامة',
'general' => 'عام',
'name' => 'اسم',
'email' => 'البريد الإلكتروني',
'password' => 'كلمه السر',
'password' => 'كلمه المرور',
'confirm-password' => 'تأكيد كلمة المرور',
'change-password' => 'غير كلمة سر الحساب',
'current-password' => 'كلمة المرور الحالية'
@ -243,22 +243,22 @@ return [
'users' => [
'forget-password' => [
'title' => 'انس كلمة السر',
'header-title' => 'استرجع كلمة السر',
'title' => 'نسيت كلمة المرور',
'header-title' => 'استرجع كلمة المرور',
'email' => 'البريد الإلكتروني المسجل',
'password' => 'كلمه السر',
'password' => 'كلمه المرور',
'confirm-password' => 'تأكيد كلمة المرور',
'back-link-title' => 'العودة للتوقيع',
'submit-btn-title' => 'بريد إلكتروني كلمة مرور إعادة تعيين وصلة'
],
'reset-password' => [
'title' => 'أعد ضبط كلمة السر',
'title' => 'أعد ضبط كلمة المرور',
'email' => 'البريد الإلكتروني المسجل',
'password' => 'كلمه السر',
'password' => 'كلمه المرور',
'confirm-password' => 'تأكيد كلمة المرور',
'back-link-title' => 'العودة للتوقيع',
'submit-btn-title' => 'أعد ضبط كلمة السر'
'submit-btn-title' => 'أعد ضبط كلمة المرور'
],
'roles' => [
@ -266,10 +266,10 @@ return [
'add-role-title' => 'أضف الدور',
'edit-role-title' => 'حرر الدور',
'save-btn-title' => 'احفظ الدور',
'general' => 'ألف-لمحة عامة',
'general' => 'عام',
'name' => 'اسم',
'description' => 'الوصف',
'access-control' => 'مراقبة الدخول',
'access-control' => 'صلاحيات الوصول',
'permissions' => 'الأذون',
'custom' => 'مخصص',
'all' => 'الكل'
@ -280,33 +280,33 @@ return [
'add-user-title' => 'إضافة مستخدم',
'edit-user-title' => 'حرر المستخدم',
'save-btn-title' => 'احفظ المستخدم',
'general' => 'ألف-لمحة عامة',
'general' => 'عام',
'email' => 'البريد الإلكتروني',
'name' => 'اسم',
'password' => 'كلمه الس',
'password' => 'كلمه المرور',
'confirm-password' => 'تأكيد كلمة المرور',
'status-and-role' => 'المركز والدور',
'role' => 'الدور',
'status' => 'الحالة',
'account-is-active' => 'الحساب نشط',
'current-password' => 'أدخل كلمة السر الحالية',
'current-password' => 'أدخل كلمة المرور الحالية',
'confirm-delete' => 'تأكيد حذف هذا الحساب',
'confirm-delete-title' => 'تأكيد كلمة السر قبل حذف',
'confirm-delete-title' => 'تأكيد كلمة المرور قبل حذف',
'delete-last' => 'على الأقل مدير واحد مطلوب.',
'delete-success' => 'نجاح! حذف المستخدم',
'incorrect-password' => 'كلمة السر التي أدخلتها غير صحيحة',
'password-match' => 'كلمة السر الحالية لا تطابق.',
'incorrect-password' => 'كلمة المرور التي أدخلتها غير صحيحة',
'password-match' => 'كلمة المرور الحالية لا تطابق.',
'account-save' => 'الحساب التغييرات و الموفرة بنجاح.',
'login-error' => 'الرجاء التحقق من أوراق اعتمادك ومحاولة مرة أخرى.',
'activate-warning' => 'حسابك لم يتم تفعيله بعد ، الرجاء الاتصال بالمدير.'
'activate-warning' => 'حسابك لم يتم تفعيله بعد، الرجاء الاتصال بالمدير.'
],
'sessions' => [
'title' => 'وقع هنا',
'email' => 'البريد الإلكتروني',
'password' => 'كلمه السر',
'forget-password-link-title' => 'نسيت كلمة السر ؟',
'remember-me' => 'تذكريني',
'password' => 'كلمه المرور',
'forget-password-link-title' => 'نسيت كلمة المرور؟',
'remember-me' => 'تذكرني',
'submit-btn-title' => 'وقع هنا'
]
],
@ -1235,7 +1235,7 @@ return [
'admin' => [
'emails' => [
'email' => 'Email',
'email' => 'البريد الإلكتروني',
'notification_label' => 'إشعارات',
'notifications' => [
'verification' => 'ارسل ايميل التفعيل',
@ -1301,6 +1301,11 @@ return [
'weight-unit' => 'وحدة الوزن',
'admin-page-limit' => 'العناصر الافتراضية لكل صفحة (المشرف)',
'design' => 'التصميم',
'email-settings' => 'إعدادات البريد الإلكتروني',
'email-sender-name' => 'اسم مرسل البريد الإلكتروني',
'shop-email-from' => 'متجر عنوان البريد الإلكتروني [لإرسال رسائل البريد الإلكتروني]',
'admin-name' => 'اسم المسؤول',
'admin-email' => 'البريد الإلكتروني للمسؤول',
'admin-logo' => 'شعار المسؤول',
'logo-image' => 'صورة الشعار',
'credit-max' => 'الحد الأقصى لائتمان العميل',
@ -1316,48 +1321,48 @@ return [
'sandbox' => 'صندوق الرمل',
'all-channels' => 'الكل',
'all-locales' => 'الكل',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'invoice-slip-design' => 'تصميم قسيمة الفاتورة',
'logo' => 'شعار',
'storefront' => 'واجهة المحل',
'default-list-mode' => 'وضع القائمة الافتراضي',
'grid' => 'جريد',
'list' => 'قائمة',
'products-per-page' => 'المنتجات في الصفحة',
'sort-by' => 'صنف حسب',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon',
'comma-seperated' => 'مفصولة بفواصل',
'favicon' => 'فافيكون',
'seo' => 'SEO',
'rich-snippets' => 'Rich Snippets',
'products' => 'Products',
'enable' => 'Enable',
'show-weight' => 'Show Weight',
'show-categories' => 'Show Categories',
'show-images' => 'Show Images',
'show-reviews' => 'Show Reviews',
'show-ratings' => 'Show Ratings',
'show-offers' => 'Show Offers',
'show-sku' => 'Show SKU',
'categories' => 'Categories',
'show-sku' => 'Show SKU',
'show-search-input-field' => 'Show Search Input Field',
'rich-snippets' => 'قصاصات غنية',
'products' => 'منتجات',
'enable' => 'ممكن',
'show-weight' => 'عرض الوزن',
'show-categories' => 'إظهار الفئات',
'show-images' => 'عرض الصور',
'show-reviews' => 'عرض التعليقات',
'show-ratings' => 'إظهار التقييمات',
'show-offers' => 'عرض العروض',
'show-sku' => 'عرض SKU',
'categories' => 'التصنيفات',
'show-sku' => 'عرض SKU',
'show-search-input-field' => 'إظهار حقل إدخال البحث',
'store-name' => 'اسم المتجر',
'vat-number' => 'ظريبه الشراء',
'contact-number' => 'رقم الاتصال',
'bank-details' => 'التفاصيل المصرفية',
'mailing-address' => 'Send Check to',
'instructions' => 'Instructions',
'custom-scripts' => 'Custom Scripts',
'custom-css' => 'Custom CSS',
'custom-javascript' => 'Custom Javascript',
'paypal-smart-button' => 'Paypal Smart Button',
'client-id' => 'Client Id',
'client-id-info' => 'Use "sb" for testing.'
'mailing-address' => 'أرسل الشيك إلى',
'instructions' => 'تعليمات',
'custom-scripts' => 'البرامج النصية المخصصة',
'custom-css' => 'لغة تنسيق ويب حسب الطلب',
'custom-javascript' => 'جافا سكريبت مخصص',
'paypal-smart-button' => 'زر Paypal الذكي',
'client-id' => 'معرف العميل',
'client-id-info' => 'استخدم "sb" للاختبار.'
]
]
];

2
packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
View File

@ -71,7 +71,7 @@
{!! view_render_event('bagisto.admin.layout.head') !!}
</head>
<body @if (core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
<div id="app" class="container">
<flash-wrapper ref='flashes'></flash-wrapper>

8
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php
View File

@ -8,7 +8,7 @@
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
<date @onChange="dateSelected($event)">
<date @onChange="dateSelected($event)" :minDate="'{{$bookingProduct->available_from}}'" :maxDate="'{{$bookingProduct->available_to}}'">
<input type="text" v-validate="'required'" name="booking[date]" class="form-style" data-vv-as="&quot;{{ __('bookingproduct::app.shop.products.date') }}&quot;"/>
</date>
@ -24,7 +24,7 @@
</div>
</div>
</div>
</script>
<script>
@ -54,6 +54,6 @@
}
}
});
</script>
@endpush
@endpush

14
packages/Webkul/Core/src/Console/Commands/Install.php
View File

@ -39,6 +39,15 @@ class Install extends Command
{
$this->checkForEnvFile();
// cached new changes
$this->warn('Step: Caching new changes...');
$cached = $this->call('config:cache');
$this->info($cached);
// waiting for 2 seconds
$this->warn('Please wait...');
sleep(2);
// running `php artisan migrate`
$this->warn('Step: Migrating all tables into database...');
$migrate = $this->call('migrate:fresh');
@ -64,11 +73,6 @@ class Install extends Command
$result = shell_exec('composer dump-autoload');
$this->info($result);
// cached new changes
$this->warn('Step: Caching new changes...');
$cached = $this->call('config:cache');
$this->info($cached);
$this->info('-----------------------------');
$this->info('Congratulations!');
$this->info('The installation has been finished and you can now use Bagisto.');

8
packages/Webkul/Product/src/Helpers/Toolbar.php
View File

@ -131,7 +131,13 @@ class Toolbar extends AbstractProduct
{
$params = request()->input();
if (isset($params['mode']) && $key == $params['mode']) {
$defaultMode = core()->getConfigData('catalog.products.storefront.mode')
? core()->getConfigData('catalog.products.storefront.mode')
: 'grid';
if (request()->input() == null && $key == $defaultMode) {
return true;
} else if (isset($params['mode']) && $key == $params['mode']) {
return true;
}

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

@ -72,8 +72,8 @@ return [
'page-title' => 'بحث',
'found-results' => 'تم العثور على نتائج البحث',
'found-result' => 'تم العثور على نتيجة البحث',
'analysed-keywords' => 'Analysed Keywords',
'image-search-option' => 'Image Search Option'
'analysed-keywords' => 'الكلمات الأساسية التي تم تحليلها',
'image-search-option' => 'خيار البحث عن الصور'
],
'reviews' => [
@ -440,7 +440,7 @@ return [
'none' => 'لا شيء',
'available-for-order' => 'متوفر لطلب الشراء',
'settings' => 'Settings',
'compare_options' => 'Compare Options',
'compare_options' => 'قارن الخيارات',
],
// 'reviews' => [

4
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -39,7 +39,7 @@
</head>
<body @if (core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
{!! view_render_event('bagisto.shop.layout.body.before') !!}
@ -103,7 +103,7 @@
@endif
window.serverErrors = [];
@if (isset($errors))
@if (count($errors))
window.serverErrors = @json($errors->getMessages());

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

22
packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt
View File

@ -1,18 +1,18 @@
/* flatpickr v4.6.3, @license MIT */
/* flatpickr v4.6.6, @license MIT */
/*! *****************************************************************************
Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0
Copyright (c) Microsoft Corporation.
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
See the Apache Version 2.0 License for specific language governing permissions
and limitations under the License.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
***************************************************************************** */
/**

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=706b63016a08ec91d32b",
"/js/ui.js": "/js/ui.js?id=2cf17b86ea451828fd09",
"/css/ui.css": "/css/ui.css?id=5673703005b2ac3d0889"
}

103
packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
View File

@ -1,54 +1,73 @@
<template>
<span>
<slot>
<input type="text" :name="name" class="control" :value="value" data-input>
</slot>
<span
class="icon cross-icon"
v-if="! hideRemoveButton"
@click.prevent="clear">
</span>
</span>
<span>
<slot>
<input
type="text"
:name="name"
class="control"
:value="value"
data-input
/>
</slot>
<span
class="icon cross-icon"
v-if="!hideRemoveButton"
@click.prevent="clear"
>
</span>
</span>
</template>
<script>
import Flatpickr from 'flatpickr';
import Flatpickr from "flatpickr";
export default {
props: {
name: String,
props: {
name: String,
value: String,
value: String,
hideRemoveButton: [Number, String]
},
minDate: String,
data () {
return {
datepicker: null
}
},
maxDate: String,
mounted () {
var this_this = this;
hideRemoveButton: [Number, String],
},
var element = this.$el.getElementsByTagName('input')[0];
this.datepicker = new Flatpickr(
element, {
allowInput: true,
altFormat: 'Y-m-d',
dateFormat: 'Y-m-d',
weekNumbers: true,
onChange: function(selectedDates, dateStr, instance) {
this_this.$emit('onChange', dateStr)
},
});
},
methods: {
clear() {
this.datepicker.clear();
}
data() {
return {
datepicker: null,
};
},
mounted() {
var this_this = this;
var options = {
allowInput: true,
altFormat: "Y-m-d",
dateFormat: "Y-m-d",
weekNumbers: true,
onChange: function(selectedDates, dateStr, instance) {
this_this.$emit("onChange", dateStr);
},
};
if (this.minDate) {
options.minDate = this.minDate;
}
};
</script>
if (this.maxDate) {
options.maxDate = this.maxDate;
}
var element = this.$el.getElementsByTagName("input")[0];
this.datepicker = new Flatpickr(element, options);
},
methods: {
clear() {
this.datepicker.clear();
},
},
};
</script>

4
packages/Webkul/Velocity/publishable/assets/css/velocity.css 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,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=3a2c3ff368005724ac15",
"/js/velocity.js": "/js/velocity.js?id=8b9f4800048d9bf205fb",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=e216b0502de8c62e8df3"
"/css/velocity.css": "/css/velocity.css?id=66121fba4e89a8f865f8"
}

2
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue
View File

@ -1,6 +1,6 @@
<template>
<form method="POST" @submit.prevent="addToCart">
<!-- for move to cart from wishlist -->
<a
:href="wishlistMoveRoute"

1
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/product-quick-view.vue
View File

@ -12,6 +12,7 @@
<slide
:key="index"
:slot="`slide-${index}`"
title=" "
v-for="(image, index) in product.galleryImages">
<li class="selected" @click="showProductDetails = false">

6
packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss vendored
View File

@ -1,3 +1,9 @@
/*
Added back again because in chrome this is not using and light house also saying not used.
But in mozilla all fonts are gone which creating problem.
*/
@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap');
//velocity variables
$white-color: #FFFFFF;
$black-color: #111111;

2
packages/Webkul/Velocity/src/Resources/assets/sass/app.scss vendored
View File

@ -481,8 +481,8 @@ header {
}
}
/* To Do: To avoid CLS reserve width for all locale */
.mini-cart-container {
width: 125px;
height: 50px;
padding: 5px 17px;

16
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -241,6 +241,7 @@
img {
width: 100%;
height: 190px;
max-height: 190px;
}
}
@ -1677,12 +1678,11 @@
}
.bundle-to {
text-align: center;
display: block;
font-size: 15px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
display: block;
}
}
@ -2347,13 +2347,10 @@
}
.bundle-to {
text-align: center;
display: unset;
margin: 0 2px;
font-size: 15px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
margin: 0 2px;
display: unset;
}
}
}
@ -2483,6 +2480,11 @@
.action {
position: relative;
.btn-add-to-cart {
width: 125px !important;
white-space: pre-wrap;
}
.close-btn {
right: 0;
top: 6px;

132
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -1,4 +1,3 @@
.vc-small-screen {
display: none !important;
}
@ -48,72 +47,6 @@
}
}
@media only screen and (max-width: 992px) {
}
@media only screen and (max-width: 768px) {
.modal-container {
left: 10%;
max-width: 80%;
margin-left: 0px;
}
.footer .footer-list-container {
padding-left: 0px !important;
}
.footer .currency {
display: block !important;
}
.table {
width: 90%;
margin-bottom: 1rem;
margin-top: 68px;
color: #212529;
overflow-x: auto;
}
.per-page {
position: absolute;
margin-top: 66px;
margin-right: -1px;
margin-left: 17px;
width: 151px;
}
.filter-left {
position: relative;
margin-right: -6px!important;
}
.dropdown-filters {
margin-left: 15px;
}
button.btn.btn-sm.btn-primary.apply-filter {
margin-top: 10px;
margin-left: -158px;
}
.lg-card-container.list-card .product-image {
max-height: 85px;
}
.quick-view-btn-container {
left: -26px;
width: 109px;
}
.quick-view-btn-container span {
left: 24%;
top: -24px;
font-size: 13px;
}
}
@media only screen and (max-width: 992px) {
$header-height: 50px;
@ -1056,3 +989,68 @@
display: inline-block;
}
}
@media only screen and (max-width: 768px) {
.modal-container {
left: 10%;
max-width: 80%;
margin-left: 0px;
}
.footer .footer-list-container {
padding-left: 0px !important;
}
.footer .currency {
display: block !important;
}
.table {
width: 90%;
margin-bottom: 1rem;
margin-top: 68px;
color: #212529;
overflow-x: auto;
}
.per-page {
position: absolute;
margin-top: 66px;
margin-right: -1px;
margin-left: 17px;
width: 151px;
}
.filter-left {
position: relative;
margin-right: -6px!important;
}
.dropdown-filters {
margin-left: 15px;
}
button.btn.btn-sm.btn-primary.apply-filter {
margin-top: 10px;
margin-left: -158px;
}
.lg-card-container.list-card .product-image {
max-height: 85px;
}
.quick-view-btn-container {
left: -26px;
width: 109px;
}
.quick-view-btn-container span {
left: 24%;
top: -24px;
font-size: 13px;
}
.quick-view-in-list {
display: none;
}
}

3
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -182,12 +182,11 @@
}
.bundle-to {
text-align: unset;
display: block;
font-size: 20px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
display: block;
}
}
}

1
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -509,7 +509,6 @@
.add-to-cart-btn {
float: left;
max-width: 150px;
display: inline-block;
}
}

6
packages/Webkul/Velocity/src/Resources/lang/ar/app.php
View File

@ -40,9 +40,9 @@ return [
]
],
'layouts' => [
'velocity' => 'Velocity',
'velocity' => '● السرعة',
'cms-pages' => 'CMS الصفحات',
'meta-data' => 'Meta Data',
'meta-data' => 'البيانات الوصفية',
'category-menu' => 'قائمة الفئة',
'header-content' => 'محتوى الرأس',
],
@ -91,7 +91,7 @@ return [
],
'meta-data' => [
'footer' => 'تذييل',
'title' => 'Velocity meta data',
'title' => 'البيانات الوصفية السرعة',
'activate-slider' => 'تنشيط شريط التمرير',
'home-page-content' => 'محتوى الصفحة الرئيسية',
'footer-left-content' => 'تذييل يسار المحتوى',

24
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -17,6 +17,10 @@
width: unset;
float: right;
}
.alert-wishlist {
display: inline-block;
}
</style>
@endpush
@ -119,15 +123,19 @@
<div class="no-padding col-12 cursor-pointer fs16">
@auth('customer')
@if ($item->parent_id != 'null' ||$item->parent_id != null)
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->id),
'text' => "<span class='align-vertical-super'>$moveToWishlist</span>"
])
<div @click="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')" class="alert-wishlist">
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->id),
'text' => "<span class='align-vertical-super'>$moveToWishlist</span>"
])
</div>
@else
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->child->id),
'text' => "<span class='align-vertical-super'>$moveToWishlist</span>"
])
<div @click="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')" class="alert-wishlist">
@include('shop::products.wishlist', [
'route' => route('shop.movetowishlist', $item->child->id),
'text' => "<span class='align-vertical-super'>$moveToWishlist</span>"
])
</div>
@endif
@endauth

2
packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
View File

@ -24,7 +24,7 @@
@php
$textContent = str_replace("\r\n", '', $slider['content']);
@endphp
<slide slot="slide-{{ $index }}">
<slide slot="slide-{{ $index }}" title=" ">
<a @if($slider['slider_path']) href="{{ $slider['slider_path'] }}" @endif>
<img
class="col-12 no-padding banner-icon"

4
packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
View File

@ -20,7 +20,7 @@
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/velocity.css') }}" />
<link rel="stylesheet" href="{{ asset('themes/velocity/assets/css/bootstrap.min.css') }}" />
@if (core()->getCurrentLocale()->direction == 'rtl')
@if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl')
<link href="{{ asset('themes/velocity/assets/css/bootstrap-flipped.css') }}" rel="stylesheet">
@endif
@ -45,7 +45,7 @@
</style>
</head>
<body @if (core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif>
<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif>
{!! view_render_event('bagisto.shop.layout.body.before') !!}
@include('shop::UI.particals')