package filters in a large package list, RT#39822

3 files changed, 74 insertions, 28 deletions

diff --git a/httemplate/elements/select-cust_location.html b/httemplate/elements/select-cust_location.html
new file mode 100644
index 000000000..29563c50e
--- /dev/null
+++ b/httemplate/elements/select-cust_location.html
@@ -0,0 +1,65 @@
+<SELECT NAME     = "locationnum"
+        ID       = "locationnum"
+%     if ( $opt{onchange} ) {
+        onchange = "<% $opt{onchange} %>"
+%     }
+    >
+
+% #false laziness w/select-table.html
+% my @pre_options  = $opt{pre_options}  ? @{ $opt{pre_options} } : ();
+% while ( @pre_options ) { 
+%   my $pre_opt   = shift(@pre_options);
+%   my $pre_label = shift(@pre_options);
+%   my $selected = #$opt{'all_selected'}
+%                  # || ( ref($locationnum) && $locationnum->{$pre_opt} )
+%                  # ||
+%                       ( $locationnum eq $pre_opt );
+    <OPTION VALUE="<% $pre_opt %>"
+            <% $selected ? 'SELECTED' : '' %>
+    ><% $pre_label %>
+% } 
+
+% if ( $cust_main ) {
+%   my $selected = ( $locationnum == $cust_main->ship_locationnum );
+    <OPTION VALUE="<% $cust_main->ship_locationnum %>"
+            <% $selected ? 'SELECTED' : '' %>
+    ><% $opt{'empty_label'} || '(default service address)' |h %>
+% }
+
+% if ( $opt{'is_optional'} ) {
+  <OPTION VALUE="-2" <% $locationnum == -2 ? 'SELECTED' : ''%>><% $opt{'optional_label'} || '(not required)' |h %>
+% }
+
+% foreach my $loc ( @{ $opt{cust_location} } ) {
+%   # don't show the ship_location redundantly
+%   next if $cust_main && $cust_main->ship_locationnum == $loc->locationnum;
+    <OPTION VALUE="<% $loc->locationnum %>"
+            <% $locationnum == $loc->locationnum ? 'SELECTED' : '' %>
+    ><% $loc->line( cust_main      => $cust_main,
+                    countrydefault => $countrydefault,
+                  )
+     |h %>
+% }
+
+% if ( $addnew ) {
+    <OPTION VALUE="-1"
+            <% $locationnum == -1 ? 'SELECTED' : '' %>
+    >Add new location
+% }
+
+</SELECT>
+<%init>
+
+my $conf = new FS::Conf;
+my $countrydefault = $conf->config('countrydefault') || 'US';
+
+my %opt = @_;
+my $cust_main     = $opt{'cust_main'};
+my $locationnum   = $opt{'curr_value'};
+
+$opt{'cust_location'} ||= [ $cust_main ? $cust_main->cust_location : () ];
+
+my $addnew = exists($opt{addnew}) ? $opt{addnew}
+                                  : $cust_main ? 1 : ( $locationnum>0 ? 0 : 1 );
+
+</%init>
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index d7ec015f3..6fb6b388b 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -159,7 +159,7 @@ my $key = $opt{'value_col'} || $dbdef_table->primary_key;
 
 my $name_col = $opt{'name_col'};
 
-my $value = $opt{'curr_value'} || $opt{'value'};
+my $value = exists($opt{'curr_value'}) ? $opt{'curr_value'} : $opt{'value'};
 $value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
 
 #my $addl_from = $opt{'addl_from'} || '';
diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 7a5b43bb8..3078f2cbe 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -183,33 +183,14 @@ Example:
 <TR>
   <<%$th%> ALIGN="right"><% $opt{'label'} || emt('Service location') %></<%$th%>>
   <TD COLSPAN=7>
-    <SELECT NAME     = "locationnum"
-            ID       = "locationnum"
-            onchange = "locationnum_changed(this);"
-    >
-% if ( $cust_main ) {
-      <OPTION VALUE="<% $cust_main->ship_locationnum %>"><% $opt{'empty_label'} || '(default service address)' |h %>
-% }
-% if ( $opt{'is_optional'} ) {
-    <OPTION VALUE="-2" <% $locationnum == -2 ? 'SELECTED' : ''%>><% $opt{'optional_label'} || '(not required)' |h %>
-% }
-%
-%     foreach my $loc ( @cust_location ) {
-%       # don't show the ship_location redundantly
-%       next if $cust_main && $cust_main->ship_locationnum == $loc->locationnum;
-        <OPTION VALUE="<% $loc->locationnum %>"
-                <% $locationnum == $loc->locationnum ? 'SELECTED' : '' %>
-        ><% $loc->line( cust_main      => $cust_main,
-                        countrydefault => $countrydefault,
-                      )
-         |h %>
-%     }
-%     if ( $addnew ) {
-        <OPTION VALUE="-1"
-                <% $locationnum == -1 ? 'SELECTED' : '' %>
-        >Add new location
-%     }
-    </SELECT>
+
+    <& /elements/select-cust_location.html,
+         %opt,
+         'curr_value'    => $locationnum,
+         'cust_location' => \@cust_location,
+         'onchange'      => 'locationnum_changed(this);',
+    &>
+
   </TD>
 </TR>