X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=1efe7456e944c47b0c61ab4f67af2565072e04b3;hp=080ba41d927d8f66071517a7ce09f335902c4d13;hb=ded6a5654efd56d2f271970c992133600e0223b1;hpb=8861d46820af163c7de7839178b6120c9b32ab2c diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 080ba41d9..1efe7456e 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -5,16 +5,7 @@ } &> -<& /elements/xmlhttp.html, - 'url' => $p.'misc/xmlhttp-part_pkg_usageprice.html', - 'subs' => [ 'get_part_pkg_usageprice' ], -&> - - - - - - +<& /elements/init_calendar.html &> @@ -39,7 +30,7 @@ <% mt('Sales') |h %> % } % if ( $show_sales_table ) { - <% ntable("#cccccc") %> + % } <& /elements/tr-select-sales.html, @@ -62,7 +53,7 @@ % } <% mt('Package') |h %> -<% ntable("#cccccc") %> +
% if ( $part_pkg ) { @@ -81,81 +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, + } &> + + -%#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? - - +

- -
+<& /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 &>

% } @@ -165,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, @@ -204,6 +195,52 @@ % } +% 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 %> + +<& /edit/elements/detail-table.html, + id => 'PackageCommentTable', + details => $details->{'package_comment'}, + field => 'package_comment', + &> +
+% } + +
% my $onclick = $cgi->param('lock_locationnum') % ? 'document.OrderPkgForm.submit()' @@ -253,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