X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=a08cb4bf1d2e0dae2b95d508ca26f0210bf853a2;hb=d2485c6fa278d7a4a1c940605816013f41d1f7e0;hp=03531bf4dea4e3815a1133a1a90ea52178844461;hpb=f417eee294482e6a7bc4ad60c916b84ffd662112;p=freeside.git
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 03531bf4d..a08cb4bf1 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -5,10 +5,7 @@
}
&>
-
-
-
-
+<& /elements/init_calendar.html &>
@@ -75,66 +72,81 @@
<& /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' : ''%>
+ <% $pkgpart ? '' : 'DISABLED' %>
+ >Now
+
+ param('start') eq 'on_hold' ? 'CHECKED' : ''%>
+ <% $pkgpart ? '' : 'DISABLED' %>
+ >On hold
+
+ param('start') eq 'date' ? 'CHECKED' : ''%>
+ <% $pkgpart ? '' : 'DISABLED' %>
+ >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,
+ } &>
+ |
+
+
+% }
+<& /elements/table-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") %>
-
-% 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 &>
% }
@@ -176,12 +188,59 @@
<& /elements/standardize_locations.html,
'form' => "OrderPkgForm",
- 'callback' => 'document.OrderPkgForm.submit();',
+ 'callback' => 'document.OrderPkgForm.submit()',
'with_census' => 1,
+ 'with_census_functions' => 1,
&>
% }
+% if ($quotationnum) {
+
+<% mt('Quotation details') |h %>
+
+
+ |
+
+
+ |
+
+<& /edit/elements/detail-table.html,
+ id => 'QuotationDetailTable',
+ details => $details->{'quotation_detail'},
+ field => 'quotation_detail',
+ &>
+
+% } else {
+
+<% mt('Invoice details') |h %>
+
+<& /edit/elements/detail-table.html,
+ id => 'InvoiceDetailTable',
+ details => $details->{'invoice_detail'},
+ field => 'invoice_detail',
+ &>
+
+
+
+<% mt('Package comments') |h %>
+
+% }
+
+
% my $onclick = $cgi->param('lock_locationnum')
% ? 'document.OrderPkgForm.submit()'
@@ -231,6 +290,23 @@ if ( $cgi->param('quotationnum') =~ /^(\d+)$/ ) {
$quotationnum = $1;
}
+my $details = {
+ 'invoice_detail' => [],
+ 'package_comment' => [],
+ 'quotation_detail' => [],
+};
+foreach my $field ( $cgi->param ) {
+ foreach my $detailtype ( keys %$details ) {
+ if ($field =~ /^$detailtype(\d+)$/) {
+ $details->{$detailtype}->[$1] = $cgi->param($field);
+ }
+ }
+}
+foreach my $detailtype ( keys %$details ) {
+ @{ $details->{$detailtype} } = grep { length($_) } @{ $details->{$detailtype} };
+}
+my $copy_on_order = $cgi->param('copy_on_order');
+
die 'no custnum or prospectnum' unless $cust_main || $prospect_main;
my $agent = $cust_main ? $cust_main->agent