feat(salix): refs #7677 #7677 return more postcode fields

back/methods/postcode/filter.js

@@ -47,6 +47,8 @@ module.exports = Self => {
         let stmt;
         stmt = new ParameterizedSQL(`
             SELECT
+                CONCAT_WS('_', pc.code, pc.townFk, t.provinceFk,
+                p.countryFk) id,
                 pc.townFk,
                 t.provinceFk,
                 p.countryFk,

db/dump/fixtures.after.sql

@@ -255,7 +255,7 @@ INSERT INTO vn.operator (workerFk, numberOfWagons, trainFk, itemPackingTypeFk, w
         (9, 1, 1, 'V', 1);
 */
 -- XXX: web
-/* #5483
+
 INSERT INTO `hedera`.`config` (`cookieLife`, `defaultForm`)
     VALUES (15,'cms/home');
 
@@ -274,7 +274,7 @@ UPDATE `vn`.`agencyMode` SET `description` = `name`;
 
 INSERT INTO `hedera`.`tpvConfig` (currency, terminal, transactionType, maxAmount, employeeFk, `url`, testMode, testUrl, testKey, merchantUrl)
     VALUES (978, 1, 0, 2000, 9, 'https://sis.redsys.es/sis/realizarPago', 0, 'https://sis-t.redsys.es:25443/sis/realizarPago', 'sq7HjrUOBfKmC576ILgskD5srU870gJ7', NULL);
-*/
+
 INSERT INTO hedera.tpvMerchantEnable (merchantFk, companyFk)
     VALUES (1, 442);
 

db/dump/fixtures.before.sql

@@ -364,6 +364,7 @@ INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`)
         ('46460', 2, 6),
         ('46680', 3, 6),
         ('46600', 4, 7),
+        ('46600',1, 6),
         ('EC170150', 5, 8);
 
 INSERT INTO `vn`.`clientType`(`code`, `type`)

db/routines/vn/procedures/client_userDisable.sql

@@ -20,15 +20,15 @@ BEGIN
 		WHERE c.typeFk = 'normal'
 			AND a.id IS NULL
 			AND u.active
-			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH 
+			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH
 			AND NOT u.role = (SELECT id FROM `role` WHERE name = 'supplier')
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c
 						LEFT JOIN ticket t ON t.clientFk = c.id
 					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH 
-						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH
+						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH
 			);
 END$$
 DELIMITER ;

loopback/locale/es.json

@@ -370,5 +370,6 @@
 	"CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos",
 	"The sale not exists in the item shelving": "La venta no existe en la estantería del artículo",
 	"The entry not have stickers": "La entrada no tiene etiquetas",
-	"Too many records": "Demasiados registros"
+	"Too many records": "Demasiados registros",
+	"CONSTRAINT `zone.price` failed for `vn`.`zone`": "CONSTRAINT `zone.price` failed for `vn`.`zone`"
 }