X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fmisc%2Forder_pkg.html;h=7a63b5c2b0ffc2b86de63f52b7ee38372accf3da;hb=9f179ee5fc7fc07a3f5e03ad1ad58cd3cadf1a56;hp=4e061e2f7a04fe0555f79d99fea05cd10bfa8bd7;hpb=29df5bd8f2f5b8e067945884dd18b549c4fcec35;p=freeside.git
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 4e061e2f7..7a63b5c2b 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -30,7 +30,7 @@
<% mt('Sales') |h %>
% }
% if ( $show_sales_table ) {
- <% ntable("#cccccc") %>
+
% }
<& /elements/tr-select-sales.html,
@@ -53,7 +53,7 @@
% }
<% mt('Package') |h %>
-<% ntable("#cccccc") %>
+
% if ( $part_pkg ) {
@@ -136,17 +136,16 @@
-<% include('/misc/cust_pkg_usageprice.html',
+<& /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") %>
+
<& /elements/tr-select-pkg-discount.html &>
@@ -157,7 +156,7 @@
% my $contact_title = $lock_locationnum ? 'Contact'
% : 'Contact and Location';
<% mt($contact_title) |h %>
-<% ntable("#cccccc") %>
+
<& /elements/tr-select-contact.html,
'cgi' => $cgi,
@@ -189,13 +188,71 @@
<& /elements/standardize_locations.html,
'form' => "OrderPkgForm",
- 'callback' => 'document.OrderPkgForm.submit()',
+ 'callback' => $conf->exists('tax_district_method')
+ ? 'wa_state_tax_district()'
+ : 'submit_continue()',
'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()'
@@ -245,6 +302,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