Skip to content

Commit e333436

Browse files
committed
chore: debug and consolidate eshipper shipment cancellation with live tests
1 parent 5a40c51 commit e333436

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎modules/connectors/eshipper/karrio/mappers/eshipper/proxy.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def create_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
3737
return lib.Deserializable(response, lib.to_dict)
3838

3939
def cancel_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
40+
print(self.settings.access_token)
4041
response = lib.request(
4142
url=f"{self.settings.server_url}/api/v2/ship/cancel",
4243
data=lib.to_json(request.serialize()),

‎modules/connectors/eshipper/karrio/providers/eshipper/shipment/cancel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def parse_shipment_cancel_response(
1313
) -> typing.Tuple[models.ConfirmationDetails, typing.List[models.Message]]:
1414
response = _response.deserialize()
1515
messages = error.parse_error_response(response, settings)
16-
success = len(response.get("order")) > 0
16+
success = not any(messages)
1717

1818
confirmation = (
1919
models.ConfirmationDetails(

‎modules/core/karrio/server/core/dataunits.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,15 @@ def _get_generic_carriers():
9292
]
9393

9494
extra_carriers = {
95-
f"{c.credentials.get('custom_carrier_name') or "generic"}": c.display_name for c in custom_carriers
95+
f"{c.credentials.get('custom_carrier_name') or 'generic'}": c.display_name
96+
for c in custom_carriers
9697
}
9798
system_carriers = {
98-
f"{c.credentials.get('custom_carrier_name') or "generic"}": c.display_name
99+
f"{c.credentials.get('custom_carrier_name') or 'generic'}": c.display_name
99100
for c in system_custom_carriers
100101
}
101102
extra_services = {
102-
f"{c.credentials.get('custom_carrier_name') or "generic"}": {
103+
f"{c.credentials.get('custom_carrier_name') or 'generic'}": {
103104
s.service_code: s.service_code for s in c.services.all()
104105
}
105106
for c in custom_carriers

‎modules/graph/karrio/server/graph/tests/test_carrier_connections.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ def test_update_user_connection(self):
211211
"customer_number": "2004381_updated",
212212
"password": "0bfa9fcb9853d1f51ee57a_updated",
213213
"username": "6e93d53968881714_updated",
214-
"language": "en",
215214
},
216215
}
217216
}

0 commit comments

Comments
 (0)