From 9939ddd7f968caa03c6632d56d46d9519d1c1905 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Mon, 26 Sep 2016 13:46:03 -0500 Subject: [PATCH] 72456: Directions - override company_address --- FS/FS/Conf.pm | 8 ++++++++ httemplate/elements/coord-links.html | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 217c9f34a..870c0095f 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2233,6 +2233,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' => 'UI', '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 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)); -- 2.11.0