From 66c37bb59fbd999d70cfacb58e85e4b36b2a2f07 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:41:39 +0100 Subject: [PATCH] fix: LetMeShip error handling --- .../doctype/letmeship/letmeship.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/erpnext_shipping/erpnext_shipping/doctype/letmeship/letmeship.py b/erpnext_shipping/erpnext_shipping/doctype/letmeship/letmeship.py index 2b02b0d..f350696 100644 --- a/erpnext_shipping/erpnext_shipping/doctype/letmeship/letmeship.py +++ b/erpnext_shipping/erpnext_shipping/doctype/letmeship/letmeship.py @@ -68,23 +68,23 @@ def get_available_services( pickup_date=pickup_date, ) try: - available_services = [] response_data = requests.post( url=url, auth=(self.api_id, self.api_password), headers=headers, data=json.dumps(payload) ) response_data = json.loads(response_data.text) - if "serviceList" in response_data: + if "status" in response_data and response_data["status"]["code"] != 0: + frappe.throw( + _("An Error occurred while fetching LetMeShip prices:\n{0}").format( + json.dumps(response_data["status"], indent=4) + ) + ) + if "serviceList" in response_data and response_data["serviceList"]: + available_services = [] for response in response_data["serviceList"]: available_service = self.get_service_dict(response) available_services.append(available_service) return available_services - else: - frappe.throw( - _("An Error occurred while fetching LetMeShip prices: {0}").format( - response_data["message"] - ) - ) except Exception: show_error_alert("fetching LetMeShip prices")