[freeside-commits] freeside/httemplate/view/cust_main/payment_history credit.html, 1.4, 1.5 payment.html, 1.5, 1.6

[Jeff Finucane,420,,]

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

Modified Files:
	credit.html payment.html 
Log Message:
credits return taxes, but the magic calculation button does not yet work properly (grrr - more sleep required) RT#4729

Index: payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/payment.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- payment.html	30 Jul 2009 06:42:32 -0000	1.5
+++ payment.html	26 Oct 2009 07:12:12 -0000	1.6
@@ -4,6 +4,7 @@
 
 my( $cust_pay, %opt ) = @_;
 
+my $conf = new FS::Conf;
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $payby = $cust_pay->payby;
@@ -38,6 +39,13 @@
   $desc .= ' for '. $cust_pkg->pkg_label_long;
 }
 
+my %cust_bill_pay_width = ('width' => 392);
+my %cust_bill_pay_height = ();
+if ($conf->exists('cust_bill_pay_pkg-manual')) {
+  %cust_bill_pay_width = ('width' => 592);
+  %cust_bill_pay_height = ('height' => 436);
+}
+
 my( $pre, $post, $apply, $ext ) = ( '', '', '', '' );
 if (    scalar(@cust_bill_pay)   == 0
      && scalar(@cust_pay_refund) == 0 ) {
@@ -52,8 +60,8 @@
                           'action'      => "${p}edit/cust_bill_pay.cgi?".
                                            $cust_pay->paynum,
                           'actionlabel' => 'Apply payment',
-                          'width'       => 392,
-                          #default# 'height' => 336,
+                          %cust_bill_pay_width,
+                          %cust_bill_pay_height,
                       ).
                 ')';
     }
@@ -112,8 +120,8 @@
                             'action'     => "${p}edit/cust_bill_pay.cgi?".
                                             $cust_pay->paynum,
                             'actionlabel' => 'Apply payment',
-                            'width'      => 392,
-                            #default# 'height' => 336,
+                            %cust_bill_pay_width,
+                            %cust_bill_pay_height,
                         ).
                  ')';
       }

Index: credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/credit.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- credit.html	30 Jul 2009 06:42:33 -0000	1.4
+++ credit.html	26 Oct 2009 07:12:12 -0000	1.5
@@ -4,6 +4,7 @@
 
 my( $cust_credit, %opt ) = @_;
 
+my $conf = new FS::Conf;
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my @cust_credit_bill = $cust_credit->cust_credit_bill;
@@ -15,6 +16,13 @@
   $desc .= ' for '. $cust_pkg->pkg_label_long;
 }
 
+my %cust_credit_bill_width = ('width' => 392);
+my %cust_credit_bill_height = ();
+if ($conf->exists('cust_credit_bill_pkg-manual')) {
+  %cust_credit_bill_width = ('width' => 592);
+  %cust_credit_bill_height = ('height' => 436);
+}
+
 my( $pre, $post, $apply, $ext ) = ( '', '', '', '' );
 if (    scalar(@cust_credit_bill)   == 0
      && scalar(@cust_credit_refund) == 0 ) {
@@ -29,8 +37,8 @@
                           'action'   => "${p}edit/cust_credit_bill.cgi?".
                                         $cust_credit->crednum,
                           'actionlabel' => 'Apply credit',
-                          'width'    => 392,
-                          #default# 'height' => 336,
+                          %cust_credit_bill_width,
+                          %cust_credit_bill_height,
                       ).
                 ')';
     }
@@ -88,8 +96,8 @@
                             'action'      => "${p}edit/cust_credit_bill.cgi?".
                                              $cust_credit->crednum,
                             'actionlabel' => 'Apply credit',
-                            'width'       => 392,
-                            #default# 'height' => 336,
+                            %cust_credit_bill_width,
+                            %cust_credit_bill_height,
                         ).
                  ')';
       }