From e6f1ca179a9fc1f0b03f9bcd77786d7cb40d2526 Mon Sep 17 00:00:00 2001
From: Konstantinos Arvanitakis <arvanitakis@radical-elements.com>
Date: Thu, 3 Sep 2026 17:42:30 +0300
Subject: [PATCH] Fix: Fixing various bugs occured on payment lifecycle

---
 src/Checkout/Services/CheckoutService.php         | 4 ++--
 src/Shipping/Carriers/Acs/AcsRateDriver.php       | 2 +-
 src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Checkout/Services/CheckoutService.php b/src/Checkout/Services/CheckoutService.php
index 0981ac9..d02a342 100644
--- a/src/Checkout/Services/CheckoutService.php
+++ b/src/Checkout/Services/CheckoutService.php
@@ -152,11 +152,11 @@ class CheckoutService
         }
 
         $cart = $this->cart->currentOrCreate();
-        $cart->meta = [...$cart->meta->toArray(), 'payment_method' => $type];
+        $cart->meta = [...($cart->meta?->toArray() ?? []), 'payment_method' => $type];
         $cart->save();
 
         $cart = $cart->calculate();
-        $cart->meta = [...$cart->meta->toArray(), 'checkout_fingerprint' => $cart->fingerprint()];
+        $cart->meta = [...($cart->meta?->toArray() ?? []), 'checkout_fingerprint' => $cart->fingerprint()];
         $cart->save();
 
         Event::dispatch(new PaymentMethodSelected($cart, $type));
diff --git a/src/Shipping/Carriers/Acs/AcsRateDriver.php b/src/Shipping/Carriers/Acs/AcsRateDriver.php
index fdadade..0daea90 100644
--- a/src/Shipping/Carriers/Acs/AcsRateDriver.php
+++ b/src/Shipping/Carriers/Acs/AcsRateDriver.php
@@ -4,7 +4,7 @@ namespace Modules\Core\Shipping\Carriers\Acs;
 
 use Lunar\DataTypes\Price;
 use Lunar\DataTypes\ShippingOption;
-use Lunar\Shipping\DTOs\ShippingOptionRequest;
+use Lunar\Shipping\DataTransferObjects\ShippingOptionRequest;
 use Lunar\Shipping\Interfaces\ShippingRateInterface;
 use Lunar\Shipping\Models\ShippingRate;
 use Modules\Core\Shipping\Carriers\Acs\Exceptions\AcsApiException;
diff --git a/src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php b/src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php
index 0e5420f..46fe211 100644
--- a/src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php
+++ b/src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php
@@ -3,7 +3,7 @@
 namespace Modules\Core\Shipping\Carriers\BoxNow;
 
 use Lunar\DataTypes\ShippingOption;
-use Lunar\Shipping\DTOs\ShippingOptionRequest;
+use Lunar\Shipping\DataTransferObjects\ShippingOptionRequest;
 use Lunar\Shipping\Interfaces\ShippingRateInterface;
 use Lunar\Shipping\Models\ShippingRate;
 use Modules\Core\Shipping\Concerns\ResolvesFixedPricing;