From 2acad0e540e717236ac5b12f56af9bd561946adb Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Tue, 23 Jul 2019 13:43:37 +0530
Subject: [PATCH] Fixed an issue with convertXToProductId which was causing
 some productids from being pushed into the storage

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php |  2 +-
 .../Discount/src/Helpers/ConvertXToProductId.php    | 13 +++++++------
 packages/Webkul/Discount/src/Helpers/Discount.php   |  2 +-
 .../Discount/src/Helpers/NonCouponAbleRule.php      |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index a3fc3a470..52e393e68 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -807,7 +807,7 @@ return [
 
     'promotion' => [
         'information' => 'Information',
-        'condiiton' => 'Conditions',
+        'conditions' => 'Conditions',
         'actions' => 'Actions',
         'coupons' => 'Coupons',
         'zero-unlimited' => 'Zero denotes unlimited usage here',
diff --git a/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php b/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php
index 5404f9cf8..6f0862367 100644
--- a/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php
+++ b/packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php
@@ -199,9 +199,14 @@ class ConvertXToProductId
 
         foreach ($categories as $category) {
             $data = $this->getAll($category->id);
+            if ($data->count()) {
+                $products->push($data);
+
+                unset($data);
+            }
         }
 
-        return $data;
+        return $products->flatten()->all();
     }
 
     /**
@@ -262,8 +267,6 @@ class ConvertXToProductId
                     ->select('products.id')
                     ->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
                     ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
-                    ->where('product_flat.channel', $channel)
-                    ->where('product_flat.locale', $locale)
                     ->whereNotNull('product_flat.url_key');
 
             if ($categoryId) {
@@ -279,9 +282,7 @@ class ConvertXToProductId
             }
 
             $queryBuilder = $qb->leftJoin('product_flat as flat_variants', function($qb) use($channel, $locale) {
-                $qb->on('product_flat.id', '=', 'flat_variants.parent_id')
-                    ->where('flat_variants.channel', $channel)
-                    ->where('flat_variants.locale', $locale);
+                $qb->on('product_flat.id', '=', 'flat_variants.parent_id');
             });
 
             return $qb->groupBy('product_flat.id');
diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php
index 82888d6d3..19946a30d 100644
--- a/packages/Webkul/Discount/src/Helpers/Discount.php
+++ b/packages/Webkul/Discount/src/Helpers/Discount.php
@@ -216,7 +216,7 @@ abstract class Discount
         $actualShippingRate = $actualShippingRate->calculate();
 
         if (is_array($actualShippingRate)) {
-            foreach($actualShippingRate as $actualRate) {
+            foreach ($actualShippingRate as $actualRate) {
                 if ($actualRate->method == $cart->selected_shipping_rate->method) {
                     $actualShippingRate = $actualRate;
 
diff --git a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
index 924a7956f..d911bf0bc 100644
--- a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
+++ b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
@@ -53,7 +53,7 @@ class NonCouponAbleRule extends Discount
         // time based filter
         foreach($rules as $rule) {
             $applicability = $this->checkApplicability($rule);
-
+            dd($applicability);
             if ($applicability) {
                 $items = collect();