User shipping service if using facility account number

DiamondLightSource · Aug 14, 2023 · 3133f7e · 3133f7e
1 parent 508addd
commit 3133f7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/api/src/Database/DatabaseFactory.php b/api/src/Database/DatabaseFactory.php
@@ -31,17 +31,17 @@ public function get($databaseType = null)
 
         if (!$databaseType) {
             error_log('Database type variable, dbtype, is not specified in config.php - defaulting to MySql.');
-            $database_type = 'MySQL';
+            $databaseType = 'MySQL';
         }
 
         // Determine fully-qualified class name of database class corresponding to $database_type.
         if (key_exists(strtolower($databaseType), $this->database_types)) {
-            $dbType = $this->database_types[strtolower($databaseType)];
+            $selectedDBConfig = $this->database_types[strtolower($databaseType)];
 
-            $full_class_name = 'SynchWeb\\Database\\Type\\' . $dbType["dbClassName"];
+            $full_class_name = 'SynchWeb\\Database\\Type\\' . $selectedDBConfig["dbClassName"];
 
             if (class_exists($full_class_name)) {
-                $conn = $this->databaseConnectionFactory->get($dbType["dataConnectionName"]);
+                $conn = $this->databaseConnectionFactory->get($selectedDBConfig["dataConnectionName"]);
                 return new $full_class_name($conn);
             }
             else {

diff --git a/api/src/Page/Shipment.php b/api/src/Page/Shipment.php
@@ -2822,10 +2822,11 @@ function _create_awb()
         $awb = null;
         if (!$ship['DELIVERYAGENT_FLIGHTCODE']) {
             try {
-                if (Utils::getValueOrDefault($use_shipping_service_incoming_shipments)) {
+                if (Utils::getValueOrDefault($use_shipping_service_incoming_shipments) && $accno === $dhl_acc) {
                     $journey_type = $this->has_arg('RETURN') ? ShippingService::JOURNEY_FROM_FACILITY : ShippingService::JOURNEY_TO_FACILITY;
                     $awb = $this->_book_shipment_in_shipping_service($user, $ship, $dewars, $journey_type);
                 } else {
+                    error_log("Not using shipping service for: {$ship['SHIPPINGID']}");
                     $awb = $this->dhl->create_awb(array(
                         'payee' => $payee,
                         'accountnumber' => $accno,