From 5b331febe5b8a0f1fe18082a09b77b0e4795dea3 Mon Sep 17 00:00:00 2001
From: Josh Stompro <stomproj@larl.org>
Date: Tue, 30 Jan 2018 14:03:33 -0600
Subject: [PATCH] LP#1746098 - Hide SMS Carrier - Catalog hold request

Hide the SMS Carier select box if sms.hide_carrier is enabled.
Send either the default sms_carrier id or the first one in
the hash since one is required to be set.

Signed-off-by: Josh Stompro <stomproj@larl.org>
---
 .../templates/opac/parts/sms_carrier_selector.tt2  | 30 ++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2 b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
index 0a6d5a9371..1f04647fd3 100644
--- a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
@@ -17,13 +17,23 @@
         });
     END;
 %]
-[% IF NOT sms_carrier_hide_label; l('Mobile carrier:'); END; %]
-<select name="sms_carrier">
-    <option value="">[% l('Please select your mobile carrier') %]</option>
-    [% FOR carrier IN carriers.sort('name','region') -%]
-    <option value='[% carrier.id | html %]'[%
-        default_carrier == carrier.id ? ' selected="selected"' : ''
-    %]>[% carrier.name | html %] ([% carrier.region | html %])</option>
-    [% END -%]
-</select>
-[% IF NOT sms_carrier_hide_warning; l('Note: carrier charges may apply'); END; %]
+[% IF ctx.get_org_setting(ctx.search_ou, 'sms.hide_carrier') != 1 %]
+    [% IF NOT sms_carrier_hide_label; l('Mobile carrier:'); END; %]
+    <select name="sms_carrier">
+        <option value="">[% l('Please select your mobile carrier') %]</option>
+        [% FOR carrier IN carriers.sort('name','region') -%]
+        <option value='[% carrier.id | html %]'[%
+            default_carrier == carrier.id ? ' selected="selected"' : ''
+        %]>[% carrier.name | html %] ([% carrier.region | html %])</option>
+       [% END -%]
+    </select>
+    [% IF NOT sms_carrier_hide_warning; l('Note: carrier charges may apply'); END; %]
+[% ELSE #set a value for sms_carrier so the hold placement won't fail %]
+    [%  IF default_carrier; #use the default if set
+            dummy_carrier = default_carrier;
+        ELSE; #pick the first carrier
+            dummy_carrier = carriers.0.id;
+        END;
+    %]
+    <input type="hidden" name="sms_carrier" value="[% dummy_carrier %]">
+[% END %]
-- 
2.11.0