Skip to content

Commit

Permalink
Merge pull request #343 from ladybirdweb/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
mverma16 authored Dec 15, 2016
2 parents 1fb1852 + a579bf2 commit 962cce2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
19 changes: 1 addition & 18 deletions app/Http/Controllers/Admin/helpdesk/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use App\Model\helpdesk\Settings\CommonSettings;
use App\Model\helpdesk\Settings\Company;
use App\Model\helpdesk\Settings\Email;
use App\Model\helpdesk\Settings\Followup;
use App\Model\helpdesk\Settings\Responder;
use App\Model\helpdesk\Settings\System;
use App\Model\helpdesk\Settings\Ticket;
Expand Down Expand Up @@ -410,25 +409,9 @@ public function getSchedular(Email $email, Template $template, Emails $email1, W
*
* @return type Response
*/
public function postSchedular(Email $email, Template $template, Followup $followup, Emails $email1, TaskRequest $request, WorkflowClose $workflow)
public function postSchedular(Email $email, Template $template, Emails $email1, TaskRequest $request, WorkflowClose $workflow)
{
try {
$followup = $followup->whereId('1')->first();
$status = $request->followup_notification_cron;

if ($status = 'null') {
$followup->status = $request->followup_notification_cron;
}
if ($status = 1) {
$followup->status = $request->followup_notification_cron;
$followup->condition = $request->followup_notification_commands;
$followup->save();
}
if ($request->followup_notification_dailyAt) {
$followup->condition = $request->followup_notification_dailyAt;
$followup->save();
}

/* fetch the values of email request */
$emails = $email->whereId('1')->first();
if ($request->email_fetching) {
Expand Down
4 changes: 4 additions & 0 deletions app/Http/breadcrumbs.php
Original file line number Diff line number Diff line change
Expand Up @@ -613,3 +613,7 @@
$breadcrumbs->parent('labels.index');
$breadcrumbs->push(Lang::get('lang.edit'), 'labels.edit');
});

Breadcrumbs::register('readmails', function ($breadcrumbs) {
$breadcrumbs->push('readmails', 'readmails');
});

0 comments on commit 962cce2

Please sign in to comment.