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

order index changes
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Bernat Exposito 2021-01-20 11:28:15 +01:00
parent a67c8e4fbd
commit a3d4f674c6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/order/back/methods/order/filter.js
View File

@ -154,8 +154,8 @@ module.exports = Self => {
u.name name,
co.code companyCode,
zed.zoneFk,
zed.hourTheoretical,
zed.hourEffective
IF(zed.hourTheoretical, zed.hourTheoretical, zed.hourEffective) AS hour,
am.name AS agencyName
FROM hedera.order o
LEFT JOIN address a ON a.id = o.address_id
LEFT JOIN agencyMode am ON am.id = o.agency_id

8
modules/order/front/index/index.html
View File

@ -15,8 +15,8 @@
<vn-th field="isConfirmed" center>Confirmed</vn-th>
<vn-th field="created" center expand>Created</vn-th>
<vn-th field="landed" default-order="DESC" center expand>Landed</vn-th>
<vn-th field="created" center translate-attr="{title: 'Theoretical hour'}">T. Hour</vn-th>
<vn-th field="created" center>Real hour</vn-th>
<vn-th field="created" center>Hour</vn-th>
<vn-th field="agencyName" center>agency</vn-th>
<vn-th center>Total</vn-th>
</vn-tr>
</vn-thead>
@ -52,8 +52,8 @@
{{::order.landed | date:'dd/MM/yyyy'}}
</span>
</vn-td>
<vn-td shrink>{{::order.hourTheoretical | date: 'HH:mm' | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::ticket.hourEffective | date: 'HH:mm' | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::order.hour | date: 'HH:mm' | dashIfEmpty}}</vn-td>
<vn-td expand>{{::order.agencyName}}</vn-td>
<vn-td number>{{::order.total | currency: 'EUR': 2 | dashIfEmpty}}</vn-td>
<vn-td shrink>
<vn-icon-button