From 423824b531efd764b8a82b368a0afaba9cd576f7 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Wed, 19 Jun 2019 18:13:41 +0530
Subject: [PATCH 1/2] Fixed issue #1075 and #1074

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php       | 4 +++-
 .../Resources/views/promotions/cart-rule/create.blade.php | 8 ++++----
 .../Resources/views/promotions/cart-rule/edit.blade.php   | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

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..a918c0f67 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
                                         </select>
 
-                                        <span class="control-error" v-if="errors.has('customer_groups')">@{{ errors.first('customer_groups') }}</span>
+                                        <span class="control-error" v-if="errors.has('customer_groups[]')">@{{ errors.first('customer_groups[]') }}</span>
                                     </div>
 
                                     <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
@@ -247,9 +247,9 @@
                             <accordian :active="false" title="Actions">
                                 <div slot="body">
                                     <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
-                                        <label for="action_type" class="required">Apply</label>
+                                        <label for="action_type" class="required">{{ __('admin::app.promotion.general-info.apply') }}</label>
 
-                                        <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;Apply As&quot;" v-on:change="detectApply">
+                                        <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.apply') }}&quot;" v-on:change="detectApply">
                                             <option v-for="(action, index) in actions" :value="index">@{{ action }}</option>
                                         </select>
 
@@ -352,7 +352,7 @@
                                 </div>
                             </accordian>
 
-                            <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.lables') }}'">
+                            <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.labels') }}'">
                                 <div slot="body">
                                     <div class="control-group" :class="[errors.has('label') ? 'has-error' : '']" v-if="dedicated_label">
                                         <label for="label">Global Label</label>
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..b4d76aac5 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
@@ -296,7 +296,7 @@
                                         </div>
 
                                         <div class="control-group" :class="[errors.has('apply_to_shipping') ? 'has-error' : '']">
-                                            <label for="customer_groups" class="required">{{ __('admin::app.promotion.cart.apply-to-shipping') }}</label>
+                                            <label for="apply_to_shipping" class="required">{{ __('admin::app.promotion.cart.apply-to-shipping') }}</label>
 
                                             <select type="text" class="control" name="apply_to_shipping" v-model="apply_to_shipping" v-validate="'required'" value="{{ old('apply_to_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.cart.apply-to-shipping') }}&quot;">
                                                 <option value="0" :selected="apply_to_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
@@ -353,7 +353,7 @@
                                 </div>
                             </accordian>
 
-                            <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.lables') }}'">
+                            <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.labels') }}'">
                                 <div slot="body">
                                     @foreach($cart_rule[3]->labels as $label)
                                         <span>[{{ $label->channel->code }}]</span>

From 052afb4fafbdf65e915a3469baf6f8b1bd431c48 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Wed, 19 Jun 2019 18:18:21 +0530
Subject: [PATCH 2/2] Fixed issues with apply to shipping and free shipping in
 create and edit of cart rules

---
 .../views/promotions/cart-rule/create.blade.php    | 14 +++++++-------
 .../views/promotions/cart-rule/edit.blade.php      |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

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 a918c0f67..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
@@ -285,9 +285,9 @@
                                             <label for="free_shipping" class="required">{{ __('admin::app.promotion.general-info.free-shipping') }}</label>
 
                                             <select type="text" class="control" name="free_shipping" v-model="free_shipping" v-validate="'required'" value="{{ old('free_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.free-shipping') }}&quot;">
-                                                <option value="0" :selected="free_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
+                                                <option value="1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
 
-                                                <option value="1" :selected="free_shipping == 1">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
+                                                <option value="0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
                                             </select>
 
                                             <span class="control-error" v-if="errors.has('free_shipping')">@{{ errors.first('free_shipping') }}</span>
@@ -297,9 +297,9 @@
                                             <label for="customer_groups" class="required">{{ __('admin::app.promotion.cart.apply-to-shipping') }}</label>
 
                                             <select type="text" class="control" name="apply_to_shipping" v-model="apply_to_shipping" v-validate="'required'" value="{{ old('apply_to_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.cart.apply-to-shipping') }}&quot;">
-                                                <option value="0" :selected="apply_to_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
+                                                <option value="1" :selected="apply_to_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
 
-                                                <option value="1" :selected="apply_to_shipping == 1">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
+                                                <option value="0" :selected="apply_to_shipping == 1">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
                                             </select>
 
                                             <span class="control-error" v-if="errors.has('apply_to_shipping')">@{{ errors.first('apply_to_shipping') }}</span>
@@ -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 b4d76aac5..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,9 +287,9 @@
                                             <label for="free_shipping" class="required">{{ __('admin::app.promotion.general-info.free-shipping') }}</label>
 
                                             <select type="text" class="control" name="free_shipping" v-model="free_shipping" v-validate="'required'" value="{{ old('free_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.free-shipping') }}&quot;">
-                                                <option value="0" :selected="free_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
+                                                <option value="1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
 
-                                                <option value="1" :selected="free_shipping == 1">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
+                                                <option value="0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
                                             </select>
 
                                             <span class="control-error" v-if="errors.has('free_shipping')">@{{ errors.first('free_shipping') }}</span>
@@ -299,9 +299,9 @@
                                             <label for="apply_to_shipping" class="required">{{ __('admin::app.promotion.cart.apply-to-shipping') }}</label>
 
                                             <select type="text" class="control" name="apply_to_shipping" v-model="apply_to_shipping" v-validate="'required'" value="{{ old('apply_to_shipping') }}" data-vv-as="&quot;{{ __('admin::app.promotion.cart.apply-to-shipping') }}&quot;">
-                                                <option value="0" :selected="apply_to_shipping == 0">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
+                                                <option value="1">{{ __('admin::app.promotion.general-info.is-coupon-yes') }}</option>
 
-                                                <option value="1" :selected="apply_to_shipping == 1">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
+                                                <option value="0">{{ __('admin::app.promotion.general-info.is-coupon-no') }}</option>
                                             </select>
 
                                             <span class="control-error" v-if="errors.has('apply_to_shipping')">@{{ errors.first('apply_to_shipping') }}</span>