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

FEAT #16982 TIME 0:30 save correct role for otp yousign + error in getbyDocumentId workflow route

parent 1441ef80
No related branches found
No related tags found
No related merge requests found
...@@ -249,6 +249,9 @@ class SignatureController ...@@ -249,6 +249,9 @@ class SignatureController
} }
$validModes = CoreConfigModel::getSignatureModes(); $validModes = CoreConfigModel::getSignatureModes();
array_push($validModes, ['id' => 'otp_visa_yousign']);
array_push($validModes, ['id' => 'otp_sign_yousign']);
foreach ($validModes as $validMode) { foreach ($validModes as $validMode) {
if ($validMode['id'] == $args['mode']) { if ($validMode['id'] == $args['mode']) {
return true; return true;
......
...@@ -24,6 +24,7 @@ use Respect\Validation\Validator; ...@@ -24,6 +24,7 @@ use Respect\Validation\Validator;
use Slim\Http\Request; use Slim\Http\Request;
use Slim\Http\Response; use Slim\Http\Response;
use User\models\UserModel; use User\models\UserModel;
use Workflow\models\WorkflowExternalInformationModel;
use Workflow\models\WorkflowModel; use Workflow\models\WorkflowModel;
class WorkflowController class WorkflowController
...@@ -43,9 +44,18 @@ class WorkflowController ...@@ -43,9 +44,18 @@ class WorkflowController
$value['process_date'] = $date->format('d-m-Y H:i'); $value['process_date'] = $date->format('d-m-Y H:i');
} }
if (in_array($value['signature_mode'], ['otp_visa_yousign', 'otp_sign_yousign'])) {
$workflowExternalInformations = WorkflowExternalInformationModel::getByWorkflowId(['select' => ['firstname', 'lastname'], 'workflowId' => $value['id']]);
if (!empty($workflowExternalInformations)) {
$userDisplay = "{$workflowExternalInformations['firstname']} {$workflowExternalInformations['lastname']}";
}
} else {
$userDisplay = UserModel::getLabelledUserById(['id' => $value['user_id']]);
}
$workflow[] = [ $workflow[] = [
'userId' => $value['user_id'], 'userId' => $value['user_id'],
'userDisplay' => UserModel::getLabelledUserById(['id' => $value['user_id']]), 'userDisplay' => $userDisplay,
'mode' => $value['mode'], 'mode' => $value['mode'],
'signatureMode' => $value['signature_mode'], 'signatureMode' => $value['signature_mode'],
'order' => $value['order'], 'order' => $value['order'],
......
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