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

Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Ivan Mas 2024-07-17 11:48:57 +00:00
parent 1d10e61541 0ae1de5c88
commit 019e29f3dd
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/methods/mrw-config/cancelShipment.js
View File

@ -13,7 +13,7 @@ module.exports = Self => {
required: true required: true
}], }],
returns: { returns: {
type: ['object'], type: 'boolean',
root: true root: true
}, },
http: { http: {
@ -39,6 +39,7 @@ module.exports = Self => {
const xmlString = response.data; const xmlString = response.data;
const parser = new DOMParser(); const parser = new DOMParser();
const xmlDoc = parser.parseFromString(xmlString, 'text/xml'); const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
return xmlDoc.getElementsByTagName('Mensaje')[0].textContent; const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
return result.toLowerCase().includes('se ha cancelado correctamente');
}; };
}; };

20
modules/ticket/back/methods/expedition/deleteExpeditions.js
View File

@ -44,15 +44,21 @@ module.exports = Self => {
const expedition = await models.Expedition.findOne(filter); const expedition = await models.Expedition.findOne(filter);
const {code} = expedition.agencyMode(); const {code} = expedition.agencyMode();
let isDeleted = true;
if (code && code.toLowerCase().substring(0, 10) == 'viaexpress') { if (code?.toLowerCase()?.includes('mrw')) {
const isDeleted = await models.ViaexpressConfig.deleteExpedition(expeditionId); const result = await models.MrwConfig.cancelShipment(expeditionId);
isDeleted = result;
}
if (isDeleted === 'true') { if (code?.toLowerCase()?.substring(0, 10) == 'viaexpress') {
const deletedExpedition = await models.Expedition.destroyById(expeditionId); const result = await models.ViaexpressConfig.deleteExpedition(expeditionId);
deletedExpeditions.push(deletedExpedition); if (result !== 'true') isDeleted = false;
} else notDeletedExpeditions.push(expeditionId); }
} else {
if (!isDeleted)
notDeletedExpeditions.push(expeditionId);
else {
const deletedExpedition = await models.Expedition.destroyById(expeditionId); const deletedExpedition = await models.Expedition.destroyById(expeditionId);
deletedExpeditions.push(deletedExpedition); deletedExpeditions.push(deletedExpedition);
} }