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

Merge branch 'dev' into 2724-ticket_service_fix
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-01-18 11:24:11 +00:00
parent 239e64db48 3b5565f0b6
commit b142d5800e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/item/back/methods/item/filter.js
View File

@ -119,6 +119,7 @@ module.exports = Self => {
ori.code AS origin, ori.code AS origin,
ic.name AS category, ic.name AS category,
i.density, i.density,
i.stemMultiplier,
b.grouping, b.grouping,
b.packing, b.packing,
itn.code AS niche, @visibleCalc itn.code AS niche, @visibleCalc

5
modules/item/back/models/item.json
View File

@ -65,7 +65,10 @@
"type": "Number", "type": "Number",
"description": "Density" "description": "Density"
}, },
"image": { "stemMultiplier": {
"type": "Number",
"description": "Multiplier"
},"image": {
"type": "String", "type": "String",
"description": "Image" "description": "Image"
}, },

2
modules/item/front/index/index.html
View File

@ -25,6 +25,7 @@
<vn-th field="origin" shrink>Origin</vn-th> <vn-th field="origin" shrink>Origin</vn-th>
<vn-th field="salesperson" shrink>Buyer</vn-th> <vn-th field="salesperson" shrink>Buyer</vn-th>
<vn-th field="density" shrink>Density</vn-th> <vn-th field="density" shrink>Density</vn-th>
<vn-th field="stemMultiplier" shrink>Multiplier</vn-th>
<vn-th field="active" shrink>Active</vn-th> <vn-th field="active" shrink>Active</vn-th>
<vn-th></vn-th> <vn-th></vn-th>
</vn-tr> </vn-tr>
@ -78,6 +79,7 @@
</span> </span>
</vn-td> </vn-td>
<vn-td shrink>{{::item.density}}</vn-td> <vn-td shrink>{{::item.density}}</vn-td>
<vn-td shrink >{{::item.stemMultiplier}}</vn-td>
<vn-td shrink> <vn-td shrink>
<vn-check <vn-check
disabled="true" disabled="true"