From d59a03f096f3e469d14a607b6ae2d4df89c6d660 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jmcameron@gmail.com>
Date: Mon, 25 Apr 2022 12:24:37 +0200
Subject: [PATCH] Disable shipment select drop-down if there are no shipments
 available

---
 client/src/i18n/en/shipment.json                              | 4 ++--
 .../src/js/components/bhShipmentSelect/bhShipmentSelect.html  | 2 +-
 client/src/js/components/bhShipmentSelect/bhShipmentSelect.js | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/src/i18n/en/shipment.json b/client/src/i18n/en/shipment.json
index ccf35c1094..dc56653754 100644
--- a/client/src/i18n/en/shipment.json
+++ b/client/src/i18n/en/shipment.json
@@ -15,8 +15,8 @@
     "DELETED": "Shipment successfully deleted",
     "DELIVERY_EXPECTED_ON": "Delivery expected on",
     "DESTINATION_DEPOT": "Destination depot",
-    "DOES_SHIPMENT_EXIST": "Do you have a ready shipment?",
-    "DOES_SHIPMENT_EXIST_HELP": "Please provide the reference of a ready shipment",
+    "DOES_SHIPMENT_EXIST": "Do you have a shipment ready?",
+    "DOES_SHIPMENT_EXIST_HELP": "Please provide the reference of a shipment that is ready to ship.",
     "EDIT": "Edit",
     "ENTER_SHIPMENT_PROGRESS": "Please enter the shipment progress status",
     "ENTER_SHIPMENT_PROGRESS_HELP_TEXT": "Ex. RECEPTION - IMA GOMA WAREHOUSE, GOMA",
diff --git a/client/src/js/components/bhShipmentSelect/bhShipmentSelect.html b/client/src/js/components/bhShipmentSelect/bhShipmentSelect.html
index f16057e6d8..7733a34718 100644
--- a/client/src/js/components/bhShipmentSelect/bhShipmentSelect.html
+++ b/client/src/js/components/bhShipmentSelect/bhShipmentSelect.html
@@ -11,7 +11,7 @@
     <ui-select name="shipment_uuid"
       ng-required ="$ctrl.required"
       ng-model="$ctrl.shipmentUuid"
-      ng-disabled="$ctrl.disabled"
+      ng-disabled="$ctrl.shipments.length === 0"
       on-select="$ctrl.onSelect($item, $model)">
       <ui-select-match placeholder="{{ 'FORM.SELECT.REFERENCE_SHIPMENT' | translate }}"><span>{{$select.selected.reference}}</span></ui-select-match>
       <ui-select-choices ui-select-focus-patch repeat="shipment.uuid as shipment in $ctrl.shipments | filter: { 'reference': $select.search }">
diff --git a/client/src/js/components/bhShipmentSelect/bhShipmentSelect.js b/client/src/js/components/bhShipmentSelect/bhShipmentSelect.js
index 0a6ac97206..746a9e7303 100644
--- a/client/src/js/components/bhShipmentSelect/bhShipmentSelect.js
+++ b/client/src/js/components/bhShipmentSelect/bhShipmentSelect.js
@@ -10,7 +10,6 @@ angular.module('bhima.components')
       required : '@?',
       ready : '@?',
       label : '@?',
-      disabled : '<?',
     },
   });