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..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 @@ -114,7 +114,7 @@ - + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!} 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..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 @@ -119,7 +119,7 @@ - + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!} 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');