diff --git a/modules/visa/batch/process_mailsFromSignatoryBook.php b/modules/visa/batch/process_mailsFromSignatoryBook.php index 7045ed50b31a818515ef5b7f5970172c831da3bb..d6eea3bdf3d92dcc311778398803263f390e7ca5 100755 --- a/modules/visa/batch/process_mailsFromSignatoryBook.php +++ b/modules/visa/batch/process_mailsFromSignatoryBook.php @@ -320,7 +320,7 @@ foreach ($retrievedMails['noVersion'] as $resId => $value) { 'format' => $value->format, 'attachment_type' => $value->attachment_type, 'in_signature_book' => 'true', - 'originId' => $resId, + 'origin_id' => $resId, 'status' => 'SIGN', 'encodedFile' => $value->encodedFile, 'noteContent' => $value->noteContent, diff --git a/src/app/resource/controllers/ResourceControlController.php b/src/app/resource/controllers/ResourceControlController.php index 41b317946e106df32a369ce313053b62743364ee..14011286e00b1ba9955add1cbddce3cb632c9d28 100644 --- a/src/app/resource/controllers/ResourceControlController.php +++ b/src/app/resource/controllers/ResourceControlController.php @@ -123,7 +123,7 @@ class ResourceControlController 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'])) { return ['errors' => 'Resource status is empty. It can not be modified']; } @@ -135,7 +135,7 @@ class ResourceControlController if ($args['onlyDocument'] && empty($body['encodedFile'])) { return ['errors' => 'Body encodedFile is not set or empty']; } 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']; } elseif (ResourceControlController::isSigned(['resId' => $args['resId']])) { return ['errors' => 'Resource is signed, file can not be modified'];