From f01bd29068debdc1793a1e7620541ff8860dfe0c Mon Sep 17 00:00:00 2001
From: Matthew Pritchard <matthew.pritchard@diamond.ac.uk>
Date: Wed, 22 Nov 2023 12:53:36 +0000
Subject: [PATCH] LIMS-1125: Pass shipping error status back from backend

---
 api/src/Page/Shipment.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/src/Page/Shipment.php b/api/src/Page/Shipment.php
index 73b47f61f..ca95ef552 100644
--- a/api/src/Page/Shipment.php
+++ b/api/src/Page/Shipment.php
@@ -2895,7 +2895,12 @@ function _create_awb()
 
                 $ship['DELIVERYAGENT_FLIGHTCODE'] = $awb['awb'];
             } catch (\Exception $e) {
-                $this->_error($e->getMessage());
+                if (Utils::getValueOrDefault($use_shipping_service_incoming_shipments) && $accno === $dhl_acc){
+                    $error_response = json_decode($e->getMessage());
+                    $this->_error($error_response->content->detail, $error_response->status);
+                } else {
+                    $this->_error($e->getMessage());
+                }
             }
         }
         $pickup = null;