X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=1efe7456e944c47b0c61ab4f67af2565072e04b3;hp=39734427e1da51f118814afd7ecd600f9dada9c1;hb=833cfe5c9938d33c3e6b97ed610c25a7afa6eb04;hpb=d1ef14dc43b37960ce08aae9b795b593a24cdc15 diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 39734427e..1efe7456e 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -1,11 +1,11 @@ -<& /elements/header-popup.html, $quotationnum ? mt('Add package to quotation') - : mt('Order new package') +<& /elements/header-popup.html, { + 'title' => $quotationnum ? mt('Add package to quotation') + : mt('Order new package'), + 'nobr' => 1, + } &> - - - - +<& /elements/init_calendar.html &> @@ -21,7 +21,40 @@ % } -<% ntable("#cccccc", 2) %> +% my $num_sales = $agent->num_sales; +% my $conf_pkg_referral = $conf->exists('pkg_referral'); +% my $show_sales = $num_sales && $conf_pkg_referral; +% my $show_sales_table = $num_sales || $conf_pkg_referral; + +% if ( $show_sales ) { + <% mt('Sales') |h %> +% } +% if ( $show_sales_table ) { + +% } + +<& /elements/tr-select-sales.html, + 'curr_value' => scalar($cgi->param('salesnum')), + 'agentnum' => $agent->agentnum, + 'th' => 1, +&> + +% if ( $conf->exists('pkg_referral') ) { + <& /elements/tr-select-part_referral.html, + 'curr_value' => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum, + 'disable_empty' => 1, + 'multiple' => $conf->exists('pkg_referral-multiple'), + 'colspan' => 7, + &> +% } + +% if ( $show_sales_table ) { +

+% } + +<% mt('Package') |h %> + + % if ( $part_pkg ) { @@ -37,62 +70,94 @@ &> % } -% if ( $conf->exists('invoice-unitprice') ) { +<& /elements/tr-input-pkg-quantity.html, curr_value => $quantity &> + +% unless ( $quotationnum ) { + +% if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) { +% my $what = lc(FS::payby->shortname($cust_main->payby)); + + + + +% } + - -% } else { - -% } - - - - -% if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) { -% my $what = lc(FS::payby->shortname($cust_main->payby)); - - + -% } -% if ( $curuser->access_right('Discount customer package') ) { - <& /elements/tr-select-discount.html, - 'element_etc' => 'DISABLED', - 'colspan' => 7, - 'cgi' => $cgi, - &> % } -% if ( $curuser->access_right('Waive setup fee') ) { - - - - -% } +
<% mt("Disable automatic $what charge") |h %>
<% mt('Quantity') |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' => $start_date, - 'noinit' => 1, - } &> - (<% mt('leave blank to start immediately') |h %>) -
<% mt("Disable automatic $what charge") |h %> <% mt('Contract end date') |h %> + + <& /elements/input-date-field.html,{ + 'name' => 'contract_end', + 'format' => $date_format, + 'value' => '', + 'noinit' => 1, + } &> +
<% mt('Waive setup fee') |h %>

+ +<& /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 %> + + <& /elements/tr-select-pkg-discount.html &> +

-% if ( $conf->exists('pkg_referral') ) { - <& /elements/tr-select-part_referral.html, - 'curr_value' => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum, - 'disable_empty' => 1, - 'multiple' => $conf->exists('pkg_referral-multiple'), - 'colspan' => 7, - &> % } + +% my $lock_locationnum = scalar($cgi->param('lock_locationnum')); +% my $contact_title = $lock_locationnum ? 'Contact' +% : 'Contact and Location'; +<% mt($contact_title) |h %> + + <& /elements/tr-select-contact.html, 'cgi' => $cgi, 'cust_main' => $cust_main, @@ -117,30 +182,65 @@ % } - - - -
<% mt('Contract end date') |h %> - - <& /elements/input-date-field.html,{ - 'name' => 'contract_end', - 'format' => $date_format, - 'value' => '', - 'noinit' => 1, - } &> -
% unless ( $cgi->param('lock_locationnum') ) { <& /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 %> + +<& /edit/elements/detail-table.html, + id => 'PackageCommentTable', + details => $details->{'package_comment'}, + field => 'package_comment', + &> +
+% } + +
% my $onclick = $cgi->param('lock_locationnum') % ? 'document.OrderPkgForm.submit()' @@ -190,17 +290,34 @@ 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 + : $prospect_main->agent; + my $part_pkg = ''; if ( $cgi->param('lock_pkgpart') ) { $part_pkg = qsearchs({ 'table' => 'part_pkg', 'hashref' => { 'pkgpart' => scalar($cgi->param('lock_pkgpart')) }, - 'extra_sql' => ' AND '. FS::part_pkg->agent_pkgs_sql( - $cust_main ? $cust_main->agent - : $prospect_main->agent - ), + 'extra_sql' => ' AND '. FS::part_pkg->agent_pkgs_sql($agent), }) or die "unknown pkgpart ". $cgi->param('lock_pkgpart'); } @@ -213,11 +330,6 @@ if ( $cgi->param('quantity') =~ /^\s*(\d+)\s*$/ ) { } my $format = $date_format. ' %T %z (%Z)'; #false laziness w/REAL_cust_pkg.cgi? -my $start_date = ''; -if( ! $conf->exists('order_pkg-no_start_date') && $cust_main ) { - $start_date = $cust_main->next_bill_date; - $start_date = $start_date ? time2str($format, $start_date) : ''; -} my $svcpart = scalar($cgi->param('svcpart'));