X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fsection.html;h=16016626406fcd1471391e8b65054b50be6deba6;hb=7118f8f027744b31c87444da0a47de3b1daa5da2;hp=95b486f05531ca2f206c46fb7f11aed56d2dd8b5;hpb=71b86f3f89e8fdeb7142fa82cdbe3e3afce7a903;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html
index 95b486f05..160166264 100755
--- a/httemplate/view/cust_main/packages/section.html
+++ b/httemplate/view/cust_main/packages/section.html
@@ -1,20 +1,29 @@
% if ( @$packages ) {
+
% #my $width = $show_location ? 'WIDTH="25%"' : 'WIDTH="33%"';
<% mt('Package') |h %> |
<% mt('Status') |h %> |
<% mt('Contact/Location') |h %> |
+% if (!$opt{no_services}) {
<% mt('Services') |h %> |
+% }
+
% #$FS::cust_pkg::DEBUG = 2;
% foreach my $cust_pkg (@$packages) {
+% # if requested, this can override cust_pkg-group_by_location
<& .packagerow, $cust_pkg,
+ %conf_opt,
( map { $_ => $opt{$_} } qw(
- cust_main bgcolor
- no_links before_pkg_callback before_svc_callback after_svc_callback
+ cust_main bgcolor no_links cust_location_cache
+ before_pkg_callback before_svc_callback after_svc_callback
+ cust_pkg-group_by_location
+ no_services
)),
- %conf_opt
+ #for status.html
+ 'has_cust_payby_auto' => $opt{cust_main}->has_cust_payby_auto,
&>
% }
% } else { # there are no packages
@@ -25,15 +34,18 @@
% my ($cust_pkg, %iopt) = @_;
% $iopt{'cust_pkg'} = $cust_pkg;
% $iopt{'part_pkg'} = $cust_pkg->part_pkg;
+% $iopt{'row'} = $row;
<& package.html, %iopt &>
<& status.html, %iopt &>
- <& contact.html, %iopt &>
+ <& contact.html, %iopt &>
<& location.html, %iopt &>
|
+% if (!$iopt{no_services}) {
<& services.html, %iopt &>
+% }
% # insert hidden predecessors to this package, if any
% # and a rolldown button to show them
@@ -60,9 +72,11 @@
<& .packagerow, $cust_pkg->change_to_pkg, %iopt, 'change_from' => 1 &>
% }
% # include supplemental packages if any
-% $iopt{'supplemental'} = ($iopt{'supplemental'} || 0) + 1;
-% foreach my $supp_pkg ($cust_pkg->supplemental_pkgs) {
- <& .packagerow, $supp_pkg, %iopt &>
+% if ( $cust_pkg->_supplemental ) {
+% $iopt{'supplemental'} = ($iopt{'supplemental'} || 0) + 1;
+% foreach my $supp_pkg (@{ $cust_pkg->_supplemental }) {
+ <& .packagerow, $supp_pkg, %iopt &>
+% }
% }
%def>
<%shared>
@@ -99,6 +113,7 @@ my %conf_opt = (
#for package.html
'invoice-unitprice' => $conf->exists('invoice-unitprice'),
'show_pkgnum' => $curuser->option('show_pkgnum'),
+ 'part_pkg-term_discounts' => $conf->exists('part_pkg-term_discounts'),
#for services.html and status.html
'cust_pkg-display_times' => ($conf->exists('cust_pkg-display_times')
@@ -106,6 +121,7 @@ my %conf_opt = (
#for status.html
'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'),
'pkg_attached' => $pkg_attached,
+ 'part_pkg-delay_cancel-days' => $conf->config('part_pkg-delay_cancel-days') || 1,
#for status.html pkg-balances
'pkg-balances' => $conf->exists('pkg-balances'),
'money_char' => ( $conf->config('money_char') || '$' ),
@@ -120,6 +136,7 @@ my %conf_opt = (
#for services.html
'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'),
+ 'svc_phone-bulk_provision_simple' => $conf->exists('svc_phone-bulk_provision_simple'),
'legacy_link' => $conf->exists('legacy_link'),
'manage_link' => scalar($conf->config('svc_broadband-manage_link')),
'manage_link_text' => scalar($conf->config('svc_broadband-manage_link_text')),