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'); 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 *