diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 9b3191d3e..5476fb09e 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -802,6 +802,7 @@ return [ ], 'promotion' => [ + 'zero-unlimited' => 'Zero denotes unlimited usage here', 'catalog-rule' => 'Catalog Rules', 'cart-rule' => 'Cart Rules', 'add-catalog-rule' => 'Add Catalog Rule', diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index b446f2e6d..1523a3391 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -136,32 +136,25 @@ {{-- --}} - {{--
+
+
* {{ __('admin::app.promotion.zero-unlimited') }}
+ @{{ errors.first('per_customer') }} -
--}} +
- {{--
- - - - - @{{ errors.first('is_guest') }} -
--}} - - {{--
+
+
* {{ __('admin::app.promotion.zero-unlimited') }}
+ @{{ errors.first('usage_limit') }} -
--}} +
diff --git a/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php new file mode 100644 index 000000000..d671110fa --- /dev/null +++ b/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php @@ -0,0 +1,13 @@ + 'required|array', 'status' => 'required|boolean', 'use_coupon' => 'boolean|required', - // 'usage_limit' => 'numeric|min:0', - // 'per_customer' => 'numeric|min:0', + 'usage_limit' => 'numeric|min:0', + 'per_customer' => 'numeric|min:0', 'action_type' => 'required|string', 'disc_amount' => 'required|numeric', 'disc_quantity' => 'required|numeric', @@ -322,12 +322,6 @@ class CartRuleController extends Controller // unset request token from $data unset($data['_token']); - // set rule uasge limit - $data['usage_limit'] = 0; - - // set rule usage per customer - $data['per_customer'] = 0; - // check if starts_from is null if ($data['starts_from'] == "") { $data['starts_from'] = null;