Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Fixes

Browse Source
This commit is contained in:
David Bomba 2020-12-13 21:33:30 +11:00
parent 6f451b8924
commit 0f86b3ec21
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Exceptions/Handler.php
View File

@ -67,7 +67,7 @@ class Handler extends ExceptionHandler
* @throws Throwable * @throws Throwable
*/ */
public function report(Throwable $exception) public function report(Throwable $exception)
{ {info("errrrrrrrrrrrrrrrrrr");
if (! Schema::hasTable('accounts')) { if (! Schema::hasTable('accounts')) {
info('account table not found'); info('account table not found');
return; return;
@ -101,6 +101,7 @@ class Handler extends ExceptionHandler
private function validException($exception) private function validException($exception)
{ {
info("valid exception = " .$exception->getMessage());
if(strpos($exception->getMessage(), 'file_put_contents') === TRUE) if(strpos($exception->getMessage(), 'file_put_contents') === TRUE)
return FALSE; return FALSE;

5
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -164,4 +164,9 @@ class CreateEntityPdf implements ShouldQueue
return $file_path; return $file_path;
} }
public function failed(\Exception $exception)
{
}
} }

20
app/Jobs/Util/Import.php
View File

@ -1048,13 +1048,11 @@ class Import implements ShouldQueue
$cgt = ClientGatewayToken::Create($modified); $cgt = ClientGatewayToken::Create($modified);
$old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id; $key = "client_gateway_tokens_{$resource['id']}";
$this->ids['client_gateway_tokens'] = [ $this->ids['client_gateway_tokens'][$key] = [
"client_gateway_tokens_{$old_user_key}" => [ 'old' => $resource['id'],
'old' => $resource['id'], 'new' => $cgt->id,
'new' => $cgt->id,
],
]; ];
} }
@ -1079,13 +1077,11 @@ class Import implements ShouldQueue
$task_status = TaskStatus::Create($modified); $task_status = TaskStatus::Create($modified);
$old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id; $key = "task_statuses_{$resource['id']}";
$this->ids['task_statuses'] = [ $this->ids['task_statuses'][$key] = [
"task_statuses_{$old_user_key}" => [ 'old' => $resource['id'],
'old' => $resource['id'], 'new' => $task_status->id,
'new' => $task_status->id,
],
]; ];
} }