X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=896e8b2d2c073298cba8c4d7e0501105ff34a194;hb=e3df7e4b96abfda72201bf3598b6bfd449bfb2a1;hp=1ff70009c12f79f95b98be86d74d6fb22036566b;hpb=55daa3803103f841d0fb2b559040115908724da8;p=freeside.git

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 1ff70009c..896e8b2d2 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,11 +1,16 @@
-<& /elements/header-popup.html, mt('One-time charge'), '',
-            ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
+% if ( $quotationnum ) {
+<& /elements/header.html, mt('One-time charge') &>
+% } else {
+<& /elements/header-cust_main.html,
+     view      => 'packages',
+     cust_main => $cust_main,
+     etc       => $cgi->param('error') ? '' : 'onload="addRow()"',
 &>
+<h2>One-time charge</h2>
+% }
 
-<LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-setup.js"></SCRIPT>
+<& /elements/init_calendar.html &>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/xregexp-all.js"></SCRIPT>
 
 <& /elements/error.html &>
 
@@ -15,9 +20,9 @@ function enable_quick_charge (e) {
 
   if (    document.QuickChargeForm.amount.value
        && document.QuickChargeForm.pkg.value    ) {
-    document.QuickChargeForm.submitButton.disabled = false;
+    document.QuickChargeForm.submit.disabled = false;
   } else {
-    document.QuickChargeForm.submitButton.disabled = true;
+    document.QuickChargeForm.submit.disabled = true;
   }
 
 % if ( $curuser->option('disable_enter_submit_onetimecharge') ) {
@@ -39,7 +44,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;
@@ -93,18 +98,24 @@ function bill_now_changed (what) {
 
 </SCRIPT>
 
+<P>
+% if ( $prospect_main ) {
+<& /elements/small_prospect_view.html, $prospect_main &>
+% }
+</P>
+
 <FORM ACTION   = "process/quick-charge.cgi"
       NAME     = "QuickChargeForm"
       ID       = "QuickChargeForm"
       METHOD   = "POST"
-      onSubmit = "document.QuickChargeForm.submitButton.disabled=true; return validate_quick_charge();"
+      onSubmit = "document.QuickChargeForm.submit.disabled=true; return validate_quick_charge();"
 >
 
 <INPUT TYPE="hidden" NAME="custnum"     VALUE="<% $cust_main ? $cust_main->custnum : '' %>">
 <INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospect_main ? $prospect_main->prospectnum : '' %>">
 <INPUT TYPE="hidden" NAME="quotationnum" VALUE="<% $quotationnum %>">
 
-<TABLE ID="QuickChargeTable" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 STYLE="background-color: #cccccc">
+<TABLE ID="QuickChargeTable" CLASS="fsinnerbox">
 
 % if ( $cust_pkg ) { #modify one-time charge
 
@@ -183,13 +194,16 @@ function bill_now_changed (what) {
 
       <& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass')  &>
 
-      <& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum')  &>
+      <& /elements/tr-select-taxproduct.html,
+        'label' => emt('Tax product'),
+        'curr_value' => $part_pkg->get('taxproductnum')
+      &>
 % }
 
 % } else { # new one-time charge
 
     <TR>
-      <TD ALIGN="right"><% mt('Amount to charge') |h %> </TD>
+      <TH ALIGN="right"><% mt('Amount to charge') |h %> </TH>
       <TD>
         <% $money_char %><INPUT TYPE       = "text"
                                 NAME       = "amount"
@@ -213,7 +227,7 @@ function bill_now_changed (what) {
 
 %   if ( $conf->exists('invoice-unitprice') ) {
     <TR>
-      <TD ALIGN="right"><% mt('Quantity') |h %> </TD>
+      <TH ALIGN="right"><% mt('Quantity') |h %> </TH>
       <TD>
         <INPUT TYPE       = "text"
                NAME       = "quantity"
@@ -229,7 +243,7 @@ function bill_now_changed (what) {
 % unless ( $quotationnum ) {
 
     <TR>
-      <TD ALIGN="right"><% mt('Invoice now') |h %></TD>
+      <TH ALIGN="right"><% mt('Invoice now') |h %></TH>
       <TD>
         <INPUT TYPE  = "checkbox"
                NAME  = "bill_now"
@@ -249,7 +263,7 @@ function bill_now_changed (what) {
 
 %   # false laziness w/misc/order_pkg.html
     <TR>
-      <TD ALIGN="right"><% mt('Charge date') |h %> </TD>
+      <TH ALIGN="right"><% mt('Charge date') |h %> </TH>
       <TD>
         <INPUT TYPE  = "text"
                NAME  = "start_date"
@@ -301,20 +315,25 @@ function bill_now_changed (what) {
 % }
 
 <TR>
-  <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD>
+  <TH ALIGN="right"><% mt('Tax exempt') |h %> </TH>
   <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
 </TR>
 
-<& /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'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $cgi->param('taxproductnum')  &>
+<& /elements/tr-select-taxproduct.html,
+  'label'      => emt('Tax product'),
+  'curr_value' => scalar($cgi->param('taxproductnum')),
+&>
 
-<& /elements/tr-select-taxoverride.html, 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => $cgi->param('tax_override')  &>
+<& /elements/tr-select-taxoverride.html,
+  'curr_value' => scalar($cgi->param('tax_override')),
+&>
 
 % } # if !$cust_pkg
 
 <TR>
-  <TD ALIGN="right"><% mt('Description') |h %> </TD>
+  <TH ALIGN="right"><% mt('Description') |h %> </TH>
   <TD>
     <INPUT TYPE       = "text"
            NAME       = "pkg"
@@ -362,7 +381,7 @@ function bill_now_changed (what) {
 % my $label = $cust_pkg
 %             ? emt('Modify one-time charge')
 %             : emt('Add one-time charge');
-<INPUT TYPE="submit" ID="submit" NAME="submitButton" VALUE="<% $label %>" \
+<INPUT TYPE="submit" ID="submit" NAME="submit" VALUE="<% $label %>" \
 <% ($cgi->param('error') || $cust_pkg) ? '' :' DISABLED' %>>
 
 </FORM>
@@ -427,8 +446,11 @@ function bill_now_changed (what) {
 
 </SCRIPT>
 
-</BODY>
-</HTML>
+% if ( $quotationnum ) {
+  <& /elements/footer.html &>
+% } else {
+  <& /elements/footer-cust_main.html &>
+% }
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;