ULIMS-50: Shipping service incoming shipment redirect

api/assets/emails/html/dewar-dispatch-lite.html

@@ -0,0 +1,30 @@
+<h1 style="font-size: 16px; font-weight: normal; border-bottom: 1px solid #000; margin: 1%; margin-bottom: 1.5%">Dewar ready to leave diamond</h1>
+
+<div class="inset" style="margin: 1%; padding: 1%; margin-bottom: 2%; border-radius: 5px; background: #82d180">
+	Goods Handling, please arrange dispatch of the following Dewar.
+</div>
+
+<table class="details" style="background: #f4f4f4; margin: 1%">
+	<tbody>
+		<tr>
+			<td style="padding: 1.5%; font-weight: bold">Proposal</td>
+			<td><?php echo $data['prop'] ?></td>
+		</tr>
+		<tr>
+			<td style="padding: 1.5%; font-weight: bold">Air Waybill</td>
+			<td><a href="<?php echo $data['AWBURL']; ?>"><?php echo $data['AWBURL']; ?></a></td>
+		</tr>
+		<tr>
+			<td style="padding: 1.5%; font-weight: bold">Dewar Facility Code</td>
+			<td><?php echo $data['FACILITYCODE'] ?></td>
+		</tr>
+		<tr>
+			<td style="padding: 1.5%; font-weight: bold">Dewar Barcode</td>
+			<td><?php echo $data['BARCODE'] ?></td>
+		</tr>
+		<tr>
+			<td style="padding: 1.5%; font-weight: bold">Current Location</td>
+			<td><?php echo $data['LOCATION'] ?></td>
+		</tr>
+	</tbody>
+</table>

api/config_sample.php

@@ -264,6 +264,8 @@
     # Shipping service details
     $use_shipping_service = null;
     $use_shipping_service_incoming_shipments = null;
+    $use_shipping_service_redirect = null;
+    $use_shipping_service_redirect_incoming_shipments = null;
     $shipping_service_api_url = null;
     $shipping_service_api_user = null;
     $shipping_service_api_password = null;

api/index.php

@@ -70,7 +70,8 @@ function setupApplication($mode): Slim
         global $motd, $authentication_type, $cas_url, $cas_sso, $sso_url, $package_description,
             $facility_courier_countries, $facility_courier_countries_nde,
             $dhl_enable, $dhl_link, $scale_grid, $scale_grid_end_date, $preset_proposal, $timezone,
-            $valid_components, $enabled_container_types, $ifsummary, $synchweb_version;
+            $valid_components, $enabled_container_types, $ifsummary, $synchweb_version, $shipping_service_app_url,
+            $use_shipping_service_redirect, $use_shipping_service_redirect_incoming_shipments;
         $app->contentType('application/json');
         $options = $app->container['options'];
         $app->response()->body(json_encode(array(
@@ -91,7 +92,9 @@ function setupApplication($mode): Slim
             'valid_components' => $valid_components,
             'enabled_container_types' => $enabled_container_types,
             'ifsummary' => $ifsummary,
-            'synchweb_version' => $synchweb_version
+            'synchweb_version' => $synchweb_version,
+            'shipping_service_app_url' => $use_shipping_service_redirect ? $shipping_service_app_url : null,
+            'shipping_service_app_url_incoming' => $use_shipping_service_redirect_incoming_shipments ? $shipping_service_app_url : null,
         )));
     });
     return $app;

api/src/Shipment/ShippingService.php

@@ -83,9 +83,16 @@ function _send_request($url, $type, $data, $expected_status_code)
                 break;
         }
         $response = json_decode(curl_exec($ch), TRUE);
-        $status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); // Will be 0 if request itself fails
         curl_close($ch);
         if ($status_code != $expected_status_code) {
+            error_log(
+                "Shipping service unexpected status code." . PHP_EOL .
+                "Request: $type $url" . PHP_EOL .
+                "Status code: $status_code" . PHP_EOL .
+                "Response: $response" . PHP_EOL .
+                "Request data:" . json_encode($data)
+            );
             throw new \Exception(json_encode(array('status' => $status_code, 'content' => $response)));
         }
         return $response;
@@ -151,4 +158,14 @@ function get_awb_pdf_url($shipment_id)
     {
         return $this->shipping_app_url . '/shipments/' . $shipment_id . '/awb';
     }
+
+    function create_shipment_request($shipment_request_data)
+    {
+        return $this->_send_request(
+            $this->shipping_api_url . '/shipment_requests/',
+            "POST",
+            $shipment_request_data,
+            201
+        );
+    }
 }

client/src/js/modules/shipment/models/dispatch.js

@@ -16,7 +16,9 @@ define(['backbone'], function(Backbone) {
         },
 
         VISIT: {
-            required: true,
+            required: function() {
+                return this.visitRequired
+            },
             pattern: 'visit',
         },
 
@@ -28,17 +30,17 @@ define(['backbone'], function(Backbone) {
 
 
         GIVENNAME: {
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
             pattern: 'wwdash',
         },
 
         FAMILYNAME: {
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
             pattern: 'wwdash',
         },
 
         PHONENUMBER: {
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
         },
 
         EMAILADDRESS: {
@@ -47,26 +49,26 @@ define(['backbone'], function(Backbone) {
         },
 
         LABNAME: {
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
             pattern: 'wwsdash',
         },
 
         ADDRESS: {
-            required: true
+            required: function () {return this.dispatchDetailsRequired}
         },
 
         CITY: {
-            required: true
+            required: function () {return this.dispatchDetailsRequired}
         },
 
         POSTCODE: {
             required: function() {
-                return this.postCodeRequired
+                return this.postCodeRequired && this.dispatchDetailsRequired
             }
         },
 
         COUNTRY: {
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
             pattern: 'country',
             fn: function (value, attr, state) {
                 if (value === null) {
@@ -77,12 +79,12 @@ define(['backbone'], function(Backbone) {
 
 
         DESCRIPTION: {
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
         },
 
         DELIVERYAGENT_SHIPPINGDATE: {
             pattern: 'edate',
-            required: true,
+            required: function () {return this.dispatchDetailsRequired},
         },
 
 
@@ -106,8 +108,10 @@ define(['backbone'], function(Backbone) {
 
     },
 
+    dispatchDetailsRequired: true,
     courierDetailsRequired: false, // We want to set this default to false unless 'DELIVERYAGENT_AGENTCODE' has a value in the shipment model
     postCodeRequired: false,
+    visitRequired: true,
   })
 
 })