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

grouping & packaging according to grouping mode
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-08-27 16:40:08 +02:00
parent 5614a39f91
commit 58fc25d91f
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/entry/front/latest-buys/index.html
View File

@ -47,7 +47,6 @@
<vn-th field="comissionValue" expand>Comission value</vn-th>
<vn-th field="packageValue" expand>Package value</vn-th>
<vn-th field="isIgnored">Is ignored</vn-th>
<vn-th field="groupingMode" expand>Grouping mode</vn-th>
<vn-th field="price2">price2</vn-th>
<vn-th field="price3">price3</vn-th>
<vn-th field="minPrice">Min price</vn-th>
@ -79,8 +78,16 @@
{{::buy.itemFk | zeroFill:6}}
</span>
</vn-td>
<vn-td number>{{::buy.grouping}}</vn-td>
<vn-td number>{{::buy.packing}}</vn-td>
<vn-td number>
<vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}">
<span translate>{{::buy.grouping | dashIfEmpty}}</span>
</vn-chip>
</vn-td>
<vn-td number>
<vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}">
<span translate>{{::buy.packing | dashIfEmpty}}</span>
</vn-chip>
</vn-td>
<vn-td number>{{::buy.size}}</vn-td>
<vn-td shrink title="{{::buy.type}}">
{{::buy.type}}
@ -110,7 +117,6 @@
<vn-td number>{{::buy.comissionValue | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.packageValue | currency: 'EUR':2}}</vn-td>
<vn-td shrink>{{::buy.isIgnored}}</vn-td>
<vn-td shrink>{{::buy.groupingMode}}</vn-td>
<vn-td number>{{::buy.price2 | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.price3 | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.minPrice | currency: 'EUR':2}}</vn-td>

1
modules/entry/front/latest-buys/index.js
View File

@ -20,7 +20,6 @@ export default class Controller extends Section {
{field: 'freightValue', displayName: 'freightValue'},
{field: 'packing', displayName: 'packing'},
{field: 'grouping', displayName: 'grouping'},
{field: 'groupingMode', displayName: 'groupingMode'},
{field: 'comissionValue', displayName: 'comissionValue'},
{field: 'packageValue', displayName: 'packageValue'},
{field: 'price2', displayName: 'price2'},

17
modules/entry/front/latest-buys/locale/es.yml
View File

@ -1,12 +1,11 @@
Edit buy(s): Editar compra(s)
Buying value: Valor compra
Freight value: Valor envío
Comission value: Valor comisión
Package value: Valor paquete
Buying value: Precio
Freight value: Porte
Commission value: Comisión
Package value: Embalaje
Is ignored: Ignorado
Grouping mode: Agrupación
price2: Precio 2
price3: Precio 3
price 2: Paquete
price 3: Caja
Min price: Precio min
Weight: Peso
Field to edit: Campo a editar
Ekt: Ekt
Weight: Peso