From 7a9700cce61a221c90ec134b8972a9d771df06e0 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 15 Dec 2016 09:39:53 +0530 Subject: [PATCH 1/2] bug-fix-patch Added breadcrumb for get route "readmails" --- app/Http/breadcrumbs.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index dcc9ef762..2b2d42374 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -613,3 +613,7 @@ Breadcrumbs::register('labels.edit', function ($breadcrumbs) { $breadcrumbs->parent('labels.index'); $breadcrumbs->push(Lang::get('lang.edit'), 'labels.edit'); }); + +Breadcrumbs::register('readmails', function ($breadcrumbs) { + $breadcrumbs->push('readmails'), 'readmails'); +}); From a579bf2a820841184d1f38c18a95d5d34fc7a24c Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 15 Dec 2016 10:56:39 +0530 Subject: [PATCH 2/2] bug-fix-patch # Removed follow up option from cron settings. # Corrected breadcrumb syntax --- .../Admin/helpdesk/SettingsController.php | 19 +------------------ app/Http/breadcrumbs.php | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 439bee481..3560dd273 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -23,7 +23,6 @@ use App\Model\helpdesk\Settings\Alert; 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; @@ -410,25 +409,9 @@ class SettingsController extends Controller * * @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) { diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 2b2d42374..5366a534e 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -615,5 +615,5 @@ Breadcrumbs::register('labels.edit', function ($breadcrumbs) { }); Breadcrumbs::register('readmails', function ($breadcrumbs) { - $breadcrumbs->push('readmails'), 'readmails'); + $breadcrumbs->push('readmails', 'readmails'); });