Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Error supression when logo is not present

Browse Source
This commit is contained in:
David Bomba 2022-03-25 15:16:39 +11:00
parent 4ec4b54327
commit 71b7cad096
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Presenters/CompanyPresenter.php
View File

@ -66,11 +66,11 @@ class CompanyPresenter extends EntityPresenter
); );
if(strlen($settings->company_logo) >= 1 && (strpos($settings->company_logo, 'http') !== false)) if(strlen($settings->company_logo) >= 1 && (strpos($settings->company_logo, 'http') !== false))
return "data:image/png;base64, ". base64_encode(file_get_contents($settings->company_logo, false, stream_context_create($context_options))); return "data:image/png;base64, ". base64_encode(@file_get_contents($settings->company_logo, false, stream_context_create($context_options)));
else if(strlen($settings->company_logo) >= 1) else if(strlen($settings->company_logo) >= 1)
return "data:image/png;base64, ". base64_encode(file_get_contents(url('') . $settings->company_logo, false, stream_context_create($context_options))); return "data:image/png;base64, ". base64_encode(@file_get_contents(url('') . $settings->company_logo, false, stream_context_create($context_options)));
else else
return "data:image/png;base64, ". base64_encode(file_get_contents(asset('images/new_logo.png'), false, stream_context_create($context_options))); return "data:image/png;base64, ". base64_encode(@file_get_contents(asset('images/new_logo.png'), false, stream_context_create($context_options)));
} }

4
app/PaymentDrivers/Eway/CreditCard.php
View File

@ -249,13 +249,15 @@ class CreditCard
'TotalAmount' => $this->convertAmountForEway($amount), 'TotalAmount' => $this->convertAmountForEway($amount),
'CurrencyCode' => $this->eway_driver->client->currency()->code, 'CurrencyCode' => $this->eway_driver->client->currency()->code,
'InvoiceNumber' => $invoice_numbers, 'InvoiceNumber' => $invoice_numbers,
'InvoiceReference' => $description,
], ],
'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING, 'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING,
]; ];
$response = $this->eway_driver->init()->eway->createTransaction(\Eway\Rapid\Enum\ApiMethod::DIRECT, $transaction); $response = $this->eway_driver->init()->eway->createTransaction(\Eway\Rapid\Enum\ApiMethod::DIRECT, $transaction);
nlog('eway');
nlog($response);
$response_status = ErrorCode::getStatus($response->ResponseMessage); $response_status = ErrorCode::getStatus($response->ResponseMessage);
if(!$response_status['success']){ if(!$response_status['success']){