From 513b4583b329d22e3e5d07cb58f63253a7628c05 Mon Sep 17 00:00:00 2001 From: guillermo Date: Mon, 22 Jul 2024 12:49:50 +0200 Subject: [PATCH] =?UTF-8?q?fix(deletExpeditions):=20merge=20test=20?= =?UTF-8?q?=E2=86=92=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/methods/expedition/deleteExpeditions.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/ticket/back/methods/expedition/deleteExpeditions.js b/modules/ticket/back/methods/expedition/deleteExpeditions.js index 24058d0f68..75993a485d 100644 --- a/modules/ticket/back/methods/expedition/deleteExpeditions.js +++ b/modules/ticket/back/methods/expedition/deleteExpeditions.js @@ -40,8 +40,6 @@ module.exports = Self => { }); const {code} = expedition.agencyMode(); - let isDeleted = true; - if (code?.toLowerCase()?.includes('mrw') && expedition.externalId) { const result = await models.MrwConfig.cancelShipment(expeditionId); if (!result) throw new Error('not deleted'); @@ -52,14 +50,9 @@ module.exports = Self => { if (result !== 'true') throw new Error('not deleted'); } - if (!isDeleted) - notDeletedExpeditions.push(expeditionId); - else { - const deletedExpedition = await models.Expedition.destroyById(expeditionId); - deletedExpeditions.push(deletedExpedition); - } + const deletedExpedition = await models.Expedition.destroyById(expeditionId); + deletedExpeditions.push(deletedExpedition); } catch (e) { - console.log('e: ', e); notDeletedExpeditions.push(expeditionId); } }