diff --git a/src/app/registeredMail/controllers/RegisteredMailController.php b/src/app/registeredMail/controllers/RegisteredMailController.php index 342ae79f5c0aad238b0b548e9e84b77a2ae76cdb..f94c139b1d4e77cc9bb43a54889dc8016ef02e17 100644 --- a/src/app/registeredMail/controllers/RegisteredMailController.php +++ b/src/app/registeredMail/controllers/RegisteredMailController.php @@ -87,9 +87,15 @@ class RegisteredMailController return $response->withStatus(400)->withJson(['errors' => 'No range found']); } - $status = $range[0]['current_number'] + 1 > $range[0]['range_end'] ? 'DEL' : 'OK'; + if ($range[0]['current_number'] + 1 > $range[0]['range_end']) { + $status = 'DEL'; + $nextNumber = $range[0]['current_number']; + } else { + $status = 'OK'; + $nextNumber = $range[0]['current_number'] + 1; + } RegisteredNumberRangeModel::update([ - 'set' => ['current_number' => $range[0]['current_number'] + 1, 'status' => $status], + 'set' => ['current_number' => $nextNumber, 'status' => $status], 'where' => ['id = ?'], 'data' => [$range[0]['id']] ]); diff --git a/src/app/registeredMail/controllers/RegisteredMailTrait.php b/src/app/registeredMail/controllers/RegisteredMailTrait.php index 086e067145062a80ff53316619b59f812aa74bee..6656fd537a5e1f25921fe5d3f04416709752c258 100644 --- a/src/app/registeredMail/controllers/RegisteredMailTrait.php +++ b/src/app/registeredMail/controllers/RegisteredMailTrait.php @@ -58,9 +58,15 @@ trait RegisteredMailTrait return ['errors' => ['No range found']]; } - $status = $range[0]['current_number'] + 1 > $range[0]['range_end'] ? 'DEL' : 'OK'; + if ($range[0]['current_number'] + 1 > $range[0]['range_end']) { + $status = 'DEL'; + $nextNumber = $range[0]['current_number']; + } else { + $status = 'OK'; + $nextNumber = $range[0]['current_number'] + 1; + } RegisteredNumberRangeModel::update([ - 'set' => ['current_number' => $range[0]['current_number'] + 1, 'status' => $status], + 'set' => ['current_number' => $nextNumber, 'status' => $status], 'where' => ['id = ?'], 'data' => [$range[0]['id']] ]); @@ -123,9 +129,15 @@ trait RegisteredMailTrait return ['errors' => ['No range found']]; } - $status = $range[0]['current_number'] + 1 > $range[0]['range_end'] ? 'DEL' : 'OK'; + if ($range[0]['current_number'] + 1 > $range[0]['range_end']) { + $status = 'DEL'; + $nextNumber = $range[0]['current_number']; + } else { + $status = 'OK'; + $nextNumber = $range[0]['current_number'] + 1; + } RegisteredNumberRangeModel::update([ - 'set' => ['current_number' => $range[0]['current_number'] + 1, 'status' => $status], + 'set' => ['current_number' => $nextNumber, 'status' => $status], 'where' => ['id = ?'], 'data' => [$range[0]['id']] ]); diff --git a/src/frontend/service/privileges.service.ts b/src/frontend/service/privileges.service.ts index df8eac4333f57b40df2a12da46ce59d91aad67d0..610609e3d8b2ebcd309d263e965acdb47ae8645a 100755 --- a/src/frontend/service/privileges.service.ts +++ b/src/frontend/service/privileges.service.ts @@ -526,7 +526,7 @@ export class PrivilegeService { 'label': 'lang.arReception', 'comment': 'lang.arReception', 'route': '/registeredMail/acknowledgement', - 'style': 'fa fa-file-archive', + 'style': 'fa fa-barcode', 'unit': 'registeredMails', 'angular': true, 'shortcut': false