diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/elements/order_pkg.js | 3 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-discount.html | 30 | ||||
| -rw-r--r-- | httemplate/view/cust_main/order_pkg_link.html | 4 |
3 files changed, 15 insertions, 22 deletions
diff --git a/httemplate/elements/order_pkg.js b/httemplate/elements/order_pkg.js index 2f53e3631..48073593a 100644 --- a/httemplate/elements/order_pkg.js +++ b/httemplate/elements/order_pkg.js @@ -8,8 +8,10 @@ function pkg_changed () { if ( discountnum ) { if ( form.pkgpart.options[form.pkgpart.selectedIndex].getAttribute('data-can_discount') == 1 ) { form.discountnum.disabled = false; + discountnum_changed(form.discountnum); } else { form.discountnum.disabled = true; + discountnum_changed(form.discountnum); } } @@ -29,6 +31,7 @@ function pkg_changed () { } else { form.submitButton.disabled = true; if ( discountnum ) { form.discountnum.disabled = true; } + discountnum_changed(form.discountnum); } } diff --git a/httemplate/elements/tr-select-discount.html b/httemplate/elements/tr-select-discount.html index 6bfc48530..30a60ec85 100644 --- a/httemplate/elements/tr-select-discount.html +++ b/httemplate/elements/tr-select-discount.html @@ -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 = ''; diff --git a/httemplate/view/cust_main/order_pkg_link.html b/httemplate/view/cust_main/order_pkg_link.html index 29398432e..7bc5eef31 100644 --- a/httemplate/view/cust_main/order_pkg_link.html +++ b/httemplate/view/cust_main/order_pkg_link.html @@ -5,7 +5,7 @@ 'color' => '#333399', 'cust_main' => $cust_main, 'closetext' => emt('Close'), - 'width' => 763, + 'width' => 960, #763, 'height' => $height, %optional, &> @@ -17,6 +17,6 @@ my %optional = map { $_ => $opt{$_} } grep $opt{$_}, qw( lock_pkgpart lock_locationnum qualnum svcpart ); -my $height = $opt{'lock_locationnum'} ? 296 : 538; +my $height = $opt{'lock_locationnum'} ? 336 : 576; </%init> |