cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #343 from ladybirdweb/development

Browse Source 
Development
This commit is contained in:
Manish Verma
2016-12-15 20:58:21 +05:30
committed by GitHub
parent 1fb18523b0 a579bf2a82
commit 962cce23e7
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -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) {

4
app/Http/breadcrumbs.php
View File

@@ -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');
});