X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Ftr-pkg_svc.html;h=de3f95a3a20460ae70400216d0fddc10b17f0013;hb=8eb6542c022ac84b125416f3fb0828b278ba600a;hp=6d17a376de268a074eae7f4cada6c913fdc30d1b;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924;p=freeside.git
diff --git a/httemplate/elements/tr-pkg_svc.html b/httemplate/elements/tr-pkg_svc.html
index 6d17a376d..de3f95a3a 100644
--- a/httemplate/elements/tr-pkg_svc.html
+++ b/httemplate/elements/tr-pkg_svc.html
@@ -1,18 +1,26 @@
+
+
<% itable('', 4, 1) %> |
-<% $thead %>
+<% pkg_svc_thead() %>
%foreach my $part_svc ( @part_svc ) {
% my $svcpart = $part_svc->svcpart;
% my $pkg_svc = $pkg_svc{$svcpart}
-% || new FS::pkg_svc ( {
-% 'pkgpart' => $pkgpart,
-% 'svcpart' => $svcpart,
-% 'quantity' => 0,
-% 'primary_svc' => '',
-% 'hidden' => '',
+% ||= qsearchs('pkg_svc', { 'pkgpart' => $pkgpart,
+% 'svcpart' => $svcpart } )
+% || new FS::pkg_svc ( {
+% 'pkgpart' => $pkgpart,
+% 'svcpart' => $svcpart,
+% 'quantity' => 0,
+% 'primary_svc' => '',
+% 'hidden' => '',
+% 'bulk_skip' => '',
% } );
% if ( $cgi->param('error') ) {
% my $primary_svc = ( $pkg_svc->primary_svc =~ /^Y/i );
@@ -23,8 +31,6 @@
% if ! $primary_svc && $pkg_svc_primary == $svcpart;
% }
%
-% push @fixups, "pkg_svc$svcpart";
-%
% my $quan = 0;
% if ( $cgi->param("pkg_svc$svcpart") =~ /^\s*(\d+)\s*$/ ) {
% $quan = $1;
@@ -32,6 +38,25 @@
% $quan = $pkg_svc->quantity;
% }
%
+% my $hidden = '';
+% if ( grep { $_ eq "hidden_svc$svcpart" } $cgi->param ) {
+% $hidden = $cgi->param("hidden_svc$svcpart");
+% } else {
+% $hidden = $pkg_svc->hidden;
+% }
+% my $bulk_skip = '';
+% if ( grep { $_ eq "no_bulk_skip$svcpart" } $cgi->param ) {
+% $bulk_skip = $cgi->param("no_bulk_skip$svcpart") eq 'Y' ? '' : 'Y';
+% } else {
+% $bulk_skip = $pkg_svc->bulk_skip;
+% }
+% my $provision_hold = '';
+% if ( grep { $_ eq "provision_hold$svcpart" } $cgi->param ) {
+% $provision_hold = $cgi->param("hidden_svc$svcpart");
+% } else {
+% $provision_hold = $pkg_svc->provision_hold;
+% }
+%
% my @exports = $pkg_svc->part_svc->part_export;
% foreach my $export ( @exports ) {
% push @possible_exports, $export if $export->can('external_pkg_map');
@@ -39,7 +64,7 @@
|
-
+
|
@@ -47,26 +72,63 @@
|
- <% $part_svc->svc %> <% $part_svc->disabled =~ /^Y/i ? ' (DISABLED' : '' %>
+ <% $part_svc->svc %> <% $part_svc->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
|
-
- hidden =~ /^Y/i ? ' CHECKED' : ''%>>
+ |
+ >
+ |
+
+
+ >
|
+
+
+ >
+ |
+
+
% foreach ( 1 .. $columns-1 ) {
% if ( $count == int( $_ * scalar(@part_svc) / $columns ) ) {
%
- <% $thead %>
+ | <% pkg_svc_thead() %>
% }
% }
% $count++;
%
-% }
+% } # foreach $part_svc
|
+
+
% if ( scalar(@possible_exports) > 0 || scalar(@mapped_exports) > 0 ) {
Export |
@@ -101,12 +163,21 @@
my %opt = @_;
my $cgi = $opt{'cgi'};
-my $thead = "\n\n". ntable('#cccccc', 2).
- '
Quan. | '.
- 'Primary | '.
- 'Service | '.
- 'Hide | '.
- '
';
+my $thead_count = 0;
+sub pkg_svc_thead {
+ $thead_count += 1;
+ return "\n\n". ntable('#cccccc', 2).
+ ''.
+ 'Quan. | '.
+ 'Primary | '.
+ 'Service | '.
+ 'Hide from Invoices | '.
+ 'Bulk Charge | '.
+ 'Remove Hold After Provisioning | '.
+ '
'.
+ qq!!;
+;
+}
my $part_pkg = $opt{'object'};
my $pkgpart = $part_pkg->pkgpart;
@@ -124,7 +195,6 @@ my @part_svc = qsearch('part_svc', {}, '', $where);
#my %pkg_svc = map { $_->svcpart => $_ } $q_part_pkg->pkg_svc;
my %pkg_svc = map { $_->svcpart => $_ } $part_pkg->pkg_svc('disable_linked'=>1);
-my @fixups = ();
my $count = 0;
my $columns = 3;