From 28b30e719a8ecb2403c45dcab4e4c685ab03f226 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 9 Oct 2023 20:40:53 +1100
Subject: [PATCH] Fixes for EPC failures

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

diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php
index 8a33cf3d45ff..62d61a0a15bb 100644
--- a/app/Helpers/Epc/EpcQrGenerator.php
+++ b/app/Helpers/Epc/EpcQrGenerator.php
@@ -53,12 +53,17 @@ class EpcQrGenerator
             $this->validateFields();
 
             $qr = $writer->writeString($this->encodeMessage(), 'utf-8');
+
+            return "<svg viewBox='0 0 200 200' width='200' height='200' x='0' y='0' xmlns='http://www.w3.org/2000/svg'>
+          <rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>";
+
         } 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'>
-          <rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>";
+       
     }
 
     public function encodeMessage()