Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

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

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
 ```

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', {
+                const err = new UserError('Pass expired', 'passExpired');
-                    id: vnUser.id,
+                err.details = {token: changePasswordToken};
-                    token: changePasswordToken.id
+                throw err;
-                });
             }
 
             try {

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
             },

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 err = req.data?.error;
-                    const [args] = req.data.error.translateArgs;
+                if (err?.code == 'passExpired')
-                    this.$state.go('change-password', args);
+                    this.$state.go('change-password', err.details.token);
-                }
 
                 throw req;
             });

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: '<vn-change-password></vn-change-password>'
         })

modules/account/back/locale/account/en.yml

@@ -0,0 +1,3 @@
+name: account
+columns:
+    id: id

modules/account/back/locale/account/es.yml

@@ -0,0 +1,3 @@
+name: cuenta
+columns:
+    id: id

modules/account/back/locale/mail-alias-account/en.yml

@@ -0,0 +1,5 @@
+name: mail alias
+columns:
+    id: id
+    mailAlias: alias
+    account: account

modules/account/back/locale/mail-alias-account/es.yml

@@ -0,0 +1,5 @@
+name: alias de correo
+columns:
+    id: id
+    mailAlias: alias
+    account: cuenta

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`)
+        this.$http.patch(`Accounts/syncAll`);
-            .then(() => this.vnApp.showSuccess(this.$t('Users synchronized!')));
     }
 
     onUserSync() {

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) {

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)">
             </vn-autocomplete>
             <vn-autocomplete
                 url="Printers"

modules/invoiceOut/front/global-invoicing/index.js

@@ -7,23 +7,29 @@ class Controller extends Section {
     $onInit() {
         const date = Date.vnNew();
         Object.assign(this, {
-            maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
+          maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
-            clientsToInvoice: 'all',
+          clientsToInvoice: 'all',
         });
 
         this.$http.get('UserConfigs/getUserConfig')
-            .then(res => {
+          .then(res => {
-                this.companyFk = res.data.companyFk;
+            this.companyFk = res.data.companyFk;
-                const params = {
+            this.getInvoiceDate(this.companyFk);
-                    companyFk: this.companyFk
+          });
-                };
+      }
-                return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
+
-            })
+      getInvoiceDate(companyFk) {
-            .then(res => {
+        const params = { companyFk: companyFk };
-                this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
+        this.fetchInvoiceDate(params);
-                this.invoiceDate = this.minInvoicingDate;
+      }
-            });
+
-    }
+      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');

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

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

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
+    started: starts
-    ended: ended
+    ended: ends
     weekDays: week days
     hour: hour
     travelingDays: traveling days
     price: price
     bonus: bonus
-    m3Max: max m3
+    m3Max: max. m3

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
+    started: empieza
-    ended: terminado
+    ended: termina
     weekDays: días semana
     hour: hora
     travelingDays: días de viaje

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

modules/zone/back/locale/zone-exclusion/es.yml

@@ -1,4 +1,4 @@
-name: zone exclusion
+name: exclusión
 columns:
     id: id
     dated: fecha

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

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

modules/zone/back/locale/zone-warehouse/en.yml

@@ -1,4 +1,4 @@
-name: zone warehouse
+name: warehouse
 columns:
     id: id
     warehouseFk: warehouse

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.26.01",
+    "version": "23.24.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",