find svc_pbx service correctly and cope anyway if it isn't there, RT#8712

[freeside.git] / FS / FS / Maestro.pm

diff --git a/FS/FS/Maestro.pm b/FS/FS/Maestro.pm
index bb79285..e395c5a 100644 (file)
--- a/FS/FS/Maestro.pm
+++ b/FS/FS/Maestro.pm
@@ -37,7 +37,7 @@ sub customer_status {
 
   my $cust_svc_pbx = $cust_svc_pbx[0];
 
-  my $svc_pbx = $cust_svc_pbx->svc_X;
+  my $svc_pbx = $cust_svc_pbx->svc_x;
 
   ###
   # find "outbound service" y/n
@@ -46,7 +46,11 @@ sub customer_status {
   my $conf = new FS::Conf;
   my %outbound_pkgs = map { $_=>1 } $conf->config('mc-outbound_packages');
   my $outbound_service =
-    scalar( grep $outbound_pkgs{ $_->pkgpart }, @cust_pkg )
+    scalar( grep { $outbound_pkgs{ $_->pkgpart }
+                     && !$_->get('cancel')
+                 }
+                 @cust_pkg
+          )
     ? 1 : 0;
 
   ###
@@ -67,8 +71,8 @@ sub customer_status {
     'status' => substr($cust_main->ucfirst_status,0,1), #what they asked for..
     'name'   => $cust_main->name,
     'email'  => $cust_main->invoicing_list_emailonly_scalar,
-    'max_lines'        => $svc_pbx->max_extensions,
-    'max_simultaneous' => $svc_pbx->max_simultaneous,
+    'max_lines'        => $svc_pbx ? $svc_pbx->max_extensions : '',
+    'max_simultaneous' => $svc_pbx ? $svc_pbx->max_simultaneous : '',
     'outbound_service' => $outbound_service,
     'good_till' => $good_till,
     'products'  => [ map $_->pkgpart, grep !$_->get('cancel'), @cust_pkg ],