diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-09-28 12:06:48 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-09-28 12:06:48 -0700 |
| commit | 1d0374a383ba412f9e9390705965a9d8467508f7 (patch) | |
| tree | 8018e6e51e268c680db607d3b562703dd50b90ef /httemplate | |
| parent | f954c8671db366b63c6c26721514c8d4a471821d (diff) | |
| parent | 31104e36b65911d1a8b93644853af0838600f771 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/quick-charge.html | 2 | ||||
| -rw-r--r-- | httemplate/elements/coord-links.html | 3 |
2 files changed, 3 insertions, 2 deletions
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; 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> |