From c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 31 Jan 2006 04:26:54 +0000 Subject: move header() to include(/elements/header.html) so it can be changed in one place, thanks to Scott Edwards --- httemplate/browse/part_pkg.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 8d5b55451..e6454639f 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -48,7 +48,7 @@ my $conf = new FS::Conf; my $taxclasses = $conf->exists('enable_taxclasses'); %> -<%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %> +<%= include("/elements/header.html","Package Definition Listing",menubar( 'Main Menu' => $p )) %> <% unless ( $cgi->param('active') ) { %> One or more service definitions are grouped together into a package definition and given pricing information. Customers purchase packages -- cgit v1.2.1 From 1a033848671cad2cbe7687b37fc718b3b2a68b83 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 22 Apr 2006 00:58:40 +0000 Subject: start of package class web UI (add/edit package classes, package class selection in package def edit) --- httemplate/browse/part_pkg.cgi | 373 ++++++++++++++++++++++++----------------- 1 file changed, 220 insertions(+), 153 deletions(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index e6454639f..0afa54750 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,169 +1,236 @@ - <% -my %search; -if ( $cgi->param('showdisabled') ) { - %search = (); -} else { +my %search = (); +my $search = ''; +unless ( $cgi->param('showdisabled') ) { %search = ( 'disabled' => '' ); + $search = "( disabled = '' OR disabled IS NULL )"; } -my @part_pkg = qsearch('part_pkg', \%search ); -my $total = scalar(@part_pkg); - -my $sortby; -my %num_active_cust_pkg = (); -my( $suspended_sth, $canceled_sth ) = ( '', '' ); +my $select = '*'; +my $orderby = 'pkgpart'; if ( $cgi->param('active') ) { - my $active_sth = dbh->prepare( - 'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'. - ' AND ( cancel IS NULL OR cancel = 0 )'. - ' AND ( susp IS NULL OR susp = 0 )' - ) or die dbh->errstr; - foreach my $part_pkg ( @part_pkg ) { - $active_sth->execute($part_pkg->pkgpart) or die $active_sth->errstr; - $num_active_cust_pkg{$part_pkg->pkgpart} = - $active_sth->fetchrow_arrayref->[0]; - } - $sortby = sub { - $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart}; - }; - - $suspended_sth = dbh->prepare( - 'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'. - ' AND ( cancel IS NULL OR cancel = 0 )'. - ' AND susp IS NOT NULL AND susp != 0' - ) or die dbh->errstr; - - $canceled_sth = dbh->prepare( - 'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'. - ' AND cancel IS NOT NULL AND cancel != 0' - ) or die dbh->errstr; -} else { - $sortby = sub { $a->pkgpart <=> $b->pkgpart; }; + $orderby = 'num_active'; + + $select = " + + *, + + ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND ( cancel IS NULL OR cancel = 0 ) + AND ( susp IS NULL OR susp = 0 ) + ) AS num_active, + + ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND ( cancel IS NULL OR cancel = 0 ) + AND susp IS NOT NULL AND susp != 0 + ) AS num_suspended, + + ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND cancel IS NOT NULL AND cancel != 0 + ) AS num_cancelled + + "; + } my $conf = new FS::Conf; my $taxclasses = $conf->exists('enable_taxclasses'); -%> -<%= include("/elements/header.html","Package Definition Listing",menubar( 'Main Menu' => $p )) %> -<% unless ( $cgi->param('active') ) { %> - One or more service definitions are grouped together into a package - definition and given pricing information. Customers purchase packages - rather than purchase services directly.

- Add a new package definition -

-<% } %> - -<%= $total %> package definitions -<% if ( $cgi->param('showdisabled') ) { $cgi->param('showdisabled', 0); %> - ( hide disabled packages ) -<% } else { $cgi->param('showdisabled', 1); %> - ( show disabled packages ) -<% } %> - -<% my $colspan = $cgi->param('showdisabled') ? 2 : 3; %> - -<%= &table() %> - - >Package - Comment -<% if ( $cgi->param('active') ) { %> - Customer
packages -<% } %> - Freq. -<% if ( $taxclasses ) { %> - Taxclass -<% } %> - Plan - Data - Service - Quan. -<% if ( dbdef->table('pkg_svc')->column('primary_svc') ) { %> - Primary -<% } %> - - +my $html_init; +unless ( $cgi->param('active') ) { + $html_init = qq! + One or more service definitions are grouped together into a package + definition and given pricing information. Customers purchase packages + rather than purchase services directly.

+ Add a new package definition +

+ !; +} -<% -foreach my $part_pkg ( sort $sortby @part_pkg ) { - my @pkg_svc = $part_pkg->pkg_svc; - my($rowspan)=scalar(@pkg_svc); - my $plandata; - if ( $part_pkg->plan ) { - $plandata = $part_pkg->plandata; - $plandata =~ s/^(\w+)=/$1 /mg; - $plandata =~ s/\n/
/g; - } else { - $part_pkg->plan('(legacy)'); - $plandata = "Setup ". $part_pkg->setup. - "
Recur ". $part_pkg->recur; - } -%> - - ><%= $part_pkg->pkgpart %> - -<% unless ( $cgi->param('showdisabled') ) { %> - > - <% if ( $part_pkg->disabled ) { %> - DISABLED - <% } %> - -<% } %> - - ><%= $part_pkg->pkg %> - ><%= $part_pkg->comment %> - -<% if ( $cgi->param('active') ) { %> - > - <%= $num_active_cust_pkg{$part_pkg->pkgpart} %> active
- - <% $suspended_sth->execute( $part_pkg->pkgpart ) - or die $suspended_sth->errstr; - my $num_suspended = $suspended_sth->fetchrow_arrayref->[0]; - %> - <%= $num_suspended %> suspended
- - <% $canceled_sth->execute( $part_pkg->pkgpart ) - or die $canceled_sth->errstr; - my $num_canceled = $canceled_sth->fetchrow_arrayref->[0]; - %> - <%= $num_canceled %> canceled - -<% } %> - - ><%= $part_pkg->freq_pretty %> - -<% if ( $taxclasses ) { %> - ><%= $part_pkg->taxclass || ' ' %> -<% } %> - - ><%= $part_pkg->plan %> - ><%= $plandata %> +my $posttotal; +if ( $cgi->param('showdisabled') ) { + $cgi->param('showdisabled', 0); + $posttotal = '( hide disabled packages )'; +} else { + $cgi->param('showdisabled', 1); + $posttotal = '( show disabled packages )'; +} -<% - my($n)=""; - foreach my $pkg_svc ( @pkg_svc ) { - my($svcpart)=$pkg_svc->getfield('svcpart'); - my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart }); - print $n,qq!!, - $part_svc->getfield('svc'),"", - $pkg_svc->getfield('quantity'),""; - if ( dbdef->table('pkg_svc')->column('primary_svc') ) { - print ''; - print 'PRIMARY' if $pkg_svc->primary_svc =~ /^Y/i; - print ''; - } - print "\n"; - $n=""; - } -%> +# ------ + +my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; + +my @header = ( '#', 'Package', 'Comment' ); +my @fields = ( 'pkgpart', 'pkg', 'comment' ); +my $align = 'rll'; +my @links = ( $link, $link, '' ); +my @style = ( '', '', '' ); + +unless ( $cgi->param('showdisabled') ) { #its been reversed already + push @header, 'Status'; + push @fields, sub { shift->disabled + ? 'DISABLED' + : 'Active' + }; + push @links, ''; + $align .= 'c'; + push @style, 'b'; +} + +unless ( 0 ) { #already showing only one class or something? + push @header, 'Class'; + push @fields, sub { shift->classname || '(none)'; }; + $align .= 'l'; +} + +if ( $cgi->param('active') ) { + push @header, 'Customer
packages'; + my %col = ( + 'active' => '00CC00', + 'suspended' => 'FF9900', + 'cancelled' => 'FF0000', + ); + my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; + push @fields, sub { my $part_pkg = shift; + [ + map { + [ + { + 'data' => ''. + $part_pkg->get("num_$_"). + '', + 'align' => 'right', + }, + { + 'data' => $_, + 'align' => 'left', + 'link' => ( $part_pkg->get("num_$_") + ? $cust_pkg_link. + $part_pkg->pkgpart. + ";magic=$_" + : '' + ), + }, + ], + } (qw( active suspended cancelled )) + ]; }; + $align .= 'r'; +} - -<% } %> +push @header, 'Frequency'; +push @fields, sub { shift->freq_pretty; }; +$align .= 'l'; - - - +if ( $taxclasses ) { + push @header, 'Taxclass'; + push @fields, sub { shift->taxclass() || ' '; }; + $align .= 'l'; +} + +push @header, 'Plan', + 'Data', + 'Services'; + #'Service', 'Quan', 'Primary'; + +push @fields, sub { shift->plan || '(legacy)' }, + + sub { + my $part_pkg = shift; + if ( $part_pkg->plan ) { + + [ map { + /^(\w+)=(.*)$/; #or something; + [ + { 'data' => $1, + 'align' => 'right', + }, + { 'data' => $2, + 'align' => 'left', + }, + ]; + } + split(/\n/, $part_pkg->plandata) + ]; + + } else { + + [ map { [ + { 'data' => uc($_), + 'align' => 'right', + }, + { + 'data' => $part_pkg->$_(), + 'align' => 'left', + }, + ]; + } + (qw(setup recur)) + ]; + + } + + }, + + sub { + my $part_pkg = shift; + + [ map { + my $pkg_svc = $_; + my $part_svc = $pkg_svc->part_svc; + my $svc = $part_svc->svc; + if ( $pkg_svc->primary_svc =~ /^Y/i ) { + $svc = "$svc (PRIMARY)"; + } + $svc =~ s/ +/ /g; + + [ + { + 'data' => ''. $pkg_svc->quantity. '', + 'align' => 'right' + }, + { + 'data' => $svc, + 'align' => 'left', + 'link' => $p. 'edit/part_svc.cgi?'. + $part_svc->svcpart, + }, + ]; + } + sort { $b->primary_svc =~ /^Y/i + <=> $a->primary_svc =~ /^Y/i + } + $part_pkg->pkg_svc + + ]; + + }; + +$align .= 'lrl'; #rr'; + +# -------- + +my $count_query = 'SELECT COUNT(*) FROM part_pkg'; +$count_query .= " WHERE $search" + if $search; + +%><%= include( 'elements/browse.html', + 'title' => 'Package Definitions', + 'menubar' => [ 'Main Menu' => $p ], + 'html_init' => $html_init, + 'html_posttotal' => $posttotal, + 'name' => 'package definitions', + 'query' => { 'select' => $select, + 'table' => 'part_pkg', + 'hashref' => \%search, + 'extra_sql' => "ORDER BY $orderby", + }, + 'count_query' => $count_query, + 'header' => \@header, + 'fields' => \@fields, + 'links' => \@links, + 'align' => $align, + 'style' => \@style, + ) +%> -- cgit v1.2.1 From 2c757d7db4cb6a7b9655de13206fcc84fb7ce61f Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 14 May 2006 16:47:31 +0000 Subject: first part of ACL and re-skinning work and some other small stuff --- httemplate/browse/part_pkg.cgi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 0afa54750..41d86358c 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -11,8 +11,8 @@ my $select = '*'; my $orderby = 'pkgpart'; if ( $cgi->param('active') ) { - $orderby = 'num_active'; - + $orderby = 'num_active DESC'; +} $select = " *, @@ -33,13 +33,13 @@ if ( $cgi->param('active') ) { "; -} +#} my $conf = new FS::Conf; my $taxclasses = $conf->exists('enable_taxclasses'); my $html_init; -unless ( $cgi->param('active') ) { +#unless ( $cgi->param('active') ) { $html_init = qq! One or more service definitions are grouped together into a package definition and given pricing information. Customers purchase packages @@ -47,7 +47,7 @@ unless ( $cgi->param('active') ) { Add a new package definition

!; -} +#} my $posttotal; if ( $cgi->param('showdisabled') ) { @@ -85,7 +85,7 @@ unless ( 0 ) { #already showing only one class or something? $align .= 'l'; } -if ( $cgi->param('active') ) { +#if ( $cgi->param('active') ) { push @header, 'Customer
packages'; my %col = ( 'active' => '00CC00', @@ -117,7 +117,7 @@ if ( $cgi->param('active') ) { } (qw( active suspended cancelled )) ]; }; $align .= 'r'; -} +#} push @header, 'Frequency'; push @fields, sub { shift->freq_pretty; }; -- cgit v1.2.1 From 8af88c7428552043516f529007645ab489b32063 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 21 Jun 2006 16:26:48 +0000 Subject: fix show/hide disabled link interaction w/pager --- httemplate/browse/part_pkg.cgi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 41d86358c..b67a5e55f 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -53,11 +53,14 @@ my $posttotal; if ( $cgi->param('showdisabled') ) { $cgi->param('showdisabled', 0); $posttotal = '( hide disabled packages )'; + $cgi->param('showdisabled', 1); } else { $cgi->param('showdisabled', 1); $posttotal = '( show disabled packages )'; + $cgi->param('showdisabled', 0); } + # ------ my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; @@ -68,7 +71,8 @@ my $align = 'rll'; my @links = ( $link, $link, '' ); my @style = ( '', '', '' ); -unless ( $cgi->param('showdisabled') ) { #its been reversed already +#unless ( $cgi->param('showdisabled') ) { #its been reversed already +if ( $cgi->param('showdisabled') ) { #its been reversed already push @header, 'Status'; push @fields, sub { shift->disabled ? 'DISABLED' -- cgit v1.2.1 From 7aae40398f1c8ed42424f1694640c9796a580d22 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 7 Aug 2006 02:44:29 +0000 Subject: add internal user disable-ing --- httemplate/browse/part_pkg.cgi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index b67a5e55f..a5e212d17 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,5 +1,6 @@ <% +#false laziness w/access_user.html my %search = (); my $search = ''; unless ( $cgi->param('showdisabled') ) { @@ -71,6 +72,7 @@ my $align = 'rll'; my @links = ( $link, $link, '' ); my @style = ( '', '', '' ); +#false laziness w/access_user.html #unless ( $cgi->param('showdisabled') ) { #its been reversed already if ( $cgi->param('showdisabled') ) { #its been reversed already push @header, 'Status'; -- cgit v1.2.1 From 3ce7691203a7737406bf2d4442f7fd84b81f847e Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 23 Aug 2006 22:25:39 +0000 Subject: Will things ever be the same again? It's the final masonize --- httemplate/browse/part_pkg.cgi | 449 +++++++++++++++++++++-------------------- 1 file changed, 225 insertions(+), 224 deletions(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index a5e212d17..f2364b152 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,227 +1,228 @@ -<% - -#false laziness w/access_user.html -my %search = (); -my $search = ''; -unless ( $cgi->param('showdisabled') ) { - %search = ( 'disabled' => '' ); - $search = "( disabled = '' OR disabled IS NULL )"; -} - -my $select = '*'; -my $orderby = 'pkgpart'; -if ( $cgi->param('active') ) { - - $orderby = 'num_active DESC'; -} - $select = " - - *, - - ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND ( cancel IS NULL OR cancel = 0 ) - AND ( susp IS NULL OR susp = 0 ) - ) AS num_active, - - ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND ( cancel IS NULL OR cancel = 0 ) - AND susp IS NOT NULL AND susp != 0 - ) AS num_suspended, - - ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND cancel IS NOT NULL AND cancel != 0 - ) AS num_cancelled - - "; - -#} - -my $conf = new FS::Conf; -my $taxclasses = $conf->exists('enable_taxclasses'); - -my $html_init; -#unless ( $cgi->param('active') ) { - $html_init = qq! - One or more service definitions are grouped together into a package - definition and given pricing information. Customers purchase packages - rather than purchase services directly.

- Add a new package definition -

- !; -#} - -my $posttotal; -if ( $cgi->param('showdisabled') ) { - $cgi->param('showdisabled', 0); - $posttotal = '( hide disabled packages )'; - $cgi->param('showdisabled', 1); -} else { - $cgi->param('showdisabled', 1); - $posttotal = '( show disabled packages )'; - $cgi->param('showdisabled', 0); -} - - -# ------ - -my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; - -my @header = ( '#', 'Package', 'Comment' ); -my @fields = ( 'pkgpart', 'pkg', 'comment' ); -my $align = 'rll'; -my @links = ( $link, $link, '' ); -my @style = ( '', '', '' ); - -#false laziness w/access_user.html -#unless ( $cgi->param('showdisabled') ) { #its been reversed already -if ( $cgi->param('showdisabled') ) { #its been reversed already - push @header, 'Status'; - push @fields, sub { shift->disabled - ? 'DISABLED' - : 'Active' - }; - push @links, ''; - $align .= 'c'; - push @style, 'b'; -} - -unless ( 0 ) { #already showing only one class or something? - push @header, 'Class'; - push @fields, sub { shift->classname || '(none)'; }; - $align .= 'l'; -} - -#if ( $cgi->param('active') ) { - push @header, 'Customer
packages'; - my %col = ( - 'active' => '00CC00', - 'suspended' => 'FF9900', - 'cancelled' => 'FF0000', - ); - my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; - push @fields, sub { my $part_pkg = shift; - [ - map { - [ - { - 'data' => ''. - $part_pkg->get("num_$_"). - '', - 'align' => 'right', - }, - { - 'data' => $_, - 'align' => 'left', - 'link' => ( $part_pkg->get("num_$_") - ? $cust_pkg_link. - $part_pkg->pkgpart. - ";magic=$_" - : '' - ), - }, - ], - } (qw( active suspended cancelled )) - ]; }; - $align .= 'r'; -#} - -push @header, 'Frequency'; -push @fields, sub { shift->freq_pretty; }; -$align .= 'l'; - -if ( $taxclasses ) { - push @header, 'Taxclass'; - push @fields, sub { shift->taxclass() || ' '; }; - $align .= 'l'; -} - -push @header, 'Plan', - 'Data', - 'Services'; - #'Service', 'Quan', 'Primary'; - -push @fields, sub { shift->plan || '(legacy)' }, - - sub { - my $part_pkg = shift; - if ( $part_pkg->plan ) { - - [ map { - /^(\w+)=(.*)$/; #or something; - [ - { 'data' => $1, - 'align' => 'right', - }, - { 'data' => $2, - 'align' => 'left', - }, - ]; - } - split(/\n/, $part_pkg->plandata) - ]; - - } else { - - [ map { [ - { 'data' => uc($_), - 'align' => 'right', - }, - { - 'data' => $part_pkg->$_(), - 'align' => 'left', - }, - ]; - } - (qw(setup recur)) - ]; - - } - - }, - - sub { - my $part_pkg = shift; - - [ map { - my $pkg_svc = $_; - my $part_svc = $pkg_svc->part_svc; - my $svc = $part_svc->svc; - if ( $pkg_svc->primary_svc =~ /^Y/i ) { - $svc = "$svc (PRIMARY)"; - } - $svc =~ s/ +/ /g; - - [ - { - 'data' => ''. $pkg_svc->quantity. '', - 'align' => 'right' - }, - { - 'data' => $svc, - 'align' => 'left', - 'link' => $p. 'edit/part_svc.cgi?'. - $part_svc->svcpart, - }, - ]; - } - sort { $b->primary_svc =~ /^Y/i - <=> $a->primary_svc =~ /^Y/i - } - $part_pkg->pkg_svc - - ]; - - }; - -$align .= 'lrl'; #rr'; - -# -------- - -my $count_query = 'SELECT COUNT(*) FROM part_pkg'; -$count_query .= " WHERE $search" - if $search; - -%><%= include( 'elements/browse.html', +% +% +%#false laziness w/access_user.html +%my %search = (); +%my $search = ''; +%unless ( $cgi->param('showdisabled') ) { +% %search = ( 'disabled' => '' ); +% $search = "( disabled = '' OR disabled IS NULL )"; +%} +% +%my $select = '*'; +%my $orderby = 'pkgpart'; +%if ( $cgi->param('active') ) { +% +% $orderby = 'num_active DESC'; +%} +% $select = " +% +% *, +% +% ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart +% AND ( cancel IS NULL OR cancel = 0 ) +% AND ( susp IS NULL OR susp = 0 ) +% ) AS num_active, +% +% ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart +% AND ( cancel IS NULL OR cancel = 0 ) +% AND susp IS NOT NULL AND susp != 0 +% ) AS num_suspended, +% +% ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart +% AND cancel IS NOT NULL AND cancel != 0 +% ) AS num_cancelled +% +% "; +% +%#} +% +%my $conf = new FS::Conf; +%my $taxclasses = $conf->exists('enable_taxclasses'); +% +%my $html_init; +%#unless ( $cgi->param('active') ) { +% $html_init = qq! +% One or more service definitions are grouped together into a package +% definition and given pricing information. Customers purchase packages +% rather than purchase services directly.

+% Add a new package definition +%

+% !; +%#} +% +%my $posttotal; +%if ( $cgi->param('showdisabled') ) { +% $cgi->param('showdisabled', 0); +% $posttotal = '( hide disabled packages )'; +% $cgi->param('showdisabled', 1); +%} else { +% $cgi->param('showdisabled', 1); +% $posttotal = '( show disabled packages )'; +% $cgi->param('showdisabled', 0); +%} +% +% +%# ------ +% +%my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; +% +%my @header = ( '#', 'Package', 'Comment' ); +%my @fields = ( 'pkgpart', 'pkg', 'comment' ); +%my $align = 'rll'; +%my @links = ( $link, $link, '' ); +%my @style = ( '', '', '' ); +% +%#false laziness w/access_user.html +%#unless ( $cgi->param('showdisabled') ) { #its been reversed already +%if ( $cgi->param('showdisabled') ) { #its been reversed already +% push @header, 'Status'; +% push @fields, sub { shift->disabled +% ? 'DISABLED' +% : 'Active' +% }; +% push @links, ''; +% $align .= 'c'; +% push @style, 'b'; +%} +% +%unless ( 0 ) { #already showing only one class or something? +% push @header, 'Class'; +% push @fields, sub { shift->classname || '(none)'; }; +% $align .= 'l'; +%} +% +%#if ( $cgi->param('active') ) { +% push @header, 'Customer
packages'; +% my %col = ( +% 'active' => '00CC00', +% 'suspended' => 'FF9900', +% 'cancelled' => 'FF0000', +% ); +% my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; +% push @fields, sub { my $part_pkg = shift; +% [ +% map { +% [ +% { +% 'data' => ''. +% $part_pkg->get("num_$_"). +% '', +% 'align' => 'right', +% }, +% { +% 'data' => $_, +% 'align' => 'left', +% 'link' => ( $part_pkg->get("num_$_") +% ? $cust_pkg_link. +% $part_pkg->pkgpart. +% ";magic=$_" +% : '' +% ), +% }, +% ], +% } (qw( active suspended cancelled )) +% ]; }; +% $align .= 'r'; +%#} +% +%push @header, 'Frequency'; +%push @fields, sub { shift->freq_pretty; }; +%$align .= 'l'; +% +%if ( $taxclasses ) { +% push @header, 'Taxclass'; +% push @fields, sub { shift->taxclass() || ' '; }; +% $align .= 'l'; +%} +% +%push @header, 'Plan', +% 'Data', +% 'Services'; +% #'Service', 'Quan', 'Primary'; +% +%push @fields, sub { shift->plan || '(legacy)' }, +% +% sub { +% my $part_pkg = shift; +% if ( $part_pkg->plan ) { +% +% [ map { +% /^(\w+)=(.*)$/; #or something; +% [ +% { 'data' => $1, +% 'align' => 'right', +% }, +% { 'data' => $2, +% 'align' => 'left', +% }, +% ]; +% } +% split(/\n/, $part_pkg->plandata) +% ]; +% +% } else { +% +% [ map { [ +% { 'data' => uc($_), +% 'align' => 'right', +% }, +% { +% 'data' => $part_pkg->$_(), +% 'align' => 'left', +% }, +% ]; +% } +% (qw(setup recur)) +% ]; +% +% } +% +% }, +% +% sub { +% my $part_pkg = shift; +% +% [ map { +% my $pkg_svc = $_; +% my $part_svc = $pkg_svc->part_svc; +% my $svc = $part_svc->svc; +% if ( $pkg_svc->primary_svc =~ /^Y/i ) { +% $svc = "$svc (PRIMARY)"; +% } +% $svc =~ s/ +/ /g; +% +% [ +% { +% 'data' => ''. $pkg_svc->quantity. '', +% 'align' => 'right' +% }, +% { +% 'data' => $svc, +% 'align' => 'left', +% 'link' => $p. 'edit/part_svc.cgi?'. +% $part_svc->svcpart, +% }, +% ]; +% } +% sort { $b->primary_svc =~ /^Y/i +% <=> $a->primary_svc =~ /^Y/i +% } +% $part_pkg->pkg_svc +% +% ]; +% +% }; +% +%$align .= 'lrl'; #rr'; +% +%# -------- +% +%my $count_query = 'SELECT COUNT(*) FROM part_pkg'; +%$count_query .= " WHERE $search" +% if $search; +% +% +<% include( 'elements/browse.html', 'title' => 'Package Definitions', 'menubar' => [ 'Main Menu' => $p ], 'html_init' => $html_init, -- cgit v1.2.1 From 02ae3eb0e7e2371721956975dc9785fdb9993450 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 24 Nov 2006 10:34:33 +0000 Subject: link to and label one-time charges correctly --- httemplate/browse/part_pkg.cgi | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index f2364b152..b572f8ab5 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -94,28 +94,43 @@ %#if ( $cgi->param('active') ) { % push @header, 'Customer
packages'; % my %col = ( -% 'active' => '00CC00', -% 'suspended' => 'FF9900', -% 'cancelled' => 'FF0000', +% 'active' => '00CC00', +% 'suspended' => 'FF9900', +% 'cancelled' => 'FF0000', +% #'one-time charge' => '000000', +% 'charge' => '000000', % ); % my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; % push @fields, sub { my $part_pkg = shift; % [ % map { +% my $magic = $_; +% my $label = $_; +% if ( $magic eq 'active' && $part_pkg->freq == 0 ) { +% $magic = 'inactive'; +% #$label = 'one-time charge', +% $label = 'charge', +% } +% % [ % { -% 'data' => ''. +% 'data' => ''. % $part_pkg->get("num_$_"). % '', % 'align' => 'right', % }, % { -% 'data' => $_, +% 'data' => $label. +% ( $part_pkg->get("num_$_") != 1 +% && $label =~ /charge$/ +% ? 's' +% : '' +% ), % 'align' => 'left', % 'link' => ( $part_pkg->get("num_$_") % ? $cust_pkg_link. % $part_pkg->pkgpart. -% ";magic=$_" +% ";magic=$magic" % : '' % ), % }, -- cgit v1.2.1 From 15777da47bab33e8f0021e6dd9aa6b434fa9be30 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 30 Jan 2007 20:59:14 +0000 Subject: its all about control --- httemplate/browse/part_pkg.cgi | 481 +++++++++++++++++++++-------------------- 1 file changed, 242 insertions(+), 239 deletions(-) (limited to 'httemplate/browse/part_pkg.cgi') diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index b572f8ab5..6b62ec67b 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,242 +1,3 @@ -% -% -%#false laziness w/access_user.html -%my %search = (); -%my $search = ''; -%unless ( $cgi->param('showdisabled') ) { -% %search = ( 'disabled' => '' ); -% $search = "( disabled = '' OR disabled IS NULL )"; -%} -% -%my $select = '*'; -%my $orderby = 'pkgpart'; -%if ( $cgi->param('active') ) { -% -% $orderby = 'num_active DESC'; -%} -% $select = " -% -% *, -% -% ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart -% AND ( cancel IS NULL OR cancel = 0 ) -% AND ( susp IS NULL OR susp = 0 ) -% ) AS num_active, -% -% ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart -% AND ( cancel IS NULL OR cancel = 0 ) -% AND susp IS NOT NULL AND susp != 0 -% ) AS num_suspended, -% -% ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart -% AND cancel IS NOT NULL AND cancel != 0 -% ) AS num_cancelled -% -% "; -% -%#} -% -%my $conf = new FS::Conf; -%my $taxclasses = $conf->exists('enable_taxclasses'); -% -%my $html_init; -%#unless ( $cgi->param('active') ) { -% $html_init = qq! -% One or more service definitions are grouped together into a package -% definition and given pricing information. Customers purchase packages -% rather than purchase services directly.

-% Add a new package definition -%

-% !; -%#} -% -%my $posttotal; -%if ( $cgi->param('showdisabled') ) { -% $cgi->param('showdisabled', 0); -% $posttotal = '( hide disabled packages )'; -% $cgi->param('showdisabled', 1); -%} else { -% $cgi->param('showdisabled', 1); -% $posttotal = '( show disabled packages )'; -% $cgi->param('showdisabled', 0); -%} -% -% -%# ------ -% -%my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; -% -%my @header = ( '#', 'Package', 'Comment' ); -%my @fields = ( 'pkgpart', 'pkg', 'comment' ); -%my $align = 'rll'; -%my @links = ( $link, $link, '' ); -%my @style = ( '', '', '' ); -% -%#false laziness w/access_user.html -%#unless ( $cgi->param('showdisabled') ) { #its been reversed already -%if ( $cgi->param('showdisabled') ) { #its been reversed already -% push @header, 'Status'; -% push @fields, sub { shift->disabled -% ? 'DISABLED' -% : 'Active' -% }; -% push @links, ''; -% $align .= 'c'; -% push @style, 'b'; -%} -% -%unless ( 0 ) { #already showing only one class or something? -% push @header, 'Class'; -% push @fields, sub { shift->classname || '(none)'; }; -% $align .= 'l'; -%} -% -%#if ( $cgi->param('active') ) { -% push @header, 'Customer
packages'; -% my %col = ( -% 'active' => '00CC00', -% 'suspended' => 'FF9900', -% 'cancelled' => 'FF0000', -% #'one-time charge' => '000000', -% 'charge' => '000000', -% ); -% my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; -% push @fields, sub { my $part_pkg = shift; -% [ -% map { -% my $magic = $_; -% my $label = $_; -% if ( $magic eq 'active' && $part_pkg->freq == 0 ) { -% $magic = 'inactive'; -% #$label = 'one-time charge', -% $label = 'charge', -% } -% -% [ -% { -% 'data' => ''. -% $part_pkg->get("num_$_"). -% '', -% 'align' => 'right', -% }, -% { -% 'data' => $label. -% ( $part_pkg->get("num_$_") != 1 -% && $label =~ /charge$/ -% ? 's' -% : '' -% ), -% 'align' => 'left', -% 'link' => ( $part_pkg->get("num_$_") -% ? $cust_pkg_link. -% $part_pkg->pkgpart. -% ";magic=$magic" -% : '' -% ), -% }, -% ], -% } (qw( active suspended cancelled )) -% ]; }; -% $align .= 'r'; -%#} -% -%push @header, 'Frequency'; -%push @fields, sub { shift->freq_pretty; }; -%$align .= 'l'; -% -%if ( $taxclasses ) { -% push @header, 'Taxclass'; -% push @fields, sub { shift->taxclass() || ' '; }; -% $align .= 'l'; -%} -% -%push @header, 'Plan', -% 'Data', -% 'Services'; -% #'Service', 'Quan', 'Primary'; -% -%push @fields, sub { shift->plan || '(legacy)' }, -% -% sub { -% my $part_pkg = shift; -% if ( $part_pkg->plan ) { -% -% [ map { -% /^(\w+)=(.*)$/; #or something; -% [ -% { 'data' => $1, -% 'align' => 'right', -% }, -% { 'data' => $2, -% 'align' => 'left', -% }, -% ]; -% } -% split(/\n/, $part_pkg->plandata) -% ]; -% -% } else { -% -% [ map { [ -% { 'data' => uc($_), -% 'align' => 'right', -% }, -% { -% 'data' => $part_pkg->$_(), -% 'align' => 'left', -% }, -% ]; -% } -% (qw(setup recur)) -% ]; -% -% } -% -% }, -% -% sub { -% my $part_pkg = shift; -% -% [ map { -% my $pkg_svc = $_; -% my $part_svc = $pkg_svc->part_svc; -% my $svc = $part_svc->svc; -% if ( $pkg_svc->primary_svc =~ /^Y/i ) { -% $svc = "$svc (PRIMARY)"; -% } -% $svc =~ s/ +/ /g; -% -% [ -% { -% 'data' => ''. $pkg_svc->quantity. '', -% 'align' => 'right' -% }, -% { -% 'data' => $svc, -% 'align' => 'left', -% 'link' => $p. 'edit/part_svc.cgi?'. -% $part_svc->svcpart, -% }, -% ]; -% } -% sort { $b->primary_svc =~ /^Y/i -% <=> $a->primary_svc =~ /^Y/i -% } -% $part_pkg->pkg_svc -% -% ]; -% -% }; -% -%$align .= 'lrl'; #rr'; -% -%# -------- -% -%my $count_query = 'SELECT COUNT(*) FROM part_pkg'; -%$count_query .= " WHERE $search" -% if $search; -% -% <% include( 'elements/browse.html', 'title' => 'Package Definitions', 'menubar' => [ 'Main Menu' => $p ], @@ -256,3 +17,245 @@ 'style' => \@style, ) %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); + +#false laziness w/access_user.html +my %search = (); +my $search = ''; +unless ( $cgi->param('showdisabled') ) { + %search = ( 'disabled' => '' ); + $search = "( disabled = '' OR disabled IS NULL )"; +} + +my $select = '*'; +my $orderby = 'pkgpart'; +if ( $cgi->param('active') ) { + + $orderby = 'num_active DESC'; +} + $select = " + + *, + + ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND ( cancel IS NULL OR cancel = 0 ) + AND ( susp IS NULL OR susp = 0 ) + ) AS num_active, + + ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND ( cancel IS NULL OR cancel = 0 ) + AND susp IS NOT NULL AND susp != 0 + ) AS num_suspended, + + ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND cancel IS NOT NULL AND cancel != 0 + ) AS num_cancelled + + "; + +#} + +my $conf = new FS::Conf; +my $taxclasses = $conf->exists('enable_taxclasses'); + +my $html_init; +#unless ( $cgi->param('active') ) { + $html_init = qq! + One or more service definitions are grouped together into a package + definition and given pricing information. Customers purchase packages + rather than purchase services directly.

+ Add a new package definition +

+ !; +#} + +my $posttotal; +if ( $cgi->param('showdisabled') ) { + $cgi->param('showdisabled', 0); + $posttotal = '( hide disabled packages )'; + $cgi->param('showdisabled', 1); +} else { + $cgi->param('showdisabled', 1); + $posttotal = '( show disabled packages )'; + $cgi->param('showdisabled', 0); +} + + +# ------ + +my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; + +my @header = ( '#', 'Package', 'Comment' ); +my @fields = ( 'pkgpart', 'pkg', 'comment' ); +my $align = 'rll'; +my @links = ( $link, $link, '' ); +my @style = ( '', '', '' ); + +#false laziness w/access_user.html +#unless ( $cgi->param('showdisabled') ) { #its been reversed already +if ( $cgi->param('showdisabled') ) { #its been reversed already + push @header, 'Status'; + push @fields, sub { shift->disabled + ? 'DISABLED' + : 'Active' + }; + push @links, ''; + $align .= 'c'; + push @style, 'b'; +} + +unless ( 0 ) { #already showing only one class or something? + push @header, 'Class'; + push @fields, sub { shift->classname || '(none)'; }; + $align .= 'l'; +} + +#if ( $cgi->param('active') ) { + push @header, 'Customer
packages'; + my %col = ( + 'active' => '00CC00', + 'suspended' => 'FF9900', + 'cancelled' => 'FF0000', + #'one-time charge' => '000000', + 'charge' => '000000', + ); + my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; + push @fields, sub { my $part_pkg = shift; + [ + map { + my $magic = $_; + my $label = $_; + if ( $magic eq 'active' && $part_pkg->freq == 0 ) { + $magic = 'inactive'; + #$label = 'one-time charge', + $label = 'charge', + } + + [ + { + 'data' => ''. + $part_pkg->get("num_$_"). + '', + 'align' => 'right', + }, + { + 'data' => $label. + ( $part_pkg->get("num_$_") != 1 + && $label =~ /charge$/ + ? 's' + : '' + ), + 'align' => 'left', + 'link' => ( $part_pkg->get("num_$_") + ? $cust_pkg_link. + $part_pkg->pkgpart. + ";magic=$magic" + : '' + ), + }, + ], + } (qw( active suspended cancelled )) + ]; }; + $align .= 'r'; +#} + +push @header, 'Frequency'; +push @fields, sub { shift->freq_pretty; }; +$align .= 'l'; + +if ( $taxclasses ) { + push @header, 'Taxclass'; + push @fields, sub { shift->taxclass() || ' '; }; + $align .= 'l'; +} + +push @header, 'Plan', + 'Data', + 'Services'; + #'Service', 'Quan', 'Primary'; + +push @fields, sub { shift->plan || '(legacy)' }, + + sub { + my $part_pkg = shift; + if ( $part_pkg->plan ) { + + [ map { + /^(\w+)=(.*)$/; #or something; + [ + { 'data' => $1, + 'align' => 'right', + }, + { 'data' => $2, + 'align' => 'left', + }, + ]; + } + split(/\n/, $part_pkg->plandata) + ]; + + } else { + + [ map { [ + { 'data' => uc($_), + 'align' => 'right', + }, + { + 'data' => $part_pkg->$_(), + 'align' => 'left', + }, + ]; + } + (qw(setup recur)) + ]; + + } + + }, + + sub { + my $part_pkg = shift; + + [ map { + my $pkg_svc = $_; + my $part_svc = $pkg_svc->part_svc; + my $svc = $part_svc->svc; + if ( $pkg_svc->primary_svc =~ /^Y/i ) { + $svc = "$svc (PRIMARY)"; + } + $svc =~ s/ +/ /g; + + [ + { + 'data' => ''. $pkg_svc->quantity. '', + 'align' => 'right' + }, + { + 'data' => $svc, + 'align' => 'left', + 'link' => $p. 'edit/part_svc.cgi?'. + $part_svc->svcpart, + }, + ]; + } + sort { $b->primary_svc =~ /^Y/i + <=> $a->primary_svc =~ /^Y/i + } + $part_pkg->pkg_svc + + ]; + + }; + +$align .= 'lrl'; #rr'; + +# -------- + +my $count_query = 'SELECT COUNT(*) FROM part_pkg'; +$count_query .= " WHERE $search" + if $search; + + -- cgit v1.2.1