[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 86bc5cdcde76e575550da249beeb33a4069fcca4

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  86bc5cdcde76e575550da249beeb33a4069fcca4 (commit)
      from  0956674f4acf255ea9f73c52048b727b81c4e555 (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 86bc5cdcde76e575550da249beeb33a4069fcca4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 10 17:26:39 2012 -0700

    make selfservice_process-pkgpart and manual_process-pkgpart into agent overrides, RT#19304

diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm
index 357ca87..ab53080 100644
--- a/FS/FS/ClientAPI/MasonComponent.pm
+++ b/FS/FS/ClientAPI/MasonComponent.pm
@@ -53,7 +53,8 @@ my %session_callbacks = (
     my %args = @$argsref;
     %args = (
       %args,
-      'process-pkgpart'    => scalar($conf->config('selfservice_process-pkgpart')),
+      'process-pkgpart'    =>
+        scalar($conf->config('selfservice_process-pkgpart', $cust_main->agentnum)),
       'process-display'    => scalar($conf->config('selfservice_process-display')),
       'process-skip_first' => $conf->exists('selfservice_process-skip_first'),
       'num_payments'       => scalar($cust_main->cust_pay), 
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 9d9ab14..7fe00e6 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -898,7 +898,7 @@ sub validate_payment {
   #changing the hidden form values
   my $conf = new FS::Conf;
   my $fee_display = $conf->config('selfservice_process-display') || 'add';
-  my $fee_pkgpart = $conf->config('selfservice_process-pkgpart');
+  my $fee_pkgpart = $conf->config('selfservice_process-pkgpart', $cust_main->agentnum);
   my $fee_skip_first = $conf->exists('selfservice_process-skip_first');
   if ( $fee_display eq 'add'
          and $fee_pkgpart
@@ -1070,7 +1070,7 @@ sub do_process_payment {
 
   #no error, so order the fee package if applicable...
   my $conf = new FS::Conf;
-  my $fee_pkgpart = $conf->config('selfservice_process-pkgpart');
+  my $fee_pkgpart = $conf->config('selfservice_process-pkgpart', $cust_main->agentnum);
   my $fee_skip_first = $conf->exists('selfservice_process-skip_first');
   
   if ( $fee_pkgpart and ! $fee_skip_first || scalar($cust_main->cust_pay) ) {
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f5269cd..a64be29 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1302,7 +1302,7 @@ and customer address. Include units.',
   {
     'key'         => 'invoice_latexextracouponspace',
     'section'     => 'invoicing',
-    'description' => 'Optional LaTeX invoice textheight space to reserve for a tear off coupon. Include units.',
+    'description' => 'Optional LaTeX invoice textheight space to reserve for a tear off coupon.  Include units.  Default is 3.6cm',
     'type'        => 'text',
     'per_agent'   => 1,
     'validate'    => sub { shift =~
@@ -2494,6 +2494,7 @@ and customer address. Include units.',
     '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.',
     'type'        => 'select-part_pkg',
+    'per_agent'   => 1,
   },
 
   {
@@ -2519,6 +2520,7 @@ and customer address. Include units.',
     'section'     => 'billing',
     'description' => 'Package to add to each manual credit card and ACH payment entered by the customer themselves in the self-service interface.  Enabling this option may be in violation of your merchant agreement(s), so please check it(/them) carefully before enabling this option.',
     'type'        => 'select-part_pkg',
+    'per_agent'   => 1,
   },
 
   {
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 2d73072..fd6991e 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -12,7 +12,8 @@
 
   <& /elements/tr-amount_fee.html,
        'amount'             => $amount,
-       'process-pkgpart'    => scalar($conf->config('manual_process-pkgpart')),
+       'process-pkgpart'    => 
+          scalar($conf->config('manual_process-pkgpart', $cust_main->agentnum)),
        'process-display'    => scalar($conf->config('manual_process-display')),
        'process-skip_first' => $conf->exists('manual_process-skip_first'),
        'num_payments'       => scalar($cust_main->cust_pay), 

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

Summary of changes:
 FS/FS/ClientAPI/MasonComponent.pm |    3 ++-
 FS/FS/ClientAPI/MyAccount.pm      |    4 ++--
 FS/FS/Conf.pm                     |    4 +++-
 httemplate/misc/payment.cgi       |    3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)