X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=e28250110f5c4ccacfaa761842a97806606c282d;hb=affba4b02a38999423f4189a40862a4c6549552a;hp=672e142c7904a6e85889844171377e929e984819;hpb=a7d8494c57376bfc493fbaa234b250cc86a79a94;p=freeside.git
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 672e142c7..e28250110 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 &>
@@ -77,59 +72,53 @@
<& /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));
+
+ <% mt("Disable automatic $what charge") |h %>
+
+
+% }
+
- <% mt("Disable automatic $what charge") |h %>
-
+ <% mt('Start') |h %>
+
+ param('start') eq '' ? 'CHECKED' : ''%>>Now
+
+ param('start') eq 'on_hold' ? 'CHECKED' : ''%>>On hold
+
+ param('start') eq 'date' ? 'CHECKED' : ''%>>On date
+
+ <& /elements/input-date-field.html,{
+ 'name' => 'start_date',
+ 'format' => $date_format,
+ 'value' => '',
+ 'noinit' => 1,
+ } &>
+
-% }
-
-
- <% mt('Start') |h %>
-
- param('start') eq '' ? 'CHECKED' : ''%>>Now
-
- param('start') eq 'on_hold' ? 'CHECKED' : ''%>>On hold
-
- param('start') eq 'date' ? 'CHECKED' : ''%>>On date
-
- <& /elements/input-date-field.html,{
- 'name' => 'start_date',
- 'format' => $date_format,
- 'value' => '',
- 'noinit' => 1,
- } &>
-
-
-
-
- <% mt('Contract end date') |h %>
-
- <& /elements/input-date-field.html,{
- 'name' => 'contract_end',
- 'format' => $date_format,
- 'value' => '',
- 'noinit' => 1,
- } &>
-
-
-
+
+ <% mt('Contract end date') |h %>
+
+ <& /elements/input-date-field.html,{
+ 'name' => 'contract_end',
+ 'format' => $date_format,
+ 'value' => '',
+ 'noinit' => 1,
+ } &>
+
+
-%#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?
-<% mt('Usage add-ons') |h %>
-
-
+<% include('/misc/cust_pkg_usageprice.html',
+ 'pkgpart' => $pkgpart
+ ) %>
% my $discount_cust_pkg = $curuser->access_right('Discount customer package');
@@ -138,22 +127,7 @@
% if ( $discount_cust_pkg || $waive_setup_fee ) {
<% mt('Discounting') |h %>
<% ntable("#cccccc") %>
-
-% if ( $waive_setup_fee ) {
-
- <% mt('Waive setup fee') |h %>
-
-
-% }
-
-% if ( $discount_cust_pkg ) {
- <& /elements/tr-select-discount.html,
- 'element_etc' => 'DISABLED',
- 'colspan' => 7,
- 'cgi' => $cgi,
- &>
-% }
-
+ <& /elements/tr-select-pkg-discount.html &>
% }