[freeside-commits] freeside/httemplate/view/cust_main/payment_history credit.html, 1.1.2.2, 1.1.2.3 payment.html, 1.1.2.2, 1.1.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history
In directory wavetail.420.am:/tmp/cvs-serv21780/httemplate/view/cust_main/payment_history

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	credit.html payment.html 
Log Message:
payment and credit applications have separate "apply to refund" choices now, and no auto-refund choice in the invoice dropdown.  RT#3545

Index: payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/payment.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- payment.html	1 Jun 2008 22:48:57 -0000	1.1.2.2
+++ payment.html	5 Jun 2008 05:07:55 -0000	1.1.2.3
@@ -49,6 +49,16 @@
                               #default# 'height' => 336,
                           ).
               ')';
+    #XXX if there are any open refunds
+    $apply.= ' ('. include( '/elements/popup_link.html',
+                              'label'       => 'apply to refund',
+                              'action'      => "${p}edit/cust_pay_refund.cgi?".
+                                               $cust_pay->paynum,
+                              'actionlabel' => 'Apply payment to refund',
+                              'width'       => 392,
+                              #default# 'height' => 336,
+                          ).
+              ')';
   }
 } elsif (    scalar(@cust_bill_pay)   == 1
           && scalar(@cust_pay_refund) == 0
@@ -85,15 +95,25 @@
              '<B><FONT COLOR="#FF0000">$'.
              $cust_pay->unapplied. ' unapplied</FONT></B>';
     if ( $curuser->access_right('Apply payment') ) {
-      $desc = ' ('. include( '/elements/popup_link.html',
-                               'label'      => 'apply',
-                               'action'     => "${p}edit/cust_bill_pay.cgi?".
-                                               $cust_pay->paynum,
-                               'actionlabel' => 'Apply payment',
-                               'width'      => 392,
-                               #default# 'height' => 336,
-                          ).
-              ')';
+      $apply = ' ('. include( '/elements/popup_link.html',
+                                'label'      => 'apply',
+                                'action'     => "${p}edit/cust_bill_pay.cgi?".
+                                                $cust_pay->paynum,
+                                'actionlabel' => 'Apply payment',
+                                'width'      => 392,
+                                #default# 'height' => 336,
+                           ).
+               ')';
+      #XXX if there are any open refunds
+      $apply.= ' ('. include( '/elements/popup_link.html',
+                                'label'      => 'apply to refund',
+                                'action'     => "${p}edit/cust_pay_refund.cgi?".
+                                                $cust_pay->paynum,
+                                'actionlabel' => 'Apply payment to refund',
+                                'width'      => 392,
+                                #default# 'height' => 336,
+                           ).
+               ')';
     }
     $desc .= '<BR>';
   }

Index: credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/credit.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- credit.html	1 Jun 2008 22:48:56 -0000	1.1.2.2
+++ credit.html	5 Jun 2008 05:07:55 -0000	1.1.2.3
@@ -25,6 +25,16 @@
                               #default# 'height' => 336,
                           ).
               ')';
+    #XXX if there are any open refunds
+    $apply.= ' ('. include( '/elements/popup_link.html',
+                              'label'    => 'apply to refund',
+                              'action'   => "${p}edit/cust_credit_refund.cgi?".
+                                            $cust_credit->crednum,
+                              'actionlabel' => 'Apply credit to refund',
+                              'width'    => 392,
+                              #default# 'height' => 336,
+                          ).
+              ')';
   }
 } elsif (    scalar(@cust_credit_bill)   == 1
           && scalar(@cust_credit_refund) == 0
@@ -60,15 +70,25 @@
     $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
              $cust_credit->credited. ' unapplied</FONT></B>';
     if ( $curuser->access_right('Apply credit') ) {
-      $desc = ' ('. include( '/elements/popup_link.html',
-                              'label'       => 'apply',
-                              'action'      => "${p}edit/cust_credit_bill.cgi?".
-                                               $cust_credit->crednum,
-                              'actionlabel' => 'Apply credit',
-                              'width'       => 392,
-                              #default# 'height' => 336,
-                          ).
-              ')';
+      $apply = ' ('. include( '/elements/popup_link.html',
+                                'label'       => 'apply',
+                                'action'      => "${p}edit/cust_credit_bill.cgi?".
+                                                 $cust_credit->crednum,
+                                'actionlabel' => 'Apply credit',
+                                'width'       => 392,
+                                #default# 'height' => 336,
+                            ).
+               ')';
+      #XXX if there are any open refunds
+      $apply.= ' ('. include( '/elements/popup_link.html',
+                                'label'       => 'apply to refund',
+                                'action'      => "${p}edit/cust_credit_refund.cgi?".
+                                                 $cust_credit->crednum,
+                                'actionlabel' => 'Apply credit to refund',
+                                'width'       => 392,
+                                #default# 'height' => 336,
+                            ).
+               ')';
     }
     $desc .= '<BR>';
   }