From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 26 Sep 2016 18:46:03 +0000 (-0500)
Subject: 72456: Directions - override company_address
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=1ede375fa1eb6ec8513f6a99661b705d3297f5be;p=freeside.git

72456: Directions - override company_address
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 562de7411..f9dc39717 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2098,6 +2098,14 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'company_physical_address',
+    'section'     => 'addresses',
+    'description' => 'Your physical company address, for use in supplying google map directions, defaults to company_address',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'show_ship_company',
     'section'     => 'addresses',
diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index f27ffd39f..586a7109d 100644
--- a/httemplate/elements/coord-links.html
+++ b/httemplate/elements/coord-links.html
@@ -51,7 +51,8 @@ my $apikey = $conf->config('google_maps_api_key');
 #for directions link
 my @origin = $opt{company_address}
                ? @{ $opt{company_address} }
-               : $conf->config('company_address', $agentnum);
+               : ( $conf->config('company_physical_address', $agentnum) ||
+                   $conf->config('company_address', $agentnum) );
 my $origin = uri_escape(join(',', @origin));
 
 </%init>