Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy

CHANGELOG.md

@@ -5,14 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2326.01] - 2023-06-29
+
+### Added
+
+### Changed
+
+### Fixed
+-
+
 ## [2324.01] - 2023-06-08
 
 ### Added
--
-
+- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
+- (General -> Desplegables) Mejorada eficiencia de carga de datos
 
 ### Changed
--
+- (General -> Permisos) Mejorada seguridad
 
 ### Fixed
 -

Dockerfile

@@ -11,9 +11,9 @@ RUN apt-get update \
         ca-certificates \
         gnupg2 \
         graphicsmagick \
-    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g npm@8.19.2
+    && npm install -g npm@9.6.6
 
 # Puppeteer
 

Jenkinsfile

@@ -39,7 +39,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                     sh 'npm install --no-audit --prefer-offline'
                     sh 'gulp install --ci'
                 }
@@ -57,14 +57,14 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v14') {
+                        nodejs('node-v20') {
                             sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=2'
                         }
                     }
                 }
                 stage('Backend') {
                     steps {
-                        nodejs('node-v14') {
+                        nodejs('node-v20') {
                             sh 'npm run test:back:ci'
                         }
                     }
@@ -80,7 +80,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                     sh 'gulp build'
                 }
 

e2e/paths/06-claim/05_summary.spec.js

@@ -49,7 +49,11 @@ describe('Claim summary path', () => {
     });
 
     it(`should click on the first sale ID making the item descriptor visible`, async() => {
-        await page.waitToClick(selectors.claimSummary.firstSaleItemId);
+        const firstItem = selectors.claimSummary.firstSaleItemId;
+        await page.evaluate(selectors => {
+            document.querySelector(selectors).scrollIntoView();
+        }, firstItem);
+        await page.click(firstItem);
         await page.waitImgLoad(selectors.claimSummary.firstSaleDescriptorImage);
         const visible = await page.isVisible(selectors.claimSummary.itemDescriptorPopover);
 

modules/order/front/catalog-search-panel/index.js

@@ -23,7 +23,7 @@ class Controller extends SearchPanel {
 
     addValue() {
         this.filter.values.push({});
-        setTimeout(() => this.popover.relocate());
+        setTimeout(() => this.parentPopover.relocate());
     }
 
     changeTag() {
@@ -36,7 +36,7 @@ ngModule.vnComponent('vnOrderCatalogSearchPanel', {
     controller: Controller,
     bindings: {
         onSubmit: '&?',
-        popover: '<?',
+        parentPopover: '<?',
         resultTags: '<?'
     }
 });

modules/order/front/catalog/index.html

@@ -104,7 +104,7 @@
         on-close="$ctrl.onPopoverClose()">
         <vn-order-catalog-search-panel
             on-submit="$ctrl.onPanelSubmit($filter)"
-            popover="popover"
+            parent-popover="popover"
             result-tags="$ctrl.resultTags">
         </vn-order-catalog-search-panel>
     </vn-popover>

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.22.01",
+    "version": "23.24.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.22.01",
+            "version": "23.24.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",

package.json

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

webpack.config.js

@@ -9,7 +9,7 @@ let mode = env == 'development' ? env : 'production';
 
 let baseConfig = {
     entry: {salix: 'salix'},
-    mode: mode,
+    mode,
     output: {
         path: path.join(__dirname, 'dist'),
         publicPath: '/'