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

2844-item last entries show the total cost in the "cost" column #585

Merged
carlosjr merged 6 commits from 2844-item_lastEntries_sum into dev 2021-03-26 11:26:30 +00:00
Conversation 0 Commits 6 Files Changed 3 +14 -14
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c8ed85e69 - Show all commits

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

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

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

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