diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php index 965e7138f..feeeec1d3 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponDataGrid.php @@ -12,11 +12,15 @@ class CartRuleCouponDataGrid extends DataGrid protected $sortOrder = 'desc'; public function prepareQueryBuilder() - { - $queryBuilder = DB::table('cart_rule_coupons') - ->addSelect('id', 'code', 'created_at', 'expired_at', 'times_used') - ->where('cart_rule_coupons.cart_rule_id', collect(request()->segments())->last()); + { + $route = request()->route() ? request()->route()->getName() : ""; + $cartRuleId = $route == 'admin.cart-rules.edit' ? collect(request()->segments())->last() : last(explode("/", url()->previous())); + + $queryBuilder = DB::table('cart_rule_coupons') + ->addSelect('id', 'code', 'created_at', 'expired_at', 'times_used') + ->where('cart_rule_coupons.cart_rule_id', $cartRuleId); + $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php index 911c1e6f0..e704c7a82 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php @@ -16,6 +16,7 @@ class ExportController extends Controller 'TaxRateDataGrid', 'ProductDataGrid', 'CMSPageDataGrid', + 'CartRuleCouponDataGrid' ]; /** diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php index f808371f7..39bc4a2b4 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php @@ -457,12 +457,38 @@ + +