diff --git a/src/app/action/controllers/ExternalSignatoryBookTrait.php b/src/app/action/controllers/ExternalSignatoryBookTrait.php index 2ee4146b0f47ed749996ef6f28df9a627f6df366..73c55b9ff760366ea8cbb40b59bbdd8dc25d4b9b 100644 --- a/src/app/action/controllers/ExternalSignatoryBookTrait.php +++ b/src/app/action/controllers/ExternalSignatoryBookTrait.php @@ -52,7 +52,14 @@ trait ExternalSignatoryBookTrait 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], 'data' => [$args['resId'], ['converted_pdf', 'print_folder', 'signed_response']] ]); - if ($attachments[0]['nb'] == 0 && $args['data']['objectSent'] == 'attachment') { + + $integratedResource = ResModel::get([ + 'select' => [1], + 'where' => ['integrations->>\'inSignatureBook\' = \'true\'', 'external_signatory_book_id is null', 'res_id = ?'], + 'data' => [$args['resId']] + ]); + + if ($attachments[0]['nb'] == 0 && empty($integratedResource) && $args['data']['objectSent'] == 'attachment') { $noAttachmentsResource = ResModel::getById(['resId' => $args['resId'], 'select' => ['alt_identifier']]); return ['errors' => ['No attachment for this mail : ' . $noAttachmentsResource['alt_identifier']]]; } diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php index 03db6175f5ecb27df5ce750fa14a84fab9f37320..eeaf856948291d03ea1cf70122730b72ce97ecf0 100755 --- a/src/app/action/controllers/PreProcessActionController.php +++ b/src/app/action/controllers/PreProcessActionController.php @@ -498,7 +498,7 @@ class PreProcessActionController break; } } - if (!$hasSignableAttachment && !empty($integratedResource)) { + if (!$hasSignableAttachment && empty($integratedResource)) { $additionalsInfos['noAttachment'][] = ['alt_identifier' => $noAttachmentsResource['alt_identifier'], 'res_id' => $resId, 'reason' => 'noSignableAttachmentInSignatoryBook']; } else { $additionalsInfos['attachments'][] = ['res_id' => $resId];