Skip to content
Snippets Groups Projects
Commit ad532216 authored by Florian Azizian's avatar Florian Azizian
Browse files

FEAT #12346 TIME 0:30 continue test batch process mail from signatory book

parent 801acb2b
No related branches found
No related tags found
No related merge requests found
...@@ -320,7 +320,7 @@ foreach ($retrievedMails['noVersion'] as $resId => $value) { ...@@ -320,7 +320,7 @@ foreach ($retrievedMails['noVersion'] as $resId => $value) {
'format' => $value->format, 'format' => $value->format,
'attachment_type' => $value->attachment_type, 'attachment_type' => $value->attachment_type,
'in_signature_book' => 'true', 'in_signature_book' => 'true',
'originId' => $resId, 'origin_id' => $resId,
'status' => 'SIGN', 'status' => 'SIGN',
'encodedFile' => $value->encodedFile, 'encodedFile' => $value->encodedFile,
'noteContent' => $value->noteContent, 'noteContent' => $value->noteContent,
......
...@@ -123,7 +123,7 @@ class ResourceControlController ...@@ -123,7 +123,7 @@ class ResourceControlController
return ['errors' => 'Body is not set or empty']; return ['errors' => 'Body is not set or empty'];
} }
$resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['status', 'model_id', 'external_signatory_book_id', 'format']]); $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['status', 'model_id', 'format', 'external_id->>\'signatureBookId\' as signaturebookid']]);
if (empty($resource['status'])) { if (empty($resource['status'])) {
return ['errors' => 'Resource status is empty. It can not be modified']; return ['errors' => 'Resource status is empty. It can not be modified'];
} }
...@@ -135,7 +135,7 @@ class ResourceControlController ...@@ -135,7 +135,7 @@ class ResourceControlController
if ($args['onlyDocument'] && empty($body['encodedFile'])) { if ($args['onlyDocument'] && empty($body['encodedFile'])) {
return ['errors' => 'Body encodedFile is not set or empty']; return ['errors' => 'Body encodedFile is not set or empty'];
} elseif (!empty($body['encodedFile'])) { } elseif (!empty($body['encodedFile'])) {
if (!empty($resource['external_signatory_book_id'])) { if (!empty($resource['signaturebookid'])) {
return ['errors' => 'Resource is in external signature book, file can not be modified']; return ['errors' => 'Resource is in external signature book, file can not be modified'];
} elseif (ResourceControlController::isSigned(['resId' => $args['resId']])) { } elseif (ResourceControlController::isSigned(['resId' => $args['resId']])) {
return ['errors' => 'Resource is signed, file can not be modified']; return ['errors' => 'Resource is signed, file can not be modified'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment