7953-devToTest_2438 #2942

Merged
alexm merged 199 commits from 7953-devToTest_2438 into test 2024-09-10 07:22:31 +00:00
2 changed files with 18 additions and 2 deletions
Showing only changes of commit 26d93ef474 - Show all commits

View File

@ -71,7 +71,16 @@ module.exports = Self => {
arg: 'continent', arg: 'continent',
type: 'string', type: 'string',
description: 'The continent code' description: 'The continent code'
}, {
arg: 'shipmentHour',
type: 'time',
description: 'The shipment hour'
}, },
{
arg: 'landingHour',
type: 'time',
description: 'The landing hour'
}
], ],
returns: { returns: {
type: ['Object'], type: ['Object'],
@ -130,6 +139,8 @@ module.exports = Self => {
t.isReceived, t.isReceived,
t.m3, t.m3,
t.kg, t.kg,
t.shipmentHour,
t.landingHour,
t.cargoSupplierFk, t.cargoSupplierFk,
t.totalEntries, t.totalEntries,
am.name agencyModeName, am.name agencyModeName,

View File

@ -44,8 +44,13 @@
}, },
"agencyModeFk": { "agencyModeFk": {
"type": "number" "type": "number"
} },
}, "shipmentHour": {
"type": "time"
},
"landingHour": {
"type": "time"
},
"relations": { "relations": {
"agency": { "agency": {
"type": "belongsTo", "type": "belongsTo",