Refactored booking->options due to dhl24 method requirements.

xGrz · Jun 18, 2024 · c64e2ad · c64e2ad
1 parent bbda676
commit c64e2ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Http/Controllers/SingleShipmentBookingController.php b/src/Http/Controllers/SingleShipmentBookingController.php
@@ -15,7 +15,7 @@ public function create(DHLShipment $shipment)
         return view('dhl-ui::shipments.create-booking', [
             'title' => 'Book courier',
             'shipment' => $shipment,
-            'dateOptions' => DHL24::booking()->options($shipment->shipper_postal_code)->availableDates(),
+            'dateOptions' => DHL24::booking()->options($shipment)->availableDates(),
         ]);
     }
 }
diff --git a/src/Livewire/CreateMassBooking.php b/src/Livewire/CreateMassBooking.php
@@ -106,7 +106,7 @@ private function getDateOptions()
             self::resetBooking();
             return;
         }
-        $this->dateOptions = DHL24::booking()->options($this->postalCode)->availableDates();
+        $this->dateOptions = DHL24::booking()->options(self::getSelectedShipments())->availableDates();
         $this->pickupDate = $this->dateOptions[0];
     }
 
@@ -122,7 +122,7 @@ private function refreshPickupFromOptions(): array
     {
         if (!$this->postalCode) return [];
         $pickupFromOptions = DHL24::booking()
-            ->options($this->postalCode, self::getSelectedShipments())
+            ->options(self::getSelectedShipments())
             ->pickupStartingOptions(Carbon::parse($this->pickupDate));
         $testArr = [];
         foreach ($pickupFromOptions as $pickupFromOption) {
@@ -141,7 +141,7 @@ private function refreshPickupToOptions(): array
     {
         if (!$this->postalCode) return [];
         $pickupToOptions = DHL24::booking()
-            ->options($this->postalCode, self::getSelectedShipments())
+            ->options(self::getSelectedShipments())
             ->pickupEndingOptions(Carbon::parse($this->pickupDate . ' ' . $this->pickupFrom));
         $testArr = [];
         foreach ($pickupToOptions as $pickupToOption) {

diff --git a/src/Livewire/CreateSingleShipmentBooking.php b/src/Livewire/CreateSingleShipmentBooking.php
@@ -52,7 +52,7 @@ public function book()
     private function refreshPickupFromOptions(): array
     {
         $pickupFromOptions = DHL24::booking()
-            ->options($this->postalCode)
+            ->options($this->shipment)
             ->pickupStartingOptions(Carbon::parse($this->pickupDate));
         $testArr = [];
         foreach ($pickupFromOptions as $pickupFromOption) {
@@ -70,7 +70,7 @@ private function refreshPickupFromOptions(): array
     private function refreshPickupToOptions(): array
     {
         $pickupToOptions = DHL24::booking()
-            ->options($this->postalCode)
+            ->options($this->shipment)
             ->pickupEndingOptions(Carbon::parse($this->pickupDate . ' ' . $this->pickupFrom));
         $testArr = [];
         foreach ($pickupToOptions as $pickupToOption) {