optimize CDR rating after timed rate perf regression, RT#15739

[freeside.git] / httemplate / misc / order_pkg.html

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 18ad746..2332f20 100644 (file)
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -1,29 +1,13 @@
-<% include('/elements/header-popup.html', 'Order new package' ) %>
+<& /elements/header-popup.html, mt('Order new package') &>
 
 <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 
-<SCRIPT TYPE="text/javascript">
+<SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT>
 
-  function enable_order_pkg () {
-    if ( document.OrderPkgForm.pkgpart.selectedIndex > 0 ) {
-      document.OrderPkgForm.submitButton.disabled = false;
-      if ( document.OrderPkgForm.pkgpart.options[document.OrderPkgForm.pkgpart.selectedIndex].getAttribute('data-can_discount') == 1 ) {
-        document.OrderPkgForm.discountnum.disabled = false;
-      } else {
-        document.OrderPkgForm.discountnum.disabled = true;
-      }
-    } else {
-      document.OrderPkgForm.submitButton.disabled = true;
-      document.OrderPkgForm.discountnum.disabled = true;
-    }
-  }
-
-</SCRIPT>
-
-<% include('/elements/error.html') %>
+<& /elements/error.html &>
 
 <FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/quick-cust_pkg.cgi" METHOD="POST">
 
@@ -37,57 +21,60 @@
 % if ( $part_pkg ) {
     <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<% $part_pkg->pkgpart %>">
     <TR>
-      <TH ALIGN="right">Package</TH>
+      <TH ALIGN="right"><% mt('Package') |h %></TH>
       <TD COLSPAN=6><% $part_pkg->pkg_comment |h %></TD>
     </TR>
 % } else {
-    <% include('/elements/tr-select-cust-part_pkg.html',
+    <& /elements/tr-select-cust-part_pkg.html,
                  'curr_value' => $pkgpart,
                  'classnum'   => -1,
                  'cust_main'  => $cust_main,
-                 'onchange'   => 'enable_order_pkg',
-              )
-    %>
+    &>
 % }
 
 <TR>
-  <TH ALIGN="right">Start date </TD>
+  <TH ALIGN="right"><% mt('Start date') |h %> </TD>
   <TD COLSPAN=6>
-    <% include('/elements/input-date-field.html',{
+    <& /elements/input-date-field.html,{
                 'name'      => 'start_date',
                 'format'    => $date_format,
                 'value'     => $start_date,
                 'noinit'    => 1,
-              }) %>
-    <FONT SIZE=-1>(leave blank to start immediately)</FONT>
+              } &>
+    <FONT SIZE=-1>(<% mt('leave blank to start immediately') |h %>)</FONT>
   </TD>
 </TR>
 
 % if ( $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
 %   my $what = lc(FS::payby->shortname($cust_main->payby));
     <TR>
-      <TH ALIGN="right">Disable automatic <% $what %> charge </TH>
+      <TH ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TH>
       <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD>
     </TR>
 % }
 
 % if ( $curuser->access_right('Discount customer package') ) {
-  <% include('/elements/tr-select-discount.html',
+  <& /elements/tr-select-discount.html,
                'element_etc' => 'DISABLED',
                'colspan'     => 7,
                'cgi'         => $cgi,
-            )
-  %>
+  &>
+% }
+
+% if ( $curuser->access_right('Waive setup fee') ) {
+    <TR>
+      <TH ALIGN="right"><% mt('Waive setup fee') |h %> </TH>
+      <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="waive_setup" VALUE="Y"></TD>
+    </TR>
 % }
 
 % if ( $conf->exists('pkg_referral') ) {
-  <% include('/elements/tr-select-part_referral.html',
+  <& /elements/tr-select-part_referral.html,
                'curr_value'    => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum,
                'disable_empty' => 1,
                'multiple'      => $conf->exists('pkg_referral-multiple'),
                'colspan'       => 7,
-            )
-  %>
+  &>
 % }
 
 % if ( $cgi->param('lock_locationnum') ) {
@@ -100,23 +87,22 @@
 
 % } else {
 
-    <% include('/elements/tr-select-cust_location.html',
+    <& /elements/tr-select-cust_location.html,
                  'cgi'       => $cgi,
                  'cust_main' => $cust_main,
-              )
-    %>
+    &>
 
 % }
 
 <TR>
-  <TH ALIGN="right">Contract end date </TD>
+  <TH ALIGN="right"><% mt('Contract end date') |h %> </TD>
   <TD COLSPAN=6>
-    <% include('/elements/input-date-field.html',{
+    <& /elements/input-date-field.html,{
                 'name'      => 'contract_end',
                 'format'    => $date_format,
                 'value'     => '',
                 'noinit'    => 1,
-                }) %>
+                } &>
   </TD>
 </TR>
 
@@ -124,13 +110,12 @@
 
 % unless ( $cgi->param('lock_locationnum') ) {
 
-  <% include( '/elements/standardize_locations.html',
+  <& /elements/standardize_locations.html,
                 'form'       => "OrderPkgForm",
                 'onlyship'   => 1,
                 'no_company' => 1,
                 'callback'   => 'document.OrderPkgForm.submit();',
-            )
-  %>
+  &>
 
 % }
 
@@ -138,28 +123,13 @@
 % my $onclick = $cgi->param('lock_locationnum')
 %                 ? 'document.OrderPkgForm.submit()'
 %                 : 'standardize_new_location()';
-<INPUT NAME="submitButton"
-       TYPE="button"
-       VALUE="Order Package"
+<INPUT NAME    = "submitButton"
+       TYPE    = "button"
+       VALUE   = "<% mt("Order Package") |h %>"
        onClick = "this.disabled=true; <% $onclick %>;"
        <% $pkgpart ? '' : 'DISABLED' %>
 >
 
-<SCRIPT TYPE="text/javascript">
-
-  function standardize_new_location() {
-    var form = document.OrderPkgForm;
-    var loc = form.locationnum;
-    if (loc.type = 'select-one' && loc.options[loc.selectedIndex].value == -1) {
-      standardize_locations();
-    } else {
-      form.submit();
-    }
-  }
-
-</SCRIPT>
-
-
 </FORM>
 </BODY>
 </HTML>