X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=b06f9622cfed4f0af146b99f45eebdefb9843038;hb=acbc7e3c55a3d5a0e9999b0630653ad510d4b19a;hp=e09ba986d5aa3c8d2c90dc352906e2e5734dd87a;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index e09ba986d..b06f9622c 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -1,5 +1,8 @@
-<& /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,
+ }
&>
@@ -21,7 +24,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 ) {
+ <% ntable("#cccccc") %>
+% }
+
+<& /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 %>
+<% ntable("#cccccc") %>
+
% if ( $part_pkg ) {
@@ -37,15 +73,14 @@
&>
% }
-% if ( $conf->exists('invoice-unitprice') ) {
+<& /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));
- | <% mt('Quantity') |h %>
- |
-
- |
+ <% mt("Disable automatic $what charge") |h %> |
+ |
-% } else {
-
% }
@@ -54,45 +89,63 @@
<& /elements/input-date-field.html,{
'name' => 'start_date',
'format' => $date_format,
- 'value' => $start_date,
+ 'value' => '',
'noinit' => 1,
} &>
+ 
(<% mt('leave blank to start immediately') |h %>)
-% if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
-% my $what = lc(FS::payby->shortname($cust_main->payby));
-
- | <% 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,
+ } &>
+ |
+
+
+
+
+% 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 ( $curuser->access_right('Discount customer package') ) {
- <& /elements/tr-select-discount.html,
+% 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,
- &>
-% }
+ &>
+% }
-% if ( $curuser->access_right('Waive setup fee') ) {
-
- | <% mt('Waive setup fee') |h %> |
- |
-
-% }
+
-% 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 %>
+<% ntable("#cccccc") %>
+
<& /elements/tr-select-contact.html,
'cgi' => $cgi,
'cust_main' => $cust_main,
@@ -117,25 +170,15 @@
% }
-
- | <% 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();',
+ 'form' => "OrderPkgForm",
+ 'callback' => 'document.OrderPkgForm.submit()',
+ 'with_census' => 1,
+ 'with_census_functions' => 1,
&>
% }
@@ -191,15 +234,15 @@ if ( $cgi->param('quotationnum') =~ /^(\d+)$/ ) {
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');
}
@@ -212,11 +255,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'));