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

sum is now made on backend and html amends

This commit is contained in:
Carlos Jimenez Ruiz 2021-03-26 10:33:53 +01:00
parent 393b9ba38c
commit 3c8ed85e69
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/item/back/methods/item/lastEntriesFilter.js
View File

@ -40,6 +40,10 @@ module.exports = Self => {
b.weight, b.weight,
i.stems, i.stems,
b.quantity, b.quantity,
b.buyingValue +
b.freightValue +
b.comissionValue +
b.packageValue AS cost,
b.buyingValue, b.buyingValue,
b.freightValue, b.freightValue,
b.comissionValue, b.comissionValue,

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

@ -72,20 +72,16 @@
</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 translate number <vn-td number
class="expendable" class="expendable">
ng-init=" <span
itemTotalCost =
entry.buyingValue +
entry.packageValue +
entry.freightValue +
entry.comissionValue"
vn-tooltip=" vn-tooltip="
{{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}} + {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}}<br>
{{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}} + {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}}<br>
{{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}} + {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}}<br>
{{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}"> {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
{{itemTotalCost | dashIfEmpty}} {{::entry.cost | dashIfEmpty}}
</span>
</vn-td> </vn-td>
<vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td> <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
<vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td> <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>