[freeside-commits] branch FREESIDE_3_BRANCH updated. ff8b4b6909c09643439a4a2a7b0bc936b754e6d4

Jonathan Prykop jonathan at 420.am
Wed Apr 29 14:16:15 PDT 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  ff8b4b6909c09643439a4a2a7b0bc936b754e6d4 (commit)
       via  11c37682117db820ace7f6bbd80c3d7efba5ee8f (commit)
      from  8ea744edd71f90160d5268d4ab1cbcd3d6bfb806 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ff8b4b6909c09643439a4a2a7b0bc936b754e6d4
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Apr 29 16:03:36 2015 -0500

    RT#34134: Processing a Credit Card Payment on Accounts [added comment]

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index b83ad71..12fca20 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -273,6 +273,8 @@ my @states = sort { $a cmp $b } keys %states;
 
 my $amount = '';
 if ( $balance > 0 ) {
+  # when configured to do so, amount will only auto-fill with balance
+  # if balance represents a single invoice
   $amount = $balance
     unless $conf->exists('manual_process-single_invoice_amount')
       && ($cust_main->open_cust_bill != 1);

commit 11c37682117db820ace7f6bbd80c3d7efba5ee8f
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Apr 22 19:46:28 2015 -0500

    RT#34134: Processing a Credit Card Payment on Accounts

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6a66163..4e2139b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2822,6 +2822,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'manual_process-single_invoice_amount',
+    'section'     => 'billing',
+    'description' => 'When entering manual credit card and ACH payments, amount will not autofill if the customer has more than one open invoice',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'billing',
     'description' => 'Package to add to each manual credit card and ACH payment entered by employees from the backend.  Enabling this option may be in violation of your merchant agreement(s), so please check it(/them) carefully before enabling this option.',
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 90b03c7..b83ad71 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -273,7 +273,9 @@ my @states = sort { $a cmp $b } keys %states;
 
 my $amount = '';
 if ( $balance > 0 ) {
-  $amount = $balance;
+  $amount = $balance
+    unless $conf->exists('manual_process-single_invoice_amount')
+      && ($cust_main->open_cust_bill != 1);
 }
 
 my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm               |    7 +++++++
 httemplate/misc/payment.cgi |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)




More information about the freeside-commits mailing list