From 9d5f61a78f7cddeb65f6943f3e58326f47cc0c0b Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 14 Dec 2016 09:36:37 -0800 Subject: [PATCH] add double-click prevention to discount popup/form, RT#73799, and clarify labels --- httemplate/edit/cust_pkg_discount.html | 10 ++++++++-- httemplate/elements/tr-select-pkg-discount.html | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/httemplate/edit/cust_pkg_discount.html b/httemplate/edit/cust_pkg_discount.html index e1e3daede..79c347813 100755 --- a/httemplate/edit/cust_pkg_discount.html +++ b/httemplate/edit/cust_pkg_discount.html @@ -1,13 +1,17 @@ <& /elements/header-popup.html, "Discount Package" &> <& /elements/error.html &> -
+ <% ntable('#cccccc') %> - Current package  + Package  <% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><% $part_pkg->pkg |h %> - <% $part_pkg->comment |h %> @@ -18,6 +22,8 @@ curr_value_recur => $recur_discountnum, disable_setup => $disable_setup, disable_recur => $disable_recur, + setup_label => emt('Setup fee discount'), + recur_label => emt('Recurring fee discount'), &> diff --git a/httemplate/elements/tr-select-pkg-discount.html b/httemplate/elements/tr-select-pkg-discount.html index dc38cff3e..0c57fd89e 100644 --- a/httemplate/elements/tr-select-pkg-discount.html +++ b/httemplate/elements/tr-select-pkg-discount.html @@ -34,7 +34,7 @@ description if curr_value_setup is set. Likewise "disable_recur". % if ( $curuser->access_right('Waive setup fee') ) { % push @$pre_options, -2 => 'Waive setup fee'; % } -<& tr-td-label.html, label => emt('Setup fee') &> +<& tr-td-label.html, label => $opt{setup_label} || emt('Setup fee') &> <& select-discount.html, field => 'setup_discountnum', @@ -97,7 +97,7 @@ description if curr_value_setup is set. Likewise "disable_recur". % if ( $curuser->access_right('Discount customer package') % and !$opt{disable_recur} ) { -<& tr-td-label.html, label => emt('Recurring fee') &> +<& tr-td-label.html, label => $opt{recur_label} || emt('Recurring fee') &> <& select-discount.html, field => 'recur_discountnum', -- 2.11.0