X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fquick-charge.html;h=330081533805d4ced66c84b71826466c48fd370c;hb=c80c0c11bce165716c08e04eea3a587fc7a58210;hp=2bbbe43d8fb70db2af68608c9ef607d833e3c0df;hpb=a2ecb1cf6a6c084c521710f1256da082f70ba9e5;p=freeside.git
diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 2bbbe43d8..330081533 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,11 +1,14 @@
+% if ( $quotationnum ) {
<& /elements/header.html, mt('One-time charge'), '',
( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
&>
+% } else {
+<& /elements/header-cust_main.html, view=>'packages', cust_main=>$cust_main &>
+
One-time charge
+% }
-
-
-
-
+<& /elements/init_calendar.html &>
+
<& /elements/error.html &>
@@ -39,7 +42,7 @@ function enable_quick_charge (e) {
function validate_quick_charge () {
var pkg = document.QuickChargeForm.pkg.value;
- var pkg_regex = /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/ ;
+ 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;
@@ -94,13 +97,7 @@ function bill_now_changed (what) {
-% if ( $cust_main ) {
-<& /elements/small_custview.html,
- $cust_main->custnum,
- scalar($conf->config('countrydefault')),
- 1, #no balance
-&>
-% } else {
+% if ( $prospect_main ) {
<& /elements/small_prospect_view.html, $prospect_main &>
% }
@@ -320,15 +317,15 @@ function bill_now_changed (what) {
param('setuptax') ? 'CHECKED' : '' %>> |
-<& /elements/tr-select-taxclass.html, 'curr_value' => $cgi->param('taxclass') &>
+<& /elements/tr-select-taxclass.html, 'curr_value' => scalar($cgi->param('taxclass')) &>
<& /elements/tr-select-taxproduct.html,
- 'label' => emt('Tax product'),
- 'curr_value' => $cgi->param('taxproductnum')
+ 'label' => emt('Tax product'),
+ 'curr_value' => scalar($cgi->param('taxproductnum')),
&>
<& /elements/tr-select-taxoverride.html,
- 'curr_value' => $cgi->param('tax_override')
+ 'curr_value' => scalar($cgi->param('tax_override')),
&>
% } # if !$cust_pkg