diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index f22e310dd..2dbb9d1ab 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -838,6 +838,7 @@ return [ 'any' => 'Any', 'all' => 'All', 'conditions' => 'Conditions', + 'apply' => 'Apply', 'are' => 'are', 'true' => 'true', 'false' => 'false', @@ -847,7 +848,7 @@ return [ 'is-guest' => 'For Guests', 'disc_qty' => 'Max. Quantity Allowed To Be Discounted', 'test-mode' => 'Choose how to test conditions', - 'lables' => 'Labels' + 'labels' => 'Labels' ], 'status' => [ @@ -875,6 +876,7 @@ return [ 'adjust-to-value' => 'Adjust to discount value', 'condition-missing' => 'Please check conditons, some values might be missing' ], + 'cart' => [ 'buy-atleast' => 'Buy Atleast (N)', 'apply-to-shipping' => 'Apply to shipping' 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 c48e5596c..6c4edcd34 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 @@ -84,7 +84,7 @@ @endforeach - @{{ errors.first('customer_groups') }} + @{{ errors.first('customer_groups[]') }}
@@ -247,9 +247,9 @@
- + - @@ -285,9 +285,9 @@ @{{ errors.first('free_shipping') }} @@ -297,9 +297,9 @@ @{{ errors.first('apply_to_shipping') }} @@ -352,7 +352,7 @@
- +
@@ -411,13 +411,13 @@ apply: null, apply_amt: false, apply_prct: false, - apply_to_shipping: null, + apply_to_shipping: 0, disc_amount: null, disc_threshold: null, disc_quantity: null, - end_other_rules: null, + end_other_rules: 0, coupon_type: null, - free_shipping: null, + free_shipping: 0, all_conditions: [], match_criteria: 'all_are_true', 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 3e1700989..1dbb01e6d 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 @@ -287,21 +287,21 @@ @{{ errors.first('free_shipping') }}
- + @{{ errors.first('apply_to_shipping') }} @@ -353,7 +353,7 @@
- +
@foreach($cart_rule[3]->labels as $label) [{{ $label->channel->code }}]