merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conditions added

This commit is contained in:
rahul shukla 2021-02-11 16:51:50 +05:30
parent 398fbdc7eb
commit f4c647fdff
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php
View File

@ -60,7 +60,7 @@
<div class="control-group" :class="[errors.has('marketing_template_id') ? 'has-error' : '']"> <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> <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;"> <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' : '' }}> <option value="{{ $template->id }}" {{ old('marketing_template_id') == $template->id ? 'selected' : '' }}>
{{ $template->name }} {{ $template->name }}
</option> </option>

2
packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php
View File

@ -62,7 +62,7 @@
<label for="marketing_template_id" class="required">{{ __('admin::app.marketing.campaigns.email-template') }}</label> <label for="marketing_template_id" class="required">{{ __('admin::app.marketing.campaigns.email-template') }}</label>
<?php $selectedOption = old('marketing_template_id') ?: $campaign->marketing_template_id ?> <?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;"> <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' : '' }}> <option value="{{ $template->id }}" {{ $selectedOption == $template->id ? 'selected' : '' }}>
{{ $template->name }} {{ $template->name }}
</option> </option>

4
packages/Webkul/Marketing/src/Helpers/Campaign.php
View File

@ -61,8 +61,10 @@ class Campaign
{ {
$campaigns = $this->campaignRepository->getModel() $campaigns = $this->campaignRepository->getModel()
->leftJoin('marketing_events', 'marketing_campaigns.marketing_event_id', 'marketing_events.id') ->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.*') ->select('marketing_campaigns.*')
->where('status', 1) ->where('marketing_campaigns.status', 1)
->where('marketing_templates.status', 'active')
->where(function ($query) { ->where(function ($query) {
$query->where('marketing_events.date', Carbon::now()->format('Y-m-d')) $query->where('marketing_events.date', Carbon::now()->format('Y-m-d'))
->orWhereNull('marketing_events.date'); ->orWhereNull('marketing_events.date');