Changes needed to support timeframe selection and retrieval

Api/Data/PostnlRequestInterface.php

@@ -55,4 +55,8 @@ public function setLocationCode($locationCode);
  public function setName($name);
 
  public function setFrom($from);
+
+ public function setDeliveryDate($deliveryDate);
+
+ public function setTo($to);
 }

Request/PostnlRequest.php

@@ -95,4 +95,14 @@ public function setFrom($from): void
  {
  $this->setData('from', $from);
  }
+
+ public function setDeliveryDate($deliveryDate)
+ {
+ $this->setData('date', $deliveryDate);
+ }
+
+ public function setTo($to)
+ {
+ $this->setData('to', $to);
+ }
 }

Service/DeliveryOptions/Save.php

@@ -64,14 +64,16 @@ private function saveDeliveryOption(PostnlRequestInterface $postnlRequest): bool
  $params = $this->orderParams->get($this->addSessionDataToParams($postnlRequest->getParams()));
  $postnlOrder = $this->utils->getPostNLOrderByQuoteId($params['quote_id']);
 
- $this->savePostNLOrderData($params, $postnlOrder);
-
- if ($type != 'pickup') {
- $this->pickupAddress->remove();
+ if ($type == 'fallback') {
+ unset ($params['is_pakjegemak']);
  }
 
+ $this->savePostNLOrderData($params, $postnlOrder);
+
  if ($type == 'pickup') {
  $this->pickupAddress->set($params['pg_address']);
+ } else if ($type == 'delivery') {
+ $this->pickupAddress->remove();
  }
 
  return true;
@@ -80,6 +82,14 @@ private function saveDeliveryOption(PostnlRequestInterface $postnlRequest): bool
  private function savePostNLOrderData(array $params, PostnlOrder $postnlOrder): void
  {
  foreach ($params as $key => $value) {
+ if ($key === PostnlOrder::FIELD_AC_INFORMATION) {
+ $value = $this->convertParamValueToJson($value);
+ }
+
+ if (empty($value) && $value !== 0) {
+ continue;
+ }
+
  $postnlOrder->setData($key, $value);
  }
 
@@ -116,6 +126,22 @@ private function addSessionDataToParams(array $params) : array
  $params['date'] = $this->utils->getDeliveryDay($params['address']);
  }
 
+ if ($params['date'] === 'keep') {
+ unset($params['date']);
+ }
+
  return $params;
  }
+
+ public function convertParamValueToJson(mixed $value) : mixed
+ {
+ if (is_array($value) && empty($value)) {
+ $value = null;
+ }
+
+ if (!empty($value)) {
+ $value = json_encode($value);
+ }
+ return $value;
+ }
 }

Utils/RequestBuilder.php

@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 use Vendic\PostnlApi\Api\Data\LocationInterface;
 use Vendic\PostnlApi\Api\Data\PostnlRequestInterface;
-use Vendic\PostnlApi\Api\TimeframesInterface;
+use Vendic\PostnlApi\Api\Data\TimeframeInterface;
 use Vendic\PostnlApi\Api\Data\PostnlRequestInterfaceFactory;
 
 class RequestBuilder
@@ -112,11 +112,11 @@ public function buildForPickupSave(Address $billingAddress, LocationInterface $l
  */
  public function buildForDeliverySave(
  Address $shippingAddress,
- ?TimeframesInterface $timeframe = null
+ ?TimeframeInterface $timeframe = null
  ): PostnlRequestInterface {
  /** @var PostnlRequestInterface $request */
  $request = $this->postnlRequestFactory->create();
- $request->setType('fallback');
+ $request->setType($timeframe ? 'delivery' : 'fallback');
 
  // Extract street and housenumber from street array
  /** @var string|array $street */
@@ -146,6 +146,14 @@ public function buildForDeliverySave(
  $request->setType('EPS');
  }
 
+ // Delivery Timeframes
+ if ($timeframe) {
+ $request->setDeliveryDate($timeframe->getDate());
+ $request->setOption($timeframe->getOption());
+ $request->setFrom($timeframe->getFrom());
+ $request->setTo($timeframe->getTo());
+ }
+
  return $request;
  }