From ee2ee290c82013f870e2b23e4235e70998e59ee1 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 7 Dec 2011 05:50:33 +0000 Subject: minor refactor and better safeguards on term discounts, #15068 --- httemplate/elements/tr-select-discount_term.html | 45 ++++++++++++++++++++---- 1 file changed, 38 insertions(+), 7 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/tr-select-discount_term.html b/httemplate/elements/tr-select-discount_term.html index 58582675d..e9faeb228 100644 --- a/httemplate/elements/tr-select-discount_term.html +++ b/httemplate/elements/tr-select-discount_term.html @@ -1,12 +1,33 @@ % if ( scalar(@discount_term) ) { - Prepayment for + <% emt('Prepayment for') %> +% if ( $amount_id ) { + +% } - <% include('select-discount_term.html', - 'discount_term' => \@discount_term, - 'cgi' => $opt{'cgi'}, - ) - %> + <& select.html, + field => 'discount_term', + id => 'discount_term', + options => [ '', @discount_term ], + labels => { '' => mt('1 month'), + map { $_ => mt('[_1] months', $_) } @discount_term }, + curr_value => '', + onchange => $amount_id ? 'change_discount_term(this)' : '', + &> @@ -20,6 +41,16 @@ my $custnum = $opt{'custnum'}; my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) or die "unknown custnum $custnum\n"; -my @discount_term = $cust_main->discount_terms; +my @discount_term = (); +my %discounted_total = (); +my $last_bill = ($cust_main->cust_bill)[-1]; +if ( $last_bill ) { # if not, there are no discounts possible + my %plans = $last_bill->discount_plans; + @discount_term = sort { $a <=> $b } keys %plans; + %discounted_total = map { $_, $plans{$_}->discounted_total } @discount_term; +} + +# the DOM id of an input to be disabled/populated with the amount due +my $amount_id = $opt{'amount_id'}; -- cgit v1.2.1