diff --git a/src/App/Order/Calculator/UPS/UPSCountryShipmentOptionsCalculator.php b/src/App/Order/Calculator/UPS/UPSCountryShipmentOptionsCalculator.php index bb2bf912c..c1b88d798 100644 --- a/src/App/Order/Calculator/UPS/UPSCountryShipmentOptionsCalculator.php +++ b/src/App/Order/Calculator/UPS/UPSCountryShipmentOptionsCalculator.php @@ -5,26 +5,12 @@ namespace MyParcelNL\Pdk\App\Order\Calculator\UPS; use MyParcelNL\Pdk\App\Order\Calculator\AbstractPdkOrderOptionCalculator; -use MyParcelNL\Pdk\App\Order\Model\PdkOrder; -use MyParcelNL\Pdk\Base\Contract\CountryServiceInterface; -use MyParcelNL\Pdk\Facade\Pdk; class UPSCountryShipmentOptionsCalculator extends AbstractPdkOrderOptionCalculator { - private $countryService; - - public function __construct(PdkOrder $order) - { - parent::__construct($order); - - $this->countryService = Pdk::get(CountryServiceInterface::class); - } - + // Comment: Always set delivery date to null for UPS shipments regardless of country public function calculate(): void { - $cc = $this->order->shippingAddress->cc; - if ($this->countryService->isRow($cc) || $this->countryService->isEu($cc) || $this->countryService->isLocalCountry($cc)) { - $this->order->deliveryOptions->date = null; - } + $this->order->deliveryOptions->date = null; } }