From 929cb2c0a62fa4cf283e3a0a2f4f7b834afc0f54 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 3 Jul 2024 19:21:50 +0800
Subject: [PATCH 1/2] Test sending welcome voucher email through server

---
 app/Classes/Jobs/SendWelcomeVoucherEmail.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Jobs/SendWelcomeVoucherEmail.php b/app/Classes/Jobs/SendWelcomeVoucherEmail.php
index 77cc4ddb..b6ef687e 100644
--- a/app/Classes/Jobs/SendWelcomeVoucherEmail.php
+++ b/app/Classes/Jobs/SendWelcomeVoucherEmail.php
@@ -46,10 +46,10 @@ class SendWelcomeVoucherEmail implements ShouldQueue
     {
         $currentDatetime = Carbon::now();
         $dateToCompare = Carbon::parse($this->voucher->end_date);
-        // if (!$this->user->hasAttribute($this->voucher->code."_EMAIL_COUNT")
-        //     && $this->user->rewards->where('voucher_id', $this->voucher->id)->count() > 0
-        //     && $currentDatetime->isBefore($dateToCompare))
-        // {
+        if (!$this->user->hasAttribute($this->voucher->code."_EMAIL_COUNT")
+            && $this->user->rewards->where('voucher_id', $this->voucher->id)->count() > 0
+            && $currentDatetime->isBefore($dateToCompare))
+        {
             //Key #1
             $keyValuePairObject = new KeyValuePairObject(
                 $this->voucher->code."_EMAIL_COUNT",
@@ -65,6 +65,6 @@ class SendWelcomeVoucherEmail implements ShouldQueue
             (App()->make(CreatesKeyValuePair::class))->execute($this->user, $keyValuePairObject);
 
             $this->user->notify(new WelcomeVoucherEmail($this->user, $this->voucher));
-        //}
+        }
     }
 }

From 77140ec7514fd300d4232a9b55196609a35dd4fc Mon Sep 17 00:00:00 2001
From: Jia Sheng <jiasheng@etctech.com.my>
Date: Thu, 4 Jul 2024 22:07:24 +0800
Subject: [PATCH 2/2] -change the heading in pdf from credit note to refund
 note for those transaction after 02 April 2024

---
 resources/views/pages/pdfs/credit_note.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/credit_note.blade.php b/resources/views/pages/pdfs/credit_note.blade.php
index ca6e0a5c..a45263be 100644
--- a/resources/views/pages/pdfs/credit_note.blade.php
+++ b/resources/views/pages/pdfs/credit_note.blade.php
@@ -24,8 +24,11 @@
         </td>
         <td class="header-details">
             <div class="title">
+                @php
+                $credit_title = \Carbon\Carbon::parse($transaction->created_at)->isAfter('2024-04-02') ? 'Refund' : 'Credit'
+                @endphp
                 <strong>
-                    {{ $transaction->type == 9 ? 'Credit' : 'Debit' }} Note
+                    {{ $transaction->type == 9 ? $credit_title : 'Debit' }} Note
                 </strong>
             </div>