Package version updates, FedEx create shipment fix

ivanmitrikeski · Sep 3, 2024 · 6634d19 · 6634d19
1 parent a6212e2
commit 6634d19
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "ext-soap": "*",
         "openlss/lib-array2xml": "^1.0",
         "psr/log": "^3.0",
-        "illuminate/collections": "^10.0",
+        "illuminate/collections": "^10.0|^11.0",
         "guzzlehttp/guzzle": "^7.6"
     },
     "require-dev": {

diff --git a/src/ServiceProviders/ServiceCanadaPost/ServiceCanadaPost.php b/src/ServiceProviders/ServiceCanadaPost/ServiceCanadaPost.php
@@ -233,6 +233,8 @@ public function ship(ShipFrom $shipFrom, ShipTo $shipTo, BoxCollection $boxes, S
 
         $results = new ServiceProviderShipmentCollection();
 
+        $group = time();
+
         /** @var BoxInterface $box */
         foreach ($boxes as $box) {
             // The weight of the parcel in kilograms. (99.999)
@@ -245,7 +247,7 @@ public function ship(ShipFrom $shipFrom, ShipTo $shipTo, BoxCollection $boxes, S
             rsort($dimensions, SORT_NUMERIC);
 
             $body = [
-                'group-id' => 'grp1',
+                'group-id' => $group,
                 'requested-shipping-point' => $shipFrom->address()->postalCode(),
                 'cpc-pickup-indicator' => true,
                 'expected-mailing-date' => $shipFrom->shipDate()->format('Y-m-d'),

diff --git a/src/ServiceProviders/ServiceFedEx/ServiceFedEx.php b/src/ServiceProviders/ServiceFedEx/ServiceFedEx.php
@@ -254,6 +254,10 @@ public function rate(Address $addressFrom, Address $addressTo, BoxCollection $bo
                 default => $e,
             };
         } catch (Exception $e) {
+            if (str_contains($e->getMessage(), 'credentials were not valid')) {
+                throw new InvalidCredentials('Invalid ' . self::NAME . ' credentials');
+            }
+
             throw $e;
         }
 
@@ -328,8 +332,8 @@ public function ship(ShipFrom $shipFrom, ShipTo $shipTo, BoxCollection $boxes, S
                 "shipper" => [
                     "contact" => [
                         "personName" => $shipFrom->name(),
-                        "phoneNumber" => $shipFrom->phone(),
-                        "phoneExtension" => $shipFrom->phone()->extension(),
+                        "phoneNumber" => $shipFrom->phone() . '',
+                        "phoneExtension" => $shipFrom->phone()->extension() . '',
                         "emailAddress" => $shipFrom->email(),
                         "company" => $shipFrom->company(),
                     ],
@@ -348,7 +352,7 @@ public function ship(ShipFrom $shipFrom, ShipTo $shipTo, BoxCollection $boxes, S
                     [
                         "contact" => [
                             "personName" => $shipTo->name(),
-                            "phoneNumber" => $shipTo->phone(),
+                            "phoneNumber" => $shipTo->phone() . '',
                             "emailAddress" => $shipFrom->email(),
                             "company" => $shipFrom->company(),
                         ],

diff --git a/src/ServiceProviders/ServiceFlat/ServiceFlat.php b/src/ServiceProviders/ServiceFlat/ServiceFlat.php
@@ -16,6 +16,7 @@
 use Mitrik\Shipping\ServiceProviders\ServiceProviderRate\ServiceProviderRateCollection;
 use Mitrik\Shipping\ServiceProviders\ServiceProviderService\ServiceProviderService;
 use Mitrik\Shipping\ServiceProviders\ServiceProviderShipment\ServiceProviderShipmentCollection;
+use Mitrik\Shipping\ServiceProviders\ServiceProviderShipment\ServiceProviderShipmentCustomsValue;
 use Mitrik\Shipping\ServiceProviders\ShipFrom\ShipFrom;
 use Mitrik\Shipping\ServiceProviders\ShipTo\ShipTo;
 
@@ -149,7 +150,7 @@ public function rate(Address $addressFrom, Address $addressTo, BoxCollection $bo
         return $results;
     }
 
-    public function ship(ShipFrom $shipFrom, ShipTo $shipTo, BoxCollection $boxes, ServiceProviderService $serviceProviderService): ServiceProviderShipmentCollection
+    public function ship(ShipFrom $shipFrom, ShipTo $shipTo, BoxCollection $boxes, ServiceProviderService $serviceProviderService, ServiceProviderShipmentCustomsValue|null $serviceProviderShipmentCustomsValue = null, $customData = []): ServiceProviderShipmentCollection
     {
         throw new \Exception('Not implemented yet.');
     }