From 79d032fa4b9e8caeb7f84b456cbd72f122279fc9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Nov 2022 19:12:51 +1100
Subject: [PATCH] Catch EPC QR failures

---
 app/Helpers/Epc/EpcQrGenerator.php                  | 4 ++--
 app/Services/TaskScheduler/TaskSchedulerService.php | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php
index 93d25fab7678..a63446f24caf 100644
--- a/app/Helpers/Epc/EpcQrGenerator.php
+++ b/app/Helpers/Epc/EpcQrGenerator.php
@@ -49,9 +49,9 @@ class EpcQrGenerator
         $this->validateFields();
 
         try {
-        $qr = $writer->writeString($this->encodeMessage());
+            $qr = $writer->writeString($this->encodeMessage());
         }
-        catch(\Exception $e){
+        catch(BaconQrCode\Exception\WriterException $e){
             return '';
         }
         return "<svg viewBox='0 0 200 200' width='200' height='200' x='0' y='0' xmlns='http://www.w3.org/2000/svg'>
diff --git a/app/Services/TaskScheduler/TaskSchedulerService.php b/app/Services/TaskScheduler/TaskSchedulerService.php
index 497601e9c43e..c0320a8b1c89 100644
--- a/app/Services/TaskScheduler/TaskSchedulerService.php
+++ b/app/Services/TaskScheduler/TaskSchedulerService.php
@@ -40,12 +40,8 @@ use Symfony\Component\HttpFoundation\Request;
 
 class TaskSchedulerService
 {
-    public Scheduler $scheduler;
-
-    public function __construct(Scheduler $scheduler)
-    {
-        $this->scheduler = $scheduler;
-    }
+    
+    public function __construct(public Scheduler $scheduler) {}
 
     public function store(Scheduler $scheduler, CreateScheduledTaskRequest $request)
     {