From ba4147647671f902061247dcc9bde72a23446c68 Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 15 Jul 2020 14:00:25 +0530 Subject: [PATCH 01/22] Changes event name for path hint --- packages/Webkul/Core/src/Providers/CoreServiceProvider.php | 2 +- .../Core/src/Resources/views/blade/tracer/style.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php index 3b1c9fbf5..8b4ff525a 100755 --- a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php +++ b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php @@ -58,7 +58,7 @@ class CoreServiceProvider extends ServiceProvider $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'core'); - Event::listen('bagisto.shop.layout.head', static function(ViewRenderEventManager $viewRenderEventManager) { + Event::listen('bagisto.shop.layout.body.after', static function(ViewRenderEventManager $viewRenderEventManager) { $viewRenderEventManager->addTemplate('core::blade.tracer.style'); }); diff --git a/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php b/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php index 6729a3934..cd461a36a 100644 --- a/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php +++ b/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php @@ -54,7 +54,7 @@ } $(this).remove(); - }) + }); $('.path-hint').on('mouseover', function(e) { e.stopPropagation(); From 6a1a96ca59619b4e96cd8e5a52e338e7e7b3d162 Mon Sep 17 00:00:00 2001 From: Devansh Date: Wed, 15 Jul 2020 20:33:53 +0530 Subject: [PATCH 02/22] Sales issue fixed in grouped as well as bundle --- packages/Webkul/Product/src/Type/Bundle.php | 30 ++++++++++++++++++-- packages/Webkul/Product/src/Type/Grouped.php | 30 ++++++++++++++++++-- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php index 7e24e7ac8..9860ada1d 100644 --- a/packages/Webkul/Product/src/Type/Bundle.php +++ b/packages/Webkul/Product/src/Type/Bundle.php @@ -278,7 +278,7 @@ class Bundle extends AbstractType if (! $bundleOptionProduct->product->getTypeInstance()->isSaleable()) { continue; } - + if (in_array($option->type, ['multiselect', 'checkbox'])) { if (! isset($optionPrices[$option->id][0])) { $optionPrices[$option->id][0] = 0; @@ -315,7 +315,7 @@ class Bundle extends AbstractType if (! $bundleOptionProduct->product->getTypeInstance()->isSaleable()) { continue; } - + if (in_array($option->type, ['multiselect', 'checkbox'])) { if (! isset($optionPrices[$option->id][0])) { $optionPrices[$option->id][0] = 0; @@ -381,6 +381,25 @@ class Bundle extends AbstractType ]; } + /** + * Get bundle product special price + * + * @return boolean + */ + private function checkBundleProductHaveSpecialPrice() + { + $haveSpecialPrice = false; + foreach ($this->product->bundle_options as $option) { + foreach ($option->bundle_option_products as $index => $bundleOptionProduct) { + if ($bundleOptionProduct->product->getTypeInstance()->haveSpecialPrice()) { + $haveSpecialPrice = true; + break; + } + } + } + return $haveSpecialPrice; + } + /** * Get product minimal price * @@ -390,7 +409,12 @@ class Bundle extends AbstractType { $prices = $this->getProductPrices(); - $priceHtml = '
'; + $priceHtml = ''; + + if ($this->checkBundleProductHaveSpecialPrice()) + $priceHtml .= '
' . trans('shop::app.products.sale') . '
'; + + $priceHtml .= '
'; if ($prices['from']['regular_price']['price'] != $prices['from']['final_price']['price']) { $priceHtml .= '' . $prices['from']['regular_price']['formated_price'] . '' diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php index bb13a3e8a..a137b8a4c 100644 --- a/packages/Webkul/Product/src/Type/Grouped.php +++ b/packages/Webkul/Product/src/Type/Grouped.php @@ -139,6 +139,23 @@ class Grouped extends AbstractType return min($minPrices); } + /** + * Get group product special price + * + * @return boolean + */ + private function checkGroupProductHaveSpecialPrice() + { + $haveSpecialPrice = false; + foreach ($this->product->grouped_products as $groupOptionProduct) { + if ($groupOptionProduct->associated_product->getTypeInstance()->haveSpecialPrice()) { + $haveSpecialPrice = true; + break; + } + } + return $haveSpecialPrice; + } + /** * Get product minimal price * @@ -146,9 +163,16 @@ class Grouped extends AbstractType */ public function getPriceHtml() { - return '' . trans('shop::app.products.starting-at') . '' - . ' ' - . '' . core()->currency($this->getMinimalPrice()) . ''; + $html = ''; + + if ($this->checkGroupProductHaveSpecialPrice()) + $html .= '
' . trans('shop::app.products.sale') . '
'; + + $html .= '' . trans('shop::app.products.starting-at') . '' + . ' ' + . '' . core()->currency($this->getMinimalPrice()) . ''; + + return $html; } /** From 822b86e126c19a0c6316d24242a120d725960f5f Mon Sep 17 00:00:00 2001 From: mohd asif Date: Thu, 16 Jul 2020 12:16:13 +0530 Subject: [PATCH 03/22] fixed issue 3311 in default theme --- .../Webkul/Shop/src/Resources/views/products/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index 6a4df8163..5247d65c2 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -46,9 +46,9 @@ @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description'])) getAll($category->id); ?> - @if ($products->count()) + @include ('shop::products.list.toolbar') - @include ('shop::products.list.toolbar') + @if ($products->count()) @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') From 21596b189d508be0398865d657e0c391c4850aef Mon Sep 17 00:00:00 2001 From: Devansh Date: Thu, 16 Jul 2020 12:29:56 +0530 Subject: [PATCH 04/22] Limit 0 Issue Fixed --- .../Webkul/Product/src/Repositories/ProductRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 9d0b0e8a4..690d6658d 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -113,7 +113,7 @@ class ProductRepository extends Repository $perPage = isset($params['limit']) ? $params['limit'] : current($pages); } else { - $perPage = isset($params['limit']) ? $params['limit'] : 9; + $perPage = isset($params['limit']) && !empty($params['limit']) ? $params['limit'] : 9; } $page = Paginator::resolveCurrentPage('page'); @@ -388,7 +388,7 @@ class ProductRepository extends Repository ->where('product_flat.channel', $channel) ->where('product_flat.locale', $locale) ->whereNotNull('product_flat.url_key') - ->where(function($subQuery) use ($term) { + ->where(function($subQuery) use ($term) { $queries = explode('_', $term); foreach (array_map('trim', $queries) as $value) { @@ -399,7 +399,7 @@ class ProductRepository extends Repository ->orderBy('product_id', 'desc'); })->paginate(16); } - + return $results; } From 31af7220cf3cbd788c70f34fe70bd80a7ddb8d30 Mon Sep 17 00:00:00 2001 From: Devansh Date: Thu, 16 Jul 2020 13:07:46 +0530 Subject: [PATCH 05/22] Reverting to previous one as this is related to another issue --- packages/Webkul/Product/src/Repositories/ProductRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 690d6658d..d0acd0d99 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -113,7 +113,7 @@ class ProductRepository extends Repository $perPage = isset($params['limit']) ? $params['limit'] : current($pages); } else { - $perPage = isset($params['limit']) && !empty($params['limit']) ? $params['limit'] : 9; + $perPage = isset($params['limit']) ? $params['limit'] : 9; } $page = Paginator::resolveCurrentPage('page'); From 222b03ed412e4718ae686eb44f35837cc5536e1e Mon Sep 17 00:00:00 2001 From: Devansh Date: Thu, 16 Jul 2020 13:12:19 +0530 Subject: [PATCH 06/22] Category filter limit zero issue fixed --- .../Webkul/Product/src/Repositories/ProductRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 9d0b0e8a4..690d6658d 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -113,7 +113,7 @@ class ProductRepository extends Repository $perPage = isset($params['limit']) ? $params['limit'] : current($pages); } else { - $perPage = isset($params['limit']) ? $params['limit'] : 9; + $perPage = isset($params['limit']) && !empty($params['limit']) ? $params['limit'] : 9; } $page = Paginator::resolveCurrentPage('page'); @@ -388,7 +388,7 @@ class ProductRepository extends Repository ->where('product_flat.channel', $channel) ->where('product_flat.locale', $locale) ->whereNotNull('product_flat.url_key') - ->where(function($subQuery) use ($term) { + ->where(function($subQuery) use ($term) { $queries = explode('_', $term); foreach (array_map('trim', $queries) as $value) { @@ -399,7 +399,7 @@ class ProductRepository extends Repository ->orderBy('product_id', 'desc'); })->paginate(16); } - + return $results; } From 47d90ce1f8eb9af7c858f62de74741545c2d047c Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 13:31:05 +0530 Subject: [PATCH 07/22] chinese locale search issue fixed --- .../Velocity/src/Resources/views/shop/UI/particals.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php index 56b0129ac..b238eeeb5 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php @@ -308,7 +308,7 @@ searchedItem.forEach(item => { let splitedItem = item.split('='); - updatedSearchedCollection[splitedItem[0]] = splitedItem[1]; + updatedSearchedCollection[splitedItem[0]] = decodeURI(splitedItem[1]); }); if (updatedSearchedCollection['image-search'] == 1) { From acbe32861ff96d1e80ad653a62dba3a01dea75cb Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 21:14:41 +0530 Subject: [PATCH 08/22] Pl local issue fixed --- packages/Webkul/Ui/src/Resources/lang/pl/app.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php index 65a467a76..6949c5121 100644 --- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php @@ -35,4 +35,6 @@ return [ 'items-per-page' => 'Przedmioty na stronę', 'value-here' => 'Wartość tutaj', 'numeric-value-here' => 'wartość liczbowa tutaj', - 'submit' => 'Prześlij' \ No newline at end of file + 'submit' => 'Prześlij' + ] +]; \ No newline at end of file From 412a620dbd183867ef421bff883ff586feabee6d Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 21:29:58 +0530 Subject: [PATCH 09/22] undo changes --- packages/Webkul/Ui/src/Resources/lang/pl/app.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php index 6949c5121..65a467a76 100644 --- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php @@ -35,6 +35,4 @@ return [ 'items-per-page' => 'Przedmioty na stronę', 'value-here' => 'Wartość tutaj', 'numeric-value-here' => 'wartość liczbowa tutaj', - 'submit' => 'Prześlij' - ] -]; \ No newline at end of file + 'submit' => 'Prześlij' \ No newline at end of file From c1f611bd2cedf71f8888df029360a1c44aa865f0 Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 22:16:38 +0530 Subject: [PATCH 10/22] Issue #3508 fixed --- packages/Webkul/Ui/src/Resources/lang/pl/app.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php index 65a467a76..6949c5121 100644 --- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php @@ -35,4 +35,6 @@ return [ 'items-per-page' => 'Przedmioty na stronę', 'value-here' => 'Wartość tutaj', 'numeric-value-here' => 'wartość liczbowa tutaj', - 'submit' => 'Prześlij' \ No newline at end of file + 'submit' => 'Prześlij' + ] +]; \ No newline at end of file From 41fbb0adab04f67e9c5f96a194019f27fa18170b Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Fri, 17 Jul 2020 14:31:51 +0530 Subject: [PATCH 11/22] Issue #3505 fixed --- .../views/guest/compare/compare-products.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index 11d356005..6867c0b9f 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -180,6 +180,10 @@ } else { this.$set(this, 'products', this.products.filter(product => product.id != productId)); } + + window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }]; + + this.$root.addFlashMessages(); }) .catch(error => { console.log("{{ __('velocity::app.error.something_went_wrong') }}"); @@ -196,6 +200,10 @@ } this.setStorageValue('compared_product', updatedItems); + + window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }]; + + this.$root.addFlashMessages(); } }, From ecf9b3cd8460df7f9c7afa9862499d592a985ea0 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Fri, 17 Jul 2020 14:45:37 +0530 Subject: [PATCH 12/22] Issue #3502 --- .../src/Resources/views/customers/addresses/create.blade.php | 4 ++-- .../src/Resources/views/customers/addresses/edit.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php index 5f7ac16b5..63561bc95 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php @@ -5,9 +5,9 @@ @stop -@section('content-wrapper') +@section('content') -
+
{!! view_render_event('admin.customer.addresses.create.before') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php index 3dc4b24b5..4c8851c65 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php @@ -5,9 +5,9 @@ @stop -@section('content-wrapper') +@section('content') -
+
{!! view_render_event('admin.customer.addresses.edit.before', ['address' => $address]) !!} From 0326c17b58520aa2d14361598f4f6f261aa7d720 Mon Sep 17 00:00:00 2001 From: mohd asif Date: Fri, 17 Jul 2020 15:36:48 +0530 Subject: [PATCH 13/22] fixed issue 3502 --- .../src/Resources/views/customers/addresses/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php index 3dc4b24b5..c438a08bc 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php @@ -5,7 +5,7 @@ @stop -@section('content-wrapper') +@section('content')
{!! view_render_event('admin.customer.addresses.edit.before', ['address' => $address]) !!} From d9e7dc7b0c7e993726daa906a9454e67519a5fe6 Mon Sep 17 00:00:00 2001 From: Akhtar Khan <67889091+akhtarkhan1@users.noreply.github.com> Date: Fri, 17 Jul 2020 15:50:32 +0530 Subject: [PATCH 14/22] Delete ui.js.LICENSE.txt --- .../publishable/assets/js/ui.js.LICENSE.txt | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt diff --git a/packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt b/packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt deleted file mode 100644 index 0f8266c9c..000000000 --- a/packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt +++ /dev/null @@ -1,49 +0,0 @@ -/* flatpickr v4.6.3, @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 - - 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. - - See the Apache Version 2.0 License for specific language governing permissions - and limitations under the License. - ***************************************************************************** */ - -/** - * - * - * @author Jerry Bendy - * @licence MIT - * - */ - -/**! - * @fileOverview Kickass library to create and place poppers near their reference elements. - * @version 1.16.1 - * @license - * Copyright (c) 2016 Federico Zivolo and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ From e8983f308d2a2acd6e1460faa2c0bcd6731b6cf1 Mon Sep 17 00:00:00 2001 From: shivam kumar Date: Fri, 17 Jul 2020 15:53:35 +0530 Subject: [PATCH 15/22] issue #3514 resolved --- packages/Webkul/Shop/src/Resources/lang/en/app.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 40b493b08..e7af54764 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -579,7 +579,7 @@ return [ 'final-summary' => 'Thanks for showing your interest in our store we will send you tracking number once it shipped', 'help' => 'If you need any kind of help please contact us at :support_email', 'thanks' => 'Thanks!', - + 'comment' => [ 'subject' => 'New comment added to your order', 'dear' => 'Dear :customer_name', @@ -618,9 +618,9 @@ return [ 'shipment' => [ 'heading' => 'Shipment #:shipment_id has been generated for Order #:order_id', - 'inventory-heading' => 'New shipment #:shipment_id had been generated for Order #:order_id', + 'inventory-heading' => 'New shipment #:shipment_id has been generated for Order #:order_id', 'subject' => 'Shipment for your order #:order_id', - 'inventory-subject' => 'New shipment had been generated for Order #:order_id', + 'inventory-subject' => 'New shipment has been generated for Order #:order_id', 'summary' => 'Summary of Shipment', 'carrier' => 'Carrier', 'tracking-number' => 'Tracking Number', From 17a23092176c43ce4ddbfa1ee9d7556a3b1ef0a0 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Mon, 20 Jul 2020 11:11:30 +0530 Subject: [PATCH 16/22] Issue #3490 fixed --- .../src/Resources/views/promotions/cart-rules/create.blade.php | 3 ++- .../src/Resources/views/promotions/cart-rules/edit.blade.php | 3 ++- .../Resources/views/promotions/catalog-rules/create.blade.php | 3 ++- .../Resources/views/promotions/catalog-rules/edit.blade.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php index caeef7f04..156a964ad 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php @@ -21,7 +21,8 @@