diff --git a/CHANGELOG.md b/CHANGELOG.md
index 708ebbc4b6..8967a1633b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
-
-## [2324.01] - 2023-06-08
+## [2324.01] - 2023-06-15
### Added
- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
diff --git a/README.md b/README.md
index f73a8551be..59f5dbcf78 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :)
Required applications.
-* Node.js = 14.x LTS
+* Node.js >= 16.x LTS
* Docker
* Git
@@ -71,7 +71,7 @@ $ npm run test:e2e
Open Visual Studio Code, press Ctrl+P and paste the following commands.
-In Visual Studio Code we use the ESLint extension.
+In Visual Studio Code we use the ESLint extension.
```
ext install dbaeumer.vscode-eslint
```
diff --git a/back/methods/vn-user/signIn.js b/back/methods/vn-user/signIn.js
index d7db90a21e..6615cb5f13 100644
--- a/back/methods/vn-user/signIn.js
+++ b/back/methods/vn-user/signIn.js
@@ -62,10 +62,9 @@ module.exports = Self => {
scopes: ['change-password'],
userId: vnUser.id
});
- throw new UserError('Pass expired', 'passExpired', {
- id: vnUser.id,
- token: changePasswordToken.id
- });
+ const err = new UserError('Pass expired', 'passExpired');
+ err.details = {token: changePasswordToken};
+ throw err;
}
try {
diff --git a/db/changes/232601/.gitkeep b/db/changes/232601/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/db/changes/232601/00-packingSiteAdvanced.sql b/db/changes/232601/00-packingSiteAdvanced.sql
new file mode 100644
index 0000000000..0e33744cd8
--- /dev/null
+++ b/db/changes/232601/00-packingSiteAdvanced.sql
@@ -0,0 +1,71 @@
+CREATE TABLE `vn`.`packingSiteAdvanced` (
+ `ticketFk` int(11),
+ `workerFk` int(10) unsigned,
+ PRIMARY KEY (`ticketFk`),
+ KEY `packingSiteAdvanced_FK_1` (`workerFk`),
+ CONSTRAINT `packingSiteAdvanced_FK` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `packingSiteAdvanced_FK_1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+ VALUES
+ ('PackingSiteAdvanced', '*', '*', 'ALLOW', 'ROLE', 'production');
+
+ DROP PROCEDURE IF EXISTS `vn`.`packingSite_startCollection`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`packingSite_startCollection`(vSelf INT, vTicketFk INT)
+proc: BEGIN
+/**
+ * @param vSelf packingSite id
+ * @param vTicketFk A ticket id from the collection to start
+ */
+ DECLARE vExists BOOL;
+ DECLARE vIsAdvanced BOOL;
+ DECLARE vNewCollectionFk INT;
+ DECLARE vOldCollectionFk INT;
+ DECLARE vIsPackingByOther BOOL;
+
+ SELECT id, collectionFk
+ INTO vExists, vOldCollectionFk
+ FROM packingSite
+ WHERE id = vSelf;
+
+ IF NOT vExists THEN
+ CALL util.throw('packingSiteNotExists');
+ END IF;
+
+ SELECT COUNT(*) > 0
+ INTO vIsAdvanced
+ FROM packingSiteAdvanced
+ WHERE ticketFk = vTicketFk;
+
+ IF vIsAdvanced THEN
+ LEAVE proc;
+ END IF;
+
+ SELECT collectionFk INTO vNewCollectionFk
+ FROM ticketCollection WHERE ticketFk = vTicketFk;
+
+ IF vOldCollectionFk IS NOT NULL
+ AND vOldCollectionFk <> vNewCollectionFk THEN
+ SELECT COUNT(*) > 0
+ INTO vIsPackingByOther
+ FROM packingSite
+ WHERE id <> vSelf
+ AND collectionFk = vOldCollectionFk;
+
+ IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) THEN
+ CALL util.throw('cannotChangeCollection');
+ END IF;
+ END IF;
+
+ UPDATE packingSite SET collectionFk = vNewCollectionFk
+ WHERE id = vSelf;
+END$$
+DELIMITER ;
+
+
+
diff --git a/front/salix/components/change-password/index.js b/front/salix/components/change-password/index.js
index 3d660e894c..baa9d96e52 100644
--- a/front/salix/components/change-password/index.js
+++ b/front/salix/components/change-password/index.js
@@ -15,7 +15,7 @@ export default class Controller {
}
$onInit() {
- if (!this.$state.params || !this.$state.params.id || !this.$state.params.token)
+ if (!this.$state.params.id)
this.$state.go('login');
this.$http.get('UserPasswords/findOne')
@@ -25,7 +25,7 @@ export default class Controller {
}
submit() {
- const id = this.$state.params.id;
+ const userId = this.$state.params.userId;
const newPassword = this.newPassword;
const oldPassword = this.oldPassword;
@@ -35,12 +35,12 @@ export default class Controller {
throw new UserError(`Passwords don't match`);
const headers = {
- Authorization: this.$state.params.token
+ Authorization: this.$state.params.id
};
this.$http.post('VnUsers/change-password',
{
- id,
+ id: userId,
oldPassword,
newPassword
},
diff --git a/front/salix/components/login/index.js b/front/salix/components/login/index.js
index 0412f3b742..8e8f082444 100644
--- a/front/salix/components/login/index.js
+++ b/front/salix/components/login/index.js
@@ -27,10 +27,9 @@ export default class Controller {
this.loading = false;
this.password = '';
this.focusUser();
- if (req?.data?.error?.code == 'passExpired') {
- const [args] = req.data.error.translateArgs;
- this.$state.go('change-password', args);
- }
+ const err = req.data?.error;
+ if (err?.code == 'passExpired')
+ this.$state.go('change-password', err.details.token);
throw req;
});
diff --git a/front/salix/routes.js b/front/salix/routes.js
index d6dea244a5..675da719a5 100644
--- a/front/salix/routes.js
+++ b/front/salix/routes.js
@@ -38,7 +38,7 @@ function config($stateProvider, $urlRouterProvider) {
})
.state('change-password', {
parent: 'outLayout',
- url: '/change-password?id&token',
+ url: '/change-password?id&userId',
description: 'Change password',
template: ''
})
diff --git a/modules/account/back/locale/account/en.yml b/modules/account/back/locale/account/en.yml
new file mode 100644
index 0000000000..221afef5f5
--- /dev/null
+++ b/modules/account/back/locale/account/en.yml
@@ -0,0 +1,3 @@
+name: account
+columns:
+ id: id
diff --git a/modules/account/back/locale/account/es.yml b/modules/account/back/locale/account/es.yml
new file mode 100644
index 0000000000..a79b1f40c3
--- /dev/null
+++ b/modules/account/back/locale/account/es.yml
@@ -0,0 +1,3 @@
+name: cuenta
+columns:
+ id: id
diff --git a/modules/account/back/locale/mail-alias-account/en.yml b/modules/account/back/locale/mail-alias-account/en.yml
new file mode 100644
index 0000000000..bf805d66f3
--- /dev/null
+++ b/modules/account/back/locale/mail-alias-account/en.yml
@@ -0,0 +1,5 @@
+name: mail alias
+columns:
+ id: id
+ mailAlias: alias
+ account: account
diff --git a/modules/account/back/locale/mail-alias-account/es.yml b/modules/account/back/locale/mail-alias-account/es.yml
new file mode 100644
index 0000000000..b53ade9967
--- /dev/null
+++ b/modules/account/back/locale/mail-alias-account/es.yml
@@ -0,0 +1,5 @@
+name: alias de correo
+columns:
+ id: id
+ mailAlias: alias
+ account: cuenta
diff --git a/modules/account/front/accounts/index.js b/modules/account/front/accounts/index.js
index 7a341b0b03..0e78ab8d6d 100644
--- a/modules/account/front/accounts/index.js
+++ b/modules/account/front/accounts/index.js
@@ -5,8 +5,7 @@ import UserError from 'core/lib/user-error';
export default class Controller extends Section {
onSynchronizeAll() {
this.vnApp.showSuccess(this.$t('Synchronizing in the background'));
- this.$http.patch(`Accounts/syncAll`)
- .then(() => this.vnApp.showSuccess(this.$t('Users synchronized!')));
+ this.$http.patch(`Accounts/syncAll`);
}
onUserSync() {
diff --git a/modules/client/back/methods/tpv-transaction/confirm.js b/modules/client/back/methods/tpv-transaction/confirm.js
index 4faa21bb5e..41229a1fd0 100644
--- a/modules/client/back/methods/tpv-transaction/confirm.js
+++ b/modules/client/back/methods/tpv-transaction/confirm.js
@@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
const base64url = require('base64url');
module.exports = Self => {
- Self.remoteMethodCtx('confirm', {
+ Self.remoteMethod('confirm', {
description: 'Confirms electronic payment transaction',
accessType: 'WRITE',
accepts: [
@@ -30,7 +30,7 @@ module.exports = Self => {
}
});
- Self.confirm = async(ctx, signatureVersion, merchantParameters, signature) => {
+ Self.confirm = async(signatureVersion, merchantParameters, signature) => {
const $ = Self.app.models;
let transaction;
@@ -83,7 +83,7 @@ module.exports = Self => {
params['Ds_Currency'],
params['Ds_Response'],
params['Ds_ErrorCode']
- ], {userId: ctx.req.accessToken.userId});
+ ]);
return true;
} catch (err) {
diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index 6d5b16329f..3f0a106507 100644
--- a/modules/invoiceOut/front/global-invoicing/index.html
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -118,7 +118,8 @@
label="Company"
show-field="code"
value-field="id"
- ng-model="$ctrl.companyFk">
+ ng-model="$ctrl.companyFk"
+ on-change="$ctrl.getInvoiceDate(value)">
{
- this.companyFk = res.data.companyFk;
- const params = {
- companyFk: this.companyFk
- };
- return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
- })
- .then(res => {
- this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
- this.invoiceDate = this.minInvoicingDate;
- });
- }
+ .then(res => {
+ this.companyFk = res.data.companyFk;
+ this.getInvoiceDate(this.companyFk);
+ });
+ }
+
+ getInvoiceDate(companyFk) {
+ const params = { companyFk: companyFk };
+ this.fetchInvoiceDate(params);
+ }
+
+ fetchInvoiceDate(params) {
+ this.$http.get('InvoiceOuts/getInvoiceDate', { params })
+ .then(res => {
+ this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
+ this.invoiceDate = this.minInvoicingDate;
+ });
+ }
stopInvoicing() {
this.status = 'stopping';
@@ -42,7 +48,7 @@ class Controller extends Section {
throw new UserError('Invoice date and the max date should be filled');
if (this.invoiceDate < this.maxShipped)
throw new UserError('Invoice date can\'t be less than max date');
- if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
+ if (this.minInvoicingDate && this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
throw new UserError('Exists an invoice with a previous date');
if (!this.companyFk)
throw new UserError('Choose a valid company');
diff --git a/modules/ticket/back/locale/ticket-request/en.yml b/modules/ticket/back/locale/ticket-request/en.yml
index f381e0c9db..fc9210501b 100644
--- a/modules/ticket/back/locale/ticket-request/en.yml
+++ b/modules/ticket/back/locale/ticket-request/en.yml
@@ -2,14 +2,17 @@ name: request
columns:
id: id
description: description
- created: created
+ buyerCode: buyer
quantity: quantity
price: price
- isOk: ok
- response: response
- saleFk: sale
- ticketFk: ticket
- attenderFk: attender
- requesterFk: requester
itemFk: item
-
+ clientFk: client
+ response: response
+ total: total
+ buyed: buyed
+ saleFk: sale
+ created: created
+ isOk: ok
+ requesterFk: requester
+ attenderFk: attender
+ ticketFk: ticket
diff --git a/modules/ticket/back/locale/ticket-request/es.yml b/modules/ticket/back/locale/ticket-request/es.yml
index 5504448bfc..fd89ddf60c 100644
--- a/modules/ticket/back/locale/ticket-request/es.yml
+++ b/modules/ticket/back/locale/ticket-request/es.yml
@@ -1,15 +1,18 @@
-name: peticion
+name: petición
columns:
id: id
description: descripción
- created: creado
+ buyerCode: comprador
quantity: cantidad
price: precio
- isOk: ok
- response: respuesta
- saleFk: línea
- ticketFk: ticket
- attenderFk: asistente
- requesterFk: solicitante
itemFk: artículo
-
+ clientFk: cliente
+ response: respuesta
+ total: total
+ buyed: comprado
+ saleFk: línea
+ created: creado
+ isOk: ok
+ requesterFk: solicitante
+ attenderFk: asistente
+ ticketFk: ticket
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index bee01a8756..3c7e12eead 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -100,5 +100,8 @@
},
"TicketConfig": {
"dataSource": "vn"
+ },
+ "PackingSiteAdvanced": {
+ "dataSource": "vn"
}
}
diff --git a/modules/ticket/back/models/packing-site-advanced.json b/modules/ticket/back/models/packing-site-advanced.json
new file mode 100644
index 0000000000..f48cbf4121
--- /dev/null
+++ b/modules/ticket/back/models/packing-site-advanced.json
@@ -0,0 +1,18 @@
+{
+ "name": "PackingSiteAdvanced",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "packingSiteAdvanced"
+ }
+ },
+ "properties": {
+ "ticketFk": {
+ "id": true,
+ "type": "number"
+ },
+ "workerFk": {
+ "type": "number"
+ }
+ }
+}
diff --git a/modules/zone/back/locale/zone-event/en.yml b/modules/zone/back/locale/zone-event/en.yml
index 2d6ef39ab7..1988c1239b 100644
--- a/modules/zone/back/locale/zone-event/en.yml
+++ b/modules/zone/back/locale/zone-event/en.yml
@@ -1,14 +1,14 @@
-name: zone event
+name: event
columns:
id: id
zoneFk: zone
type: type
dated: dated
- started: started
- ended: ended
+ started: starts
+ ended: ends
weekDays: week days
hour: hour
travelingDays: traveling days
price: price
bonus: bonus
- m3Max: max m3
+ m3Max: max. m3
diff --git a/modules/zone/back/locale/zone-event/es.yml b/modules/zone/back/locale/zone-event/es.yml
index 9bc8db9fe4..5092cc9333 100644
--- a/modules/zone/back/locale/zone-event/es.yml
+++ b/modules/zone/back/locale/zone-event/es.yml
@@ -1,11 +1,11 @@
-name: evento zona
+name: evento
columns:
id: id
zoneFk: zona
type: tipo
dated: fecha
- started: comenzado
- ended: terminado
+ started: empieza
+ ended: termina
weekDays: días semana
hour: hora
travelingDays: días de viaje
diff --git a/modules/zone/back/locale/zone-exclusion/en.yml b/modules/zone/back/locale/zone-exclusion/en.yml
index 4389d8b937..6a2383b87a 100644
--- a/modules/zone/back/locale/zone-exclusion/en.yml
+++ b/modules/zone/back/locale/zone-exclusion/en.yml
@@ -1,5 +1,5 @@
-name: zone exclusion
+name: exclusion
columns:
id: id
- dated: dated
+ dated: date
zoneFk: zone
diff --git a/modules/zone/back/locale/zone-exclusion/es.yml b/modules/zone/back/locale/zone-exclusion/es.yml
index 4e59cba46b..35102a670c 100644
--- a/modules/zone/back/locale/zone-exclusion/es.yml
+++ b/modules/zone/back/locale/zone-exclusion/es.yml
@@ -1,4 +1,4 @@
-name: zone exclusion
+name: exclusión
columns:
id: id
dated: fecha
diff --git a/modules/zone/back/locale/zone-included/en.yml b/modules/zone/back/locale/zone-included/en.yml
index 0e44989e9a..65e4faac61 100644
--- a/modules/zone/back/locale/zone-included/en.yml
+++ b/modules/zone/back/locale/zone-included/en.yml
@@ -1,5 +1,7 @@
-name: zone included
+name: inclusion
columns:
id: id
dated: dated
zoneFk: zone
+ isIncluded: incluida
+ geoFk: localización
diff --git a/modules/zone/back/locale/zone-included/es.yml b/modules/zone/back/locale/zone-included/es.yml
index 30a89373ad..bd48cdbe5d 100644
--- a/modules/zone/back/locale/zone-included/es.yml
+++ b/modules/zone/back/locale/zone-included/es.yml
@@ -1,5 +1,7 @@
-name: zona incluida
+name: inclusión
columns:
id: id
dated: fecha
zoneFk: zona
+ isIncluded: incluida
+ geoFk: localización
diff --git a/modules/zone/back/locale/zone-warehouse/en.yml b/modules/zone/back/locale/zone-warehouse/en.yml
index b9c4f76098..6caa3de1b2 100644
--- a/modules/zone/back/locale/zone-warehouse/en.yml
+++ b/modules/zone/back/locale/zone-warehouse/en.yml
@@ -1,4 +1,4 @@
-name: zone warehouse
+name: warehouse
columns:
id: id
warehouseFk: warehouse
diff --git a/modules/zone/back/locale/zone-warehouse/es.yml b/modules/zone/back/locale/zone-warehouse/es.yml
index ec8dec2dd0..caf0d8f1a4 100644
--- a/modules/zone/back/locale/zone-warehouse/es.yml
+++ b/modules/zone/back/locale/zone-warehouse/es.yml
@@ -1,4 +1,4 @@
-name: almacén zona
+name: almacén
columns:
id: id
warehouseFk: almacén
diff --git a/package-lock.json b/package-lock.json
index 4ed50e2568..c190065b0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.24.01",
+ "version": "23.26.01",
"lockfileVersion": 2,
"requires": true,
"packages": {