diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-09-26 13:46:03 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-09-26 13:46:03 -0500 |
| commit | bda14295c400a8e829c223b80e55826977992ecc (patch) | |
| tree | 6232554268c85ae9ed13c9a286074931ffe74f97 | |
| parent | fe58901b811f0ab26e8f93a9563fb93bc98e4c19 (diff) | |
72456: Directions - override company_address
| -rw-r--r-- | FS/FS/Conf.pm | 8 | ||||
| -rw-r--r-- | httemplate/elements/coord-links.html | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 6bfbf983c..a7e5d947a 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 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> |