FIX retrieve signatoryBooks

modules/visa/batch/process_mailsFromSignatoryBook.php

@@ -122,15 +122,17 @@ if ($xmlconfig == false) {
 
 // Load config
 $config = $xmlconfig->CONFIG;
-$GLOBALS['MaarchDirectory']   = $_SESSION['config']['corepath'] = (string)$config->MaarchDirectory;
-$_SESSION['config']['app_id'] = 'maarch_entreprise';
-$GLOBALS['CustomId']          = $_SESSION['custom_override_id'] = (string)$config->CustomId;
-$GLOBALS['applicationUrl']    = (string)$config->applicationUrl;
-$GLOBALS['userWS']            = (string)$config->userWS;
-$GLOBALS['passwordWS']        = (string)$config->passwordWS;
-$GLOBALS['batchDirectory']    = $GLOBALS['MaarchDirectory'] . 'modules' . DIRECTORY_SEPARATOR . 'visa' . DIRECTORY_SEPARATOR . 'batch';
-$validatedStatus              = (string)$config->validatedStatus;
-$refusedStatus                = (string)$config->refusedStatus;
+$GLOBALS['MaarchDirectory']        = $_SESSION['config']['corepath'] = (string)$config->MaarchDirectory;
+$_SESSION['config']['app_id']      = 'maarch_entreprise';
+$GLOBALS['CustomId']               = $_SESSION['custom_override_id'] = (string)$config->CustomId;
+$GLOBALS['applicationUrl']         = (string)$config->applicationUrl;
+$GLOBALS['userWS']                 = (string)$config->userWS;
+$GLOBALS['passwordWS']             = (string)$config->passwordWS;
+$GLOBALS['batchDirectory']         = $GLOBALS['MaarchDirectory'] . 'modules' . DIRECTORY_SEPARATOR . 'visa' . DIRECTORY_SEPARATOR . 'batch';
+$validatedStatus                   = (string)$config->validatedStatus;
+$refusedStatus                     = (string)$config->refusedStatus;
+$validatedStatusAnnot              = (string)$config->validatedStatusAnnot;
+$refusedStatusAnnot                = (string)$config->refusedStatusAnnot;
 
 set_include_path(get_include_path() . PATH_SEPARATOR . $GLOBALS['MaarchDirectory']);
 
@@ -267,6 +269,8 @@ foreach ($retrievedMails['isVersion'] as $resId => $value) {
             'dest_address_id' => $value->dest_address_id,
             'dest_user'       => $value->dest_user,
             'typist'          => $value->typist,
+            'format'          => $value->format,
+            'encodedFile'     => $value->encodedFile,
             'noteContent'     => $value->noteContent
         ]);
 

modules/visa/class/MaarchParapheurController.php

@@ -162,19 +162,26 @@ class MaarchParapheurController
 
     public static function retrieveSignedMails($aArgs)
     {
+        $validated = $aArgs['config']['data']['externalValidated'];
+        $refused   = $aArgs['config']['data']['externalRefused'];
+
         foreach (['noVersion', 'isVersion'] as $version) {
             foreach ($aArgs['idsToRetrieve'][$version] as $resId => $value) {
                 $documentStatus = MaarchParapheurController::getDocumentStatus(['config' => $aArgs['config'], 'documentId' => $value->external_id]);
-    
-                // Validated
-                if ((string)$documentStatus == $aArgs['config']['data']['valsignature']) {
-                    $aArgs['idsToRetrieve'][$version][$resId]->status = 'validated';
+                
+                if (in_array($documentStatus['reference'], [$validated, $refused])) {
                     $signedDocument = MaarchParapheurController::getHandwrittenDocument(['config' => $aArgs['config'], 'documentId' => $value->external_id]);
                     $aArgs['idsToRetrieve'][$version][$resId]->format = 'pdf'; // format du fichier récupéré
-                    $aArgs['idsToRetrieve'][$version][$resId]->encodedFile = (string)$signedDocument;
-
-                // $notes = MaarchParapheurController::getAnnotations(['config' => $aArgs['config'], 'sessionId' => $sessionId, 'dossier_id' => $value->external_id]);
-                    // $aArgs['idsToRetrieve'][$version][$resId]->noteContent = (string)$notes->Annotation->Texte;
+                    $aArgs['idsToRetrieve'][$version][$resId]->encodedFile = $signedDocument;
+                    if ($documentStatus['reference'] == $validated && $documentStatus['mode'] == 'sign') {
+                        $aArgs['idsToRetrieve'][$version][$resId]->status = 'validated';
+                    } elseif ($documentStatus['reference'] == $refused && $documentStatus['mode'] == 'sign') {
+                        $aArgs['idsToRetrieve'][$version][$resId]->status = 'refused';
+                    } elseif ($documentStatus['reference'] == $validated && $documentStatus['mode'] == 'note') {
+                        $aArgs['idsToRetrieve'][$version][$resId]->status = 'validatedNote';
+                    } elseif ($documentStatus['reference'] == $refused && $documentStatus['mode'] == 'note') {
+                        $aArgs['idsToRetrieve'][$version][$resId]->status = 'refusedNote';
+                    }
                 } else {
                     unset($aArgs['idsToRetrieve'][$version][$resId]);
                 }
@@ -194,7 +201,7 @@ class MaarchParapheurController
             'method'   => 'GET'
         ]);
 
-        return $response['status']['reference'];
+        return $response['status'];
     }
 
     public static function getHandwrittenDocument($aArgs)

modules/visa/xml/remoteSignatoryBooks.xml

@@ -7,11 +7,9 @@
         <password>maarch</password>
         <url>http://localhost/MaarchParapheur</url>
         <signature>SIGN</signature>
-        <valsignature>SIGNED</valsignature>
-        <refsignature>REFSIGNED</refsignature>
         <annotation>ANNOT</annotation>
-        <valannotation>VAL</valannotation>
-        <refannotation>REF</refannotation>
+        <externalValidated>VAL</externalValidated>
+        <externalRefused>REF</externalRefused>
     </signatoryBook>
     <signatoryBook>
         <id>ixbus</id>