X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fws_list.html;h=dcc62ec86fe3e6d3c5c8c3037463ae23b856d13f;hb=e710e07e4451b7c615fb477799dc64bf3490248c;hp=f4beedf335cd393948dd4d79aae261945af712fe;hpb=1eff7a1cd742bab7a0084d55f74b2f53c1f84e64;p=freeside.git
diff --git a/fs_selfservice/FS-SelfService/cgi/ws_list.html b/fs_selfservice/FS-SelfService/cgi/ws_list.html
index f4beedf33..dcc62ec86 100644
--- a/fs_selfservice/FS-SelfService/cgi/ws_list.html
+++ b/fs_selfservice/FS-SelfService/cgi/ws_list.html
@@ -19,19 +19,21 @@ sub ws_pkgstatus {
sub pdate {
my($field,$date_format) = (shift,shift);
return "
".Date::Format::time2str($date_format,$field)." | "
- if $field > 0;
+ if $field && $field > 0;
' | ';
}
+
if ( $pkgpart ) {
- $OUT .= qq! Package | Status | !;
+ $OUT .= qq! Package | Status | !;
$OUT .= "Setup | Last Bill | Next Bill | Adjourn | ";
$OUT .= "Suspend | Expire | Contract End | ";
- $OUT .= "Cancel |
";
+ $OUT .= "Cancel | Services | ";
foreach my $pkg ( @cust_pkg ) {
my $part_pkg = $pkg->{part_pkg}[0];
$status = ws_pkgstatus($pkg);
- if($pkg->{pkgpart} == $pkgpart && ($filter eq $status || !$filter) ) {
+ if($pkg->{pkgpart} == $pkgpart &&
+ ( ($filter && $filter eq $status) || !$filter) ) {
$OUT .= "$part_pkg->{pkg} | $status | ";
$OUT .= pdate($pkg->{setup},$date_format);
$OUT .= pdate($pkg->{last_bill},$date_format);
@@ -41,7 +43,30 @@ if ( $pkgpart ) {
$OUT .= pdate($pkg->{expire},$date_format);
$OUT .= pdate($pkg->{contract_end},$date_format);
$OUT .= pdate($pkg->{cancel},$date_format);
- $OUT .= "
";
+
+ $OUT .= "";
+ my @cust_svc = @{$pkg->{cust_svc}};
+ foreach my $cust_svc ( @cust_svc ) {
+ my @label = @{$cust_svc->{'label'}};
+ $OUT .= qq!$label[0]: $label[1]
!;
+ }
+ my @part_svc = @{$pkg->{part_svc}};
+ foreach my $part_svc ( @part_svc ) {
+ my $link = qq!Setup !
+ . qq!$part_svc->{'svc'} ($part_svc->{'num_avail'}!
+ . qq! available)
!;
+ $OUT .= $link if $part_svc->{'can_get_dids'};
+
+ if($part_svc->{'svcdb'} eq 'svc_phone' && $lnp) {
+ $OUT .= qq!Port-In $part_svc->{'svc'}!;
+ }
+ }
+
+ $OUT .= " | ";
}
}
$OUT .= "
";
@@ -57,7 +82,7 @@ else {
$OUT .= "";
- $OUT .= qq! Package | Status | !;
+ $OUT .= qq! Package | Status | !;
my($pkgpart,$counts);
while(($pkgpart,$count) = each %pkgparts){
my $link = "${url}provision;pkgpart=$pkgpart";
|
---|