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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-06-28 08:33:41 +02:00
parent db30ac3175 ef9f3b13e4
commit e7dcb54efb
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/client/front/summary/index.html
View File

@ -292,7 +292,7 @@
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th field="id" number>Id</vn-th> <vn-th field="id" number>Id</vn-th>
<vn-th field="nickname" expand>Client</vn-th> <vn-th field="nickname" expand>Nickname</vn-th>
<vn-th field="packages" shrink>Packages</vn-th> <vn-th field="packages" shrink>Packages</vn-th>
<vn-th field="shipped" shrink-date>Date</vn-th> <vn-th field="shipped" shrink-date>Date</vn-th>
<vn-th>State</vn-th> <vn-th>State</vn-th>
@ -325,7 +325,7 @@
<span <span
ng-show="::ticket.refFk" ng-show="::ticket.refFk"
title="{{::ticket.refFk}}" title="{{::ticket.refFk}}"
vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)" vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOut.id)"
class="link"> class="link">
{{::ticket.refFk}} {{::ticket.refFk}}
</span> </span>

22
modules/client/front/summary/index.js
View File

@ -7,15 +7,23 @@ class Controller extends Summary {
super($element, $); super($element, $);
this.ticketFilter = { this.ticketFilter = {
include: { include: [
relation: 'ticketState', {
scope: { relation: 'ticketState',
fields: ['stateFk', 'code', 'alertLevel'], scope: {
include: { fields: ['stateFk', 'code', 'alertLevel'],
relation: 'state' include: {
relation: 'state'
}
}
},
{
relation: 'invoiceOut',
scope: {
fields: ['id']
} }
} }
} ]
}; };
} }
$onChanges() { $onChanges() {

4
modules/ticket/front/summary/index.html
View File

@ -126,6 +126,7 @@
<vn-th number>Price</vn-th> <vn-th number>Price</vn-th>
<vn-th number>Discount</vn-th> <vn-th number>Discount</vn-th>
<vn-th number>Amount</vn-th> <vn-th number>Amount</vn-th>
<vn-th shrink>Packing</vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
@ -190,6 +191,9 @@
<vn-td number>{{::sale.price | currency: 'EUR':2}}</vn-td> <vn-td number>{{::sale.price | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::sale.discount}} %</vn-td> <vn-td number>{{::sale.discount}} %</vn-td>
<vn-td number>{{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}}</vn-td> <vn-td number>{{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}}</vn-td>
<vn-td shrink>
{{::sale.item.itemPackingTypeFk | dashIfEmpty}}
</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>