diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-09-26 13:46:03 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-09-27 12:22:44 -0500 |
| commit | 1ede375fa1eb6ec8513f6a99661b705d3297f5be (patch) | |
| tree | 0d347253d2e091252d0b3b3739ef8c6f85510033 | |
| parent | 302a18ba3d7f4a2527f68e7e07989d37a6db38fc (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 562de7411..f9dc39717 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2099,6 +2099,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> |