From 1407b7b76f96185535da409e71cb56caa30ae952 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 19 Dec 2019 15:45:19 +0100 Subject: [PATCH 1/6] Nginx config fixes --- front/nginx.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/front/nginx.conf b/front/nginx.conf index 64f9436f3..22bce2283 100644 --- a/front/nginx.conf +++ b/front/nginx.conf @@ -7,11 +7,7 @@ server { client_max_body_size 250M; root /salix/dist; - error_page 404 = @notfound; - location @notfound { - return 302 /; - } location / { autoindex on; } From 5db65e188a3af56e80b6659511b7102c6580d340 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 19 Dec 2019 16:11:56 +0100 Subject: [PATCH 2/6] Jenkinsfile fixes --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c238e452c..b26a55f62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -99,7 +99,6 @@ pipeline { sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' sh 'docker-compose build --parallel' sh 'docker-compose push' - sh 'docker logout $REGISTRY' } } stage('Deploy') { From 00b103b38919ffddeb852afd2dc90944e26f1745 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 19 Dec 2019 16:16:54 +0100 Subject: [PATCH 3/6] Jenkinsfile fixes --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b26a55f62..cebd959e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,7 +70,7 @@ pipeline { stage('Frontend') { steps { nodejs('node-lts') { - sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=1' + sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=2' } } } @@ -107,7 +107,7 @@ pipeline { branch 'master' }} steps { - sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}" + sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}" } } stage('Database') { From fce22f2e3009cd21b9051eb1c672dfdbab361ced Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 19 Dec 2019 16:23:59 +0100 Subject: [PATCH 4/6] Jenkinsfile fixes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cebd959e1..0d56f7476 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,7 +70,7 @@ pipeline { stage('Frontend') { steps { nodejs('node-lts') { - sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=2' + sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=1' } } } From ec1750476ee1386661d3d038557079ee974e674b Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 20 Dec 2019 12:56:56 +0100 Subject: [PATCH 5/6] Fixed tags --- .../reports/delivery-note/delivery-note.html | 18 ++++++++++++------ .../templates/reports/sepa-core/locale/fr.yml | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index 812ef0715..1bad225de 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -96,16 +96,22 @@ - {{sale.tag1}} - {{sale.val1}} +
+ {{sale.tag5}} + {{sale.value5}} +
- {{sale.tag2}} - {{sale.val2}} +
+ {{sale.tag6}} + {{sale.value6}} +
- {{sale.tag3}} - {{sale.val3}} +
+ {{sale.tag7}} + {{sale.value7}} +
diff --git a/print/templates/reports/sepa-core/locale/fr.yml b/print/templates/reports/sepa-core/locale/fr.yml index ec6fd11ab..9489fa277 100644 --- a/print/templates/reports/sepa-core/locale/fr.yml +++ b/print/templates/reports/sepa-core/locale/fr.yml @@ -1,4 +1,4 @@ -title: Mandat de domiciliation Européene LCR +title: Mandat de domiciliation Européene description: En signant ce formulaire de mandat, vous autorisez VERDNATURA LEVANTE SL à envoyer des instructions à votre banque pour débiter votre compte, et (B) votre banque à débiter votre compte conformément aux instructions de VERDNATURA LEVANTE SL. From 3d4fc9c18ef589fccaaa1b86095fa6a1b2ce43c3 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Mon, 23 Dec 2019 08:05:58 +0100 Subject: [PATCH 6/6] #1963 Entry & zone style changes --- e2e/helpers/selectors.js | 2 +- front/core/components/chip/style.scss | 19 ++++++++++- modules/agency/front/location/style.scss | 13 +++++--- modules/item/front/last-entries/index.html | 32 +++++++++---------- .../ticket/specs/deleteStowaway.spec.js | 2 +- 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index d752b265f..bb23c9d96 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -360,7 +360,7 @@ export default { goBackToModuleIndexButton: 'vn-ticket-descriptor a[ui-sref="ticket.index"]', moreMenu: 'vn-ticket-descriptor vn-icon-menu[icon=more_vert]', moreMenuAddStowaway: '.vn-drop-down.shown li[name="Add stowaway"]', - moreMenuDeleteStowawayButton: '.vn-drop-down.shown li[name="Remove stowaway"]', + moreMenuDeleteStowawayButton: '.vn-drop-down.shown li[name="Delete stowaway"]', moreMenuAddToTurn: '.vn-drop-down.shown li[name="Add turn"]', moreMenuDeleteTicket: '.vn-drop-down.shown li[name="Delete ticket"]', moreMenuMakeInvoice: '.vn-drop-down.shown li[name="Make invoice"]', diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss index 5840ecdf1..3778c62b9 100644 --- a/front/core/components/chip/style.scss +++ b/front/core/components/chip/style.scss @@ -14,8 +14,25 @@ vn-chip { &.colored { background-color: $color-main; - color: $color-font-dark; + color: $color-font-bg; } + &.notice { + background-color: $color-notice-medium + } + &.success { + background-color: $color-success-medium; + } + &.warning { + background-color: $color-main-medium; + } + &.alert { + background-color: $color-alert-medium; + } + &.message { + color: $color-font-dark; + background-color: $color-bg-dark + } + & > div { display: flex; align-items: center; diff --git a/modules/agency/front/location/style.scss b/modules/agency/front/location/style.scss index 4972a5d29..2316a2622 100644 --- a/modules/agency/front/location/style.scss +++ b/modules/agency/front/location/style.scss @@ -1,14 +1,19 @@ @import "variables"; vn-treeview-child { - .content > .vn-check:not(.indeterminate) { - color: $color-button; + .content > .vn-check:not(.indeterminate):not(.checked) { + color: $color-alert; & > .btn { - border-color: $color-button; + border-color: $color-alert; } } .content > .vn-check.checked { - color: $color-button; + color: $color-notice; + + & > .btn { + background-color: $color-notice; + border-color: $color-notice + } } } \ No newline at end of file diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index a7046e17b..28ba9989b 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -43,27 +43,27 @@ disabled="true"> - {{entry.warehouse| dashIfEmpty}} - {{entry.landed | date:'dd/MM/yyyy HH:mm'}} - {{entry.entryFk | dashIfEmpty}} - {{entry.price2 | dashIfEmpty}} - {{entry.price3 | dashIfEmpty}} + {{::entry.warehouse| dashIfEmpty}} + {{::entry.landed | date:'dd/MM/yyyy HH:mm'}} + {{::entry.entryFk | dashIfEmpty}} + {{::entry.price2 | dashIfEmpty}} + {{::entry.price3 | dashIfEmpty}} {{entry.stickers | dashIfEmpty}} - - {{entry.packing | dashIfEmpty}} - + + {{::entry.packing | dashIfEmpty}} + - - {{entry.grouping | dashIfEmpty}} - + + {{::entry.grouping | dashIfEmpty}} + - {{entry.stems | dashIfEmpty}} - {{entry.quantity}} - {{entry.buyingValue | dashIfEmpty}} - {{entry.packageFk | dashIfEmpty}} - {{entry.supplier | dashIfEmpty}} + {{::entry.stems | dashIfEmpty}} + {{::entry.quantity}} + {{::entry.buyingValue | dashIfEmpty}} + {{::entry.packageFk | dashIfEmpty}} + {{::entry.supplier | dashIfEmpty}} diff --git a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js index d5a10ac3b..3c8097e37 100644 --- a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js +++ b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js @@ -1,6 +1,6 @@ const app = require('vn-loopback/server/server'); -fdescribe('ticket deleteStowaway()', () => { +describe('ticket deleteStowaway()', () => { const shipId = 16; const stowawayId = 17;