This commit is contained in:
parent
ed88a5b25f
commit
d6b30271f2
|
@ -3,7 +3,7 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
||||||
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
Self.remoteMethodCtx('getExternalCmrs', {
|
Self.remoteMethod('getExternalCmrs', {
|
||||||
description: 'Returns an array of external cmrs',
|
description: 'Returns an array of external cmrs',
|
||||||
accessType: 'READ',
|
accessType: 'READ',
|
||||||
accepts: [
|
accepts: [
|
||||||
|
@ -11,43 +11,36 @@ module.exports = Self => {
|
||||||
arg: 'filter',
|
arg: 'filter',
|
||||||
type: 'object',
|
type: 'object',
|
||||||
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
|
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'cmrFk',
|
arg: 'cmrFk',
|
||||||
type: 'integer',
|
type: 'integer',
|
||||||
description: 'Searchs the route by id',
|
description: 'Searchs the route by id',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'ticketFk',
|
arg: 'ticketFk',
|
||||||
type: 'integer',
|
type: 'integer',
|
||||||
description: 'The worker id',
|
description: 'The worker id',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'country',
|
arg: 'country',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: 'The agencyMode id',
|
description: 'The agencyMode id',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'clientFk',
|
arg: 'clientFk',
|
||||||
type: 'integer',
|
type: 'integer',
|
||||||
description: 'The vehicle id',
|
description: 'The vehicle id',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'hasCmrDms',
|
arg: 'hasCmrDms',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
description: 'The vehicle id',
|
description: 'The vehicle id',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'shipped',
|
arg: 'shipped',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
description: 'The to date filter',
|
description: 'The to date filter',
|
||||||
http: {source: 'query'}
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
returns: {
|
returns: {
|
||||||
|
@ -60,10 +53,27 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.getExternalCmrs = async(ctx, filter, options) => {
|
Self.getExternalCmrs = async(
|
||||||
|
filter,
|
||||||
|
cmrFk,
|
||||||
|
ticketFk,
|
||||||
|
country,
|
||||||
|
clientFk,
|
||||||
|
hasCmrDms,
|
||||||
|
shipped,
|
||||||
|
options
|
||||||
|
) => {
|
||||||
|
const params = {
|
||||||
|
cmrFk,
|
||||||
|
ticketFk,
|
||||||
|
country,
|
||||||
|
clientFk,
|
||||||
|
hasCmrDms,
|
||||||
|
shipped,
|
||||||
|
};
|
||||||
const conn = Self.dataSource.connector;
|
const conn = Self.dataSource.connector;
|
||||||
|
|
||||||
let where = buildFilter(ctx.args, (param, value) => {
|
let where = buildFilter(params, (param, value) => {
|
||||||
switch (param) {
|
switch (param) {
|
||||||
case 'cmrFk':
|
case 'cmrFk':
|
||||||
return {'cmrFk': value};
|
return {'cmrFk': value};
|
||||||
|
@ -80,7 +90,7 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
filter = mergeFilters(ctx.args.filter, {where});
|
filter = mergeFilters(filter, {where});
|
||||||
|
|
||||||
if (!filter.where) {
|
if (!filter.where) {
|
||||||
const yesterday = new Date();
|
const yesterday = new Date();
|
||||||
|
|
Loading…
Reference in New Issue