From 579539eb607e96e36163f1b321302b934ace892a Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 9 Feb 2021 17:57:45 +0530
Subject: [PATCH 1/3] Properties moved to Abstract Class

---
 packages/Webkul/Product/src/Type/AbstractType.php | 14 ++++++++++++++
 packages/Webkul/Product/src/Type/Simple.php       |  7 -------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php
index aacd176d0..5b2d2bfdf 100644
--- a/packages/Webkul/Product/src/Type/AbstractType.php
+++ b/packages/Webkul/Product/src/Type/AbstractType.php
@@ -133,6 +133,20 @@ abstract class AbstractType
      */
     protected $productOptions = [];
 
+    /**
+     * Skip attribute for simple product type.
+     *
+     * @var array
+     */
+    protected $skipAttributes = [];
+
+    /**
+     * These blade files will be included in product edit page.
+     *
+     * @var array
+     */
+    protected $additionalViews = [];
+
     /**
      * Create a new product type instance.
      *
diff --git a/packages/Webkul/Product/src/Type/Simple.php b/packages/Webkul/Product/src/Type/Simple.php
index 40934f562..8dced5ecb 100644
--- a/packages/Webkul/Product/src/Type/Simple.php
+++ b/packages/Webkul/Product/src/Type/Simple.php
@@ -4,13 +4,6 @@ namespace Webkul\Product\Type;
 
 class Simple extends AbstractType
 {
-    /**
-     * Skip attribute for simple product type
-     *
-     * @var array
-     */
-    protected $skipAttributes = [];
-
     /**
      * These blade files will be included in product edit page
      *

From 398fbdc7eb0592bced161cad6f44ddc82df6a2c7 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 11 Feb 2021 15:59:45 +0530
Subject: [PATCH 2/3] Issue #4583 fixed

---
 .../marketing/email-marketing/campaigns/create.blade.php      | 4 ++--
 .../views/marketing/email-marketing/campaigns/edit.blade.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
index 98963a669..1b4d7285a 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
@@ -60,7 +60,7 @@
                             <div class="control-group" :class="[errors.has('marketing_template_id') ? 'has-error' : '']">
                                 <label for="marketing_template_id" class="required">{{ __('admin::app.marketing.campaigns.email-template') }}</label>
                                 <select v-validate="'required'" class="control" id="marketing_template_id" name="marketing_template_id" data-vv-as="&quot;{{ __('admin::app.marketing.campaigns.email-template') }}&quot;">
-                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->all() as $template)
+                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->findWhere(['status' => 'active']) as $template)
                                         <option value="{{ $template->id }}" {{ old('marketing_template_id') == $template->id ? 'selected' : '' }}>
                                             {{ $template->name }}
                                         </option>
@@ -114,7 +114,7 @@
 
                         </div>
                     </accordian>
-                            
+
                     {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
 
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
index 662597560..207c09839 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
@@ -62,7 +62,7 @@
                                 <label for="marketing_template_id" class="required">{{ __('admin::app.marketing.campaigns.email-template') }}</label>
                                 <?php $selectedOption = old('marketing_template_id') ?: $campaign->marketing_template_id ?>
                                 <select v-validate="'required'" class="control" id="marketing_template_id" name="marketing_template_id" data-vv-as="&quot;{{ __('admin::app.marketing.campaigns.email-template') }}&quot;">
-                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->all() as $template)
+                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->findWhere(['status' => 'active']) as $template)
                                         <option value="{{ $template->id }}" {{ $selectedOption == $template->id ? 'selected' : '' }}>
                                             {{ $template->name }}
                                         </option>
@@ -119,7 +119,7 @@
 
                         </div>
                     </accordian>
-                            
+
                     {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
 
                 </div>

From f4c647fdff9d2db89e5622186fa1f35a08ca28f0 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 11 Feb 2021 16:51:50 +0530
Subject: [PATCH 3/3] conditions added

---
 .../marketing/email-marketing/campaigns/create.blade.php      | 2 +-
 .../views/marketing/email-marketing/campaigns/edit.blade.php  | 2 +-
 packages/Webkul/Marketing/src/Helpers/Campaign.php            | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
index 1b4d7285a..d75df174e 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
@@ -60,7 +60,7 @@
                             <div class="control-group" :class="[errors.has('marketing_template_id') ? 'has-error' : '']">
                                 <label for="marketing_template_id" class="required">{{ __('admin::app.marketing.campaigns.email-template') }}</label>
                                 <select v-validate="'required'" class="control" id="marketing_template_id" name="marketing_template_id" data-vv-as="&quot;{{ __('admin::app.marketing.campaigns.email-template') }}&quot;">
-                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->findWhere(['status' => 'active']) as $template)
+                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->all() as $template)
                                         <option value="{{ $template->id }}" {{ old('marketing_template_id') == $template->id ? 'selected' : '' }}>
                                             {{ $template->name }}
                                         </option>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
index 207c09839..330c844bc 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
@@ -62,7 +62,7 @@
                                 <label for="marketing_template_id" class="required">{{ __('admin::app.marketing.campaigns.email-template') }}</label>
                                 <?php $selectedOption = old('marketing_template_id') ?: $campaign->marketing_template_id ?>
                                 <select v-validate="'required'" class="control" id="marketing_template_id" name="marketing_template_id" data-vv-as="&quot;{{ __('admin::app.marketing.campaigns.email-template') }}&quot;">
-                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->findWhere(['status' => 'active']) as $template)
+                                    @foreach (app('Webkul\Marketing\Repositories\TemplateRepository')->all() as $template)
                                         <option value="{{ $template->id }}" {{ $selectedOption == $template->id ? 'selected' : '' }}>
                                             {{ $template->name }}
                                         </option>
diff --git a/packages/Webkul/Marketing/src/Helpers/Campaign.php b/packages/Webkul/Marketing/src/Helpers/Campaign.php
index 116dcd2aa..dbbee67d8 100644
--- a/packages/Webkul/Marketing/src/Helpers/Campaign.php
+++ b/packages/Webkul/Marketing/src/Helpers/Campaign.php
@@ -61,8 +61,10 @@ class Campaign
     {
         $campaigns = $this->campaignRepository->getModel()
             ->leftJoin('marketing_events', 'marketing_campaigns.marketing_event_id', 'marketing_events.id')
+            ->leftJoin('marketing_templates', 'marketing_campaigns.marketing_template_id', 'marketing_templates.id')
             ->select('marketing_campaigns.*')
-            ->where('status', 1)
+            ->where('marketing_campaigns.status', 1)
+            ->where('marketing_templates.status', 'active')
             ->where(function ($query) {
                 $query->where('marketing_events.date', Carbon::now()->format('Y-m-d'))
                     ->orWhereNull('marketing_events.date');