diff --git a/app/FaveoStorage/Controllers/StorageController.php b/app/FaveoStorage/Controllers/StorageController.php index 74fc47890..0551652c8 100644 --- a/app/FaveoStorage/Controllers/StorageController.php +++ b/app/FaveoStorage/Controllers/StorageController.php @@ -204,7 +204,7 @@ class StorageController extends Controller if ($this->default !== 'database') { $this->setFileSystem(); Storage::disk($this->default)->put($filename, $data); - $storagePath = Storage::disk($this->default)->getDriver()->getAdapter()->getPathPrefix().$filename; + $storagePath = Storage::disk($this->default)->path($filename); if (mime(\File::mimeType($storagePath)) != 'image' || mime(\File::extension($storagePath)) != 'image') { chmod($storagePath, 1204); } diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index dcf770834..7f77d1595 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -186,7 +186,7 @@ class PhpMailController extends Controller 'port' => $mail->sending_port, 'security' => $mail->sending_encryption, 'username' => $mail->email_address, - 'password' => $mail->getRawOriginal()['password'], + 'password' => $mail->password, ]; if (!$this->commonMailer->setSmtpDriver($config)) { \Log::info('Invaid configuration :- '.$config); diff --git a/resources/views/themes/default1/agent/helpdesk/report/pdf.blade.php b/resources/views/themes/default1/agent/helpdesk/report/pdf.blade.php index bc0ebf29c..f81f171ac 100644 --- a/resources/views/themes/default1/agent/helpdesk/report/pdf.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/report/pdf.blade.php @@ -51,13 +51,13 @@ Date - @if($table_datas[1]->open) + @if(array_key_exists(1, $table_datas) && $table_datas[1]->open) Created @endif - @if($table_datas[1]->closed) + @if(array_key_exists(1, $table_datas) && $table_datas[1]->closed) Closed @endif - @if($table_datas[1]->reopened) + @if(array_key_exists(1, $table_datas) && $table_datas[1]->reopened) Reopened @endif @@ -91,9 +91,11 @@ + @if(array_key_exists(1, $table_datas)) + @endif
TOTAL IN PROGRESS : {!! $table_datas[1]->inprogress !!} @if($table_data->open) TOTAL CREATED : {!! $table_open !!}