From 6b9be23cb0608f0952a910b0b94472df2ff7814c Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Tue, 11 Jun 2019 14:38:57 +0530
Subject: [PATCH] fixed issue in cart rule for add condition button and
 exception while updating cart rule

---
 .../src/Resources/views/promotions/cart-rule/create.blade.php | 4 ++--
 .../src/Resources/views/promotions/cart-rule/edit.blade.php   | 4 ++--
 .../Discount/src/Http/Controllers/CartRuleController.php      | 4 ++--
 3 files changed, 6 insertions(+), 6 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 9fae27f7e..a67a17501 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
@@ -183,8 +183,6 @@
                                                 <option value="cart">Cart Properties</option>
                                             </select>
                                         </div>
-
-                                        <span class="btn btn-primary btn-lg" v-on:click="addCondition">Add Condition</span>
                                     </div>
 
                                     <div class="mt-10 mb-10"><b>Any of the condition is true</b></div>
@@ -239,6 +237,8 @@
                                             </div>
                                         </div>
                                     </div>
+
+                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">Add Condition</span>
                                 </div>
                             </accordian>
 
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 65f3f7292..fc16e4586 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
@@ -183,8 +183,6 @@
                                                 <option value="cart">Cart Properties</option>
                                             </select>
                                         </div>
-
-                                        <span class="btn btn-primary btn-lg" v-on:click="addCondition">Add Condition</span>
                                     </div>
 
                                     <div class="mt-10 mb-10"><b>Any of the condition is true</b></div>
@@ -239,6 +237,8 @@
                                             </div>
                                         </div>
                                     </div>
+
+                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">Add Condition</span>
                                 </div>
                             </accordian>
 
diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
index 09257d3a5..66fe52b21 100644
--- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
+++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
@@ -192,7 +192,7 @@ class CartRuleController extends Controller
             //     unset($data['suffix']);
             // }
 
-            $coupons['limit'] = 0;
+            // $coupons['limit'] = 0;
         }
 
         // if(isset($data['usage_limit'])) {
@@ -352,7 +352,7 @@ class CartRuleController extends Controller
             //     $coupons['suffix'] = $data['suffix'];
             //     unset($data['suffix']);
             // }
-            $coupons['limit'] = 0;
+            // $coupons['limit'] = 0;
         }
 
         // if (isset($data['usage_limit'])) {