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

added invoiceOut descriptor #377

Merged
carlosjr merged 5 commits from 2446-ticket_index_overlap_ref_and_state into dev 2020-09-14 14:41:21 +00:00
Conversation 0 Commits 5 Files Changed 3 +13 -1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b4c53a655 - Show all commits

2
modules/ticket/back/methods/ticket/filter.js
View File

@ -197,6 +197,7 @@ module.exports = Self => {
t.routeFk,
t.warehouseFk,
t.clientFk,
io.id AS invoiceOutId,
a.provinceFk,
p.name AS province,
w.name AS warehouse,
@ -216,6 +217,7 @@ module.exports = Self => {
z.id AS zoneFk,
CAST(z.hour AS CHAR) AS hour
FROM ticket t
LEFT JOIN invoiceOut io ON t.refFk = io.ref
LEFT JOIN zone z ON z.id = t.zoneFk
LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN province p ON p.id = a.provinceFk

12
modules/ticket/front/index/index.html
View File

@ -103,7 +103,14 @@
</span>
</vn-td>
<vn-td>{{::ticket.warehouse}}</vn-td>
<vn-td class="expendable">{{::ticket.refFk | dashIfEmpty}}</vn-td>
<vn-td class="expendable">
<span
title="{{::ticket.refFk}}"
vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
class="link">
{{::ticket.refFk | dashIfEmpty}}
</span>
</vn-td>
<vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
<vn-td number>
<span class="chip {{$ctrl.totalPriceColor(ticket)}}">
@ -169,6 +176,9 @@
<vn-client-balance-create
vn-id="balanceCreateDialog">
</vn-client-balance-create>
<vn-invoice-out-descriptor-popover
vn-id="invoiceOutDescriptor">
</vn-invoice-out-descriptor-popover>
<vn-contextmenu vn-id="contextmenu" targets="['vn-data-viewer']" model="model"
expr-builder="$ctrl.exprBuilder(param, value)">
<slot-menu>