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

Laravel version update

Browse Source 
Laravel version update
This commit is contained in:
Manish Verma
2018-08-06 18:48:58 +05:30
parent d143048413
commit 126fbb0255
13678 changed files with 1031482 additions and 778530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Common/ApiSettings.php
View File

@@ -34,7 +34,7 @@ class ApiSettings extends Controller
$ticket_detail = '';
$settings = $this->api;
if ($settings->get()->count() > 0) {
$details = $this->api->lists('value', 'key')->toArray();
$details = $this->api->pluck('value', 'key')->toArray();
}
if (array_key_exists('ticket_detail', $details)) {
$ticket_detail = $details['ticket_detail'];

4
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -206,7 +206,7 @@ class PhpMailController extends Controller
public function setServices($emailid, $protocol)
{
$service = new \App\Model\MailJob\FaveoMail();
$services = $service->where('email_id', $emailid)->lists('value', 'key')->toArray();
$services = $service->where('email_id', $emailid)->pluck('value', 'key')->toArray();
$controller = new \App\Http\Controllers\Admin\helpdesk\EmailsController();
$controller->setServiceConfig($protocol, $services);
}
@@ -279,7 +279,7 @@ class PhpMailController extends Controller
if ($active_queue) {
$short = $active_queue->short_name;
$fields = new \App\Model\MailJob\FaveoQueue();
$field = $fields->where('service_id', $active_queue->id)->lists('value', 'key')->toArray();
$field = $fields->where('service_id', $active_queue->id)->pluck('value', 'key')->toArray();
}
$this->setQueueConfig($short, $field);
}

4
app/Http/Controllers/Common/TemplateController.php
View File

@@ -97,7 +97,7 @@ class TemplateController extends Controller
{
try {
$i = $this->template->orderBy('created_at', 'desc')->first()->id + 1;
$type = $this->type->lists('name', 'id')->toArray();
$type = $this->type->pluck('name', 'id')->toArray();
return view('themes.default1.common.template.create', compact('type'));
} catch (\Exception $ex) {
@@ -135,7 +135,7 @@ class TemplateController extends Controller
try {
$i = $this->template->orderBy('created_at', 'desc')->first()->id + 1;
$template = $this->template->where('id', $id)->first();
$type = $this->type->lists('name', 'id')->toArray();
$type = $this->type->pluck('name', 'id')->toArray();
return view('themes.default1.common.template.edit', compact('type', 'template'));
} catch (\Exception $ex) {