From 60103fa80ac08ce1ac39909fd2f14b5cf71cc9bf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 12 Apr 2023 14:39:40 +0200
Subject: [PATCH] refs #5540 validacion nif

---
 loopback/locale/es.json                  |  3 ++-
 modules/supplier/back/models/supplier.js | 13 +++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 42276efe7e..8e2672bc4b 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -274,5 +274,6 @@
 	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
 	"Insert a date range": "Inserte un rango de fechas",
     "Added observation": "{{user}} añadió esta observacion: {{text}}",
-    "Comment added to client": "Observación añadida al cliente {{clientFk}}"
+    "Comment added to client": "Observación añadida al cliente {{clientFk}}",
+	"The first two values are letters": "Los dos primeros carácteres del NIF son letras"
 }
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 745a2f7e33..7f12e86efd 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -73,16 +73,13 @@ module.exports = Self => {
         done();
     }
 
-    Self.validateAsync('nif', areFirstTwoCharsLetters, nifInvalid, {
-        message: 'The first two values are letters.'});
+    Self.validateAsync('nif', nifInvalid, {
+        message: 'The first two values are letters'});
 
-    function areFirstTwoCharsLetters(str) {
-        return /^[a-zA-Z]{2}/.test(str);
-    }
-
-    async function nifInvalid(err, areFirstTwoCharsLetters) {
-        if (this.isVies == 1 && areFirstTwoCharsLetters(this.nif))
+    async function nifInvalid(err, done) {
+        if (this.isVies && /^[a-zA-Z]{2}/.test(this.nif))
             err();
+        done();
     }
 
     function isAlpha(value) {