verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

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

This commit is contained in:
Joan Sanchez 2022-08-12 15:53:24 +02:00
parent 6b6d00cf95 4de596df4a
commit 7a04cf0a6e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/client/front/notification/index.js
View File

@ -108,6 +108,7 @@ export default class Controller extends Section {
case 'fi':
case 'postcode':
case 'salesPersonFk':
case 'provinceFk':
return {[param]: value};
}
}

4
modules/entry/front/summary/index.html
View File

@ -123,12 +123,12 @@
<td center title="{{::line.weight}}">{{::line.weight}}</td>
<td center>
<vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}">
<span translate>{{::line.packing | dashIfEmpty}}</span>
<span>{{::line.packing | dashIfEmpty}}</span>
</vn-chip>
</td>
<td center>
<vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}">
<span translate>{{::line.grouping | dashIfEmpty}}</span>
<span>{{::line.grouping | dashIfEmpty}}</span>
</vn-chip>
</vn-td>
<td center title="{{::line.buyingValue | currency: 'EUR':2}}">{{::line.buyingValue | currency: 'EUR':2}}</td>

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

@ -70,12 +70,12 @@
<vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
<vn-td number>
<vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}">
<span translate>{{::entry.packing | dashIfEmpty}}</span>
<span>{{::entry.packing | dashIfEmpty}}</span>
</vn-chip>
</vn-td>
<vn-td number>
<vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}">
<span translate>{{::entry.grouping | dashIfEmpty}}</span>
<span>{{::entry.grouping | dashIfEmpty}}</span>
</vn-chip>
</vn-td>
<vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>