From 82a3142c73120259c2cfd818372179ae713ba88c Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Fri, 16 Nov 2018 18:28:41 +0530
Subject: [PATCH] subscription mails bug fix

---
 packages/Webkul/Checkout/src/Cart.php              |  8 ++++++--
 .../Http/Controllers/SubscriptionController.php    | 14 ++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 57ae232d6..ae6548016 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -1061,9 +1061,13 @@ class Cart {
 
             return false;
         } else {
-            $result = $this->moveToCart($id);
+            $simpleOrVariant = $this->product->find($id);
 
-            return $result;
+            if($simpleOrVariant->type == 'simple') {
+                $result = $this->add($id, $data);
+
+                return $result;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php
index 6e018dbcf..95c9bb95f 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php
@@ -81,13 +81,15 @@ class SubscriptionController extends Controller
                 }
             };
         } else {
-            $unique = $this->subscription->findWhere(['email' => $email]);
+            $alreadySubscribed = $this->subscription->findWhere(['email' => $email]);
 
-            if($unique->count() > 0) {
-                return 0;
-            } else {
-                return 1;
-            }
+            $unique = function() use($alreadySubscribed){
+                if($alreadySubscribed->count() > 0) {
+                    return 0;
+                } else {
+                    return 1;
+                }
+            };
         }
 
         if($unique()) {