From 0a2a6c42344eb1de00bd98a65cd4dc02ad07ad14 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Thu, 27 Dec 2018 16:22:44 +0530
Subject: [PATCH] conflicts in class attribute of storefront search and
 datagrid's search box

---
 packages/Webkul/Checkout/src/Cart.php         | 22 ++++++++++++++-----
 .../Controllers/RegistrationController.php    |  2 +-
 .../views/checkout/cart/mini-cart.blade.php   |  2 +-
 .../views/customers/signup/index.blade.php    |  6 ++---
 .../views/datagrid/filters.blade.php          |  2 +-
 .../Resources/views/datagrid/index.blade.php  |  6 +++--
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index c4014baad..3cf32d41f 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -229,6 +229,10 @@ class Cart {
         $product = $this->product->findOneByField('id', $id);
 
         if($product->type == 'configurable') {
+            if(!isset($data['selected_configurable_option'])) {
+                return false;
+            }
+
             $parentProduct = $this->product->findOneByField('id', $data['selected_configurable_option']);
 
             $canAdd = $parentProduct->haveSufficientQuantity($data['quantity']);
@@ -537,16 +541,24 @@ class Cart {
     {
         $cart = null;
 
-        if(auth()->guard('customer')->check()) {
+        if (auth()->guard('customer')->check()) {
             $cart = $this->cart->findOneWhere([
-                    'customer_id' => auth()->guard('customer')->user()->id,
-                    'is_active' => 1
-                ]);
+                'customer_id' => auth()->guard('customer')->user()->id,
+                'is_active' => 1
+            ]);
 
-        } elseif(session()->has('cart')) {
+        } elseif (session()->has('cart')) {
             $cart = $this->cart->find(session()->get('cart')->id);
         }
 
+        if($cart != null) {
+            if($cart->items->count() == 0) {
+                $this->cart->delete($cart->id);
+
+                return false;
+            }
+        }
+
         return $cart && $cart->is_active ? $cart : null;
     }
 
diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index 0726fb51b..947be1eaa 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -58,7 +58,7 @@ class RegistrationController extends Controller
             'last_name' => 'string|required',
             'email' => 'email|required|unique:customers,email',
             'password' => 'confirmed|min:6|required',
-            'agreement' => 'required'
+            // 'agreement' => 'required'
         ]);
 
         $data = request()->input();
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
index 8df77e20d..c904e9108 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
@@ -9,7 +9,7 @@
         <div style="display: inline-block; cursor: pointer;">
             <span class="name">
                 Cart
-                <span class="count"> ({{ intval($cart->items_qty) }})</span>
+                <span class="count"> ({{ $cart->items->count() }})</span>
             </span>
         </div>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
index 2c92f39de..f3a3c11b3 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
@@ -63,15 +63,15 @@
             </div> --}}
 
             {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
-            
-            <div class="control-group" :class="[errors.has('agreement') ? 'has-error' : '']">
+
+            {{-- <div class="control-group" :class="[errors.has('agreement') ? 'has-error' : '']">
 
                 <input type="checkbox" id="checkbox2" name="agreement" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.agreement') }}&quot;">
                 <span>{{ __('shop::app.customer.signup-form.agree') }}
                     <a href="">{{ __('shop::app.customer.signup-form.terms') }}</a> & <a href="">{{ __('shop::app.customer.signup-form.conditions') }}</a> {{ __('shop::app.customer.signup-form.using') }}.
                 </span>
                 <span class="control-error" v-if="errors.has('agreement')">@{{ errors.first('agreement') }}</span>
-            </div>
+            </div> --}}
 
             <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.signup-form.button_title') }}">
 
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php
index 1fae47ebb..5dffa79eb 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php
@@ -1,7 +1,7 @@
 <div class="{{ $css->filter }} filter-wrapper">
     <div class="filter-row-one">
         <div class="search-filter" style="display: inline-flex; align-items: center;">
-            <input type="search" class="control search-field" placeholder="Search Here..." value="" />
+            <input type="search" id="search-field" class="control" placeholder="Search Here..." value="" />
             <div class="ic-wrapper">
                 <span class="icon search-icon search-btn"></span>
             </div>
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
index 526fd2ccb..86813a1c3 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
@@ -45,13 +45,15 @@
                 }
 
                 $('.search-btn').click(function() {
-                    search_value = $(".search-field").val();
+                    search_value = $("#search-field").val();
+                    alert(search_value);
                     formURL('search', 'all', search_value, params);  //format for search
                 });
 
                 $(".search-field").on('keyup', function (e) {
                     if (e.keyCode == 13) {
-                        search_value = $(".search-field").val();
+                        search_value = $("#search-field").val();
+                        alert(search_value);
                         formURL('search', 'all', search_value, params);  //format for search
                     }
                 });