diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-02-26 12:00:45 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-02-26 12:00:45 -0500 |
| commit | 8c36d1e4f1255abb483bc7372fa1908cc192b528 (patch) | |
| tree | 4860dc83c68920f2a8444c67ba01187501d2b3fc /FS | |
| parent | 66feacf4ed45aa7b27d48f91c0d8741f0ad9b9de (diff) | |
| parent | def6bb5926b81d4a4b66e0c9dd7ff03bf55706ad (diff) | |
Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/ClientAPI/MyAccount.pm | 5 | ||||
| -rw-r--r-- | FS/FS/cust_pkg.pm | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index c00a13f2b..66697efb5 100644 --- a/FS/FS/ClientAPI/MyAccount.pm +++ b/FS/FS/ClientAPI/MyAccount.pm @@ -3589,6 +3589,11 @@ sub list_tickets { # unavoidable false laziness w/ httemplate/view/cust_main/tickets.html if ( $FS::TicketSystem::system && FS::TicketSystem->selfservice_priority ) { + + @tickets = grep { $_->{'_selfservice_priority'} + !~ /^\s*(closed?|resolved?|done)\s*/i } + @tickets; + my $conf = new FS::Conf; my $dir = $conf->exists('ticket_system-priority_reverse') ? -1 : 1; +{ tickets => [ diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index f11beec7d..b24b3abe3 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -3010,6 +3010,7 @@ sub _parse_new_discounts { discountnum => $opt->{"${type}_discountnum"}, amount => $opt->{"${type}_discountnum_amount"}, percent => $opt->{"${type}_discountnum_percent"}, + months => $opt->{"${type}_discountnum_months"}, }; } |