From cf84f5b24d22eedbfb5e84c4e1ec5c016989a31c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 22 Nov 2022 09:13:16 +1100
Subject: [PATCH] Set encoding to UTF-8 for EPC QR Codes

---
 app/Helpers/Epc/EpcQrGenerator.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php
index a63446f24caf..d308f7188ba9 100644
--- a/app/Helpers/Epc/EpcQrGenerator.php
+++ b/app/Helpers/Epc/EpcQrGenerator.php
@@ -49,9 +49,12 @@ class EpcQrGenerator
         $this->validateFields();
 
         try {
-            $qr = $writer->writeString($this->encodeMessage());
+            $qr = $writer->writeString($this->encodeMessage(), 'utf-8');
         }
-        catch(BaconQrCode\Exception\WriterException $e){
+        catch(\Throwable $e){
+            return '';
+        }
+        catch(\Exception $e){
             return '';
         }
         return "<svg viewBox='0 0 200 200' width='200' height='200' x='0' y='0' xmlns='http://www.w3.org/2000/svg'>