From 44c33825e0c13bb3e77431d38a7765699bcd22ca Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 14 Aug 2019 16:53:05 +0530 Subject: [PATCH 1/2] Cart discount helper namespace fix --- packages/Webkul/Admin/src/Config/menu.php | 16 +++++++--------- .../Discount/src/Helpers/Cart/CouponAbleRule.php | 2 +- .../src/Helpers/Cart/NonCouponAbleRule.php | 2 +- .../src/Helpers/Cart/ValidatesDiscount.php | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php index 1091a60fb..2c73ae44d 100755 --- a/packages/Webkul/Admin/src/Config/menu.php +++ b/packages/Webkul/Admin/src/Config/menu.php @@ -188,15 +188,13 @@ return [ 'route' => 'admin.cart-rule.index', 'sort' => 1, 'icon-class' => '', - ], - // [ - // 'key' => 'promotions.catalog-rule', - // 'name' => 'admin::app.promotion.catalog-rule', - // 'route' => 'admin.catalog-rule.index', - // 'sort' => 1, - // 'icon-class' => '', - // ], - [ + ], [ + 'key' => 'promotions.catalog-rule', + 'name' => 'admin::app.promotion.catalog-rule', + 'route' => 'admin.catalog-rule.index', + 'sort' => 1, + 'icon-class' => '', + ], [ 'key' => 'cms', 'name' => 'admin::app.layouts.cms', 'route' => 'admin.cms.index', diff --git a/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php index 2d4572dda..6973ebefc 100644 --- a/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php +++ b/packages/Webkul/Discount/src/Helpers/Cart/CouponAbleRule.php @@ -2,7 +2,7 @@ namespace Webkul\Discount\Helpers\Cart; -use Webkul\Discount\Helpers\Discount; +use Webkul\Discount\Helpers\Cart\Discount; use Cart; class CouponAbleRule extends Discount diff --git a/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php index ad445cef3..76d4cf0f4 100644 --- a/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php +++ b/packages/Webkul/Discount/src/Helpers/Cart/NonCouponAbleRule.php @@ -2,7 +2,7 @@ namespace Webkul\Discount\Helpers\Cart; -use Webkul\Discount\Helpers\Discount; +use Webkul\Discount\Helpers\Cart\Discount; class NonCouponAbleRule extends Discount { diff --git a/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php b/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php index 31e382cd4..ef0681497 100644 --- a/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php +++ b/packages/Webkul/Discount/src/Helpers/Cart/ValidatesDiscount.php @@ -2,7 +2,7 @@ namespace Webkul\Discount\Helpers\Cart; -use Webkul\Discount\Helpers\Discount; +use Webkul\Discount\Helpers\Cart\Discount; use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart; class ValidatesDiscount extends Discount From 8c96bca9b370c95144309e09f90f7fc26ce58855 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 14 Aug 2019 16:54:13 +0530 Subject: [PATCH 2/2] Base sync --- packages/Webkul/Admin/src/Config/menu.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php index 2c73ae44d..1091a60fb 100755 --- a/packages/Webkul/Admin/src/Config/menu.php +++ b/packages/Webkul/Admin/src/Config/menu.php @@ -188,13 +188,15 @@ return [ 'route' => 'admin.cart-rule.index', 'sort' => 1, 'icon-class' => '', - ], [ - 'key' => 'promotions.catalog-rule', - 'name' => 'admin::app.promotion.catalog-rule', - 'route' => 'admin.catalog-rule.index', - 'sort' => 1, - 'icon-class' => '', - ], [ + ], + // [ + // 'key' => 'promotions.catalog-rule', + // 'name' => 'admin::app.promotion.catalog-rule', + // 'route' => 'admin.catalog-rule.index', + // 'sort' => 1, + // 'icon-class' => '', + // ], + [ 'key' => 'cms', 'name' => 'admin::app.layouts.cms', 'route' => 'admin.cms.index',