[freeside-commits] branch master updated. 082486da42e753b3d3fe847578e60af3ac8432fa

[Ivan]

The branch, master has been updated
       via  082486da42e753b3d3fe847578e60af3ac8432fa (commit)
      from  5ffd80e8e6ac4554fc4515b018eaf0354ebcdc9a (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 082486da42e753b3d3fe847578e60af3ac8432fa
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jan 27 21:32:11 2014 -0800

    add agent_custid to cust_main-custom_link, RT#21998

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bf45762..597d193 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5213,7 +5213,7 @@ and customer address. Include units.',
   {
     'key'         => 'cust_main-custom_link',
     'section'     => 'UI',
-    'description' => 'URL to use as source for the "Custom" tab in the View Customer page.  The customer number will be appended, or you can insert "$custnum" to have it inserted elsewhere.  "$agentnum" will be replaced with the agent number, and "$usernum" will be replaced with the employee number.',
+    'description' => 'URL to use as source for the "Custom" tab in the View Customer page.  The customer number will be appended, or you can insert "$custnum" to have it inserted elsewhere.  "$agentnum" will be replaced with the agent number, "$agent_custid" with be replaced with the agent customer ID (if any), and "$usernum" will be replaced with the employee number.',
     'type'        => 'textarea',
   },
 
diff --git a/httemplate/misc/custom_link_proxy.cgi b/httemplate/misc/custom_link_proxy.cgi
index f3c6e37..db9a048 100644
--- a/httemplate/misc/custom_link_proxy.cgi
+++ b/httemplate/misc/custom_link_proxy.cgi
@@ -14,12 +14,14 @@ my $conf = new FS::Conf;
 my $url = $conf->config('cust_main-custom_link');
 
 my $agentnum = $cust_main->agentnum;
+my $agent_custid = $cust_main->agent_custid;
 my $curuser = $FS::CurrentUser::CurrentUser;
 my $usernum = $curuser->usernum;
 # like eval(qq("$url")) but with fewer things that can go wrong
 # and if $custnum isn't mentioned, assume it goes at the end
 $url =~ s/\$custnum/$custnum/ or $url .= $custnum;
 $url =~ s/\$agentnum/$agentnum/;
+$url =~ s/\$agent_custid/$agent_custid/;
 $url =~ s/\$usernum/$usernum/;
 
 #warn $url;

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

Summary of changes:
 FS/FS/Conf.pm                         |    2 +-
 httemplate/misc/custom_link_proxy.cgi |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)