From fd068873ca79b92bed2b8bdca68d52f4342faeac Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 27 Apr 2017 15:31:08 -0700 Subject: discount action UI improvements: don't show 'Custom discount' which we can't add on the fly, RT#75536 --- httemplate/elements/select-discount.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'httemplate') diff --git a/httemplate/elements/select-discount.html b/httemplate/elements/select-discount.html index b7f1fa5be..3a267ed08 100644 --- a/httemplate/elements/select-discount.html +++ b/httemplate/elements/select-discount.html @@ -4,7 +4,7 @@ 'order_by' => 'ORDER BY discountnum', #XXX weight 'value' => $discountnum, 'empty_label' => '(none)', - 'hashref' => { 'disabled' => '' }, + 'hashref' => $hashref, 'post_options' => $post_options, %opt, ) @@ -19,10 +19,12 @@ $opt{'records'} = delete $opt{'discount'} my $curuser = $FS::CurrentUser::CurrentUser; -#make an opt if we need to turn this off -my $post_options = $curuser->access_right('Custom discount customer package') - ? [ -1 => 'Custom discount' ] - : []; +my $hashref = $opt{hashref} || { 'disabled' => '' }; + +my $post_options = []; +push @$post_options, -1 => 'Custom discount' + if $curuser->access_right('Custom discount customer package') + && ! $opt{disable_custom_discount}; -- cgit v1.2.1