7489-testToMaster #2515
|
@ -70,7 +70,7 @@ module.exports = Self => {
|
||||||
c.hasToInvoice,
|
c.hasToInvoice,
|
||||||
c.isTaxDataChecked,
|
c.isTaxDataChecked,
|
||||||
w.id comercialId,
|
w.id comercialId,
|
||||||
CONCAT(w.firstName, ' ', w.lastName) comercialName
|
u.name workerName
|
||||||
FROM vn.ticket t
|
FROM vn.ticket t
|
||||||
JOIN vn.company co ON co.id = t.companyFk
|
JOIN vn.company co ON co.id = t.companyFk
|
||||||
JOIN vn.sale s ON s.ticketFk = t.id
|
JOIN vn.sale s ON s.ticketFk = t.id
|
||||||
|
|
|
@ -15,5 +15,13 @@
|
||||||
"description": {
|
"description": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"acls": [
|
||||||
|
{
|
||||||
|
"accessType": "READ",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "$everyone",
|
||||||
|
"permission": "ALLOW"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
|
@ -114,7 +114,7 @@
|
||||||
<vn-span
|
<vn-span
|
||||||
class="link"
|
class="link"
|
||||||
ng-click="workerDescriptor.show($event, client.comercialId)">
|
ng-click="workerDescriptor.show($event, client.comercialId)">
|
||||||
{{::client.comercialName | dashIfEmpty}}
|
{{::client.workerName | dashIfEmpty}}
|
||||||
</vn-span>
|
</vn-span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
||||||
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
||||||
|
@ -135,7 +134,8 @@ module.exports = Self => {
|
||||||
tr.requesterFk,
|
tr.requesterFk,
|
||||||
tr.isOk,
|
tr.isOk,
|
||||||
s.quantity saleQuantity,
|
s.quantity saleQuantity,
|
||||||
s.itemFk,
|
s.itemFk saleItemFk,
|
||||||
|
i.id itemFk,
|
||||||
i.name itemDescription,
|
i.name itemDescription,
|
||||||
t.shipped,
|
t.shipped,
|
||||||
DATE(t.shipped) shippedDate,
|
DATE(t.shipped) shippedDate,
|
||||||
|
|
Loading…
Reference in New Issue