From 0fa2188146562804a83c90ca7fe29b07d996e189 Mon Sep 17 00:00:00 2001
From: Konstantinos Arvanitakis <arvanitakis@radical-elements.com>
Date: Thu, 3 Sep 2026 15:58:51 +0300
Subject: [PATCH] Feat: Refactoring Shipping DataTransferObjects to DTOs
 namespace

---
 src/Payment/Services/TransactionRecorder.php                | 4 ++--
 src/Shipping/Carriers/Acs/AcsFulfillmentService.php         | 6 +++---
 src/Shipping/Carriers/Acs/AcsRateDriver.php                 | 2 +-
 src/Shipping/Carriers/BoxNow/BoxNowFulfillmentService.php   | 4 ++--
 src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php           | 2 +-
 src/Shipping/Contracts/CarrierFulfillmentInterface.php      | 2 +-
 src/Shipping/Contracts/SupportsManifestBatching.php         | 2 +-
 src/Shipping/Contracts/SupportsTracking.php                 | 2 +-
 .../{DataTransferObjects => DTOs}/ManifestResult.php        | 2 +-
 .../{DataTransferObjects => DTOs}/ShipmentRequest.php       | 2 +-
 .../{DataTransferObjects => DTOs}/TrackingCheckpoint.php    | 2 +-
 src/Shipping/Extensions/OrderViewExtension.php              | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)
 rename src/Shipping/{DataTransferObjects => DTOs}/ManifestResult.php (93%)
 rename src/Shipping/{DataTransferObjects => DTOs}/ShipmentRequest.php (92%)
 rename src/Shipping/{DataTransferObjects => DTOs}/TrackingCheckpoint.php (91%)

diff --git a/src/Payment/Services/TransactionRecorder.php b/src/Payment/Services/TransactionRecorder.php
index fcd0c56..4b27e71 100644
--- a/src/Payment/Services/TransactionRecorder.php
+++ b/src/Payment/Services/TransactionRecorder.php
@@ -4,8 +4,8 @@ namespace Modules\Core\Payment\Services;
 
 use Lunar\Models\Order;
 use Lunar\Models\Transaction;
-use Modules\Core\Payment\DataTransferObjects\CaptureResult;
-use Modules\Core\Payment\DataTransferObjects\RefundResult;
+use Modules\Core\Payment\DTOs\CaptureResult;
+use Modules\Core\Payment\DTOs\RefundResult;
 
 /**
  * Writes the Transaction row a SupportsRefunds/SupportsCaptures driver's
diff --git a/src/Shipping/Carriers/Acs/AcsFulfillmentService.php b/src/Shipping/Carriers/Acs/AcsFulfillmentService.php
index b7f401d..aac4d37 100644
--- a/src/Shipping/Carriers/Acs/AcsFulfillmentService.php
+++ b/src/Shipping/Carriers/Acs/AcsFulfillmentService.php
@@ -10,9 +10,9 @@ use Modules\Core\Shipping\Contracts\CarrierFulfillmentInterface;
 use Modules\Core\Shipping\Contracts\SupportsManifestBatching;
 use Modules\Core\Shipping\Contracts\SupportsTracking;
 use Modules\Core\Shipping\Carriers\Acs\Exceptions\AcsApiException;
-use Modules\Core\Shipping\DataTransferObjects\ManifestResult;
-use Modules\Core\Shipping\DataTransferObjects\ShipmentRequest;
-use Modules\Core\Shipping\DataTransferObjects\TrackingCheckpoint;
+use Modules\Core\Shipping\DTOs\ManifestResult;
+use Modules\Core\Shipping\DTOs\ShipmentRequest;
+use Modules\Core\Shipping\DTOs\TrackingCheckpoint;
 use Modules\Core\Shipping\Enums\TrackingStatus;
 use Modules\Core\Shipping\Models\Shipment;
 
diff --git a/src/Shipping/Carriers/Acs/AcsRateDriver.php b/src/Shipping/Carriers/Acs/AcsRateDriver.php
index 0daea90..fdadade 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\DataTransferObjects\ShippingOptionRequest;
+use Lunar\Shipping\DTOs\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/BoxNowFulfillmentService.php b/src/Shipping/Carriers/BoxNow/BoxNowFulfillmentService.php
index ea32ea7..4b8b643 100644
--- a/src/Shipping/Carriers/BoxNow/BoxNowFulfillmentService.php
+++ b/src/Shipping/Carriers/BoxNow/BoxNowFulfillmentService.php
@@ -8,8 +8,8 @@ use Lunar\Models\Order;
 use Modules\Core\Shipping\Carriers\BoxNow\Exceptions\BoxNowApiException;
 use Modules\Core\Shipping\Contracts\CarrierFulfillmentInterface;
 use Modules\Core\Shipping\Contracts\SupportsTracking;
-use Modules\Core\Shipping\DataTransferObjects\ShipmentRequest;
-use Modules\Core\Shipping\DataTransferObjects\TrackingCheckpoint;
+use Modules\Core\Shipping\DTOs\ShipmentRequest;
+use Modules\Core\Shipping\DTOs\TrackingCheckpoint;
 use Modules\Core\Shipping\Enums\TrackingStatus;
 use Modules\Core\Shipping\Models\Shipment;
 
diff --git a/src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php b/src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php
index 46fe211..0e5420f 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\DataTransferObjects\ShippingOptionRequest;
+use Lunar\Shipping\DTOs\ShippingOptionRequest;
 use Lunar\Shipping\Interfaces\ShippingRateInterface;
 use Lunar\Shipping\Models\ShippingRate;
 use Modules\Core\Shipping\Concerns\ResolvesFixedPricing;
diff --git a/src/Shipping/Contracts/CarrierFulfillmentInterface.php b/src/Shipping/Contracts/CarrierFulfillmentInterface.php
index d76d8d4..0411a96 100644
--- a/src/Shipping/Contracts/CarrierFulfillmentInterface.php
+++ b/src/Shipping/Contracts/CarrierFulfillmentInterface.php
@@ -3,7 +3,7 @@
 namespace Modules\Core\Shipping\Contracts;
 
 use Lunar\Models\Order;
-use Modules\Core\Shipping\DataTransferObjects\ShipmentRequest;
+use Modules\Core\Shipping\DTOs\ShipmentRequest;
 use Modules\Core\Shipping\Models\Shipment;
 
 interface CarrierFulfillmentInterface
diff --git a/src/Shipping/Contracts/SupportsManifestBatching.php b/src/Shipping/Contracts/SupportsManifestBatching.php
index 0ae3718..fd9ba39 100644
--- a/src/Shipping/Contracts/SupportsManifestBatching.php
+++ b/src/Shipping/Contracts/SupportsManifestBatching.php
@@ -3,7 +3,7 @@
 namespace Modules\Core\Shipping\Contracts;
 
 use Illuminate\Support\Collection;
-use Modules\Core\Shipping\DataTransferObjects\ManifestResult;
+use Modules\Core\Shipping\DTOs\ManifestResult;
 
 /**
  * Optional capability for carriers that batch shipments into a manifest
diff --git a/src/Shipping/Contracts/SupportsTracking.php b/src/Shipping/Contracts/SupportsTracking.php
index 4ec4457..7e1f8b8 100644
--- a/src/Shipping/Contracts/SupportsTracking.php
+++ b/src/Shipping/Contracts/SupportsTracking.php
@@ -3,7 +3,7 @@
 namespace Modules\Core\Shipping\Contracts;
 
 use Illuminate\Support\Collection;
-use Modules\Core\Shipping\DataTransferObjects\TrackingCheckpoint;
+use Modules\Core\Shipping\DTOs\TrackingCheckpoint;
 use Modules\Core\Shipping\Models\Shipment;
 
 /**
diff --git a/src/Shipping/DataTransferObjects/ManifestResult.php b/src/Shipping/DTOs/ManifestResult.php
similarity index 93%
rename from src/Shipping/DataTransferObjects/ManifestResult.php
rename to src/Shipping/DTOs/ManifestResult.php
index a855421..682b79e 100644
--- a/src/Shipping/DataTransferObjects/ManifestResult.php
+++ b/src/Shipping/DTOs/ManifestResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Shipping\DataTransferObjects;
+namespace Modules\Core\Shipping\DTOs;
 
 use Illuminate\Support\Collection;
 
diff --git a/src/Shipping/DataTransferObjects/ShipmentRequest.php b/src/Shipping/DTOs/ShipmentRequest.php
similarity index 92%
rename from src/Shipping/DataTransferObjects/ShipmentRequest.php
rename to src/Shipping/DTOs/ShipmentRequest.php
index f63b4a0..35cb380 100644
--- a/src/Shipping/DataTransferObjects/ShipmentRequest.php
+++ b/src/Shipping/DTOs/ShipmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Shipping\DataTransferObjects;
+namespace Modules\Core\Shipping\DTOs;
 
 /**
  * Carrier-agnostic input for CarrierFulfillmentInterface::createShipment().
diff --git a/src/Shipping/DataTransferObjects/TrackingCheckpoint.php b/src/Shipping/DTOs/TrackingCheckpoint.php
similarity index 91%
rename from src/Shipping/DataTransferObjects/TrackingCheckpoint.php
rename to src/Shipping/DTOs/TrackingCheckpoint.php
index 3ce5e94..085b1e6 100644
--- a/src/Shipping/DataTransferObjects/TrackingCheckpoint.php
+++ b/src/Shipping/DTOs/TrackingCheckpoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Shipping\DataTransferObjects;
+namespace Modules\Core\Shipping\DTOs;
 
 use Carbon\CarbonInterface;
 use Modules\Core\Shipping\Enums\TrackingStatus;
diff --git a/src/Shipping/Extensions/OrderViewExtension.php b/src/Shipping/Extensions/OrderViewExtension.php
index d033cab..18929c8 100644
--- a/src/Shipping/Extensions/OrderViewExtension.php
+++ b/src/Shipping/Extensions/OrderViewExtension.php
@@ -14,7 +14,7 @@ use Lunar\Admin\Support\Extending\ViewPageExtension;
 use Lunar\Models\Order;
 use Lunar\Shipping\Models\ShippingMethod;
 use Modules\Core\Shipping\Contracts\CarrierFulfillmentInterface;
-use Modules\Core\Shipping\DataTransferObjects\ShipmentRequest;
+use Modules\Core\Shipping\DTOs\ShipmentRequest;
 
 class OrderViewExtension extends ViewPageExtension
 {