verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

refs #6915 master into test #2092

Merged
juan merged 22 commits from master into test 2024-02-23 18:02:08 +00:00
Conversation 0 Commits 22 Files Changed 18 +25 -27
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 854447f7c1 - Show all commits

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

@ -1,5 +1,6 @@
const axios = require('axios'); const axios = require('axios');
const fs = require('fs'); const fs = require('fs');
const ejs = require('ejs');
const {DOMParser} = require('xmldom'); const {DOMParser} = require('xmldom');
module.exports = Self => { module.exports = Self => {
@ -21,7 +22,7 @@ module.exports = Self => {
} }
}); });
Self.deleteExpedition = async expeditionFk => { Self.cancelShipment = async expeditionFk => {
const models = Self.app.models; const models = Self.app.models;
const mrw = await models.MrwConfig.findOne(); const mrw = await models.MrwConfig.findOne();
@ -39,8 +40,7 @@ module.exports = Self => {
const parser = new DOMParser(); const parser = new DOMParser();
const xmlDoc = parser.parseFromString(xmlString, 'text/xml'); const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
const resultElement = xmlDoc.getElementsByTagName('Mensaje')[0]; const resultElement = xmlDoc.getElementsByTagName('Mensaje')[0];
const result = resultElement.textContent;
return result; return resultElement.textContent;
}; };
}; };

0
back/methods/mrw-config/shipmentCreation.ejs → back/methods/mrw-config/createShipment.ejs
View File

12
back/methods/mrw-config/shipmentCreation.js → back/methods/mrw-config/createShipment.js
View File

@ -4,8 +4,8 @@ const fs = require('fs');
const ejs = require('ejs'); const ejs = require('ejs');
module.exports = Self => { module.exports = Self => {
Self.remoteMethod('shipmentCreation', { Self.remoteMethod('createShipment', {
description: 'Create an expedition and return a label', description: 'Create an expedition and return a base64Binary label',
accessType: 'WRITE', accessType: 'WRITE',
accepts: [{ accepts: [{
arg: 'expeditionFk', arg: 'expeditionFk',
@ -17,12 +17,12 @@ module.exports = Self => {
root: true root: true
}, },
http: { http: {
path: `/shipmentCreation`, path: `/createShipment`,
verb: 'POST' verb: 'POST'
} }
}); });
Self.shipmentCreation = async expeditionFk => { Self.createShipment = async expeditionFk => {
const models = Self.app.models; const models = Self.app.models;
const mrw = await models.MrwConfig.findOne(); const mrw = await models.MrwConfig.findOne();
@ -56,7 +56,7 @@ module.exports = Self => {
WHERE e.id = ?`, [expeditionFk] WHERE e.id = ?`, [expeditionFk]
); );
const shipmentTemplate = fs.readFileSync(__dirname + '/shipmentCreation.ejs', 'utf-8'); const shipmentTemplate = fs.readFileSync(__dirname + '/createShipment.ejs', 'utf-8');
const renderedShipment = ejs.render(shipmentTemplate, {mrw, expeditionData}); const renderedShipment = ejs.render(shipmentTemplate, {mrw, expeditionData});
const shipmentResponse = await axios.post(mrw.url, renderedShipment, { const shipmentResponse = await axios.post(mrw.url, renderedShipment, {
headers: { headers: {
@ -75,7 +75,7 @@ module.exports = Self => {
} }
}); });
const getLableXmlDoc = parser.parseFromString(getLabelResponse.data, 'text/xml'); const getLableXmlDoc = parser.parseFromString(getLabelResponse.data, 'text/xml');
const base64Binary = getLableXmlDoc.getElementsByTagName('EtiquetaFile')[0].textContent; const base64Binary = getLableXmlDoc.getElementsByTagName('EtiquetaFile')[0]?.textContent;
const expedition = await models.Expedition.findById(expeditionFk); const expedition = await models.Expedition.findById(expeditionFk);
await expedition.updateAttribute('externalId', shipmentId); await expedition.updateAttribute('externalId', shipmentId);

2
back/models/mrw-config.js
View File

@ -1,4 +1,4 @@
module.exports = Self => { module.exports = Self => {
require('../methods/mrw-config/shipmentCreation')(Self); require('../methods/mrw-config/createShipment')(Self);
require('../methods/mrw-config/cancelShipment')(Self); require('../methods/mrw-config/cancelShipment')(Self);
}; };

32
db/changes/240401/00-mrwWebService.sql
View File

@ -1,38 +1,36 @@
CREATE TABLE IF NOT EXISTS vn.mrwConfig ( CREATE TABLE IF NOT EXISTS `vn`.`mrwConfig` (
id INT auto_increment NULL, `id` INT auto_increment NULL,
url varchar(100) NULL, `url` varchar(100) NULL,
`user` varchar(100) NULL, `user` varchar(100) NULL,
password varchar(100) NULL, `password` varchar(100) NULL,
franchiseCode varchar(100) NULL, `franchiseCode` varchar(100) NULL,
subscriberCode varchar(100) NULL, `subscriberCode` varchar(100) NULL,
CONSTRAINT mrwConfig_pk PRIMARY KEY (id) CONSTRAINT mrwConfig_pk PRIMARY KEY (id)
) )
ENGINE=InnoDB ENGINE=InnoDB
DEFAULT CHARSET=utf8mb3 DEFAULT CHARSET=utf8mb3
COLLATE=utf8mb3_unicode_ci; COLLATE=utf8mb3_unicode_ci;
ALTER TABLE `vn`.`packingSite` ADD `hasNewLabelMrwMethod` BOOL NULL;
INSERT INTO vn.mrwConfig (url, `user`,password,franchiseCode,subscriberCode) INSERT INTO `vn`.`mrwConfig` (`url`, `user`, `password`, `franchiseCode`, `subscriberCode`)
VALUES ('https://sagec-test.mrw.es/MRWEnvio.asmx', '04301SGVERDNATURA', 'Verdnatura@4301V', '04301', '009731'); VALUES ('https://sagec-test.mrw.es/MRWEnvio.asmx', '04301SGVERDNATURA', 'Verdnatura@4301V', '04301', '009731');
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES('MrwConfig', 'cancelShipment', 'WRITE', 'ALLOW', 'ROLE', 'employee'); VALUES('MrwConfig', 'cancelShipment', 'WRITE', 'ALLOW', 'ROLE', 'employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId) INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
VALUES ('MrwConfig','renderer','READ','ALLOW','ROLE','employee'); VALUES ('MrwConfig','createShipment','WRITE','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('MrwConfig','shipmentCreation','WRITE','ALLOW','ROLE','employee');
INSERT INTO vn.agency (name,warehouseFk,warehouseAliasFk,isOwn,isAnyVolumeAllowed) INSERT INTO `vn`.`agency` (`name`,`warehouseFk`,`warehouseAliasFk`,`isOwn`,`isAnyVolumeAllowed`)
VALUES ('MRW',1,1,0,0); VALUES ('MRW',1,1,0,0);
INSERT INTO vn.agencyMode (id, name, description, deliveryMethodFk, m3, web, agencyFk, inflation, isVolumetric, reportMail, showAgencyName, isActive, isExternalAgency, flag, code, isRiskFree, hasWeightVolumetric) INSERT INTO `vn`.`agencyMode` (`id`, `name`, `description`, `deliveryMethodFk`, `m3`, `web`, `agencyFk`, `inflation`, `isVolumetric`, `reportMail`, `showAgencyName`, `isActive`, `isExternalAgency`, `flag`, `code`, `isRiskFree`, `hasWeightVolumetric`)
VALUES(25, 'MRW', NULL, NULL, 0.0, 0, 11, 0.00, 0, NULL, 1, 1, 0, NULL, 'MRW', 0, 0); VALUES(25, 'MRW', NULL, NULL, 0.0, 0, 11, 0.00, 0, NULL, 1, 1, 0, NULL, 'MRW', 0, 0);
INSERT INTO vn.ticket (id, clientFk, warehouseFk, shipped, nickname, refFk, addressFk, workerFk, observations, isSigned, isLabeled, isPrinted, packages, location, `hour`, created, isBlocked, solution, routeFk, priority, hasPriority, companyFk, agencyModeFk, landed, isBoxed, isDeleted, zoneFk, zonePrice, zoneBonus, totalWithVat, totalWithoutVat, weight, clonedFrom, cmrFk, editorFk) INSERT INTO `vn`.`ticket` (`id`, `clientFk`, `warehouseFk`, `shipped`, `nickname`, `refFk`, `addressFk`, `workerFk`, `observations`, `isSigned`, `isLabeled`, `isPrinted`, `packages`, `location`, `hour`, `created`, `isBlocked`, `solution`, `routeFk`, `priority`, `hasPriority`, `companyFk`, `agencyModeFk`, `landed`, `isBoxed`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `totalWithVat`, `totalWithoutVat`, `weight`, `clonedFrom`, `cmrFk`, `editorFk`)
VALUES(33, 1101, 1, '2001-01-01 00:00:00.000', 'MRW', NULL, 1, NULL, NULL, 0, 0, 0, 1, NULL, 0, '2001-01-01 00:00:00.000', 1, NULL, 6, NULL, 1, 442, 25, '2001-01-02', 0, 0, 3, 5.00, 1.00, 8.88, 8.07, NULL, NULL, NULL, 100); VALUES
INSERT INTO vn.expedition (agencyModeFk,ticketFk,freightItemFk,created,counter,workerFk,packagingFk,hostFk,stateTypeFk,hasNewRoute,isBox,editorFk) INSERT INTO vn.expedition (agencyModeFk,ticketFk,freightItemFk,created,counter,workerFk,packagingFk,hostFk,stateTypeFk,hasNewRoute,isBox,editorFk)
VALUES (25,33,71,'2001-01-01 01:00:00.000',1,18,'94','',3,0,71,100); VALUES (25,33,71,'2001-01-01 01:00:00.000',1,18,'94','',3,0,71,100);