From bda14295c400a8e829c223b80e55826977992ecc Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Mon, 26 Sep 2016 13:46:03 -0500 Subject: 72456: Directions - override company_address --- httemplate/elements/coord-links.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'httemplate') 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)); -- cgit v1.2.1 From 704bb43d5343eeb523a13be55506b804d8c67bd0 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 26 Sep 2016 15:56:23 -0700 Subject: fix "-" character in one-time charge descriptions, #72101, from #72175 --- httemplate/edit/quick-charge.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate') diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 6da5f1231..dde891767 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -40,7 +40,7 @@ function enable_quick_charge (e) { function validate_quick_charge () { var pkg = document.QuickChargeForm.pkg.value; - var pkg_regex = XRegExp('^([\\p{L}\\p{N} \_\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\\[\\]]*)$'); + var pkg_regex = XRegExp('^([\\p{L}\\p{N} \_\!\@\#\$\%\&\(\)\+\;\:\'\"\,\.\?\/\=\\-\\[\\]]*)$'); var amount = document.QuickChargeForm.amount.value; var amount_regex = /^\s*\$?\s*(\d*(\.?\d{1,2}))\s*$/ ; var rval = true; -- cgit v1.2.1