From 1d2ebf3b7a140b23e6daac60f483b77009461055 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 7 Oct 2023 09:43:08 +1100 Subject: [PATCH] Fixes for EPC failures --- app/Filters/QuoteFilters.php | 2 +- app/Helpers/Epc/EpcQrGenerator.php | 18 ++++++++++-------- lang/en/texts.php | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php index 0a8c549af609..220960a219d8 100644 --- a/app/Filters/QuoteFilters.php +++ b/app/Filters/QuoteFilters.php @@ -113,7 +113,7 @@ class QuoteFilters extends QueryFilters }); } - if(in_array('convert', $status_parameters)) { + if(in_array('converted', $status_parameters)) { $query->orWhere(function ($q) { $q->whereNotNull('invoice_id'); }); diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php index 100e9a2cca38..8a33cf3d45ff 100644 --- a/app/Helpers/Epc/EpcQrGenerator.php +++ b/app/Helpers/Epc/EpcQrGenerator.php @@ -41,15 +41,17 @@ class EpcQrGenerator public function getQrCode() { - $renderer = new ImageRenderer( - new RendererStyle(200), - new SvgImageBackEnd() - ); - $writer = new Writer($renderer); - - $this->validateFields(); - + $qr = ''; + try { + $renderer = new ImageRenderer( + new RendererStyle(200), + new SvgImageBackEnd() + ); + $writer = new Writer($renderer); + + $this->validateFields(); + $qr = $writer->writeString($this->encodeMessage(), 'utf-8'); } catch(\Throwable $e) { return ''; diff --git a/lang/en/texts.php b/lang/en/texts.php index 626c69b9a22e..5a69b507d265 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5177,6 +5177,7 @@ $LANG = array( 'log' => 'Log', 'classification' => 'Classification', 'stock_quantity_number' => 'Stock :quantity', + 'upcoming' => 'Upcoming', ); return $LANG;