feat: add ups to nl, be and lu (#324)

INT-658 --------- Co-authored-by: jochemgravendeel <[email protected]>
myparcelnl · Dec 18, 2024 · 065e50f · 065e50f
1 parent 0cdbf7d
commit 065e50f
Show file tree

Hide file tree

Showing 131 changed files with 2,540 additions and 173 deletions.
diff --git a/config/pdk-business-logic.php b/config/pdk-business-logic.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use MyParcelNL\Pdk\App\Options\Definition\AgeCheckDefinition;
+use MyParcelNL\Pdk\App\Options\Definition\CollectDefinition;
 use MyParcelNL\Pdk\App\Options\Definition\DirectReturnDefinition;
 use MyParcelNL\Pdk\App\Options\Definition\HideSenderDefinition;
 use MyParcelNL\Pdk\App\Options\Definition\InsuranceDefinition;
@@ -76,6 +77,7 @@
             new SignatureDefinition(),
             new TrackedDefinition(),
             new ReceiptCodeDefinition(),
+            new CollectDefinition(),
         ];
     }),
 

diff --git a/config/platform/myparcel.php b/config/platform/myparcel.php
@@ -48,6 +48,7 @@
                     'sameDayDelivery' => false,
                     'signature'       => true,
                     'receiptCode'     => true,
+                    'collect'         => false,
                     'insurance'       => [
                         0,
                         10000,
@@ -99,6 +100,7 @@
                     'onlyRecipient'   => true,
                     'sameDayDelivery' => false,
                     'largeFormat'     => true,
+                    'collect'         => false,
                 ],
                 'features'        => [
                     'labelDescriptionLength' => 45,
@@ -112,7 +114,7 @@
                 'packageTypes'    => [
                     DeliveryOptions::PACKAGE_TYPE_PACKAGE_NAME,
                     DeliveryOptions::PACKAGE_TYPE_MAILBOX_NAME,
-                    DeliveryOptions::PACKAGE_TYPE_PACKAGE_SMALL_NAME
+                    DeliveryOptions::PACKAGE_TYPE_PACKAGE_SMALL_NAME,
                 ],
                 'deliveryTypes'   => [
                     DeliveryOptions::DELIVERY_TYPE_STANDARD_NAME,
@@ -127,6 +129,7 @@
                     'signature'        => true,
                     'saturdayDelivery' => true,
                     'hideSender'       => true,
+                    'collect'          => false,
                     'insurance'        => [
                         0,
                         50000,
@@ -162,6 +165,7 @@
                     'onlyRecipient'   => true,
                     'sameDayDelivery' => true,
                     'largeFormat'     => true,
+                    'collect'         => false,
                 ],
                 'features'        => [
                     'labelDescriptionLength' => 45,
@@ -187,6 +191,7 @@
                     'signature'        => true,
                     'saturdayDelivery' => false,
                     'hideSender'       => false,
+                    'collect'          => false,
                     'insurance'        => [
                         0,
                         50000,
@@ -222,6 +227,7 @@
                     'onlyRecipient'   => false,
                     'sameDayDelivery' => false,
                     'largeFormat'     => false,
+                    'collect'         => false,
                 ],
                 'features'        => [
                     'labelDescriptionLength' => 45,
@@ -273,11 +279,14 @@
                 ],
                 'deliveryTypes'   => [
                     DeliveryOptions::DELIVERY_TYPE_STANDARD_NAME,
+                    DeliveryOptions::DELIVERY_TYPE_EXPRESS_NAME,
                 ],
                 'shipmentOptions' => [
-                    'ageCheck'      => false,
-                    'onlyRecipient' => false,
-                    'return'        => false,
+                    'ageCheck'      => true,
+                    'onlyRecipient' => true,
+                    'return'        => true,
+                    'signature'     => true,
+                    'collect'       => true,
                 ],
                 'features'        => [
                     'labelDescriptionLength' => 45,
@@ -299,6 +308,7 @@
                     'ageCheck'      => false,
                     'onlyRecipient' => false,
                     'return'        => false,
+                    'collect'       => false,
                 ],
                 'features'        => [
                     'labelDescriptionLength' => 45,

diff --git a/config/schema/myparcel/order/ups/base.json b/config/schema/myparcel/order/ups/base.json
@@ -10,7 +10,7 @@
               "required": ["deliveryType"],
               "properties": {
                 "deliveryType": {
-                  "enum": ["standard", null]
+                  "enum": ["standard", null, "express"]
                 }
               }
             }
@@ -43,7 +43,7 @@
     "deliveryOptions": {
       "properties": {
         "deliveryType": {
-          "enum": ["standard", null]
+          "enum": ["standard", null, "express"]
         },
         "packageType": {
           "enum": ["package", null]

diff --git a/config/schema/order.json b/config/schema/order.json
@@ -44,7 +44,7 @@
           "pattern": "^(20\\d\\d)-(0[1-9]|1[012])-(0[1-9]|[12]\\d|3[01]) ([01]\\d|2[0123]):([012345]\\d):([012345]\\d)$"
         },
         "deliveryType": {
-          "enum": ["morning", "standard", "evening", "pickup"]
+          "enum": ["morning", "standard", "evening", "pickup", "express"]
         },
         "labelAmount": {
           "type": ["integer", "null"],
@@ -146,6 +146,9 @@
             },
             "receiptCode": {
               "enum": [0, 1]
+            },
+            "collect": {
+              "enum": [-1, 0, 1]
             }
           }
         }

diff --git a/src/App/DeliveryOptions/Service/DeliveryOptionsService.php b/src/App/DeliveryOptions/Service/DeliveryOptionsService.php
@@ -36,6 +36,7 @@ class DeliveryOptionsService implements DeliveryOptionsServiceInterface
         'allowSameDayDelivery'         => CarrierSettings::ALLOW_SAME_DAY_DELIVERY,
         'allowSaturdayDelivery'        => CarrierSettings::ALLOW_SATURDAY_DELIVERY,
         'allowSignature'               => CarrierSettings::ALLOW_SIGNATURE,
+        'allowExpressDelivery'         => CarrierSettings::ALLOW_DELIVERY_TYPE_EXPRESS,
         'priceEveningDelivery'         => CarrierSettings::PRICE_DELIVERY_TYPE_EVENING,
         'priceMorningDelivery'         => CarrierSettings::PRICE_DELIVERY_TYPE_MORNING,
         'priceOnlyRecipient'           => CarrierSettings::PRICE_ONLY_RECIPIENT,
@@ -46,6 +47,7 @@ class DeliveryOptionsService implements DeliveryOptionsServiceInterface
         'priceSameDayDelivery'         => CarrierSettings::PRICE_DELIVERY_TYPE_SAME_DAY,
         'priceSignature'               => CarrierSettings::PRICE_SIGNATURE,
         'priceStandardDelivery'        => CarrierSettings::PRICE_DELIVERY_TYPE_STANDARD,
+        'priceCollect'                 => CarrierSettings::PRICE_COLLECT,
     ];
 
     /**

diff --git a/src/App/Options/Definition/CollectDefinition.php b/src/App/Options/Definition/CollectDefinition.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Pdk\App\Options\Definition;
+
+use MyParcelNL\Pdk\App\Options\Contract\OrderOptionDefinitionInterface;
+use MyParcelNL\Pdk\Settings\Model\CarrierSettings;
+use MyParcelNL\Pdk\Shipment\Model\ShipmentOptions;
+use MyParcelNL\Pdk\Validation\Validator\CarrierSchema;
+
+class CollectDefinition implements OrderOptionDefinitionInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getCarrierSettingsKey(): ?string
+    {
+        return CarrierSettings::EXPORT_COLLECT;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getProductSettingsKey(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getShipmentOptionsKey(): ?string
+    {
+        return ShipmentOptions::COLLECT;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(CarrierSchema $carrierSchema): bool
+    {
+        return $carrierSchema->canHaveCollect();
+    }
+}
diff --git a/src/App/Order/Calculator/UPS/UPSAgeCheckCalculator.php b/src/App/Order/Calculator/UPS/UPSAgeCheckCalculator.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Pdk\App\Order\Calculator\UPS;
+
+use MyParcelNL\Pdk\App\Order\Calculator\AbstractPdkOrderOptionCalculator;
+use MyParcelNL\Pdk\Types\Service\TriStateService;
+
+/**
+ * When age check is enabled, signature is required.
+ */
+final class UPSAgeCheckCalculator extends AbstractPdkOrderOptionCalculator
+{
+    public function calculate(): void
+    {
+        $shipmentOptions = $this->order->deliveryOptions->shipmentOptions;
+
+        if (TriStateService::ENABLED !== $shipmentOptions->ageCheck) {
+            return;
+        }
+
+        $shipmentOptions->signature = TriStateService::ENABLED;
+    }
+}
diff --git a/src/App/Order/Calculator/UPS/UPSCalculator.php b/src/App/Order/Calculator/UPS/UPSCalculator.php
@@ -12,6 +12,8 @@ protected function getCalculators(): array
     {
         return [
             UPSCountryShipmentOptionsCalculator::class,
+            UPSAgeCheckCalculator::class,
+            UPSDeliveryTypeCalculator::class,
         ];
     }
 }
diff --git 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->order->deliveryOptions->date = null;
-        }
+        $this->order->deliveryOptions->date = null;
     }
 }
diff --git a/src/App/Order/Calculator/UPS/UPSDeliveryTypeCalculator.php b/src/App/Order/Calculator/UPS/UPSDeliveryTypeCalculator.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Pdk\App\Order\Calculator\UPS;
+
+use MyParcelNL\Pdk\App\Order\Calculator\AbstractPdkOrderOptionCalculator;
+use MyParcelNL\Pdk\Base\Service\CountryCodes;
+use MyParcelNL\Pdk\Shipment\Model\DeliveryOptions;
+
+class UPSDeliveryTypeCalculator extends AbstractPdkOrderOptionCalculator
+{
+    /**
+     * @inheritDoc
+     */
+    public function calculate(): void
+    {
+        $deliveryOptions = $this->order->deliveryOptions;
+
+        $isExpress = $deliveryOptions->deliveryType === DeliveryOptions::DELIVERY_TYPE_EXPRESS_NAME;
+        if (
+            $isExpress
+            && $this->order->shippingAddress->cc !== CountryCodes::CC_NL
+        ) {
+            $deliveryOptions->deliveryType = DeliveryOptions::DELIVERY_TYPE_STANDARD_NAME;
+        }
+    }
+}
diff --git a/src/Frontend/View/CarrierSettingsItemView.php b/src/Frontend/View/CarrierSettingsItemView.php
@@ -265,6 +265,10 @@ function (FormOperationBuilder $builder) {
                 : [],
 
             $this->carrierSchema->canHaveInsurance() ? $this->getExportInsuranceFields() : [],
+
+            $this->carrierSchema->canHaveCollect()
+                ? [new interactiveElement(CarrierSettings::EXPORT_COLLECT, Components::INPUT_TOGGLE)]
+                : [],
         ];
     }
 
@@ -393,7 +397,13 @@ function (FormOperationBuilder $builder) {
                 $this->carrierSchema->canHaveOnlyRecipient() ? $this->createSettingWithPriceFields(
                     CarrierSettings::ALLOW_ONLY_RECIPIENT,
                     CarrierSettings::PRICE_ONLY_RECIPIENT
-                ) : []
+                ) : [],
+
+                $this->carrierSchema->canHaveExpressDelivery() ?
+                    $this->createSettingWithPriceFields(
+                        CarrierSettings::ALLOW_DELIVERY_TYPE_EXPRESS,
+                        CarrierSettings::PRICE_DELIVERY_TYPE_EXPRESS
+                    ) : []
             ),
 
             /**