Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 17:54:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

v5.7.33

Browse Source
This commit is contained in:
David Bomba 2023-10-20 07:46:45 +11:00
parent e5bd186b61
commit 574c800c2e
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.32 5.7.33

14
app/Helpers/Epc/EpcQrGenerator.php
View File

@ -15,6 +15,7 @@ use App\Models\Company;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\RecurringInvoice; use App\Models\RecurringInvoice;
use App\Utils\Ninja; use App\Utils\Ninja;
use BaconQrCode\Exception\InvalidArgumentException;
use BaconQrCode\Renderer\Image\SvgImageBackEnd; use BaconQrCode\Renderer\Image\SvgImageBackEnd;
use BaconQrCode\Renderer\ImageRenderer; use BaconQrCode\Renderer\ImageRenderer;
use BaconQrCode\Renderer\RendererStyle\RendererStyle; use BaconQrCode\Renderer\RendererStyle\RendererStyle;
@ -50,8 +51,7 @@ class EpcQrGenerator
); );
$writer = new Writer($renderer); $writer = new Writer($renderer);
if($this->validateFields()) $this->validateFields();
return '';
$qr = $writer->writeString($this->encodeMessage(), 'utf-8'); $qr = $writer->writeString($this->encodeMessage(), 'utf-8');
@ -59,10 +59,15 @@ class EpcQrGenerator
<rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>"; <rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>";
} catch(\Throwable $e) { } catch(\Throwable $e) {
nlog("EPC QR failure => ".$e->getMessage());
return ''; return '';
} catch(\Exception $e) { } catch(\Exception $e) {
nlog("EPC QR failure => ".$e->getMessage());
return ''; return '';
} } catch( InvalidArgumentException $e) {
nlog("EPC QR failure => ".$e->getMessage());
return '';
}
} }
@ -88,16 +93,13 @@ class EpcQrGenerator
private function validateFields() private function validateFields()
{ {
if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company2)) { if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company2)) {
return true;
nlog('The BIC field is not present and _may_ be a required fields for EPC QR codes'); nlog('The BIC field is not present and _may_ be a required fields for EPC QR codes');
} }
if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company1)) { if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company1)) {
return true;
nlog('The IBAN field is required'); nlog('The IBAN field is required');
} }
return false;
} }
private function formatMoney($value) private function formatMoney($value)

9
app/Http/Controllers/PreviewController.php
View File

@ -111,11 +111,12 @@ class PreviewController extends BaseController
$html->settings = $settings; $html->settings = $settings;
$variables = $html->generateLabelsAndValues(); $variables = $html->generateLabelsAndValues();
$design = \App\Models\Design::withTrashed()->find($entity_obj->design_id ?? 2);
$design = \App\Models\Design::query()->withTrashed()->find($entity_obj->design_id ?? 2);
/* Catch all in case migration doesn't pass back a valid design */ /* Catch all in case migration doesn't pass back a valid design */
if (! $design) { if (! $design) {
$design = \App\Models\Design::find(2); $design = \App\Models\Design::query()->find(2);
} }
if ($design->is_custom) { if ($design->is_custom) {
@ -329,8 +330,8 @@ class PreviewController extends BaseController
/** /**
* @deprecated due to usage of transactions * @deprecated due to usage of transactions
* *
* @param mixed $request * @param PreviewInvoiceRequest $request
* @return void * @return mixed
*/ */
public function livex(PreviewInvoiceRequest $request) public function livex(PreviewInvoiceRequest $request)
{ {

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.7.32'), 'app_version' => env('APP_VERSION','5.7.33'),
'app_tag' => env('APP_TAG','5.7.32'), 'app_tag' => env('APP_TAG','5.7.33'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),