[freeside-commits] branch FREESIDE_4_BRANCH updated. e60961f67f140a46563d0b65a81a035aabf0bc86

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  e60961f67f140a46563d0b65a81a035aabf0bc86 (commit)
      from  8f3cc0805952046b0445c1c5e7aab414485d5a00 (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 e60961f67f140a46563d0b65a81a035aabf0bc86
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 15 10:17:39 2017 -0700

    cleanup

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 34ed78d..36ee7b6 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -2,24 +2,23 @@
 
 Example:
 
-  include('/elements/tr-select-cust_location.html',
-            'cgi'       => $cgi,
+  <& /elements/tr-select-cust_location.html,
+         'cgi'           => $cgi,
 
-            'cust_main'     => $cust_main,
-            #or
-            'prospect_main' => $prospect_main,
+         'cust_main'     => $cust_main,
+         #or
+         'prospect_main' => $prospect_main,
 
-            #optional
-            'empty_label'   => '(default service address)',
-         )
+         #optional
+         'empty_label'   => '(default service address)',
+  &>
 
 </%doc>
 
-<% include('/elements/xmlhttp.html',
-              'url'  => $p.'misc/location.cgi',
-              'subs' => [ 'get_location' ],
-           )
-%>
+<& /elements/xmlhttp.html,
+     'url'  => $p.'misc/location.cgi',
+     'subs' => [ 'get_location' ],
+&>
 
 <SCRIPT TYPE="text/javascript">
 
@@ -194,17 +193,16 @@ Example:
   </TD>
 </TR>
 
-<% include('/elements/location.html',
-             'object'       => $cust_location,
-             #'onchange' ?  probably not
-             'disabled'     => $disabled,
-             'no_asterisks' => 1,
-             'no_bold'      => $opt{'no_bold'},
-             'alt_format'   => $opt{'alt_format'},
-             'enable_coords'=> 1,
-             'enable_censustract' => 1,
-          )
-%>
+<& /elements/location.html,
+     'object'             => $cust_location,
+     #'onchange' ?  probably not
+     'disabled'           => $disabled,
+     'no_asterisks'       => 1,
+     'no_bold'            => $opt{'no_bold'},
+     'alt_format'         => $opt{'alt_format'},
+     'enable_coords'      => 1,
+     'enable_censustract' => 1,
+&>
 
 % unless ( $prospect_main ) {
   <SCRIPT TYPE="text/javascript">
@@ -292,7 +290,7 @@ push @cust_location, $cust_location
 @cust_location = sort $location_sort grep !$_->disabled, @cust_location;
 
 $cust_location = $cust_location[0]
-  if ( $prospect_main )
+  if $prospect_main
   && !$opt{'is_optional'}
   && @cust_location;
 

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

Summary of changes:
 httemplate/elements/tr-select-cust_location.html |   48 +++++++++++-----------
 1 file changed, 23 insertions(+), 25 deletions(-)