[freeside-commits] branch master updated. ec7e8155fce544f19f2b6734476ed6db8c200aa9

[Alex Brelsfoard]

The branch, master has been updated
       via  ec7e8155fce544f19f2b6734476ed6db8c200aa9 (commit)
       via  d422d2530bda9de3af830f1e1ab1084061b486f5 (commit)
      from  0238fd7aa7a92887970507346ac7e6ad8ed5492c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec7e8155fce544f19f2b6734476ed6db8c200aa9
Merge: d422d25 0238fd7
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Tue Feb 10 00:11:07 2015 -0500

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit d422d2530bda9de3af830f1e1ab1084061b486f5
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Tue Feb 10 00:10:00 2015 -0500

    RT #29285 adding new config to disable city requirement

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 029f1a1..9ba3f09 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3352,6 +3352,14 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'city_not_required',
+    'section'     => 'required',
+    'description' => 'Turn off requirement for a City to be entered for billing & shipping addresses',
+    'type'        => 'checkbox',
+    'per_agent'   => 1,
+  },
+
+  {
     'key'         => 'echeck-void',
     'section'     => 'deprecated',
     'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 214a7d5..357a91d 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -169,10 +169,15 @@ Example:
 
 
 <TR>
+% if ($conf->exists('city_not_required')) {
+<input type="hidden" name="<% ($select_hash{'prefix'}) ? $select_hash{'prefix'} : '' %>city" value=" "/>
+%} else {
   <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %></<%$th%>>
   <TD WIDTH="1"><% include('/elements/city.html', %select_hash, 'text_style' => \@style ) %></TD>
+
   <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
   <TD WIDTH="1"><% include('/elements/select-county.html', %select_hash ) %></TD>
+% }
   <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %></<%$th%>>
   <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm                     |    8 ++++++++
 httemplate/elements/location.html |    5 +++++
 2 files changed, 13 insertions(+)