fix: Invalid eshipper packaging Unit

karrioapi · Aug 12, 2024 · c1ae6cb · c1ae6cb
1 parent d7071c1
commit c1ae6cb
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/modules/connectors/eshipper/karrio/providers/eshipper/rate.py b/modules/connectors/eshipper/karrio/providers/eshipper/rate.py
@@ -116,7 +116,7 @@ def rate_request(
             confirmDelivery=None,
             notifyRecipient=None,
         ),
-        packagingUnit="Imperial",
+        packagingUnit="Metric",
         packages=eshipper.PackagesType(
             type="Package",
             packages=[

diff --git a/modules/connectors/eshipper/karrio/providers/eshipper/shipment/create.py b/modules/connectors/eshipper/karrio/providers/eshipper/shipment/create.py
@@ -143,7 +143,7 @@ def shipment_request(
             confirmDelivery=None,
             notifyRecipient=None,
         ),
-        packagingUnit="Imperial",
+        packagingUnit="Metric",
         packages=eshipper.PackagesType(
             type="Package",
             quantity=len(packages),

diff --git a/modules/connectors/eshipper/tests/eshipper/test_rate.py b/modules/connectors/eshipper/tests/eshipper/test_rate.py
@@ -321,7 +321,7 @@ def test_parse_rate_response(self):
         "country": "CA",
     },
     "scheduledShipDate": "2024-07-16 00:00",
-    "packagingUnit": "Imperial",
+    "packagingUnit": "Metric",
     "packages": {
         "type": "Package",
         "packages": [

diff --git a/modules/connectors/eshipper/tests/eshipper/test_shipment.py b/modules/connectors/eshipper/tests/eshipper/test_shipment.py
@@ -182,7 +182,7 @@ def test_parse_cancel_shipment_response(self):
         "type": "Package",
         "weightUnit": "KG",
     },
-    "packagingUnit": "Imperial",
+    "packagingUnit": "Metric",
     "scheduledShipDate": "2024-07-16 00:00",
     "serviceId": "5000184",
     "from": {

diff --git a/modules/connectors/usps/karrio/providers/usps/rate.py b/modules/connectors/usps/karrio/providers/usps/rate.py
@@ -119,7 +119,9 @@ def rate_request(
                 package.options.shipment_date.state or time.strftime("%Y-%m-%d")
             ),
             accountType=settings.account_type or "EPS",
-            accountNumber=settings.account_number,
+            accountNumber=lib.identity(
+                settings.account_number or settings.connection_config.mailer_id.state
+            ),
             itemValue=lib.identity(
                 package.items.value_amount if len(package.items) > 0 else None
             ),

diff --git a/modules/connectors/usps/karrio/providers/usps/utils.py b/modules/connectors/usps/karrio/providers/usps/utils.py
@@ -83,5 +83,7 @@ def login(settings: Settings, client_id: str = None, client_secret: str = None):
 
 
 class ConnectionConfig(lib.Enum):
+    mailer_id = lib.OptionEnum("mailer_id")
+    customer_registration_id = lib.OptionEnum("customer_registration_id")
     shipping_options = lib.OptionEnum("shipping_options", list)
     shipping_services = lib.OptionEnum("shipping_services", list)
diff --git a/modules/connectors/usps_international/karrio/providers/usps_international/rate.py b/modules/connectors/usps_international/karrio/providers/usps_international/rate.py
@@ -108,7 +108,9 @@ def rate_request(
                 package.options.shipment_date.state or time.strftime("%Y-%m-%d")
             ),
             accountType=settings.account_type or "EPS",
-            accountNumber=settings.account_number,
+            accountNumber=lib.identity(
+                settings.account_number or settings.connection_config.mailer_id.state
+            ),
             itemValue=package.items.value_amount,
             extraServices=[
                 lib.to_int(_.code)

diff --git a/modules/connectors/usps_international/karrio/providers/usps_international/utils.py b/modules/connectors/usps_international/karrio/providers/usps_international/utils.py
@@ -83,5 +83,7 @@ def login(settings: Settings, client_id: str = None, client_secret: str = None):
 
 
 class ConnectionConfig(lib.Enum):
+    mailer_id = lib.OptionEnum("mailer_id")
+    customer_registration_id = lib.OptionEnum("customer_registration_id")
     shipping_options = lib.OptionEnum("shipping_options", list)
     shipping_services = lib.OptionEnum("shipping_services", list)