From 9e80687960f2e9c40b2639dc11cc7b3ac8e602a7 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Tue, 18 Jun 2019 19:00:24 +0530
Subject: [PATCH] Fixed customer group bug in cart rule and fixed a bug in
 coupon apply rule

---
 config/{product_types.php => product-types.php}             | 0
 packages/Webkul/Discount/src/Helpers/CouponAbleRule.php     | 4 ++++
 packages/Webkul/Discount/src/Helpers/Discount.php           | 6 ++++--
 .../src/Config/{product_types.php => product-types.php}     | 0
 .../Webkul/Product/src/Providers/ProductServiceProvider.php | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)
 rename config/{product_types.php => product-types.php} (100%)
 rename packages/Webkul/Product/src/Config/{product_types.php => product-types.php} (100%)

diff --git a/config/product_types.php b/config/product-types.php
similarity index 100%
rename from config/product_types.php
rename to config/product-types.php
diff --git a/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php
index b8f647274..19fbd3127 100644
--- a/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php
+++ b/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php
@@ -41,6 +41,10 @@ class CouponAbleRule extends Discount
             }
         }
 
+        if (! isset($applicableRule)) {
+            return false;
+        }
+
         $applicability = $this->checkApplicability($applicableRule);
 
         if ($applicability) {
diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php
index 9ef2ef868..b67d901fc 100644
--- a/packages/Webkul/Discount/src/Helpers/Discount.php
+++ b/packages/Webkul/Discount/src/Helpers/Discount.php
@@ -85,8 +85,10 @@ abstract class Discount
         // customer groups based constraints
         if (auth()->guard('customer')->check()) {
             foreach ($rule->customer_groups as $customer_group) {
-                if ($customer_group->customer_group_id == auth()->guard('customer')->user()->group->id) {
-                    $customerGroupBased = true;
+                if (auth()->guard('customer')->user()->group->exists()) {
+                    if ($customer_group->customer_group_id == auth()->guard('customer')->user()->group->id) {
+                        $customerGroupBased = true;
+                    }
                 }
             }
         } else {
diff --git a/packages/Webkul/Product/src/Config/product_types.php b/packages/Webkul/Product/src/Config/product-types.php
similarity index 100%
rename from packages/Webkul/Product/src/Config/product_types.php
rename to packages/Webkul/Product/src/Config/product-types.php
diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php
index 5d2b76543..31e028b6e 100755
--- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php
+++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php
@@ -39,7 +39,7 @@ class ProductServiceProvider extends ServiceProvider
 
     public function registerConfig() {
         $this->mergeConfigFrom(
-            dirname(__DIR__) . '/Config/product_types.php', 'product_types'
+            dirname(__DIR__) . '/Config/product-types.php', 'product-types'
         );
     }