back/methods/mrw-config/cancelShipment.js

@@ -39,8 +39,6 @@ module.exports = Self => {
         const xmlString = response.data;
         const parser = new DOMParser();
         const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
-        const [resultElement] = xmlDoc.getElementsByTagName('Mensaje');
-
-        return resultElement.textContent;
+        return xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
     };
 };

back/methods/mrw-config/createShipment.js

@@ -42,7 +42,8 @@ module.exports = Self => {
             throw new UserError(`Some mrwConfig parameters are not set`);
 
         const query =
-            `SELECT CASE co.code 
+            `SELECT 
+                CASE co.code 
                     WHEN 'ES' THEN a.postalCode
                     WHEN 'PT' THEN LEFT(a.postalCode, 4)
                     WHEN 'AD' THEN REPLACE(a.postalCode, 'AD', '00')
@@ -89,14 +90,9 @@ module.exports = Self => {
         const getLabelResponse = await sendXmlDoc('getLabel', {mrw, shipmentId}, 'text/xml');
         const file = getTextByTag(getLabelResponse, 'EtiquetaFile');
 
-        try {
-            await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
-            if (tx) await tx.commit();
-        } catch (error) {
-            if (tx) await tx.rollback();
-            throw error;
-        }
-        return file;
+        if (tx) await tx.commit();
+
+        return {shipmentId, file};
     };
 
     function getTextByTag(xmlDoc, tag) {

back/methods/mrw-config/specs/createShipment.spec.js

@@ -81,9 +81,9 @@ describe('MRWConfig createShipment()', () => {
 
         spyOn(axios, 'post').and.callFake(() => Promise.resolve(mockPostResponses.pop()));
 
-        const base64Binary = await models.MrwConfig.createShipment(expedition1.id, options);
+        const {file} = await models.MrwConfig.createShipment(expedition1.id, options);
 
-        expect(base64Binary).toEqual(mockBase64Binary);
+        expect(file).toEqual(mockBase64Binary);
     });
 
     it('should fail if mrwConfig has no data', async() => {