4.x style one-time charge

[freeside.git] / httemplate / edit / quick-charge.html

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index a9e57b6..51cd854 100644 (file)
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,11 +1,15 @@
-<& /elements/header.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 &>
@@ -40,7 +44,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;
@@ -95,13 +99,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>
@@ -117,7 +115,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
 
@@ -205,7 +203,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"
@@ -229,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"
@@ -245,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"
@@ -265,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"
@@ -317,25 +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'),
-  '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"