[freeside-commits] branch master updated. bda14295c400a8e829c223b80e55826977992ecc

[Jonathan Prykop]

The branch, master has been updated
       via  bda14295c400a8e829c223b80e55826977992ecc (commit)
      from  fe58901b811f0ab26e8f93a9563fb93bc98e4c19 (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 bda14295c400a8e829c223b80e55826977992ecc
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Sep 26 13:46:03 2016 -0500

    72456: Directions - override company_address

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6bfbf98..a7e5d94 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2076,6 +2076,14 @@ and customer address. Include units.',
   },
 
   {
+    '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',
     'description' => 'Turns on display/collection of a "service company name" field for customers.',
diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index f27ffd3..586a710 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>

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

Summary of changes:
 FS/FS/Conf.pm                        |    8 ++++++++
 httemplate/elements/coord-links.html |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)