X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=36f1f5f370b759bd9dceeca7263a690fa5eead8b;hb=884a56decedee6bb6704fcc8887d65bb50ce6516;hp=057346810b43a0555a87723df9900a9278ee18c5;hpb=ad46607a14730f6ce4d70cd796b803591d90070e;p=freeside.git

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 057346810..36f1f5f37 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -33,12 +33,13 @@
   <FONT CLASS="fsinnerbox-title"><% mt('Sales') |h %></FONT>
 % }
 % if ( $show_sales_table ) {
-  <% ntable("#cccccc", 2) %>
+  <% ntable("#cccccc") %>
 % }
 
 <& /elements/tr-select-sales.html,
      'curr_value' => scalar($cgi->param('salesnum')),
-     'th' => 1,
+     'agentnum'   => $agent->agentnum,
+     'th'         => 1,
 &>
 
 % if ( $conf->exists('pkg_referral') ) {
@@ -55,7 +56,7 @@
 % }
 
 <FONT CLASS="fsinnerbox-title"><% mt('Package') |h %></FONT>
-<% ntable("#cccccc", 2) %>
+<% ntable("#cccccc") %>
 
 % if ( $part_pkg ) {
     <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<% $part_pkg->pkgpart %>">
@@ -74,41 +75,47 @@
 
 <& /elements/tr-input-pkg-quantity.html, curr_value => $quantity &>
 
-% if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
-%   my $what = lc(FS::payby->shortname($cust_main->payby));
+% unless ( $quotationnum ) {
+
+%   if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
+%     my $what = lc(FS::payby->shortname($cust_main->payby));
+      <TR>
+        <TH ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TH>
+        <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD>
+      </TR>
+%   }
+
     <TR>
-      <TH ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TH>
-      <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD>
+      <TH ALIGN="right"><% mt('Start') |h %> </TD>
+      <TD COLSPAN=6>
+        <INPUT TYPE="radio" NAME="start" ID="start_now" VALUE="" <% $cgi->param('start') eq '' ? 'CHECKED' : ''%>>Now
+        &emsp;
+        <INPUT TYPE="radio" NAME="start" ID="start_on_hold" VALUE="on_hold" <% $cgi->param('start') eq 'on_hold' ? 'CHECKED' : ''%>>On hold
+        &emsp;
+        <INPUT TYPE="radio" NAME="start" ID="start_on_date" VALUE="on_date" <% $cgi->param('start') eq 'date' ? 'CHECKED' : ''%>>On date
+
+        <& /elements/input-date-field.html,{
+                    'name'      => 'start_date',
+                    'format'    => $date_format,
+                    'value'     => '',
+                    'noinit'    => 1,
+                  } &>
+      </TD>
     </TR>
-% }
 
-<TR>
-  <TH ALIGN="right"><% mt('Start date') |h %> </TD>
-  <TD COLSPAN=6>
-    <& /elements/input-date-field.html,{
-                'name'      => 'start_date',
-                'format'    => $date_format,
-                'value'     => '',
-                'noinit'    => 1,
-              } &>
-    <IMG SRC   = "<%$fsurl%>images/calendar-disabled.png"
-         ID    = "start_date_button_disabled"
-         STYLE = "display:none">
-    <FONT SIZE=-1>(<% mt('leave blank to start immediately') |h %>)</FONT>
-  </TD>
-</TR>
-
-<TR>
-  <TH ALIGN="right"><% mt('Contract end date') |h %> </TD>
-  <TD COLSPAN=6>
-    <& /elements/input-date-field.html,{
-                'name'      => 'contract_end',
-                'format'    => $date_format,
-                'value'     => '',
-                'noinit'    => 1,
-                } &>
-  </TD>
-</TR>
+    <TR>
+      <TH ALIGN="right"><% mt('Contract end date') |h %> </TD>
+      <TD COLSPAN=6>
+        <& /elements/input-date-field.html,{
+                    'name'      => 'contract_end',
+                    'format'    => $date_format,
+                    'value'     => '',
+                    'noinit'    => 1,
+                    } &>
+      </TD>
+    </TR>
+
+% }
 
 </TABLE><BR>
 
@@ -117,7 +124,7 @@
 %
 % if ( $discount_cust_pkg || $waive_setup_fee ) {
   <FONT CLASS="fsinnerbox-title"><% mt('Discounting') |h %></FONT>
-  <% ntable("#cccccc", 2) %>
+  <% ntable("#cccccc") %>
 
 %   if ( $waive_setup_fee ) {
       <TR>
@@ -143,7 +150,7 @@
 % my $contact_title = $lock_locationnum ? 'Contact'
 %                                       : 'Contact and Location';
 <FONT CLASS="fsinnerbox-title"><% mt($contact_title) |h %></FONT>
-<% ntable("#cccccc", 2) %>
+<% ntable("#cccccc") %>
 
 <& /elements/tr-select-contact.html,
              'cgi'           => $cgi,
@@ -175,8 +182,9 @@
 
   <& /elements/standardize_locations.html,
                 'form'        => "OrderPkgForm",
-                'callback'    => 'document.OrderPkgForm.submit();',
+                'callback'    => 'document.OrderPkgForm.submit()',
                 'with_census' => 1,
+                'with_census_functions' => 1,
   &>
 
 % }