X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=e28250110f5c4ccacfaa761842a97806606c282d;hb=087c45b52363e519320eef20482ca94a7a8fb5f0;hp=057346810b43a0555a87723df9900a9278ee18c5;hpb=5c0cfcb8dec7c4f3a7aecea4c550ffb4bfb774c3;p=freeside.git
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 057346810..e28250110 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -5,10 +5,7 @@
}
&>
-
-
-
-
+<& /elements/init_calendar.html &>
@@ -33,12 +30,13 @@
<% mt('Sales') |h %>
% }
% 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 +53,7 @@
% }
<% mt('Package') |h %>
-<% ntable("#cccccc", 2) %>
+<% ntable("#cccccc") %>
% if ( $part_pkg ) {
@@ -74,66 +72,62 @@
<& /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 date') |h %>
- |
- <& /elements/input-date-field.html,{
- 'name' => 'start_date',
- 'format' => $date_format,
- 'value' => '',
- 'noinit' => 1,
- } &>
-
- (<% mt('leave blank to start immediately') |h %>)
- |
-
-
-
- <% 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,
+ } &>
+ |
+
+
+% }
+<% include('/misc/cust_pkg_usageprice.html',
+ 'pkgpart' => $pkgpart
+ ) %>
+
+
% my $discount_cust_pkg = $curuser->access_right('Discount customer package');
% my $waive_setup_fee = $curuser->access_right('Waive setup fee');
%
% if ( $discount_cust_pkg || $waive_setup_fee ) {
<% mt('Discounting') |h %>
- <% ntable("#cccccc", 2) %>
-
-% 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,
- &>
-% }
-
+ <% ntable("#cccccc") %>
+ <& /elements/tr-select-pkg-discount.html &>
% }
@@ -143,7 +137,7 @@
% my $contact_title = $lock_locationnum ? 'Contact'
% : 'Contact and Location';
<% mt($contact_title) |h %>
-<% ntable("#cccccc", 2) %>
+<% ntable("#cccccc") %>
<& /elements/tr-select-contact.html,
'cgi' => $cgi,
@@ -175,8 +169,9 @@
<& /elements/standardize_locations.html,
'form' => "OrderPkgForm",
- 'callback' => 'document.OrderPkgForm.submit();',
+ 'callback' => 'document.OrderPkgForm.submit()',
'with_census' => 1,
+ 'with_census_functions' => 1,
&>
% }