diff options
Diffstat (limited to 'httemplate/search')
| -rwxr-xr-x | httemplate/search/cust_pkg.cgi | 7 | ||||
| -rwxr-xr-x | httemplate/search/report_cust_pkg.html | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index 4fd5e9d45..941a2e76c 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -12,6 +12,7 @@ 'Setup', 'Last bill', 'Next bill', + 'Adjourn', 'Susp.', 'Expire', 'Cancel', @@ -43,7 +44,7 @@ #sub { time2str('%b %d %Y', shift->expire); }, #sub { time2str('%b %d %Y', shift->get('cancel')); }, ( map { time_or_blank($_) } - qw( setup last_bill bill susp expire cancel ) ), + qw( setup last_bill bill adjourn susp expire cancel ) ), \&FS::UI::Web::cust_fields, #sub { '<table border=0 cellspacing=0 cellpadding=0 STYLE="border:none">'. @@ -210,14 +211,14 @@ my $orderby = ''; #false laziness w/report_cust_pkg.html my %disable = ( 'all' => {}, - 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, }, + 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, }, 'active' => { 'susp'=>1, 'cancel'=>1 }, 'suspended' => { 'cancel' => 1 }, 'cancelled' => {}, '' => {}, ); -foreach my $field (qw( setup last_bill bill susp expire cancel )) { +foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) { my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field); diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html index 1412816c9..57180c18e 100755 --- a/httemplate/search/report_cust_pkg.html +++ b/httemplate/search/report_cust_pkg.html @@ -26,7 +26,7 @@ if ( what.options[what.selectedIndex].value == '<% $status %>' ) { -% foreach my $field (qw( setup last_bill bill susp expire cancel )) { +% foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) { % if ( $disable{$status}->{$field} ) { what.form.<% $field %>_beginning_text.disabled = true; @@ -68,7 +68,7 @@ ) %> -% foreach my $field (qw( setup last_bill bill susp expire cancel )) { +% foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) { <TR> <TD ALIGN="right" VALIGN="center"><% $label{$field} %></TD> @@ -116,6 +116,7 @@ my %label = ( 'setup' => 'Setup', 'last_bill' => 'Last bill', 'bill' => 'Next bill', + 'adjourn' => 'Adjourns', 'susp' => 'Suspended', 'expire' => 'Expires', 'cancel' => 'Cancelled', @@ -124,7 +125,7 @@ my %label = ( #false laziness w/cust_pkg.cgi my %disable = ( 'all' => {}, - 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, }, + 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, }, 'active' => { 'susp'=>1, 'cancel'=>1 }, 'suspended' => { 'cancel' => 1 }, 'cancelled' => {}, |