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

added packageFk as column
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-09-10 13:26:04 +02:00
parent 0cf99a5a83
commit e8384e3ec9
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/entry/back/methods/entry/latestBuysFilter.js
View File

@ -125,7 +125,8 @@ module.exports = Self => {
b.price2, b.price2,
b.price3, b.price3,
b.ektFk, b.ektFk,
b.weight b.weight,
b.packageFk
FROM cache.last_buy lb FROM cache.last_buy lb
LEFT JOIN cache.visible v ON v.item_id = lb.item_id LEFT JOIN cache.visible v ON v.item_id = lb.item_id
AND v.calc_id = @calc_id AND v.calc_id = @calc_id

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

@ -53,6 +53,7 @@
<vn-th field="minPrice">Min price</vn-th> <vn-th field="minPrice">Min price</vn-th>
<vn-th field="ektFk">Ekt</vn-th> <vn-th field="ektFk">Ekt</vn-th>
<vn-th field="weight">Weight</vn-th> <vn-th field="weight">Weight</vn-th>
<vn-th field="packageFk" expand>PackageName</vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
@ -126,6 +127,7 @@
<vn-td number>{{::buy.minPrice | currency: 'EUR':2}}</vn-td> <vn-td number>{{::buy.minPrice | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.ektFk | dashIfEmpty}}</vn-td> <vn-td number>{{::buy.ektFk | dashIfEmpty}}</vn-td>
<vn-td number>{{::buy.weight}}</vn-td> <vn-td number>{{::buy.weight}}</vn-td>
<vn-td number>{{::buy.packageFk}}</vn-td>
</a> </a>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>

1
modules/entry/front/latest-buys/locale/en.yml
View File

@ -1 +1,2 @@
Minimun amount: Minimun purchase quantity Minimun amount: Minimun purchase quantity
PackageName: Package

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

@ -11,3 +11,4 @@ Ekt: Ekt
Weight: Peso Weight: Peso
Minimun amount: Cantidad mínima de compra Minimun amount: Cantidad mínima de compra
Field to edit: Campo a editar Field to edit: Campo a editar
PackageName: Cubo