Skip to content
Open
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions lib/consignment.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ var fetchStockOrdersForSuppliers = function(args, connectionInfo, retryCounter)
log.debug('retry # ' + retryCounter);
}

var path = '/api/consignment';
var path = '/api/2.0/consignments';
var vendUrl = 'https://' + connectionInfo.domainPrefix + '.vendhq.com' + path;
var authString = 'Bearer ' + connectionInfo.accessToken;
log.debug('GET ' + vendUrl);
Expand All @@ -215,8 +215,9 @@ var fetchStockOrdersForSuppliers = function(args, connectionInfo, retryCounter)
page_size: args.pageSize.value // eslint-disable-line camelcase
}
};

return utils.sendRequest(options, args, connectionInfo, fetchStockOrdersForSuppliers, retryCounter);
const getOrdersFromSuppliers = utils.sendRequest(options, args, connectionInfo, fetchStockOrdersForSuppliers, retryCounter);
const result = getOrdersFromSuppliers?.data ? getOrdersFromSuppliers?.data : getOrdersFromSuppliers;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getOrdersFromSuppliers?.data || getOrdersFromSuppliers

return result;
};

// TODO: need to add a test
Expand Down Expand Up @@ -251,7 +252,7 @@ var fetchConsignment = function(args, connectionInfo, retryCounter) {
log.debug('retry # ' + retryCounter);
}

var path = '/api/1.0/consignment/' + args.apiId.value;
var path = '/api/2.0/consignments/' + args.apiId.value;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have you considered creating a new path instead of replacing the existing ones?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No

var vendUrl = 'https://' + connectionInfo.domainPrefix + '.vendhq.com' + path;
log.debug('Requesting vend consignment ' + vendUrl);
var authString = 'Bearer ' + connectionInfo.accessToken;
Expand All @@ -264,8 +265,9 @@ var fetchConsignment = function(args, connectionInfo, retryCounter) {
'Accept': 'application/json'
}
};

return utils.sendRequest(options, args, connectionInfo, fetchConsignment, retryCounter);
const getConsignment = utils.sendRequest(options, args, connectionInfo, fetchConsignment, retryCounter);
const result = getConsignment?.data ? getConsignment?.data : getConsignment;
return result;
};

// TODO: need to add a test
Expand Down Expand Up @@ -513,7 +515,7 @@ var createStockOrder = function(args, connectionInfo, retryCounter) {
log.debug('retry # ' + retryCounter);
}

var path = '/api/consignment';
var path = '/api/2.0/consignment';
var vendUrl = 'https://' + connectionInfo.domainPrefix + '.vendhq.com' + path;
var authString = 'Bearer ' + connectionInfo.accessToken;

Expand Down Expand Up @@ -588,7 +590,7 @@ var markStockOrderAsSent = function(args, connectionInfo, retryCounter) {
log.debug('retry # ' + retryCounter);
}

var path = '/api/consignment/' + args.apiId.value;
var path = '/api/2.0/consignments/' + args.apiId.value;
var vendUrl = 'https://' + connectionInfo.domainPrefix + '.vendhq.com' + path;
var authString = 'Bearer ' + connectionInfo.accessToken;
var body = args.body.value;
Expand All @@ -606,8 +608,9 @@ var markStockOrderAsSent = function(args, connectionInfo, retryCounter) {
};
log.debug(options.method + ' ' + options.url);
log.debug( { message: 'body', body: options.json } );

return utils.sendRequest(options, args, connectionInfo, markStockOrderAsSent, retryCounter);
const updateConsignmentToSent = utils.sendRequest(options, args, connectionInfo, markStockOrderAsSent, retryCounter);
const result = updateConsignmentToSent?.data ? updateConsignmentToSent?.data : updateConsignmentToSent;
return result;
};

var markStockOrderAsReceived = function(args, connectionInfo, retryCounter) {
Expand All @@ -623,7 +626,7 @@ var markStockOrderAsReceived = function(args, connectionInfo, retryCounter) {
log.debug('retry # ' + retryCounter);
}

var path = '/api/consignment/' + args.apiId.value;
var path = '/api/2.0/consignments/' + args.apiId.value;
var vendUrl = 'https://' + connectionInfo.domainPrefix + '.vendhq.com' + path;
var authString = 'Bearer ' + connectionInfo.accessToken;
var body = args.body.value;
Expand All @@ -642,7 +645,9 @@ var markStockOrderAsReceived = function(args, connectionInfo, retryCounter) {
log.debug(options.method + ' ' + options.url);
log.debug( { message: 'body', body: options.json } );

return utils.sendRequest(options, args, connectionInfo, markStockOrderAsReceived, retryCounter);
const updateConsignmentToReceived = utils.sendRequest(options, args, connectionInfo, markStockOrderAsReceived, retryCounter);
const result = updateConsignmentToReceived?.data ? updateConsignmentToReceived?.data : updateConsignmentToReceived;
return result;
};

var deleteStockOrder = function(args, connectionInfo, retryCounter) {
Expand All @@ -659,7 +664,7 @@ var deleteStockOrder = function(args, connectionInfo, retryCounter) {
}

log.debug(args.apiId.value);
var path = '/api/consignment/' + args.apiId.value;
var path = '/api/2.0/consignments/' + args.apiId.value;
log.debug(path);
var vendUrl = 'https://' + connectionInfo.domainPrefix + '.vendhq.com' + path;
var authString = 'Bearer ' + connectionInfo.accessToken;
Expand All @@ -675,7 +680,9 @@ var deleteStockOrder = function(args, connectionInfo, retryCounter) {
};
log.debug(options.method + ' ' + options.url);

return utils.sendRequest(options, args, connectionInfo, deleteStockOrder, retryCounter);
const consignmentDelete = utils.sendRequest(options, args, connectionInfo, deleteStockOrder, retryCounter);
const result = consignmentDelete?.data ? consignmentDelete?.data : consignmentDelete;
return result;
};

var deleteConsignmentProduct = function(args, connectionInfo, retryCounter) {
Expand Down