verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-12-23 08:15:25 +01:00
parent 994b87ef1d 3d4fc9c18e
commit 0799e58558
7 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -99,7 +99,6 @@ pipeline {
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
sh 'docker-compose build --parallel' sh 'docker-compose build --parallel'
sh 'docker-compose push' sh 'docker-compose push'
sh 'docker logout $REGISTRY'
} }
} }
stage('Deploy') { stage('Deploy') {
@ -108,7 +107,7 @@ pipeline {
branch 'master' branch 'master'
}} }}
steps { 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') { stage('Database') {

19
front/core/components/chip/style.scss
View File

@ -14,8 +14,25 @@ vn-chip {
&.colored { &.colored {
background-color: $color-main; 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 { & > div {
display: flex; display: flex;
align-items: center; align-items: center;

4
front/nginx.conf
View File

@ -7,11 +7,7 @@ server {
client_max_body_size 250M; client_max_body_size 250M;
root /salix/dist; root /salix/dist;
error_page 404 = @notfound;
location @notfound {
return 302 /;
}
location / { location / {
autoindex on; autoindex on;
} }

13
modules/agency/front/location/style.scss
View File

@ -1,14 +1,19 @@
@import "variables"; @import "variables";
vn-treeview-child { vn-treeview-child {
.content > .vn-check:not(.indeterminate) { .content > .vn-check:not(.indeterminate):not(.checked) {
color: $color-button; color: $color-alert;
& > .btn { & > .btn {
border-color: $color-button; border-color: $color-alert;
} }
} }
.content > .vn-check.checked { .content > .vn-check.checked {
color: $color-button; color: $color-notice;
& > .btn {
background-color: $color-notice;
border-color: $color-notice
}
} }
} }

32
modules/item/front/last-entries/index.html
View File

@ -43,27 +43,27 @@
disabled="true"> disabled="true">
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td>{{entry.warehouse| dashIfEmpty}}</vn-td> <vn-td>{{::entry.warehouse| dashIfEmpty}}</vn-td>
<vn-td>{{entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td> <vn-td>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
<vn-td number>{{entry.entryFk | dashIfEmpty}}</vn-td> <vn-td number>{{::entry.entryFk | dashIfEmpty}}</vn-td>
<vn-td number>{{entry.price2 | dashIfEmpty}}</vn-td> <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
<vn-td number>{{entry.price3 | dashIfEmpty}}</vn-td> <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
<vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td> <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
<vn-td number> <vn-td number>
<span class="chip" ng-class="{counter: entry.groupingMode == 2}"> <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}">
{{entry.packing | dashIfEmpty}} <span translate>{{::entry.packing | dashIfEmpty}}</span>
</span> </vn-chip>
</vn-td> </vn-td>
<vn-td number> <vn-td number>
<span class="chip" ng-class="{counter: entry.groupingMode == 1}"> <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}">
{{entry.grouping | dashIfEmpty}} <span translate>{{::entry.grouping | dashIfEmpty}}</span>
</span> </vn-chip>
</vn-td> </vn-td>
<vn-td number class="expendable">{{entry.stems | dashIfEmpty}}</vn-td> <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
<vn-td number>{{entry.quantity}}</vn-td> <vn-td number>{{::entry.quantity}}</vn-td>
<vn-td number class="expendable">{{entry.buyingValue | dashIfEmpty}}</vn-td> <vn-td number class="expendable">{{::entry.buyingValue | dashIfEmpty}}</vn-td>
<vn-td number>{{entry.packageFk | dashIfEmpty}}</vn-td> <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
<vn-td class="expendable">{{entry.supplier | dashIfEmpty}}</vn-td> <vn-td class="expendable">{{::entry.supplier | dashIfEmpty}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>

18
print/templates/reports/delivery-note/delivery-note.html
View File

@ -96,16 +96,22 @@
</tr> </tr>
<tr class="description"> <tr class="description">
<td colspan="2" class="centered"> <td colspan="2" class="centered">
<strong class="font gray" v-if="sale.val1">{{sale.tag1}}</strong> <div v-if="sale.value5">
<span>{{sale.val1}}</span> <strong class="font gray">{{sale.tag5}}</strong>
<span>{{sale.value5}}</span>
</div>
</td> </td>
<td colspan="3" class="centered"> <td colspan="3" class="centered">
<strong class="font gray" v-if="sale.val2">{{sale.tag2}}</strong> <div v-if="sale.value6">
<span>{{sale.val2}}</span> <strong class="font gray">{{sale.tag6}}</strong>
<span>{{sale.value6}}</span>
</div>
</td> </td>
<td colspan="2" class="centered"> <td colspan="2" class="centered">
<strong class="font gray" v-if="sale.val3">{{sale.tag3}}</strong> <div v-if="sale.value7">
<span>{{sale.val3}}</span> <strong class="font gray">{{sale.tag7}}</strong>
<span>{{sale.value7}}</span>
</div>
</td> </td>
</tr> </tr>
<tr class="description phytosanitary" v-if="sale.passportNumber"> <tr class="description phytosanitary" v-if="sale.passportNumber">

2
print/templates/reports/sepa-core/locale/fr.yml
View File

@ -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 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 à 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. à débiter votre compte conformément aux instructions de VERDNATURA LEVANTE SL.