X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=4e061e2f7a04fe0555f79d99fea05cd10bfa8bd7;hb=ff8a7535a81005b7c66e8e75e5cfa8449a8cef04;hp=672e142c7904a6e85889844171377e929e984819;hpb=a7d8494c57376bfc493fbaa234b250cc86a79a94;p=freeside.git

diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 672e142c7..4e061e2f7 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -5,11 +5,6 @@
    }
 &>
 
-<& /elements/xmlhttp.html,
-              'url'  => $p.'misc/xmlhttp-part_pkg_usageprice.html',
-              'subs' => [ 'get_part_pkg_usageprice' ],
-&>
-
 <& /elements/init_calendar.html &>
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT>
@@ -77,59 +72,73 @@
 
 <& /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' : ''%>
+               <% $pkgpart ? '' : 'DISABLED' %>
+        >Now
+        &emsp;
+        <INPUT TYPE  = "radio"
+               NAME  = "start"
+               ID    = "start_on_hold"
+               VALUE = "on_hold"
+               <% $cgi->param('start') eq 'on_hold' ? 'CHECKED' : ''%>
+               <% $pkgpart ? '' : 'DISABLED' %>
+        >On hold
+        &emsp;
+        <INPUT TYPE  = "radio" 
+               NAME  = "start" 
+               ID    = "start_on_date" 
+               VALUE = "on_date" 
+               <% $cgi->param('start') eq 'date' ? 'CHECKED' : ''%>
+               <% $pkgpart ? '' : 'DISABLED' %>
+        >On date
+
+        <& /elements/input-date-field.html,
+             { 'name'      => 'start_date',
+               'format'    => $date_format,
+               'value'     => '',
+               'noinit'    => 1,
+             }
+        &>
+
+      </TD>
     </TR>
-% }
-
-<TR>
-  <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('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>
+    <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>
 
-%#so:
-%# - hide until you selecdt a pacakge with add-ons
-%# -lookup and display the available add-ons when 
-%# -add them to the (recur if there is one, otherwise setup) price and display magically like processing fees do on edit/cust_pay.cgi
+% }
 
-%# better label?
-<FONT CLASS = "fsinnerbox-title" 
-      ID    = "cust_pkg_usageprice_title"
-      STYLE = "display:none"
-><% mt('Usage add-ons') |h %></FONT>
-<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 ID="cust_pkg_usageprice_table">
+</TABLE><BR>
 
-</TABLE>
+<% include('/misc/cust_pkg_usageprice.html',
+     'pkgpart' => $pkgpart
+   ) %>
 <BR>
 
 % my $discount_cust_pkg = $curuser->access_right('Discount customer package');
@@ -138,22 +147,7 @@
 % if ( $discount_cust_pkg || $waive_setup_fee ) {
   <FONT CLASS="fsinnerbox-title"><% mt('Discounting') |h %></FONT>
   <% ntable("#cccccc") %>
-
-%   if ( $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 ( $discount_cust_pkg ) {
-      <& /elements/tr-select-discount.html,
-               'element_etc' => 'DISABLED',
-               'colspan'     => 7,
-               'cgi'         => $cgi,
-      &>
-%   }
-
+    <& /elements/tr-select-pkg-discount.html &>
   </TABLE><BR>
 
 % }