X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-discount.html;h=30a60ec85cac948ed75c49d05ac076f2e6acd1cb;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=e8be3938c777d84b3ac5d10823b1bc14f1bed906;hpb=e774555a6ae69da65e7774c701232fdf9dd052b1;p=freeside.git
diff --git a/httemplate/elements/tr-select-discount.html b/httemplate/elements/tr-select-discount.html
index e8be3938c..30a60ec85 100644
--- a/httemplate/elements/tr-select-discount.html
+++ b/httemplate/elements/tr-select-discount.html
@@ -6,7 +6,7 @@
% } else {
- <% $opt{'label'} || 'Discount' %> |
+ <% $opt{'label'} || ''.emt('Discount').'' %> |
>
<% include( '/elements/select-discount.html',
'curr_value' => $discountnum,
@@ -81,12 +81,14 @@
function <% $name %>_changed(what) {
var <% $name %> = what.options[what.selectedIndex].value;
- if ( <% $name %> == '-1' ) {
+ if ( <% $name %> == '-1' && ! what.disabled ) {
<% $ge %>('<% $name %>__type_label0').style.display = '';
<% $ge %>('<% $name %>__type_label0').style.visibility = '';
<% $ge %>('<% $name %>__type').style.display = '';
<% $ge %>('<% $name %>__type').style.visibility = '';
-% #XXX retrieve previous visibility for amount, percent :/
+
+ <% $name %>__type_changed( <% $ge %>('<% $name %>__type') );
+
<% $ge %>('<% $name %>_months_label0').style.display = '';
<% $ge %>('<% $name %>_months_label0').style.visibility = '';
<% $ge %>('<% $name %>_months').style.display = '';
@@ -104,19 +106,7 @@
<% $ge %>('<% $name %>__type').style.display = 'none';
<% $ge %>('<% $name %>__type').style.visibility = 'hidden';
-% #XXX save visibility settings for amount, percent :/
- <% $ge %>('<% $name %>_amount_label0').style.display = 'none';
- <% $ge %>('<% $name %>_amount_label0').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_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';
+ <% $name %>__type_changed( <% $ge %>('<% $name %>__type') );
<% $ge %>('<% $name %>_months_label0').style.display = 'none';
<% $ge %>('<% $name %>_months_label0').style.visibility = 'hidden';
@@ -137,15 +127,15 @@
function <% $name %>__type_changed(what) {
var <% $name %>__type = what.options[what.selectedIndex].value;
- if ( <% $name %>__type == '<% $select %>' ) {
+ if ( <% $name %>__type == '<% $select %>' || what.style.display == 'none' ) {
<% $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 = '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 == 'Amount' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = '';
<% $ge %>('<% $name %>_amount_label0').style.visibility = '';
|