From b528ac66fcdff4a0e02debe14c7a29451b0cc54e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 30 Apr 2024 17:46:25 +0800
Subject: [PATCH] update estimated delivery date for E2E

---
 .../Services/GeneratesBookingQuotation.php    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php b/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
index 8ea1b88d..3a0b1536 100644
--- a/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
+++ b/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
@@ -19,7 +19,31 @@ class GeneratesBookingQuotation
         $hours = $date->diffInHours($date->copy()->addMinutes($paymentAttemptLimit)->subDays($days)) ;
         $minutes = $date->diffInMinutes($date->copy()->addMinutes($paymentAttemptLimit)->subDays($days)->subHours($hours));
 
-        $receive_date = $currencyConversionObject ? Carbon::now()->endOfDay()->addWeekdays($currencyConversionObject->getServiceId() === 3 ? 3 : 1)->timezone('Asia/Singapore')->format('4:00 \P\M, jS M, Y \G\M\T T') : null;
+        // Initialize $receive_date to null by default
+        $receive_date = null;
+
+        if ($currencyConversionObject) {
+            $serviceId = $currencyConversionObject->getServiceId();
+
+            switch ($serviceId) {
+                case 3:
+                    $daysToAdd = 3;
+                    break;
+                case 5:
+                    $daysToAdd = 7;
+                    break;
+                default:
+                    $daysToAdd = 1;
+                    break;
+            }
+
+            $receive_date = Carbon::now()
+                ->endOfDay()
+                ->addWeekdays($daysToAdd)
+                ->timezone('Asia/Singapore')
+                ->format('4:00 PM, jS M, Y GMT T');
+        }
+
 
         return [
             'bank' => new BankResource(Bank::find($calculationObject->getConfigurations()->getBankId())),