projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clarify docs on bandwidth.com account and site numbers, #39914
[freeside.git]
/
httemplate
/
elements
/
select-terms.html
diff --git
a/httemplate/elements/select-terms.html
b/httemplate/elements/select-terms.html
index
629d1e4
..
a330df1
100644
(file)
--- a/
httemplate/elements/select-terms.html
+++ b/
httemplate/elements/select-terms.html
@@
-2,7
+2,18
@@
ID = "invoice_terms"
<% $opt{'disabled'} ? 'DISABLED' : ''%>
>
ID = "invoice_terms"
<% $opt{'disabled'} ? 'DISABLED' : ''%>
>
- <OPTION VALUE=""><% $empty_label %>
+# #false laziness w/select-table.html
+% while ( @pre_options ) {
+% my $pre_opt = shift(@pre_options);
+% my $pre_label = shift(@pre_options);
+% my $selected = # ( ref($value) && $value->{$pre_opt} ) ||
+% ( $curr_value eq $pre_opt );
+ <OPTION VALUE="<% $pre_opt %>"
+ <% $selected ? 'SELECTED' : '' %>
+ ><% $pre_label %>
+% }
+
+ <OPTION VALUE="<% $empty_value %>"><% $empty_label %>
% foreach my $term ( @terms ) {
<OPTION VALUE="<% $term %>" <% $curr_value eq $term ? ' SELECTED' : '' %>><% $term %>
% }
% foreach my $term ( @terms ) {
<OPTION VALUE="<% $term %>" <% $curr_value eq $term ? ' SELECTED' : '' %>><% $term %>
% }
@@
-15,12
+26,19
@@
my $conf = new FS::Conf;
my $empty_label =
$opt{'empty_label'}
my $empty_label =
$opt{'empty_label'}
- || 'Default ('.
- ($conf->config('invoice_default_terms') || 'Payable upon receipt').
- ')';
+ || emt('Default').' ('.
+ ( $conf->config('invoice_default_terms', $opt{'agentnum'})
+ || emt('Payable upon receipt')
+ ).
+ ')';
+
+my $empty_value = $opt{'empty_value'} || '';
-my @terms = ( 'Payable upon receipt',
- ( map "Net $_", 0, 10, 15, 20, 30, 45, 60 ),
+my @terms = ( emt('Payable upon receipt'),
+ ( map "Net $_",
+ 0, 3, 5, 7, 9, 10, 14, 15, 18, 20, 21, 25, 30, 45, 60, 90 ),
);
);
+my @pre_options = $opt{pre_options} ? @{ $opt{pre_options} } : ();
+
</%init>
</%init>