diff --git a/Jenkinsfile b/Jenkinsfile
index cb76da130d..9ed7055db4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -76,7 +76,7 @@ pipeline {
def packageJson = readJSON file: 'package.json'
def version = "${packageJson.version}-build${env.BUILD_ID}"
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') {
when {
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') {
when {
expression { PROTECTED_BRANCH }
diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 2b0af8af87..a874bc9224 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -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),
(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),
- (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`)
VALUES
@@ -1614,7 +1614,7 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
(18, 12, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 'grouping', NULL, 0.00, 99.6, 99.4, 0, 1, 0, NULL, 1, util.VN_CURDATE() - INTERVAL 2 MONTH),
(19, 100, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 'grouping', NULL, 0.00, 99.6, 99.4, 0, 1, 0, NULL, 1, util.VN_CURDATE()),
(20, 100, 2, 5, 450, 3, 2, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00, 0, 1, 0, NULL, 2.5, util.VN_CURDATE()),
- (21, 100,72, 55, 500, 5, 3, 1.000, 1.000, 0.000, 1, 1, 'packing', NULL, 0.00, 78.3, 75.6, 0, 1, 0, 1, 3, util.VN_CURDATE()),
+ (21, 100,72, 55, 500, 5, 3, 1.000, 1.000, 0.000, 1, 1, 'packing', NULL, 0.00, 78.3, 75.6, 0, 1, 0, 1, 3, util.VN_CURDATE()),
(10000002, 12,88, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 'grouping', NULL, 0.00, 99.60, 99.40, 0, 1, 0, 1.00, 1,util.VN_CURDATE() - INTERVAL 2 MONTH);
INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
diff --git a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
index 3d6702482d..73264ad546 100644
--- a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
+++ b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
@@ -33,7 +33,7 @@ describe('route getSuggestedTickets()', () => {
expect(result.length).toEqual(5);
expect(anyResult.zoneFk).toEqual(1);
- expect(anyResult.agencyModeFk).toEqual(8);
+ expect([1, 8]).toContain(anyResult.agencyModeFk);
await tx.rollback();
} catch (e) {
diff --git a/modules/travel/back/methods/travel/filter.js b/modules/travel/back/methods/travel/filter.js
index 837e30b305..ad7a71d11d 100644
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@@ -173,6 +173,7 @@ module.exports = Self => {
t.isRaid,
t.daysInForward,
t.awbFk,
+ t.availabled,
am.name agencyModeName,
a.code awbCode,
win.name warehouseInName,
diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json
index a2a9e478e3..feeb24f698 100644
--- a/modules/travel/back/models/travel.json
+++ b/modules/travel/back/models/travel.json
@@ -56,6 +56,9 @@
},
"daysInForward": {
"type": "number"
+ },
+ "availabled": {
+ "type": "date"
}
},
"relations": {
diff --git a/print/templates/email/invoice/locale/fr.yml b/print/templates/email/invoice/locale/fr.yml
index 9efbdf5a03..937976f390 100644
--- a/print/templates/email/invoice/locale/fr.yml
+++ b/print/templates/email/invoice/locale/fr.yml
@@ -1,9 +1,8 @@
subject: Votre facture
title: Votre facture
-dear: Cher client,
-description: Le facture {0} correspondant à la commande {1} est maintenant disponible.
- Vous pouvez le télécharger en cliquant sur la pièce jointe dans cet email.
-poll: Si vous le souhaitez, vous pouvez répondre à notre questionaire de satisfaction
- pour nous aider à améliorer notre service. Votre avis est très important pour nous!
-help: N'hésitez pas nous envoyer toute doute ou question, nous sommes là pour vous aider!
+dear: Chère cliente, cher client
+description: La facture {0} correspondant à votre commande {1} est maintenant disponible.
+ Vous pouvez la télécharger en cliquant sur la pièce jointe.
+poll:
+help: En cas de besoin d'eclaircissement, n'hésitez pas à nous contacter, nous sommes là pour vous aider!
conclusion: Merci pour votre attention!