X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-discount.html;h=258eeb3496d6d056dbc7b1d360c17b26eebad1c9;hb=1318909d7eb16d736cbfb9f641eecccb00d4636c;hp=df221da9623813fb949b3f3e83324d8d643269b3;hpb=4cacb3fa439b56fc7c9a742b69ec3f6ffd660433;p=freeside.git
diff --git a/httemplate/elements/tr-select-discount.html b/httemplate/elements/tr-select-discount.html
index df221da96..258eeb349 100644
--- a/httemplate/elements/tr-select-discount.html
+++ b/httemplate/elements/tr-select-discount.html
@@ -6,11 +6,11 @@
% } else {
- <% $opt{'label'} || 'Discount' %> |
+ <% $opt{'label'} || 'Discount' %> |
>
<% include( '/elements/select-discount.html',
'curr_value' => $discountnum,
- 'onchange' => $name.'_changed',
+ 'onchange' => $onchange,
%opt,
)
%>
@@ -19,7 +19,7 @@
% # a weird kind of false laziness w/edit/discount.html
-
+% #
<% include( '/elements/tr-select.html',
@@ -27,18 +27,18 @@
'field' => $name. '__type',
'id' => $name. '__type',
'options' => \@_type_options,
- #XXX 'curr_value' =>
- 'onchange' => '_type_changed',
+ 'curr_value' => scalar($cgi->param($name.'__type')),
+ 'onchange' => $name.'__type_changed',
'colspan' => $opt{'colspan'},
)
%>
<% include( '/elements/tr-input-money.html',
- 'label' => 'Discount Amount',
+ 'label' => 'Discount Amount ',
'field' => $name. '_amount',
'id' => $name. '_amount',
'default' => '0.00',
- #XXX 'curr_value' =>
+ 'curr_value' => scalar($cgi->param($name.'_amount')),
'colspan' => $opt{'colspan'},
)
%>
@@ -48,18 +48,18 @@
'field' => $name. '_percent',
'id' => $name. '_percent',
'default' => '0',
- #XXX 'curr_value' =>
+ 'curr_value' => scalar($cgi->param($name.'_percent')),
'colspan' => $opt{'colspan'},
)
%>
<% include( '/elements/tr-input-text.html',
- 'label' => 'Discount # of Months',
+ 'label' => 'Discount duration (months)',
'field' => $name. '_months',
'id' => $name. '_months',
'size' => 2,
'postfix' => qq((blank for non-expiring discount)),
- #XXX 'curr_value' =>
+ 'curr_value' => scalar($cgi->param($name.'_months')),
'colspan' => $opt{'colspan'},
)
%>
@@ -93,14 +93,14 @@
% #XXX save visibility settings for amount, percent :/
<% $ge %>('<% $name %>_amount_label0').style.display = 'none';
<% $ge %>('<% $name %>_amount_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_amount').style.display = 'none';
- <% $ge %>('<% $name %>_amount').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_amount_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_amount_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_amount_input0').style.display = 'none';
<% $ge %>('<% $name %>_amount_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_percent_label0').style.display = 'none';
<% $ge %>('<% $name %>_percent_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_percent').style.display = 'none';
- <% $ge %>('<% $name %>_percent').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_percent_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_percent_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_percent_input0').style.display = 'none';
<% $ge %>('<% $name %>_percent_input0').style.visibility = 'hidden';
@@ -116,7 +116,7 @@
}
function <% $name %>__type_changed(what) {
- var _type = what.options[what.selectedIndex].value;
+ var <% $name %>__type = what.options[what.selectedIndex].value;
if ( <% $name %>__type == '<% $select %>' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = 'none';
@@ -130,31 +130,34 @@
} else if ( <% $name %>__type == 'Amount' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = '';
<% $ge %>('<% $name %>_amount_label0').style.visibility = '';
- <% $ge %>('<% $name %>_amount').style.display = '';
- <% $ge %>('<% $name %>_amount').style.visibility = '';
+ <% $ge %>('<% $name %>_amount_input0').style.display = '';
+ <% $ge %>('<% $name %>_amount_input0').style.visibility = '';
<% $ge %>('<% $name %>_percent_label0').style.display = 'none';
<% $ge %>('<% $name %>_percent_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_percent').style.display = 'none';
- <% $ge %>('<% $name %>_percent').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_percent_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_percent_input0').style.visibility = 'hidden';
} else if ( <% $name %>__type == 'Percentage' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = 'none';
<% $ge %>('<% $name %>_amount_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_amount').style.display = 'none';
- <% $ge %>('<% $name %>_amount').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_amount_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_amount_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_percent_label0').style.display = '';
<% $ge %>('<% $name %>_percent_label0').style.visibility = '';
- <% $ge %>('<% $name %>_percent').style.display = '';
- <% $ge %>('<% $name %>_percent').style.visibility = '';
+ <% $ge %>('<% $name %>_percent_input0').style.display = '';
+ <% $ge %>('<% $name %>_percent_input0').style.visibility = '';
}
}
+ <% $name %>_changed(<% $ge %>('<% $name %>'));
+
% }
<%init>
my %opt = @_;
+my $cgi = $opt{'cgi'};
my $discountnum = $opt{'curr_value'} || $opt{'value'};
$opt{'discount'} ||= [ qsearch( 'discount', { disabled=>'' } ) ];
@@ -170,4 +173,7 @@ unshift @_type_options, $select;
my $colspan = $opt{'colspan'} ? 'COLSPAN="'.$opt{'colspan'}.'"' : '';
+my $onchange = ( $opt{'onchange'} ? delete($opt{'onchange'}).';' : '' ).
+ $name.'_changed(this);';
+
%init>
|