diff --git a/modules/visa/batch/process_mailsFromSignatoryBook.php b/modules/visa/batch/process_mailsFromSignatoryBook.php index 3854d77f7b003b9f2fa93bb1d266f65b15ab8fca..bfd02794f5a4652338a03f076077c8de335b1d6b 100755 --- a/modules/visa/batch/process_mailsFromSignatoryBook.php +++ b/modules/visa/batch/process_mailsFromSignatoryBook.php @@ -310,8 +310,8 @@ foreach ($retrievedMails['noVersion'] as $resId => $value) { if (!empty($value->encodedFile)) { \SrcCore\models\DatabaseModel::delete([ 'table' => 'res_attachments', - 'where' => ['res_id_master = ?', 'status = ?', 'relation = ?'], - 'data' => [$value->res_id_master, 'SIGN', $value->relation] + 'where' => ['res_id_master = ?', 'status = ?', 'relation = ?', 'origin = ?'], + 'data' => [$value->res_id_master, 'SIGN', $value->relation, $value->res_id . ',res_attachments'] ]); $GLOBALS['logger']->write('Create validated Attachment', 'INFO'); diff --git a/src/app/external/externalSignatoryBook/controllers/FastParapheurController.php b/src/app/external/externalSignatoryBook/controllers/FastParapheurController.php index 9de5d7c37eeab554a55edd1ba9e7d3f31621d292..01c40dfd7aba49e2c90b72b486dc0690e23e4dba 100755 --- a/src/app/external/externalSignatoryBook/controllers/FastParapheurController.php +++ b/src/app/external/externalSignatoryBook/controllers/FastParapheurController.php @@ -49,7 +49,11 @@ class FastParapheurController ] ]); - $isError = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body; + if ($curlReturn['infos']['http_code'] == 404) { + return ['error' => 'Erreur 404 : ' . $curlReturn['raw']]; + } + + $isError = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body; if (!empty($isError ->Fault[0]) && !empty($value->res_id_master)) { echo 'PJ n° ' . $resId . ' et document original n° ' . $value->res_id_master . ' : ' . (string)$curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0]->children()->faultstring . PHP_EOL; continue; @@ -161,7 +165,6 @@ class FastParapheurController if (!empty($annexes['letterbox'][0])) { $mainDocumentIntegration = json_decode($annexes['letterbox'][0]['integrations'], true); $externalId = json_decode($annexes['letterbox'][0]['external_id'], true); - // $externalId = empty($externalId) ? [] : $externalId; if ($mainDocumentIntegration['inSignatureBook'] && empty($externalId['signatureBookId'])) { $resId = $annexes['letterbox'][0]['res_id']; $collId = 'letterbox_coll';