X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=2d38203fa63b310a7ec00f8035d170a7137125c6;hb=9e878943532b9ecb84bac1db76c05cf9bc09d2cc;hp=2bbbe43d8fb70db2af68608c9ef607d833e3c0df;hpb=a2ecb1cf6a6c084c521710f1256da082f70ba9e5;p=freeside.git

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 2bbbe43d8..2d38203fa 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,11 +1,19 @@
-<& /elements/header.html, mt('One-time charge'), '',
-            ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
+% if ( $quotationnum && ! $cust_main ) {
+<& /elements/header.html, mt('Quotation #[_1]: add one-time charge', $quotationnum) &>
+% } else {
+<& /elements/header-cust_main.html,
+     view      => $quotationnum ? 'quotations' : 'packages',
+     cust_main => $cust_main,
+     etc       => $cgi->param('error') ? '' : 'onload="addRow()"',
 &>
+<h2><% $quotationnum
+         ? emt('Quotation #[_1]: add one-time charge', $quotationnum)
+         : mt('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 &>
 
@@ -39,7 +47,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 +102,7 @@ function bill_now_changed (what) {
 </SCRIPT>
 
 <P>
-% 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 &>
 % }
 </P>
@@ -116,7 +118,7 @@ function bill_now_changed (what) {
 <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
 
@@ -204,7 +206,7 @@ function bill_now_changed (what) {
 % } 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"
@@ -228,7 +230,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"
@@ -244,7 +246,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"
@@ -264,7 +266,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"
@@ -316,25 +318,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'),
-  '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
 
 <TR>
-  <TD ALIGN="right"><% mt('Description') |h %> </TD>
+  <TH ALIGN="right"><% mt('Description') |h %> </TH>
   <TD>
     <INPUT TYPE       = "text"
            NAME       = "pkg"
@@ -447,8 +449,20 @@ function bill_now_changed (what) {
 
 </SCRIPT>
 
-</BODY>
-</HTML>
+%my %footer_args = (
+%    formvalidation => {
+%        QuickChargeForm => {
+%            validate_fields => {
+%                quantity => 'digits: true, min: 1, required: true',
+%            },
+%        },
+%    },
+%);
+% if ( $quotationnum ) {
+  <& /elements/footer.html, %footer_args &>
+% } else {
+  <& /elements/footer-cust_main.html, %footer_args &>
+% }
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;