[freeside-commits] freeside/httemplate/edit cust_bill_pay.cgi, 1.13, 1.14 cust_credit.cgi, 1.15, 1.16 cust_credit_bill.cgi, 1.12, 1.13 part_bill_event.cgi, 1.31, 1.32

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv28724/httemplate/edit

Modified Files:
	cust_bill_pay.cgi cust_credit.cgi cust_credit_bill.cgi 
	part_bill_event.cgi 
Log Message:
batch refactor continued

Index: cust_bill_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_bill_pay.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cust_bill_pay.cgi	26 Aug 2006 12:57:42 -0000	1.13
+++ cust_bill_pay.cgi	26 Aug 2006 23:15:13 -0000	1.14
@@ -36,6 +36,7 @@
 
 <BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">
 <OPTION VALUE="">
+% foreach my $cust_bill ( @cust_bill ) { 
 
 % foreach my $cust_bill ( @cust_bill ) { 
   <OPTION<% $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<% $cust_bill->invnum %>"><% $cust_bill->invnum %> - <% time2str("%D", $cust_bill->_date) %> - $<% $cust_bill->owed %>
@@ -83,3 +84,4 @@
                 qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } );
 </%init>
 
+

Index: cust_credit.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_credit.cgi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cust_credit.cgi	24 Aug 2006 01:37:19 -0000	1.15
+++ cust_credit.cgi	26 Aug 2006 23:15:13 -0000	1.16
@@ -25,6 +25,9 @@
     <TD ALIGN="right">Amount</TD>
     <TD BGCOLOR="#ffffff">$<INPUT TYPE="text" NAME="amount" VALUE="<% $amount %>" SIZE=8 MAXLENGTH=8></TD>
   </TR>
+%
+%#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+%
 
 %
 %#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
@@ -78,3 +81,4 @@
 
 my $p1 = popurl(1);
 </%init>
+

Index: cust_credit_bill.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_credit_bill.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cust_credit_bill.cgi	26 Aug 2006 12:57:42 -0000	1.12
+++ cust_credit_bill.cgi	26 Aug 2006 23:15:13 -0000	1.13
@@ -21,6 +21,12 @@
 <SCRIPT>
 function changed(what) {
   cust_bill = what.options[what.selectedIndex].value;
+% foreach my $cust_bill ( @cust_bill ) {
+%  my $invnum = $cust_bill->invnum;
+%  my $changeto = $cust_bill->owed < $cust_credit->credited
+%                   ? $cust_bill->owed 
+%                   : $cust_credit->credited;
+%
 
 % foreach my $cust_bill ( @cust_bill ) {
 
@@ -38,6 +44,7 @@
 
 <BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">
 <OPTION VALUE="">
+% foreach my $cust_bill ( @cust_bill ) { 
 
 % foreach my $cust_bill ( @cust_bill ) { 
   <OPTION<% $cust_bill->invnum eq $invnum ? ' SELECTED' : '' %> VALUE="<% $cust_bill->invnum %>"><% $cust_bill->invnum %> - <% time2str("%D",$cust_bill->_date) %> - $<% $cust_bill->owed %>
@@ -90,3 +97,4 @@
                 qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
 </%init>
 
+

Index: part_bill_event.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_bill_event.cgi,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- part_bill_event.cgi	23 Aug 2006 22:25:37 -0000	1.31
+++ part_bill_event.cgi	26 Aug 2006 23:15:13 -0000	1.32
@@ -216,10 +216,16 @@
 %
 %  'batch-card' => {
 %    'name' => 'Add card to the pending credit card batch',
-%    'code' => '$cust_bill->batch_card();',
+%    'code' => '$cust_bill->batch_card(%options);',
 %    'weight' => 40,
 %  },
 %
+%  'retriable' => {
+%    'name' => 'Mark batched card event as retriable',
+%    'code' => '$cust_pay_batch->retriable();',
+%    'weight' => 60,
+%  },
+%
 %  'send' => {
 %    'name' => 'Send invoice (email/print/fax)',
 %    'code' => '$cust_bill->send();',
@@ -430,3 +436,4 @@
   </BODY>
 </HTML>
 
+