fix(return): fix/return shipments (#1016)

* fix(ups): set ShipFrom to customer address for return shipments

* fix(fedex): set origin to customer address for return shipments

* fix(ups): swap shipper/recipient in rate request for return shipments

* fix(fedex): swap shipper/recipient in rate request for return shipments

Author: Ansh-Dev-Nagar

modules/connectors/fedex/karrio/providers/fedex/rate.py

@@ -92,8 +92,9 @@ def rate_request(
     payload: models.RateRequest,
     settings: provider_utils.Settings,
 ) -> lib.Serializable:
-    shipper = lib.to_address(payload.shipper)
-    recipient = lib.to_address(payload.recipient)
+    is_return = (payload.options or {}).get("is_return", False)
+    shipper = lib.to_address(payload.recipient if is_return else payload.shipper)
+    recipient = lib.to_address(payload.shipper if is_return else payload.recipient)
     service = lib.to_services(payload.services, provider_units.ShippingService).first
     options = lib.to_shipping_options(
         payload.options,
@@ -114,11 +115,11 @@ def rate_request(
     default_currency = lib.identity(
         options.currency.state
         or settings.default_currency
-        or units.CountryCurrency.map(payload.shipper.country_code).value
+        or units.CountryCurrency.map(shipper.country_code).value
         or "USD"
     )
     weight_unit, dim_unit = lib.identity(
-        provider_units.COUNTRY_PREFERED_UNITS.get(payload.shipper.country_code)
+        provider_units.COUNTRY_PREFERED_UNITS.get(shipper.country_code)
         or packages.compatible_units
     )
     request_types = lib.identity(
@@ -149,8 +150,8 @@ def rate_request(
 
     customs = lib.to_customs_info(
         payload.customs,
-        shipper=payload.shipper,
-        recipient=payload.recipient,
+        shipper=(payload.recipient if is_return else payload.shipper),
+        recipient=(payload.shipper if is_return else payload.recipient),
         weight_unit=weight_unit.value,
     )
     commodities = lib.identity(

modules/connectors/fedex/karrio/providers/fedex/shipment/return_shipment.py

@@ -31,6 +31,13 @@ def return_shipment_request(
     }
 
     return create.shipment_request(
-        models.ShipmentRequest(**{**lib.to_dict(payload), "options": options}),
+        models.ShipmentRequest(
+            **{
+                **lib.to_dict(payload),
+                "options": options,
+                # origin should be the customer (shipper after SDK swap), not the merchant
+                "return_address": lib.to_dict(payload.shipper),
+            }
+        ),
         settings,
     )

modules/connectors/ups/karrio/providers/ups/rate.py

@@ -106,9 +106,10 @@ def rate_request(
     payload: models.RateRequest,
     settings: provider_utils.Settings,
 ) -> lib.Serializable:
-    shipper = lib.to_address(payload.shipper)
-    recipient = lib.to_address(payload.recipient)
-    return_address = lib.to_address(payload.return_address or payload.shipper)
+    is_return = (payload.options or {}).get("is_return", False)
+    shipper = lib.to_address(payload.recipient if is_return else payload.shipper)
+    recipient = lib.to_address(payload.shipper if is_return else payload.recipient)
+    return_address = lib.to_address(payload.return_address or shipper)
     packages = lib.to_packages(payload.parcels, provider_units.PackagePresets)
     is_document = all([parcel.is_document for parcel in payload.parcels])
     service = lib.to_services(payload.services, provider_units.ServiceCode).first
@@ -122,8 +123,8 @@ def rate_request(
     currency = options.currency.state or settings.default_currency
     customs = lib.to_customs_info(
         payload.customs,
-        shipper=payload.shipper,
-        recipient=payload.recipient,
+        shipper=(payload.recipient if is_return else payload.shipper),
+        recipient=(payload.shipper if is_return else payload.recipient),
         weight_unit=packages.weight_unit,
     )
     declared_value = (
@@ -135,7 +136,7 @@ def rate_request(
         provider_units.PackagingType.ups_unknown.value if len(packages) > 1 else None
     )
     weight_unit, dim_unit = lib.identity(
-        provider_units.COUNTRY_PREFERED_UNITS.get(payload.shipper.country_code)
+        provider_units.COUNTRY_PREFERED_UNITS.get(shipper.country_code)
         or packages.compatible_units
     )
     indications = [

modules/connectors/ups/karrio/providers/ups/shipment/return_shipment.py

@@ -34,6 +34,13 @@ def return_shipment_request(
     }
 
     return create.shipment_request(
-        models.ShipmentRequest(**{**lib.to_dict(payload), "options": options}),
+        models.ShipmentRequest(
+            **{
+                **lib.to_dict(payload),
+                "options": options,
+                # ShipFrom should be the customer (shipper after SDK swap), not the merchant
+                "return_address": lib.to_dict(payload.shipper),
+            }
+        ),
         settings,
     )