verdnatura/salix
verdnatura
/
salix
3
5
Fork 1
Code Issues Pull Requests 66 Releases Wiki Activity

Merge branch 'dev' into 7937-claimAgile

This commit is contained in:
Javi Gallego 2025-02-17 19:16:16 +01:00
parent a04ddfdee3 f687ad35fd
commit a30f12dd27
6 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Jenkinsfile vendored
View File

@ -76,7 +76,7 @@ pipeline {
def packageJson = readJSON file: 'package.json' def packageJson = readJSON file: 'package.json'
def version = "${packageJson.version}-build${env.BUILD_ID}" def version = "${packageJson.version}-build${env.BUILD_ID}"
writeFile(file: 'VERSION.txt', text: version) writeFile(file: 'VERSION.txt', text: version)
echo "VERSION.txt: ${version}" echo "VERSION: ${version}"
} }
} }
} }
@ -109,39 +109,6 @@ pipeline {
} }
} }
} }
stage('Build') {
when {
expression { RUN_BUILD }
}
environment {
VERSION = readFile 'VERSION.txt'
CREDENTIALS = credentials('docker-registry')
}
parallel {
stage('Back') {
steps {
dockerBuildPush 'salix-back', '.', 'back/Dockerfile'
}
}
stage('Front') {
steps {
sh 'gulp build'
dockerBuildPush 'salix-front', 'front'
}
}
stage('DB') {
steps {
sh 'npx myt run -t'
sh 'docker exec vn-database sh -c "cp -r /var/lib/mysql /data"'
sh 'docker commit vn-database vn_db'
sh 'docker stop vn-database'
sh 'docker rm vn-database'
dockerBuildPush 'salix-db', 'db'
}
}
}
}
stage('Test') { stage('Test') {
when { when {
expression { RUN_TESTS } expression { RUN_TESTS }
@ -178,6 +145,38 @@ pipeline {
} }
} }
} }
stage('Build') {
when {
expression { RUN_BUILD }
}
environment {
VERSION = readFile 'VERSION.txt'
CREDENTIALS = credentials('docker-registry')
}
parallel {
stage('Back') {
steps {
dockerBuildPush 'salix-back', '.', 'back/Dockerfile'
}
}
stage('Front') {
steps {
sh 'gulp build'
dockerBuildPush 'salix-front', 'front'
}
}
stage('DB') {
steps {
sh 'npx myt run -t'
sh 'docker exec vn-database sh -c "cp -r /var/lib/mysql /data"'
sh 'docker commit vn-database vn_db'
sh 'docker stop vn-database'
sh 'docker rm vn-database'
dockerBuildPush 'salix-db', 'db'
}
}
}
}
stage('Deploy') { stage('Deploy') {
when { when {
expression { PROTECTED_BRANCH } expression { PROTECTED_BRANCH }

2
db/dump/fixtures.before.sql
View File

@ -799,7 +799,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
(35, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1102, 'Somewhere in Philippines', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL, NULL, NULL), (35, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1102, 'Somewhere in Philippines', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL, NULL, NULL),
(36, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1102, 'Ant-Man Adventure', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL, NULL, NULL), (36, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1102, 'Ant-Man Adventure', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL, NULL, NULL),
(37, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1110, 'Deadpool swords', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL, NULL, NULL), (37, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1110, 'Deadpool swords', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL, NULL, NULL),
(1000000, NULL, 1, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1, 'employee', 131, NULL, 0, 1, 1.00, 0.00, CURDATE(), NULL, NULL, '', NULL); (1000000, NULL, 1, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1, 'employee', 121, NULL, 0, 1, 1.00, 0.00, CURDATE(), NULL, NULL, '', NULL);
INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`) INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
VALUES VALUES

2
modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
View File

@ -33,7 +33,7 @@ describe('route getSuggestedTickets()', () => {
expect(result.length).toEqual(5); expect(result.length).toEqual(5);
expect(anyResult.zoneFk).toEqual(1); expect(anyResult.zoneFk).toEqual(1);
expect(anyResult.agencyModeFk).toEqual(8); expect([1, 8]).toContain(anyResult.agencyModeFk);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {

1
modules/travel/back/methods/travel/filter.js
View File

@ -173,6 +173,7 @@ module.exports = Self => {
t.isRaid, t.isRaid,
t.daysInForward, t.daysInForward,
t.awbFk, t.awbFk,
t.availabled,
am.name agencyModeName, am.name agencyModeName,
a.code awbCode, a.code awbCode,
win.name warehouseInName, win.name warehouseInName,

3
modules/travel/back/models/travel.json
View File

@ -56,6 +56,9 @@
}, },
"daysInForward": { "daysInForward": {
"type": "number" "type": "number"
},
"availabled": {
"type": "date"
} }
}, },
"relations": { "relations": {

11
print/templates/email/invoice/locale/fr.yml
View File

@ -1,9 +1,8 @@
subject: Votre facture subject: Votre facture
title: Votre facture title: Votre facture
dear: Cher client, dear: Chère cliente, cher client
description: Le facture <strong>{0}</strong> correspondant à la commande <strong>{1}</strong> est maintenant disponible.<br/> description: La facture <strong>{0}</strong> correspondant à votre commande <strong>{1}</strong> est maintenant disponible.<br/>
Vous pouvez le télécharger en cliquant sur la pièce jointe dans cet email. Vous pouvez la télécharger en cliquant sur la pièce jointe.
poll: Si vous le souhaitez, vous pouvez répondre à notre questionaire de satisfaction poll: <strong></strong>
pour nous aider à améliorer notre service. Votre avis est très important pour nous! help: En cas de besoin d'eclaircissement, n'hésitez pas à nous contacter, <strong>nous sommes là pour vous aider!</strong>
help: N'hésitez pas nous envoyer toute doute ou question, <strong>nous sommes là pour vous aider!</strong>
conclusion: Merci pour votre attention! conclusion: Merci pour votre attention!