extend maestro status API for the multi-service scenario, RT#9334

diff --git a/httemplate/misc/maestro-customer_status.cgi b/httemplate/misc/maestro-customer_status.cgi
index 8e82a02..ffeb53c 100644 (file)
--- a/httemplate/misc/maestro-customer_status.cgi
+++ b/httemplate/misc/maestro-customer_status.cgi
@@ -7,10 +7,10 @@ my($custnum, $svcnum) = $cgi->keywords;
 if ( $custnum =~ /^(\d+)$/ ) {
 
   use FS::Maestro;
 if ( $custnum =~ /^(\d+)$/ ) {
 
   use FS::Maestro;

-  $return = FS::Maestro::customer_status($1, $svcnum);
+  $uri->query_form( FS::Maestro::customer_status($1) );

 
 } else {
 
 } else {

-  $return = { 'error' => 'No custnum' };
+  $uri->query_form( { 'error' => 'No custnum' } );

 }
 
 </%init>
 }
 
 </%init>

diff --git a/httemplate/misc/maestro-customer_status.html b/httemplate/misc/maestro-customer_status.html
index 0c45bcd..8acae2b 100644 (file)
--- a/httemplate/misc/maestro-customer_status.html
+++ b/httemplate/misc/maestro-customer_status.html
@@ -3,11 +3,11 @@
 
 my $return;
 
 
 my $return;
 

-my($query) = $cgi->keywords;
-if ( $query =~ /^(\d+)$/ ) {
+my($custnum, $svcnum) = $cgi->keywords;
+if ( $custnum =~ /^(\d+)$/ ) {

 
   use FS::Maestro;
 
   use FS::Maestro;

-  $return = FS::Maestro::customer_status($1);
+  $return = FS::Maestro::customer_status($1, $svcnum);

 
 } else {
   $return = { 'error' => 'No custnum' };
 
 } else {
   $return = { 'error' => 'No custnum' };

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 3ac4861..811ac3c 100755 (executable)
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -159,7 +159,8 @@ my %conf_opt = (
   #for services.html
   'svc_external-skip_manual'  => $conf->exists('svc_external-skip_manual'),
   'legacy_link'               => $conf->exists('legacy_link'),
   #for services.html
   'svc_external-skip_manual'  => $conf->exists('svc_external-skip_manual'),
   'legacy_link'               => $conf->exists('legacy_link'),

-  'svc_broadband-manage_link' => $conf->config('svc_broadband-manage_link'),
+  'svc_broadband-manage_link' => scalar($conf->config('svc_broadband-manage_link')),
+  'maestro-status_test'       => $conf->exists('maestro-status_test'),

 );
 
 #subroutines
 );
 
 #subroutines

diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html
index 0fe7931..6e30922 100644 (file)
--- a/httemplate/view/cust_main/packages/services.html
+++ b/httemplate/view/cust_main/packages/services.html
@@ -58,6 +58,11 @@
 %           if ( $curuser->access_right('Unprovision customer service') ) { 
               <FONT SIZE="-2">(&nbsp;<%svc_unprovision_link($cust_svc)%>&nbsp;)</FONT>
 %           } 
 %           if ( $curuser->access_right('Unprovision customer service') ) { 
               <FONT SIZE="-2">(&nbsp;<%svc_unprovision_link($cust_svc)%>&nbsp;)</FONT>
 %           } 

+
+%           if ( $part_svc->svcdb eq 'svc_pbx' && $opt{'maestro-status_test'} ){
+              <FONT SIZE="-2">(&nbsp;<A HREF="<% $p %>misc/maestro-customer_status-test.html?<% $cust_pkg->custnum.'+'.$cust_svc->svcnum %>">Test maestro status</A>&nbsp;)</FONT>
+%           } 
+

           </TD>
         </TR>
 %   } 
           </TD>
         </TR>
 %   }