diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index bcf6c699e..7a71f39c8 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -134,21 +134,21 @@ {{-- --}} - {{--
+
@{{ errors.first('per_customer') }} -
--}} +
- {{--
+
@{{ errors.first('usage_limit') }} -
--}} +
diff --git a/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php index d671110fa..d008f344f 100644 --- a/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php +++ b/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php @@ -9,5 +9,23 @@ use Cart; class ConvertXToProductId { + public function __construct() + { + } + + public function convertFromCategory() + { + + } + + public function convertFromAttributeOptions() + { + + } + + public function convertFromAttributes() + { + + } } \ No newline at end of file diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index a9d395a6c..ad6c78a53 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -90,8 +90,8 @@ class CartRuleController extends Controller 'channels' => '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' => 'numeric', @@ -108,12 +108,6 @@ class CartRuleController extends Controller // unset token unset($data['_token']); - // set usage limit - $data['usage_limit'] = 0; - - // set per customer usage limit - $data['per_customer'] = 0; - // check if starts_from is null if ($data['starts_from'] == "") { $data['starts_from'] = null;