prepayment discounts rt#5318

5 files changed, 142 insertions, 24 deletions

diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index 505f2d0ff..610f6e1db 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -13,23 +13,63 @@ function warnUnload() {
   }
 }
 window.onbeforeunload = warnUnload;
+
+function select_discount_term(row, prefix) {
+  var custnum_obj = document.getElementById('custnum'+prefix+row);
+  var select_obj = document.getElementById('discount_term'+prefix+row);
+
+  var value = '';
+  if (select_obj.type == 'hidden') {
+    value = select_obj.value;
+  }
+
+  var term_select = document.createElement('SELECT');
+  term_select.setAttribute('name', 'discount_term'+row);
+  term_select.setAttribute('id',   'discount_term'+row);
+  term_select.setAttribute('rownum', row);
+  term_select.style.display = '';
+  select_obj.parentNode.replaceChild(term_select, select_obj);
+  opt(term_select, '', '1 month');
+  
+  function select_discount_term_update(discount_terms) {
+
+    var termArray = eval('(' + discount_terms + ')');
+    for ( var t = 0; t < termArray.length; t++ ) {
+      opt(term_select, termArray[t][0], termArray[t][1]);
+      if (termArray[t][0] == value) {
+        term_select.selectedIndex = t+1;
+      }
+    }
+
+  }
+
+  discount_terms(custnum_obj.value, select_discount_term_update);
+
+}
 </SCRIPT>
 
+<% include('/elements/xmlhttp.html',
+              'url'  => $p. 'misc/xmlhttp-cust_main-discount_terms.cgi',
+              'subs' => [qw( discount_terms )],
+           )
+%>
+
 <FORM ACTION="process/batch-cust_pay.cgi" NAME="OneTrueForm" METHOD="POST" onsubmit="document.OneTrueForm.submit.disabled=true;window.onbeforeunload = null;">
 
 <!-- <B>Batch</B> <INPUT TYPE="text" NAME="paybatch"><BR><BR> -->
 
 <% include( "/elements/customer-table.html",
               name_singular => 'payment',
-              header  => [ '', 'Amount', 'Check #', '' ],
-              fields  => [ sub {'$'}, 'paid', 'payinfo', 'error', ],
-              types   => [ 'immutable', '', '', 'immutable', ],
-              align   => [ 'c', 'r', 'r', 'l' ],
-              sizes   => [ 0, 8, 10, 0, ],
-              colors  => [ '', '', '', '#ff0000' ],
-              param   => { () },
-              footer  => [ '$', '_TOTAL', '', '' ],
-              footer_align => [ 'c', 'r', 'r', '' ],
+              header  => \@header,
+              fields  => \@fields,
+              types   => \@types,
+              align   => \@align,
+              sizes   => \@sizes,
+              colors  => \@colors,
+              param   => \%param,
+              footer  => \@footer,
+              footer_align => \@footer_align,
+              custnum_update_callback => $custnum_update_callback,
           )
 %>
 
@@ -41,6 +81,14 @@ window.onbeforeunload = warnUnload;
 
 </FORM>
 
+%if ( $cgi->param('error') ) {
+<SCRIPT TYPE="text/javascript">
+%  for ( my $row = 0; defined($cgi->param("custnum$row")); $row++ ) {
+     select_discount_term(<% $row %>, '');
+%  }
+</SCRIPT>
+%}
+
 <% include('/elements/footer.html') %>
 
 <%init>
@@ -48,4 +96,36 @@ window.onbeforeunload = warnUnload;
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Post payment batch');
 
+my @header  = ( '', 'Amount', 'Check #' );
+my @fields  = ( sub {'$'}, 'paid', 'payinfo' );
+my @types   = ( 'immutable', '', '' );
+my @align   = ( 'c', 'r', 'r' );
+my @sizes   = ( 0, 8, 10 );
+my @colors  = ( '', '', '' );
+my %param   = ();
+my @footer  = ( '$', '_TOTAL', '' );
+my @footer_align = ( 'c', 'r', 'r' );
+my $custnum_update_callback = '';
+
+if ( FS::Record->scalar_sql('SELECT count(*) FROM part_pkg_discount') ) {
+  push @header, '';
+  push @fields, 'discount_term';
+  push @types, 'immutable';
+  push @align, 'r';
+  push @sizes, '0';
+  push @colors, '';
+  push @footer, '';
+  push @footer_align, '';
+  $custnum_update_callback = 'select_discount_term';
+}
+
+push @header, '';
+push @fields, 'error';
+push @types, 'immutable';
+push @align, 'l';
+push @sizes, '0';
+push @colors, '#ff0000';
+push @footer, '';
+push @footer_align, '';
+
 </%init>
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 813b560bd..bcab68aae 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -67,6 +67,11 @@
 
 % }
 
+<% include('/elements/tr-select-discount_term.html',
+             'custnum' => $custnum,
+             'cgi'     => $cgi
+          )
+%>
 
 % if ( $payby eq 'CARD' ) {
 %
diff --git a/httemplate/misc/process/batch-cust_pay.cgi b/httemplate/misc/process/batch-cust_pay.cgi
index 4da00c63d..aefc00654 100644
--- a/httemplate/misc/process/batch-cust_pay.cgi
+++ b/httemplate/misc/process/batch-cust_pay.cgi
@@ -11,12 +11,13 @@
 %  #while ( exists($param->{"custnum$row"}) ) {
 %  for ( my $row = 0; exists($param->{"custnum$row"}); $row++ ) {
 %    push @cust_pay, new FS::cust_pay {
-%                                       'custnum'  => $param->{"custnum$row"},
-%                                       'paid'     => $param->{"paid$row"},
-%                                       'payby'    => 'BILL',
-%                                       'payinfo'  => $param->{"payinfo$row"},
-%                                       'paybatch' => $paybatch,
-%                                     }
+%                      'custnum'        => $param->{"custnum$row"},
+%                      'paid'           => $param->{"paid$row"},
+%                      'payby'          => 'BILL',
+%                      'payinfo'        => $param->{"payinfo$row"},
+%                      'discount_term'  => $param->{"discount_term$row"},
+%                      'paybatch'       => $paybatch,
+%                    }
 %      if    $param->{"custnum$row"}
 %         || $param->{"paid$row"}
 %         || $param->{"payinfo$row"};
diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index 665001ea9..c1c9071f9 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -119,19 +119,26 @@ if ( $payby eq 'CHEK' ) {
   die "unknown payby $payby";
 }
 
+$cgi->param('discount_term') =~ /^\d*$/
+  or errorpage("illegal discount_term");
+my $discount_term = $1;
+
 my $error = '';
 my $paynum = '';
 if ( $cgi->param('batch') ) {
 
-  $error = $cust_main->batch_card(
-                                   'payby'    => $payby,
-                                   'amount'   => $amount,
-                                   'payinfo'  => $payinfo,
-                                   'paydate'  => "$year-$month-01",
-                                   'payname'  => $payname,
-                                   map { $_ => $cgi->param($_) } 
-                                     @{$payby2fields{$payby}}
-                                 );
+  $error = 'Prepayment discounts not supported with batched payments' 
+    if $discount_term;
+
+  $error ||= $cust_main->batch_card(
+                                     'payby'    => $payby,
+                                     'amount'   => $amount,
+                                     'payinfo'  => $payinfo,
+                                     'paydate'  => "$year-$month-01",
+                                     'payname'  => $payname,
+                                     map { $_ => $cgi->param($_) } 
+                                       @{$payby2fields{$payby}}
+                                   );
   errorpage($error) if $error;
 
 } else {
@@ -146,6 +153,7 @@ if ( $cgi->param('batch') ) {
     'payunique'  => $payunique,
     'paycvv'     => $paycvv,
     'paynum_ref' => \$paynum,
+    'discount_term' => $discount_term,
     map { $_ => $cgi->param($_) } @{$payby2fields{$payby}}
   );
   errorpage($error) if $error;
diff --git a/httemplate/misc/xmlhttp-cust_main-discount_terms.cgi b/httemplate/misc/xmlhttp-cust_main-discount_terms.cgi
new file mode 100644
index 000000000..71e2da597
--- /dev/null
+++ b/httemplate/misc/xmlhttp-cust_main-discount_terms.cgi
@@ -0,0 +1,24 @@
+% if ( $sub eq 'discount_terms' ) {
+% 
+%   my $return = [];
+%   my $custnum = $cgi->param('arg');
+%   my $cust_main = '';
+%   $cust_main = qsearchs({
+%     'table'   => 'cust_main',
+%     'hashref' => { 'custnum' => $custnum },
+%     'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+%   });
+%     
+%   if ($cust_main) {
+%     $return = [ map [ $_, "$_ months" ], $cust_main->discount_terms ];
+%   }
+%
+<% objToJson($return) %>
+% } 
+<%init>
+
+my $conf = new FS::Conf;
+
+my $sub = $cgi->param('sub');
+
+</%init>