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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Carlos Jimenez Ruiz 2019-03-20 12:27:36 +01:00
parent 30333a914e 41e1505b1a
commit 7a5124aca2
24 changed files with 6963 additions and 5514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
back/models/country.json
View File

@ -1,39 +1,39 @@
{ {
"name": "Country", "name": "Country",
"description": "Worldwide countries", "description": "Worldwide countries",
"base": "VnModel", "base": "VnModel",
"options": { "options": {
"mysql": { "mysql": {
"table": "country" "table": "country"
} }
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
}, },
"country": { "properties": {
"type": "string", "id": {
"required": true "type": "Number",
"id": true,
"description": "Identifier"
},
"country": {
"type": "string",
"required": true
},
"code": {
"type": "string"
}
}, },
"code": { "relations": {
"type": "string" "currency": {
} "type": "belongsTo",
}, "model": "Currency",
"relations": { "foreignKey": "currencyFk"
"currency": { }
"type": "belongsTo", },
"model": "Currency", "acls": [
"foreignKey": "currencyFk" {
} "accessType": "READ",
}, "principalType": "ROLE",
"acls": [ "principalId": "$everyone",
{ "permission": "ALLOW"
"accessType": "READ", }
"principalType": "ROLE", ]
"principalId": "$everyone",
"permission": "ALLOW"
}
]
} }

18
db/export-data.sh
View File

@ -1,17 +1,19 @@
#!/bin/bash #!/bin/bash
echo "USE \`account\`;" > install/dump/dumpedFixtures.sql echo "USE \`account\`;" > install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info account role roleRole roleInherit >> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info account role roleRole roleInherit >> install/dump/dumpedFixtures.sql
echo "USE \`salix\`;" >> install/dump/dumpedFixtures.sql echo "USE \`salix\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info salix ACL fieldAcl>> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info salix ACL fieldAcl>> install/dump/dumpedFixtures.sql
echo "USE \`vn\`;" >> install/dump/dumpedFixtures.sql echo "USE \`vn\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc tag alertLevel >> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc tag alertLevel >> install/dump/dumpedFixtures.sql
echo "USE \`vn2008\`;" >> install/dump/dumpedFixtures.sql echo "USE \`vn2008\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas container iva_group_codigo escritos cl_est cl_con cl_res cl_dev cl_mot department businessReasonEnd>> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options \
Grupos Monedas container iva_group_codigo escritos cl_est cl_con cl_res cl_dev cl_mot department businessReasonEnd>> install/dump/dumpedFixtures.sql
echo "USE \`bi\`;" >> install/dump/dumpedFixtures.sql echo "USE \`bi\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/dumpedFixtures.sql
echo "USE \`cache\`;" >> install/dump/dumpedFixtures.sql echo "USE \`cache\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info cache cache >> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info cache cache >> install/dump/dumpedFixtures.sql
echo "USE \`hedera\`;" >> install/dump/dumpedFixtures.sql echo "USE \`hedera\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info hedera tpvError tpvResponse tpvConfig >> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info hedera tpvError tpvResponse tpvConfig >> install/dump/dumpedFixtures.sql
echo "USE \`postgresql\`;" >> install/dump/dumpedFixtures.sql echo "USE \`postgresql\`;" >> install/dump/dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info postgresql profile_type media_type professional_category labour_agreement calendar_labour_type workcenter>> install/dump/dumpedFixtures.sql mysqldump --defaults-file=config.production.ini --no-create-info postgresql profile_type media_type professional_category labour_agreement \
calendar_labour_type workcenter>> install/dump/dumpedFixtures.sql

3
db/export-structure.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
#IMPORTANT Any changes in this file are to applyed to mirror file export-structure.cmd #IMPORTANT Any changes in this file are to applyed to mirror file export-structure.cmd
mysqldump --defaults-file=connect.ini --default-character-set=utf8 --no-data --comments --triggers --routines --events --databases account util vn2008 vn edi bs bi pbx cache salix vncontrol hedera stock postgresql> install/dump/structure.sql mysqldump --defaults-file=config.production.ini --default-character-set=utf8 --no-data --comments --triggers --routines --events --databases \
account util vn2008 vn edi bs bi pbx cache salix vncontrol hedera stock postgresql> install/dump/structure.sql

4
db/install/changes/0-ACL.sql
View File

@ -1,4 +1,4 @@
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (149, 'Sip', '*', 'WRITE', 'ALLOW', 'ROLE', 'hr');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (150, 'Sip', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (151, 'Department','*','READ','ALLOW','ROLE','employee'); INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (151, 'Department','*','READ','ALLOW','ROLE','employee');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (152, 'Department','*','WRITE','ALLOW','ROLE','hr'); INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (152, 'Department','*','WRITE','ALLOW','ROLE','hr');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (153, 'Route','*','READ','ALLOW','ROLE','employee');
INSERT INTO `salix`.`ACL` (`id`,`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (154, 'Route','*','WRITE','ALLOW','ROLE','delivery');

4
db/install/changes/15-zoneGeo.sql
View File

@ -1,4 +0,0 @@
USE `vn`;
CREATE UNIQUE INDEX zoneGeo_lft_IDX USING BTREE ON vn.zoneGeo (lft);
CREATE UNIQUE INDEX zoneGeo_rgt_IDX USING BTREE ON vn.zoneGeo (rgt);

28
db/install/changes/16-itemLog.sql
View File

@ -1,16 +1,16 @@
ALTER TABLE `vn`.`itemLog` -- ALTER TABLE `vn`.`itemLog`
CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT , -- CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ,
ADD PRIMARY KEY (`id`); -- ADD PRIMARY KEY (`id`);
ALTER TABLE `vn`.`itemLog` -- ALTER TABLE `vn`.`itemLog`
DROP FOREIGN KEY `itemLogUserFk`; -- DROP FOREIGN KEY `itemLogUserFk`;
ALTER TABLE `vn`.`itemLog` -- ALTER TABLE `vn`.`itemLog`
CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT , -- CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ,
CHANGE COLUMN `userFk` `userFk` INT(10) UNSIGNED NULL DEFAULT NULL ; -- CHANGE COLUMN `userFk` `userFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
ALTER TABLE `vn`.`itemLog` -- ALTER TABLE `vn`.`itemLog`
ADD CONSTRAINT `itemLogUserFk` -- ADD CONSTRAINT `itemLogUserFk`
FOREIGN KEY (`userFk`) -- FOREIGN KEY (`userFk`)
REFERENCES `account`.`user` (`id`) -- REFERENCES `account`.`user` (`id`)
ON DELETE CASCADE -- ON DELETE CASCADE
ON UPDATE CASCADE; -- ON UPDATE CASCADE;

148
db/install/changes/17-ticketComponentUpdateSale.sql Normal file
View File

@ -0,0 +1,148 @@
USE `vn`;
DROP procedure IF EXISTS `ticketComponentUpdateSale`;
DELIMITER $$
USE `vn`$$
CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentUpdateSale`(vOption INT)
BEGIN
DECLARE vComponentFk INT;
DECLARE vRenewComponents BOOLEAN;
DECLARE vKeepPrices BOOLEAN;
CASE vOption
WHEN 1 THEN
SET vRenewComponents = TRUE;
SET vKeepPrices = FALSE;
WHEN 2 THEN
SET vComponentFk = 17;
SET vRenewComponents = TRUE;
SET vKeepPrices = TRUE;
WHEN 3 THEN
SET vComponentFk = 37;
SET vRenewComponents = TRUE;
SET vKeepPrices = TRUE;
WHEN 4 THEN
SET vComponentFk = 34;
SET vRenewComponents = TRUE;
SET vKeepPrices = TRUE;
WHEN 5 THEN
SET vComponentFk = 35;
SET vRenewComponents = TRUE;
SET vKeepPrices = TRUE;
WHEN 6 THEN
SET vComponentFk = 36;
SET vRenewComponents = TRUE;
SET vKeepPrices = TRUE;
WHEN 7 THEN
REPLACE INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3)
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id
LEFT JOIN saleComponent sc ON sc.saleFk = s.id
AND sc.componentFk NOT IN (28, 29)
GROUP BY s.id;
REPLACE INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3)
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id
LEFT JOIN saleComponent sc ON sc.saleFk = s.id
AND sc.componentFk NOT IN (28, 29)
GROUP BY s.id;
SET vRenewComponents = FALSE;
SET vKeepPrices = FALSE;
WHEN 8 THEN
DELETE sc.*
FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk;
REPLACE INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3)
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id;
SET vRenewComponents = FALSE;
SET vKeepPrices = FALSE;
WHEN 9 THEN
SET vRenewComponents = TRUE;
SET vKeepPrices = TRUE;
END CASE;
IF vRenewComponents THEN
DELETE sc.*
FROM tmp.sale tmps
JOIN saleComponent sc ON sc.saleFk = tmps.saleFk
JOIN componentRate cr ON cr.id = sc.componentFk
WHERE cr.isRenewable;
REPLACE INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, tc.componentFk, tc.cost
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id
JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
LEFT JOIN saleComponent sc ON sc.saleFk = s.id
AND sc.componentFk = tc.componentFk
LEFT JOIN componentRate cr ON cr.id = tc.componentFk
WHERE IF(sc.componentFk IS NULL AND NOT cr.isRenewable, FALSE, TRUE);
END IF;
IF vKeepPrices THEN
REPLACE INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, vComponentFk, ROUND((s.price * (100 - s.discount) / 100) - SUM(sc.value), 3) dif
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id
LEFT JOIN saleComponent sc ON sc.saleFk = s.id
WHERE sc.saleFk <> vComponentFk
GROUP BY s.id
HAVING dif <> 0;
ELSE
UPDATE sale s
JOIN item i on i.id = s.itemFk
JOIN itemType it on it.id = i.typeFk
JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk
FROM saleComponent sc
JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
SET s.price = sumValue
WHERE it.code != 'PRT';
REPLACE INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, 21, ROUND((s.price * (100 - s.discount) / 100) - SUM(value), 3) saleValue
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id
LEFT JOIN saleComponent sc ON sc.saleFk = s.id
WHERE sc.componentFk != 21
GROUP BY s.id
HAVING ROUND(saleValue, 4) <> 0;
END IF;
UPDATE sale s
JOIN (
SELECT SUM(sc.value) sumValue, sc.saleFk
FROM saleComponent sc
JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
JOIN componentRate cr ON cr.id = sc.componentFk
JOIN componentTypeRate ctr on ctr.id = cr.componentTypeRate AND ctr.base
GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
SET s.priceFixed = sumValue, s.isPriceFixed = 1;
DELETE sc.*
FROM saleComponent sc
JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
JOIN sale s on s.id = sc.saleFk
JOIN item i ON i.id = s.itemFk
JOIN itemType it ON it.id = i.typeFk
WHERE it.code = 'PRT';
INSERT INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, 15, s.price
FROM sale s
JOIN tmp.sale tmps ON tmps.saleFk = s.id
JOIN item i ON i.id = s.itemFK
JOIN itemType it ON it.id = i.typeFk
WHERE it.code = 'PRT' AND s.price > 0;
END$$
DELIMITER ;

7
db/install/changes/18-zone.sql
View File

@ -1,7 +0,0 @@
USE `vn`;
ALTER TABLE `vn`.`zone`
ADD COLUMN `isVolumetric` TINYINT(1) NOT NULL DEFAULT 0 AFTER `bonus`;
ALTER TABLE `vn`.`zone`
DROP INDEX `name_UNIQUE` ;

40
db/install/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

38
db/install/dump/fixtures.sql
View File

@ -6,6 +6,10 @@ ALTER TABLE `vn2008`.`Consignatarios` AUTO_INCREMENT = 1;
INSERT INTO `util`.`config` ( `dbVersion`, `hasTriggersDisabled`, `environment`) INSERT INTO `util`.`config` ( `dbVersion`, `hasTriggersDisabled`, `environment`)
VALUES ('1.0.0', '0', 'development'); VALUES ('1.0.0', '0', 'development');
INSERT INTO `account`.`mailConfig` (`id`, `domain`)
VALUES
('1', 'verdnatura.es');
INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`) INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`)
SELECT id, name, CONCAT(name, 'Nick'),MD5('nightmare'), id, 1, CONCAT(name, '@mydomain.com') SELECT id, name, CONCAT(name, 'Nick'),MD5('nightmare'), id, 1, CONCAT(name, '@mydomain.com')
FROM `account`.`role`; FROM `account`.`role`;
@ -349,15 +353,15 @@ INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassification`, `credit`, `crea
(2, 2 , 6000, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), NULL), (2, 2 , 6000, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), NULL),
(3, 3, 10000 , DATE_ADD(CURDATE(), INTERVAL -3 MONTH), NULL); (3, 3, 10000 , DATE_ADD(CURDATE(), INTERVAL -3 MONTH), NULL);
INSERT INTO `vn`.`route`(`id`, `created`) INSERT INTO `vn`.`route`(`id`, `created`, `workerFk`, `vehicleFk`, `isOk`, `description`)
VALUES VALUES
(1, CURDATE()), (1, CURDATE(), 56, 1, 0, 'first route' ),
(2, CURDATE()), (2, CURDATE(), 56, 1, 0, 'second route' ),
(3, CURDATE()), (3, CURDATE(), 56, 2, 0, 'third route' ),
(4, CURDATE()), (4, CURDATE(), 56, 3, 0, 'fourth route' ),
(5, CURDATE()), (5, CURDATE(), 56, 4, 0, 'fifth route' ),
(6, CURDATE()), (6, CURDATE(), 57, 5, 0, 'sixth route' ),
(7, CURDATE()); (7, CURDATE(), 57, 6, 0, 'seventh route');
INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`) INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`)
VALUES VALUES
@ -455,7 +459,7 @@ INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk
(3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI', 442, 1, 'Iron-Man Heavy Armor MARK-VI', 16, 1), (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI', 442, 1, 'Iron-Man Heavy Armor MARK-VI', 16, 1),
(4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII', 442, 1, 'Iron-Man Heavy Armor MARK-VII', 14, 1), (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII', 442, 1, 'Iron-Man Heavy Armor MARK-VII', 14, 1),
(5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1), (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1),
(6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV', 442, 1, 'Iron-Man Heavy Armor MARK-XLV', 12, 1); (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV', 442, 1, 'Iron-Man Heavy Armor MARK-XLV', 12, 0);
INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`) INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`)
VALUES VALUES
@ -573,8 +577,9 @@ INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `create
INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`) INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`)
VALUES VALUES
(1, 0.00, 10, 10, 0, 0, CURDATE(), 6, 1.50), (1, 0.00, 10, 10, 0, 0, CURDATE(), 6, 1.50),
(2, 100.00, 20, 20, 0, 0, CURDATE(), 7, 1.00); (2, 100.00, 20, 20, 0, 0, CURDATE(), 7, 1.00),
(94, 140875.00, 49.00, 115.00,25.00, 0, CURDATE(), 71, 0.00);
INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, `created`, `pvp`) INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, `created`, `pvp`)
VALUES VALUES
@ -590,7 +595,7 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
(4, 4, 1 , 'Object4 Armor2 2', 20, 3.06, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)), (4, 4, 1 , 'Object4 Armor2 2', 20, 3.06, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(5, 1, 2 , 'Object1 Gem1 5', 10, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -10 DAY)), (5, 1, 2 , 'Object1 Gem1 5', 10, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -10 DAY)),
(6, 1, 3 , 'Object1 Gem1 5', 15, 6.50, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -5 DAY)), (6, 1, 3 , 'Object1 Gem1 5', 15, 6.50, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -5 DAY)),
(7, 2, 11, 'Object2 Gem2 3', 15, 1.30, 0, 0, 0, CURDATE()), (7, 2, 11, 'Object2 Gem2 3', 15, 1.46, 0, 0, 0, CURDATE()),
(8, 4, 11, 'Object4 Armor2 2', 10, 3.05, 0, 0, 0, CURDATE()), (8, 4, 11, 'Object4 Armor2 2', 10, 3.05, 0, 0, 0, CURDATE()),
(9, 1, 16, 'Object1 Gem1 5', 5, 9.10, 0, 0, 0, CURDATE()), (9, 1, 16, 'Object1 Gem1 5', 5, 9.10, 0, 0, 0, CURDATE()),
(10, 2, 16, 'Object2 Gem2 3', 10, 1.07, 0, 0, 0, CURDATE()), (10, 2, 16, 'Object2 Gem2 3', 10, 1.07, 0, 0, 0, CURDATE()),
@ -637,12 +642,13 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
(5, 29, -18.72), (5, 29, -18.72),
(5, 39, 0.02), (5, 39, 0.02),
(6, 23, 6.5), (6, 23, 6.5),
(7, 15, 0.2899), (7, 15, 0.2839),
(7, 21, 0.166),
(7, 28, 5.6), (7, 28, 5.6),
(7, 29, -4.6), (7, 29, -4.6),
(7, 39, 0.01), (7, 39, 0.01),
(8, 15, 0.0435), (8, 15, 0.0426),
(8, 21, -0.004), (8, 21, -0.003),
(8, 28, 20.72), (8, 28, 20.72),
(8, 29, -19.72), (8, 29, -19.72),
(8, 37, 2), (8, 37, 2),
@ -1212,5 +1218,3 @@ INSERT INTO `postgresql`.`business_labour`(`business_id`, `notes`, `department_i
(1, NULL, 22, 4, 0, 1, 1, 1, 1), (1, NULL, 22, 4, 0, 1, 1, 1, 1),
(2, 'From las friday worker ownes the company 1 hour', 23, 1, 0, 1, 0, 1, 1); (2, 'From las friday worker ownes the company 1 hour', 23, 1, 0, 1, 0, 1, 1);
INSERT INTO `account`.`mailConfig` (`id`, `domain`) VALUES ('1', 'verdnatura.es');

11939
db/install/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

2
e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js
View File

@ -73,7 +73,7 @@ describe('Ticket Edit basic data path', () => {
.wait(1900) .wait(1900)
.waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText'); .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
expect(result).toContain('-€208.75'); expect(result).toContain('-€204.25');
}); });
it(`should then click next to move on to step three`, async() => { it(`should then click next to move on to step three`, async() => {

23
front/core/styles/salixfont.css
View File

@ -23,9 +23,21 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-unavailable:before { .icon-pbx:before {
content: "\e950";
}
.icon-calendar:before {
content: "\e94f"; content: "\e94f";
} }
.icon-linesplit:before {
content: "\e945";
}
.icon-invoices:before {
content: "\e91c";
}
.icon-pets:before {
content: "\e94e";
}
.icon-100:before { .icon-100:before {
content: "\e940"; content: "\e940";
} }
@ -134,9 +146,6 @@
.icon-info:before { .icon-info:before {
content: "\e949"; content: "\e949";
} }
.icon-invoices:before {
content: "\e91c";
}
.icon-invoices1:before { .icon-invoices1:before {
content: "\e94a"; content: "\e94a";
} }
@ -152,9 +161,6 @@
.icon-lines:before { .icon-lines:before {
content: "\e91e"; content: "\e91e";
} }
.icon-linesplit:before {
content: "\e945";
}
.icon-linesprepaired:before { .icon-linesprepaired:before {
content: "\e94b"; content: "\e94b";
} }
@ -191,9 +197,6 @@
.icon-person:before { .icon-person:before {
content: "\e929"; content: "\e929";
} }
.icon-pets:before {
content: "\e94e";
}
.icon-photo:before { .icon-photo:before {
content: "\e92a"; content: "\e92a";
} }

9
front/core/styles/salixfont.svg
View File

@ -20,7 +20,7 @@
<glyph unicode="&#xe90a;" glyph-name="accessory" d="M499.2 960c118.4-3.2 224-12.8 320-54.4 35.2-16 70.4-32 89.6-67.2 9.6-19.2 16-48 16-70.4-9.6-73.6-25.6-147.2-38.4-224-22.4-137.6-41.6-272-60.8-406.4-3.2-19.2-6.4-38.4-6.4-54.4-3.2-41.6-25.6-73.6-60.8-96-60.8-35.2-124.8-44.8-192-51.2-89.6-6.4-179.2 0-262.4 38.4-51.2 22.4-76.8 57.6-86.4 112-35.2 192-64 374.4-89.6 563.2-6.4 38.4-16 73.6-22.4 112-9.6 44.8 9.6 89.6 54.4 118.4 64 41.6 134.4 57.6 208 67.2 48 6.4 96 9.6 131.2 12.8zM227.2 652.8c25.6-179.2 54.4-358.4 80-534.4 6.4-35.2 22.4-54.4 54.4-64 70.4-19.2 144-25.6 217.6-16 38.4 6.4 73.6 16 112 28.8 9.6 3.2 22.4 19.2 22.4 28.8 19.2 121.6 38.4 246.4 57.6 371.2 9.6 57.6 16 118.4 25.6 179.2-192-54.4-377.6-51.2-569.6 6.4zM828.8 787.2c-28.8 12.8-51.2 28.8-73.6 35.2-60.8 16-118.4 28.8-179.2 32-105.6 9.6-208 0-310.4-35.2-22.4-6.4-41.6-19.2-64-28.8 0-3.2 0-6.4 0-9.6 16-6.4 32-19.2 48-25.6 150.4-54.4 304-54.4 457.6-22.4 41.6 6.4 83.2 22.4 121.6 54.4z" /> <glyph unicode="&#xe90a;" glyph-name="accessory" d="M499.2 960c118.4-3.2 224-12.8 320-54.4 35.2-16 70.4-32 89.6-67.2 9.6-19.2 16-48 16-70.4-9.6-73.6-25.6-147.2-38.4-224-22.4-137.6-41.6-272-60.8-406.4-3.2-19.2-6.4-38.4-6.4-54.4-3.2-41.6-25.6-73.6-60.8-96-60.8-35.2-124.8-44.8-192-51.2-89.6-6.4-179.2 0-262.4 38.4-51.2 22.4-76.8 57.6-86.4 112-35.2 192-64 374.4-89.6 563.2-6.4 38.4-16 73.6-22.4 112-9.6 44.8 9.6 89.6 54.4 118.4 64 41.6 134.4 57.6 208 67.2 48 6.4 96 9.6 131.2 12.8zM227.2 652.8c25.6-179.2 54.4-358.4 80-534.4 6.4-35.2 22.4-54.4 54.4-64 70.4-19.2 144-25.6 217.6-16 38.4 6.4 73.6 16 112 28.8 9.6 3.2 22.4 19.2 22.4 28.8 19.2 121.6 38.4 246.4 57.6 371.2 9.6 57.6 16 118.4 25.6 179.2-192-54.4-377.6-51.2-569.6 6.4zM828.8 787.2c-28.8 12.8-51.2 28.8-73.6 35.2-60.8 16-118.4 28.8-179.2 32-105.6 9.6-208 0-310.4-35.2-22.4-6.4-41.6-19.2-64-28.8 0-3.2 0-6.4 0-9.6 16-6.4 32-19.2 48-25.6 150.4-54.4 304-54.4 457.6-22.4 41.6 6.4 83.2 22.4 121.6 54.4z" />
<glyph unicode="&#xe90b;" glyph-name="components" d="M490.667 657.067c-4.267-8.533-4.267-25.6-4.267-42.667v-140.8h-140.8c-17.067 0-25.6 0-34.133 4.267 0 0 0 0 0 0l17.067 25.6c12.8 12.8 21.333 29.867 17.067 51.2 0 25.6-12.8 51.2-29.867 68.267-17.067 12.8-42.667 21.333-72.533 21.333-25.6 0-51.2-8.533-72.533-25.6s-29.867-42.667-29.867-68.267c0-17.067 4.267-34.133 17.067-51.2l17.067-25.6c0 0 0 0 0 0-4.267 0-17.067-4.267-34.133-4.267 0 0 0 0 0 0h-140.8v490.667h486.4v-145.067c0-21.333 0-34.133 4.267-42.667 0-12.8 8.533-25.6 21.333-29.867 4.267-4.267 12.8-4.267 21.333-4.267 0 0 0 0 0 0 4.267 0 17.067 0 25.6 8.533l29.867 21.333c8.533 4.267 17.067 8.533 25.6 8.533 12.8 0 21.333-4.267 29.867-17.067s12.8-25.6 12.8-42.667c0-17.067-4.267-29.867-12.8-42.667-8.533-8.533-21.333-17.067-29.867-17.067s-17.067 4.267-25.6 8.533l-29.867 21.333c-8.533 4.267-21.333 8.533-25.6 8.533-8.533 0-12.8 0-21.333-4.267-12.8-8.533-21.333-21.333-21.333-34.133zM1019.733 614.4c0 8.533 0 38.4-8.533 42.667 0 0 0 0 0 0-4.267 0-4.267 0-8.533 0l-29.867-21.333c-12.8-8.533-25.6-17.067-42.667-17.067-46.933 0-85.333 42.667-85.333 93.867s38.4 93.867 85.333 93.867c17.067 0 34.133-4.267 46.933-17.067l29.867-21.333c0 0 4.267 0 8.533 0 8.533 4.267 8.533 34.133 8.533 42.667v149.333h-494.933v-145.067c0-17.067 0-25.6 4.267-34.133 0 0 0 0 0 0v0l25.6 17.067c12.8 12.8 34.133 17.067 51.2 17.067 25.6 0 51.2-12.8 68.267-29.867 17.067-21.333 25.6-46.933 25.6-72.533s-8.533-51.2-25.6-72.533c-17.067-21.333-42.667-29.867-68.267-29.867-17.067 0-34.133 4.267-51.2 17.067l-25.6 17.067c0 0 0 0 0 0 0-4.267-4.267-17.067-4.267-34.133v-140.8h145.067c21.333 0 34.133 0 42.667-4.267 12.8-4.267 25.6-12.8 29.867-21.333 4.267-4.267 4.267-12.8 4.267-21.333s0-17.067-8.533-25.6l-21.333-29.867c-4.267-8.533-8.533-17.067-8.533-25.6 0-12.8 4.267-21.333 17.067-29.867s25.6-12.8 42.667-12.8c17.067 0 29.867 4.267 42.667 12.8 8.533 8.533 17.067 21.333 17.067 29.867s-4.267 17.067-8.533 25.6l-12.8 29.867c-8.533 12.8-8.533 21.333-8.533 25.6 0 8.533 0 12.8 4.267 21.333s17.067 17.067 29.867 21.333c8.533 4.267 25.6 4.267 42.667 4.267h140.8v145.067zM874.667-59.733c25.6 0 115.2-4.267 149.333-4.267v490.667h-140.8c-17.067 0-25.6 0-34.133-4.267 0 0 0 0 0 0v0l17.067-25.6c12.8-12.8 17.067-34.133 17.067-51.2 0-25.6-12.8-51.2-29.867-68.267-21.333-17.067-46.933-25.6-72.533-25.6s-51.2 8.533-72.533 25.6c-21.333 17.067-29.867 42.667-29.867 68.267 0 17.067 4.267 34.133 17.067 51.2l17.067 29.867c0 0 0 0 0 0-4.267 0-17.067 4.267-34.133 4.267h-149.333v-140.8c0-21.333 0-34.133-4.267-42.667-4.267-12.8-12.8-25.6-21.333-29.867-4.267-4.267-12.8-4.267-21.333-4.267s-17.067 0-25.6 8.533l-29.867 12.8c-8.533 4.267-17.067 8.533-25.6 8.533-12.8 0-21.333-4.267-29.867-17.067s-12.8-25.6-12.8-42.667c0-17.067 4.267-29.867 12.8-42.667 8.533-8.533 21.333-17.067 29.867-17.067s17.067 4.267 25.6 8.533l29.867 21.333c8.533 4.267 17.067 8.533 25.6 8.533 0 0 0 0 0 0 8.533 0 12.8 0 21.333-4.267 12.8-4.267 17.067-17.067 21.333-29.867 4.267-8.533 4.267-25.6 4.267-42.667v-140.8h140.8c8.533 0 38.4 0 42.667 8.533 0 4.267 0 8.533 0 8.533l-21.333 29.867c-8.533 12.8-17.067 29.867-17.067 46.933 0 46.933 42.667 85.333 93.867 85.333s93.867-38.4 93.867-85.333c0-17.067-4.267-34.133-17.067-46.933l-21.333-29.867c0 0-4.267-4.267 0-8.533 12.8-12.8 42.667-12.8 51.2-12.8zM0 426.667v-490.667h486.4v145.067c0 17.067 0 25.6-4.267 34.133 0 0 0 0 0 0v0l-25.6-17.067c-12.8-12.8-34.133-17.067-51.2-17.067-25.6 0-51.2 12.8-68.267 29.867-17.067 21.333-25.6 46.933-25.6 72.533s8.533 51.2 25.6 72.533c17.067 21.333 42.667 29.867 68.267 29.867 17.067 0 34.133-4.267 51.2-17.067l29.867-17.067c0 0 0 0 0 0 0 4.267 4.267 17.067 4.267 34.133v140.8h-145.067c-21.333 0-34.133 0-42.667 4.267-12.8 4.267-25.6 12.8-29.867 21.333-4.267 4.267-4.267 12.8-4.267 21.333s0 17.067 8.533 25.6l21.333 29.867c0 8.533 4.267 17.067 4.267 25.6 0 12.8-4.267 21.333-17.067 29.867s-25.6 12.8-42.667 12.8v0c-17.067 0-29.867-4.267-42.667-12.8-8.533-8.533-12.8-17.067-12.8-29.867 0-8.533 4.267-17.067 8.533-25.6l17.067-29.867c8.533-12.8 8.533-21.333 8.533-25.6 0-8.533 0-12.8-4.267-21.333-4.267-12.8-17.067-17.067-29.867-21.333-8.533-4.267-25.6-4.267-42.667-4.267h-145.067z" /> <glyph unicode="&#xe90b;" glyph-name="components" d="M490.667 657.067c-4.267-8.533-4.267-25.6-4.267-42.667v-140.8h-140.8c-17.067 0-25.6 0-34.133 4.267 0 0 0 0 0 0l17.067 25.6c12.8 12.8 21.333 29.867 17.067 51.2 0 25.6-12.8 51.2-29.867 68.267-17.067 12.8-42.667 21.333-72.533 21.333-25.6 0-51.2-8.533-72.533-25.6s-29.867-42.667-29.867-68.267c0-17.067 4.267-34.133 17.067-51.2l17.067-25.6c0 0 0 0 0 0-4.267 0-17.067-4.267-34.133-4.267 0 0 0 0 0 0h-140.8v490.667h486.4v-145.067c0-21.333 0-34.133 4.267-42.667 0-12.8 8.533-25.6 21.333-29.867 4.267-4.267 12.8-4.267 21.333-4.267 0 0 0 0 0 0 4.267 0 17.067 0 25.6 8.533l29.867 21.333c8.533 4.267 17.067 8.533 25.6 8.533 12.8 0 21.333-4.267 29.867-17.067s12.8-25.6 12.8-42.667c0-17.067-4.267-29.867-12.8-42.667-8.533-8.533-21.333-17.067-29.867-17.067s-17.067 4.267-25.6 8.533l-29.867 21.333c-8.533 4.267-21.333 8.533-25.6 8.533-8.533 0-12.8 0-21.333-4.267-12.8-8.533-21.333-21.333-21.333-34.133zM1019.733 614.4c0 8.533 0 38.4-8.533 42.667 0 0 0 0 0 0-4.267 0-4.267 0-8.533 0l-29.867-21.333c-12.8-8.533-25.6-17.067-42.667-17.067-46.933 0-85.333 42.667-85.333 93.867s38.4 93.867 85.333 93.867c17.067 0 34.133-4.267 46.933-17.067l29.867-21.333c0 0 4.267 0 8.533 0 8.533 4.267 8.533 34.133 8.533 42.667v149.333h-494.933v-145.067c0-17.067 0-25.6 4.267-34.133 0 0 0 0 0 0v0l25.6 17.067c12.8 12.8 34.133 17.067 51.2 17.067 25.6 0 51.2-12.8 68.267-29.867 17.067-21.333 25.6-46.933 25.6-72.533s-8.533-51.2-25.6-72.533c-17.067-21.333-42.667-29.867-68.267-29.867-17.067 0-34.133 4.267-51.2 17.067l-25.6 17.067c0 0 0 0 0 0 0-4.267-4.267-17.067-4.267-34.133v-140.8h145.067c21.333 0 34.133 0 42.667-4.267 12.8-4.267 25.6-12.8 29.867-21.333 4.267-4.267 4.267-12.8 4.267-21.333s0-17.067-8.533-25.6l-21.333-29.867c-4.267-8.533-8.533-17.067-8.533-25.6 0-12.8 4.267-21.333 17.067-29.867s25.6-12.8 42.667-12.8c17.067 0 29.867 4.267 42.667 12.8 8.533 8.533 17.067 21.333 17.067 29.867s-4.267 17.067-8.533 25.6l-12.8 29.867c-8.533 12.8-8.533 21.333-8.533 25.6 0 8.533 0 12.8 4.267 21.333s17.067 17.067 29.867 21.333c8.533 4.267 25.6 4.267 42.667 4.267h140.8v145.067zM874.667-59.733c25.6 0 115.2-4.267 149.333-4.267v490.667h-140.8c-17.067 0-25.6 0-34.133-4.267 0 0 0 0 0 0v0l17.067-25.6c12.8-12.8 17.067-34.133 17.067-51.2 0-25.6-12.8-51.2-29.867-68.267-21.333-17.067-46.933-25.6-72.533-25.6s-51.2 8.533-72.533 25.6c-21.333 17.067-29.867 42.667-29.867 68.267 0 17.067 4.267 34.133 17.067 51.2l17.067 29.867c0 0 0 0 0 0-4.267 0-17.067 4.267-34.133 4.267h-149.333v-140.8c0-21.333 0-34.133-4.267-42.667-4.267-12.8-12.8-25.6-21.333-29.867-4.267-4.267-12.8-4.267-21.333-4.267s-17.067 0-25.6 8.533l-29.867 12.8c-8.533 4.267-17.067 8.533-25.6 8.533-12.8 0-21.333-4.267-29.867-17.067s-12.8-25.6-12.8-42.667c0-17.067 4.267-29.867 12.8-42.667 8.533-8.533 21.333-17.067 29.867-17.067s17.067 4.267 25.6 8.533l29.867 21.333c8.533 4.267 17.067 8.533 25.6 8.533 0 0 0 0 0 0 8.533 0 12.8 0 21.333-4.267 12.8-4.267 17.067-17.067 21.333-29.867 4.267-8.533 4.267-25.6 4.267-42.667v-140.8h140.8c8.533 0 38.4 0 42.667 8.533 0 4.267 0 8.533 0 8.533l-21.333 29.867c-8.533 12.8-17.067 29.867-17.067 46.933 0 46.933 42.667 85.333 93.867 85.333s93.867-38.4 93.867-85.333c0-17.067-4.267-34.133-17.067-46.933l-21.333-29.867c0 0-4.267-4.267 0-8.533 12.8-12.8 42.667-12.8 51.2-12.8zM0 426.667v-490.667h486.4v145.067c0 17.067 0 25.6-4.267 34.133 0 0 0 0 0 0v0l-25.6-17.067c-12.8-12.8-34.133-17.067-51.2-17.067-25.6 0-51.2 12.8-68.267 29.867-17.067 21.333-25.6 46.933-25.6 72.533s8.533 51.2 25.6 72.533c17.067 21.333 42.667 29.867 68.267 29.867 17.067 0 34.133-4.267 51.2-17.067l29.867-17.067c0 0 0 0 0 0 0 4.267 4.267 17.067 4.267 34.133v140.8h-145.067c-21.333 0-34.133 0-42.667 4.267-12.8 4.267-25.6 12.8-29.867 21.333-4.267 4.267-4.267 12.8-4.267 21.333s0 17.067 8.533 25.6l21.333 29.867c0 8.533 4.267 17.067 4.267 25.6 0 12.8-4.267 21.333-17.067 29.867s-25.6 12.8-42.667 12.8v0c-17.067 0-29.867-4.267-42.667-12.8-8.533-8.533-12.8-17.067-12.8-29.867 0-8.533 4.267-17.067 8.533-25.6l17.067-29.867c8.533-12.8 8.533-21.333 8.533-25.6 0-8.533 0-12.8-4.267-21.333-4.267-12.8-17.067-17.067-29.867-21.333-8.533-4.267-25.6-4.267-42.667-4.267h-145.067z" />
<glyph unicode="&#xe90c;" glyph-name="handmade" d="M537.6 681.6c44.8 54.4 99.2 83.2 163.2 89.6 51.2 6.4 99.2 0 144-16 64-19.2 121.6-57.6 176-99.2-60.8-51.2-128-89.6-214.4-105.6 105.6-60.8 163.2-150.4 204.8-256-153.6-32-278.4 19.2-400 112-6.4-41.6-12.8-76.8-16-112-12.8-80-22.4-160-35.2-236.8-3.2-28.8-19.2-44.8-41.6-54.4-76.8-28.8-153.6-28.8-227.2 0-25.6 9.6-41.6 28.8-44.8 57.6-12.8 99.2-28.8 201.6-44.8 300.8-3.2 12.8-6.4 22.4-19.2 28.8-38.4 16-57.6 41.6-70.4 80-3.2 6.4-9.6 16-16 16-89.6 22.4-128 134.4-64 201.6 9.6 9.6 12.8 19.2 9.6 35.2-19.2 99.2 54.4 166.4 156.8 147.2 6.4-3.2 12.8 3.2 19.2 6.4 73.6 67.2 176 41.6 208-51.2 3.2-9.6 9.6-16 16-19.2 60.8-16 89.6-57.6 96-124.8zM227.2 790.4c-60.8 38.4-86.4 38.4-115.2 9.6-38.4-41.6-16-80 16-118.4-44.8-16-83.2-41.6-70.4-92.8 16-54.4 60.8-57.6 108.8-44.8 0-12.8-3.2-22.4-3.2-32-3.2-38.4 19.2-67.2 54.4-76.8 28.8-6.4 64 12.8 80 44.8 3.2 9.6 9.6 16 12.8 25.6 57.6-38.4 86.4-41.6 115.2-12.8s28.8 54.4-12.8 118.4c41.6 16 80 38.4 67.2 92.8-12.8 57.6-60.8 57.6-108.8 51.2 9.6 57.6-6.4 92.8-44.8 105.6-41.6 12.8-67.2-6.4-99.2-70.4zM256 361.6c0-9.6 0-19.2 0-28.8 12.8-86.4 28.8-169.6 38.4-252.8 3.2-19.2 12.8-28.8 28.8-35.2 54.4-16 108.8-16 166.4 0 12.8 3.2 22.4 12.8 25.6 28.8 6.4 54.4 16 112 25.6 166.4 6.4 38.4 9.6 80 16 121.6-140.8-32-150.4-32-300.8 0zM947.2 336c-38.4 73.6-83.2 134.4-156.8 172.8-44.8 25.6-92.8 32-144 16-32-12.8-60.8-32-76.8-57.6 25.6-9.6 48-12.8 70.4-22.4 22.4-12.8 44.8-25.6 67.2-41.6 67.2-48 147.2-76.8 240-67.2zM547.2 572.8c32 19.2 64 22.4 99.2 22.4 51.2 0 102.4-3.2 153.6 3.2 51.2 3.2 96 25.6 140.8 54.4-76.8 57.6-179.2 86.4-265.6 67.2-67.2-16-121.6-76.8-128-147.2zM304 396.8c38.4-3.2 73.6-3.2 105.6-9.6 48-6.4 80 6.4 92.8 60.8 6.4 25.6 3.2 48 0 76.8-3.2-9.6-6.4-12.8-9.6-19.2-19.2-60.8-73.6-96-134.4-83.2-25.6 3.2-38.4-3.2-54.4-25.6zM364.8 646.4c0-54.4-44.8-96-96-96-54.4 0-99.2 44.8-99.2 99.2 0 51.2 44.8 96 96 96 54.4 0 99.2-44.8 99.2-99.2zM310.4 646.4c0 22.4-19.2 41.6-41.6 41.6-25.6 3.2-44.8-19.2-44.8-41.6s22.4-44.8 44.8-44.8c22.4 3.2 41.6 22.4 41.6 44.8z" /> <glyph unicode="&#xe90c;" glyph-name="handmade" d="M537.6 681.6c44.8 54.4 99.2 83.2 163.2 89.6 51.2 6.4 99.2 0 144-16 64-19.2 121.6-57.6 176-99.2-60.8-51.2-128-89.6-214.4-105.6 105.6-60.8 163.2-150.4 204.8-256-153.6-32-278.4 19.2-400 112-6.4-41.6-12.8-76.8-16-112-12.8-80-22.4-160-35.2-236.8-3.2-28.8-19.2-44.8-41.6-54.4-76.8-28.8-153.6-28.8-227.2 0-25.6 9.6-41.6 28.8-44.8 57.6-12.8 99.2-28.8 201.6-44.8 300.8-3.2 12.8-6.4 22.4-19.2 28.8-38.4 16-57.6 41.6-70.4 80-3.2 6.4-9.6 16-16 16-89.6 22.4-128 134.4-64 201.6 9.6 9.6 12.8 19.2 9.6 35.2-19.2 99.2 54.4 166.4 156.8 147.2 6.4-3.2 12.8 3.2 19.2 6.4 73.6 67.2 176 41.6 208-51.2 3.2-9.6 9.6-16 16-19.2 60.8-16 89.6-57.6 96-124.8zM227.2 790.4c-60.8 38.4-86.4 38.4-115.2 9.6-38.4-41.6-16-80 16-118.4-44.8-16-83.2-41.6-70.4-92.8 16-54.4 60.8-57.6 108.8-44.8 0-12.8-3.2-22.4-3.2-32-3.2-38.4 19.2-67.2 54.4-76.8 28.8-6.4 64 12.8 80 44.8 3.2 9.6 9.6 16 12.8 25.6 57.6-38.4 86.4-41.6 115.2-12.8s28.8 54.4-12.8 118.4c41.6 16 80 38.4 67.2 92.8-12.8 57.6-60.8 57.6-108.8 51.2 9.6 57.6-6.4 92.8-44.8 105.6-41.6 12.8-67.2-6.4-99.2-70.4zM256 361.6c0-9.6 0-19.2 0-28.8 12.8-86.4 28.8-169.6 38.4-252.8 3.2-19.2 12.8-28.8 28.8-35.2 54.4-16 108.8-16 166.4 0 12.8 3.2 22.4 12.8 25.6 28.8 6.4 54.4 16 112 25.6 166.4 6.4 38.4 9.6 80 16 121.6-140.8-32-150.4-32-300.8 0zM947.2 336c-38.4 73.6-83.2 134.4-156.8 172.8-44.8 25.6-92.8 32-144 16-32-12.8-60.8-32-76.8-57.6 25.6-9.6 48-12.8 70.4-22.4 22.4-12.8 44.8-25.6 67.2-41.6 67.2-48 147.2-76.8 240-67.2zM547.2 572.8c32 19.2 64 22.4 99.2 22.4 51.2 0 102.4-3.2 153.6 3.2 51.2 3.2 96 25.6 140.8 54.4-76.8 57.6-179.2 86.4-265.6 67.2-67.2-16-121.6-76.8-128-147.2zM304 396.8c38.4-3.2 73.6-3.2 105.6-9.6 48-6.4 80 6.4 92.8 60.8 6.4 25.6 3.2 48 0 76.8-3.2-9.6-6.4-12.8-9.6-19.2-19.2-60.8-73.6-96-134.4-83.2-25.6 3.2-38.4-3.2-54.4-25.6zM364.8 646.4c0-54.4-44.8-96-96-96-54.4 0-99.2 44.8-99.2 99.2 0 51.2 44.8 96 96 96 54.4 0 99.2-44.8 99.2-99.2zM310.4 646.4c0 22.4-19.2 41.6-41.6 41.6-25.6 3.2-44.8-19.2-44.8-41.6s22.4-44.8 44.8-44.8c22.4 3.2 41.6 22.4 41.6 44.8z" />
<glyph unicode="&#xe90d;" glyph-name="consignatarios" d="M883.2 631.467h-140.8v183.467h-648.533c-51.2 0-93.867-42.667-93.867-93.867v-503.467h93.867c0-76.8 64-136.533 140.8-136.533s140.8 59.733 140.8 136.533h277.333c0-76.8 64-136.533 140.8-136.533s140.8 59.733 140.8 136.533h89.6v230.4l-140.8 183.467zM234.667 149.333c-38.4 0-68.267 29.867-68.267 68.267s29.867 68.267 68.267 68.267c38.4 0 68.267-29.867 68.267-68.267 0-34.133-29.867-68.267-68.267-68.267zM861.867 563.2l89.6-115.2h-209.067v115.2h119.467zM789.333 149.333c-38.4 0-68.267 29.867-68.267 68.267s29.867 68.267 68.267 68.267c38.4 0 68.267-29.867 68.267-68.267 4.267-34.133-25.6-68.267-68.267-68.267z" /> <glyph unicode="&#xe90d;" glyph-name="consignatarios" d="M409.6-64v349.867h204.8v-349.867h256v563.2h153.6l-512 460.8-512-460.8h153.6v-563.2h256z" />
<glyph unicode="&#xe90e;" glyph-name="credit" d="M921.6 849.067h-819.2c-55.467 0-102.4-42.667-102.4-98.133v-601.6c0-55.467 46.933-102.4 102.4-102.4h819.2c55.467 0 102.4 42.667 102.4 102.4v601.6c0 55.467-46.933 98.133-102.4 98.133zM921.6 145.067h-819.2v302.933h819.2v-302.933zM921.6 648.533h-819.2v102.4h819.2v-102.4z" /> <glyph unicode="&#xe90e;" glyph-name="credit" d="M921.6 849.067h-819.2c-55.467 0-102.4-42.667-102.4-98.133v-601.6c0-55.467 46.933-102.4 102.4-102.4h819.2c55.467 0 102.4 42.667 102.4 102.4v601.6c0 55.467-46.933 98.133-102.4 98.133zM921.6 145.067h-819.2v302.933h819.2v-302.933zM921.6 648.533h-819.2v102.4h819.2v-102.4z" />
<glyph unicode="&#xe90f;" glyph-name="columndelete" d="M0 960h256v-256h-256v256zM0 192h256v-256h-256v256zM0 576h256v-256h-256v256zM785.067 686.933l93.867-98.133-140.8-140.8 140.8-145.067-93.867-98.133-145.067 145.067-145.067-145.067-93.867 98.133 140.8 145.067-140.8 140.8 93.867 98.133 145.067-145.067z" /> <glyph unicode="&#xe90f;" glyph-name="columndelete" d="M0 960h256v-256h-256v256zM0 192h256v-256h-256v256zM0 576h256v-256h-256v256zM785.067 686.933l93.867-98.133-140.8-140.8 140.8-145.067-93.867-98.133-145.067 145.067-145.067-145.067-93.867 98.133 140.8 145.067-140.8 140.8 93.867 98.133 145.067-145.067z" />
<glyph unicode="&#xe910;" glyph-name="delivery" d="M1006.933 494.933l-196.267 192c-12.8 12.8-29.867 17.067-46.933 17.067h-98.133v38.4c0 25.6-21.333 51.2-51.2 51.2h-563.2c-29.867 0-51.2-21.333-51.2-51.2v-332.8h1024v38.4c0 17.067-8.533 34.133-17.067 46.933zM328.533 516.267c0-34.133-21.333-64-42.667-68.267 0 0-4.267 0-4.267 0l-72.533-8.533v38.4c0 34.133 21.333 64 42.667 68.267 0 0 4.267 0 4.267 0l72.533 8.533v-38.4zM332.8 580.267l-85.333-12.8c-34.133 0-59.733 29.867-55.467 72.533v51.2l85.333 12.8c34.133 4.267 55.467-25.6 55.467-72.533v-51.2zM435.2 499.2l-51.2-4.267c-17.067-4.267-29.867 12.8-29.867 38.4v25.6l46.933 8.533c17.067 4.267 29.867-17.067 29.867-38.4l4.267-29.867zM520.533 695.467c0-46.933-29.867-85.333-59.733-93.867-4.267 0-4.267 0-8.533 0l-98.133-17.067v55.467c0 46.933 29.867 85.333 59.733 93.867 4.267 0 4.267 0 8.533 0l98.133 12.8v-51.2zM921.6 486.4h-187.733c-8.533 0-8.533 4.267-8.533 8.533v145.067c0 4.267 4.267 8.533 8.533 8.533h34.133c0 0 4.267 0 4.267-4.267l153.6-145.067c4.267 0 0-12.8-4.267-12.8zM789.333 307.2c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4c55.467 0 102.4 46.933 102.4 102.4 0 59.733-46.933 102.4-102.4 102.4zM789.333 153.6c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2c29.867 0 51.2-21.333 51.2-51.2 0-25.6-25.6-51.2-51.2-51.2zM1024 384v-110.933c0-25.6-21.333-51.2-51.2-51.2h-51.2c-8.533 64-68.267 115.2-136.533 115.2s-123.733-51.2-132.267-115.2h-268.8c-8.533 64-68.267 115.2-132.267 115.2-68.267 0-123.733-51.2-132.267-115.2h-68.267c-25.6 0-51.2 21.333-51.2 51.2v110.933h1024zM251.733 307.2c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4c55.467 0 102.4 46.933 102.4 102.4 0 59.733-46.933 102.4-102.4 102.4zM251.733 153.6c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2c29.867 0 51.2-21.333 51.2-51.2 0-25.6-25.6-51.2-51.2-51.2z" /> <glyph unicode="&#xe910;" glyph-name="delivery" d="M1006.933 494.933l-196.267 192c-12.8 12.8-29.867 17.067-46.933 17.067h-98.133v38.4c0 25.6-21.333 51.2-51.2 51.2h-563.2c-29.867 0-51.2-21.333-51.2-51.2v-332.8h1024v38.4c0 17.067-8.533 34.133-17.067 46.933zM328.533 516.267c0-34.133-21.333-64-42.667-68.267 0 0-4.267 0-4.267 0l-72.533-8.533v38.4c0 34.133 21.333 64 42.667 68.267 0 0 4.267 0 4.267 0l72.533 8.533v-38.4zM332.8 580.267l-85.333-12.8c-34.133 0-59.733 29.867-55.467 72.533v51.2l85.333 12.8c34.133 4.267 55.467-25.6 55.467-72.533v-51.2zM435.2 499.2l-51.2-4.267c-17.067-4.267-29.867 12.8-29.867 38.4v25.6l46.933 8.533c17.067 4.267 29.867-17.067 29.867-38.4l4.267-29.867zM520.533 695.467c0-46.933-29.867-85.333-59.733-93.867-4.267 0-4.267 0-8.533 0l-98.133-17.067v55.467c0 46.933 29.867 85.333 59.733 93.867 4.267 0 4.267 0 8.533 0l98.133 12.8v-51.2zM921.6 486.4h-187.733c-8.533 0-8.533 4.267-8.533 8.533v145.067c0 4.267 4.267 8.533 8.533 8.533h34.133c0 0 4.267 0 4.267-4.267l153.6-145.067c4.267 0 0-12.8-4.267-12.8zM789.333 307.2c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4c55.467 0 102.4 46.933 102.4 102.4 0 59.733-46.933 102.4-102.4 102.4zM789.333 153.6c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2c29.867 0 51.2-21.333 51.2-51.2 0-25.6-25.6-51.2-51.2-51.2zM1024 384v-110.933c0-25.6-21.333-51.2-51.2-51.2h-51.2c-8.533 64-68.267 115.2-136.533 115.2s-123.733-51.2-132.267-115.2h-268.8c-8.533 64-68.267 115.2-132.267 115.2-68.267 0-123.733-51.2-132.267-115.2h-68.267c-25.6 0-51.2 21.333-51.2 51.2v110.933h1024zM251.733 307.2c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4c55.467 0 102.4 46.933 102.4 102.4 0 59.733-46.933 102.4-102.4 102.4zM251.733 153.6c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2c29.867 0 51.2-21.333 51.2-51.2 0-25.6-25.6-51.2-51.2-51.2z" />
@ -35,7 +35,7 @@
<glyph unicode="&#xe919;" glyph-name="grid" d="M0 704h256v256h-256v-256zM384-64h256v256h-256v-256zM0-64h256v256h-256v-256zM0 320h256v256h-256v-256zM384 320h256v256h-256v-256zM768 960v-256h256v256h-256zM384 704h256v256h-256v-256zM768 320h256v256h-256v-256zM768-64h256v256h-256v-256z" /> <glyph unicode="&#xe919;" glyph-name="grid" d="M0 704h256v256h-256v-256zM384-64h256v256h-256v-256zM0-64h256v256h-256v-256zM0 320h256v256h-256v-256zM384 320h256v256h-256v-256zM768 960v-256h256v256h-256zM384 704h256v256h-256v-256zM768 320h256v256h-256v-256zM768-64h256v256h-256v-256z" />
<glyph unicode="&#xe91a;" glyph-name="history" d="M554.667 934.4c-260.267 0-469.333-209.067-469.333-469.333h-85.333l136.533-209.067 140.8 209.067h-85.333c0 200.533 162.133 362.667 362.667 362.667s362.667-162.133 362.667-362.667-162.133-362.667-362.667-362.667c-98.133 0-192 42.667-251.733 106.667l-72.533-72.533c85.333-85.333 200.533-136.533 332.8-136.533 260.267 0 465.067 209.067 465.067 465.067s-217.6 469.333-473.6 469.333zM503.467 674.133v-260.267l221.867-132.267 34.133 64-179.2 106.667v221.867h-76.8z" /> <glyph unicode="&#xe91a;" glyph-name="history" d="M554.667 934.4c-260.267 0-469.333-209.067-469.333-469.333h-85.333l136.533-209.067 140.8 209.067h-85.333c0 200.533 162.133 362.667 362.667 362.667s362.667-162.133 362.667-362.667-162.133-362.667-362.667-362.667c-98.133 0-192 42.667-251.733 106.667l-72.533-72.533c85.333-85.333 200.533-136.533 332.8-136.533 260.267 0 465.067 209.067 465.067 465.067s-217.6 469.333-473.6 469.333zM503.467 674.133v-260.267l221.867-132.267 34.133 64-179.2 106.667v221.867h-76.8z" />
<glyph unicode="&#xe91b;" glyph-name="disabled" d="M98.133 174.933v17.067c0 76.8 81.067 128 179.2 162.133l-179.2-179.2zM247.467 42.667h678.4v149.333c0 110.933-183.467 179.2-328.533 200.533l-349.867-349.867zM686.933 763.733c-38.4 55.467-102.4 89.6-174.933 89.6-115.2 0-209.067-89.6-209.067-204.8 0-68.267 38.4-132.267 98.133-170.667l285.867 285.867zM0-4.267l59.733-59.733 964.267 964.267-59.733 59.733-964.267-964.267z" /> <glyph unicode="&#xe91b;" glyph-name="disabled" d="M98.133 174.933v17.067c0 76.8 81.067 128 179.2 162.133l-179.2-179.2zM247.467 42.667h678.4v149.333c0 110.933-183.467 179.2-328.533 200.533l-349.867-349.867zM686.933 763.733c-38.4 55.467-102.4 89.6-174.933 89.6-115.2 0-209.067-89.6-209.067-204.8 0-68.267 38.4-132.267 98.133-170.667l285.867 285.867zM0-4.267l59.733-59.733 964.267 964.267-59.733 59.733-964.267-964.267z" />
<glyph unicode="&#xe91c;" glyph-name="invoices" d="M878.933 857.6h-217.6c-25.6 59.733-81.067 102.4-149.333 102.4s-123.733-42.667-145.067-102.4h-221.867c-55.467 0-102.4-46.933-102.4-102.4v-716.8c0-55.467 46.933-102.4 102.4-102.4h729.6c55.467 0 102.4 46.933 102.4 102.4v716.8c4.267 55.467-42.667 102.4-98.133 102.4zM512 857.6c29.867 0 51.2-21.333 51.2-51.2s-25.6-51.2-51.2-51.2c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2zM597.333 413.867v-55.467h-183.467c0-8.533-4.267-17.067-4.267-29.867s0-17.067 4.267-29.867h183.467v-55.467h-162.133c29.867-59.733 93.867-98.133 162.133-98.133 46.933 0 89.6 17.067 119.467 42.667l51.2-51.2c-46.933-42.667-106.667-64-170.667-64-110.933 0-204.8 72.533-243.2 170.667h-98.133v55.467h85.333c0 8.533 0 17.067 0 29.867s0 17.067 0 29.867h-85.333v55.467h98.133c34.133 98.133 128 170.667 243.2 170.667 64 0 123.733-25.6 170.667-64l-51.2-51.2c-34.133 29.867-72.533 42.667-119.467 42.667-72.533 0-132.267-38.4-162.133-98.133h162.133z" /> <glyph unicode="&#xe91c;" glyph-name="invoices" d="M345.6 174.933h-89.6v102.4h81.067c4.267 34.133 8.533 68.267 21.333 102.4h-102.4v102.4h162.133c34.133 42.667 72.533 76.8 119.467 102.4h-281.6v102.4h520.533v-55.467c4.267 0 12.8 0 17.067 0 42.667 0 85.333-4.267 128-17.067v243.2c0 55.467-46.933 102.4-102.4 102.4h-622.933c-55.467 0-102.4-46.933-102.4-102.4v-819.2c0-55.467 46.933-102.4 102.4-102.4h302.933c-81.067 55.467-136.533 140.8-153.6 238.933zM942.933 119.467l85.333-81.067c-25.6-34.133-59.733-59.733-102.4-76.8s-85.333-25.6-136.533-25.6c-46.933 0-93.867 8.533-132.267 25.6s-76.8 42.667-106.667 72.533c-29.867 29.867-51.2 68.267-64 110.933h-93.867v68.267h81.067c0 4.267 0 12.8 0 21.333s0 17.067 0 21.333h-81.067v68.267h93.867c12.8 42.667 34.133 76.8 64 110.933 29.867 29.867 64 55.467 106.667 72.533s85.333 25.6 132.267 25.6c51.2 0 93.867-8.533 136.533-25.6s76.8-42.667 102.4-76.8l-85.333-81.067c-38.4 46.933-89.6 68.267-145.067 68.267-38.4 0-68.267-8.533-98.133-25.6s-51.2-38.4-68.267-68.267h209.067v-68.267h-230.4c0-4.267 0-12.8 0-21.333s0-17.067 0-21.333h230.4v-68.267h-209.067c17.067-29.867 38.4-51.2 68.267-68.267s59.733-25.6 98.133-25.6c55.467 0 102.4 21.333 145.067 68.267z" />
<glyph unicode="&#xe91d;" glyph-name="languaje" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512c281.6 0 512 230.4 512 512s-230.4 512-512 512zM866.133 652.8h-149.333c-17.067 64-38.4 123.733-72.533 183.467 93.867-34.133 174.933-98.133 221.867-183.467zM512 857.6c42.667-59.733 76.8-128 98.133-204.8h-196.267c21.333 72.533 55.467 140.8 98.133 204.8zM115.2 345.6c-8.533 34.133-12.8 68.267-12.8 102.4s4.267 68.267 12.8 102.4h174.933c-4.267-34.133-8.533-68.267-8.533-102.4s4.267-68.267 8.533-102.4h-174.933zM157.867 243.2h149.333c17.067-64 38.4-123.733 72.533-183.467-93.867 34.133-174.933 98.133-221.867 183.467zM307.2 652.8h-149.333c51.2 85.333 128 149.333 221.867 183.467-29.867-59.733-55.467-119.467-72.533-183.467zM512 38.4c-42.667 59.733-76.8 128-98.133 204.8h196.267c-21.333-72.533-55.467-140.8-98.133-204.8zM631.467 345.6h-238.933c-4.267 34.133-8.533 68.267-8.533 102.4s4.267 68.267 8.533 102.4h238.933c4.267-34.133 8.533-68.267 8.533-102.4s-4.267-68.267-8.533-102.4zM644.267 59.733c29.867 55.467 55.467 119.467 72.533 183.467h149.333c-46.933-85.333-128-149.333-221.867-183.467zM733.867 345.6c4.267 34.133 8.533 68.267 8.533 102.4s-4.267 68.267-8.533 102.4h174.933c8.533-34.133 12.8-68.267 12.8-102.4s-4.267-68.267-12.8-102.4h-174.933z" /> <glyph unicode="&#xe91d;" glyph-name="languaje" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512c281.6 0 512 230.4 512 512s-230.4 512-512 512zM866.133 652.8h-149.333c-17.067 64-38.4 123.733-72.533 183.467 93.867-34.133 174.933-98.133 221.867-183.467zM512 857.6c42.667-59.733 76.8-128 98.133-204.8h-196.267c21.333 72.533 55.467 140.8 98.133 204.8zM115.2 345.6c-8.533 34.133-12.8 68.267-12.8 102.4s4.267 68.267 12.8 102.4h174.933c-4.267-34.133-8.533-68.267-8.533-102.4s4.267-68.267 8.533-102.4h-174.933zM157.867 243.2h149.333c17.067-64 38.4-123.733 72.533-183.467-93.867 34.133-174.933 98.133-221.867 183.467zM307.2 652.8h-149.333c51.2 85.333 128 149.333 221.867 183.467-29.867-59.733-55.467-119.467-72.533-183.467zM512 38.4c-42.667 59.733-76.8 128-98.133 204.8h196.267c-21.333-72.533-55.467-140.8-98.133-204.8zM631.467 345.6h-238.933c-4.267 34.133-8.533 68.267-8.533 102.4s4.267 68.267 8.533 102.4h238.933c4.267-34.133 8.533-68.267 8.533-102.4s-4.267-68.267-8.533-102.4zM644.267 59.733c29.867 55.467 55.467 119.467 72.533 183.467h149.333c-46.933-85.333-128-149.333-221.867-183.467zM733.867 345.6c4.267 34.133 8.533 68.267 8.533 102.4s-4.267 68.267-8.533 102.4h174.933c8.533-34.133 12.8-68.267 12.8-102.4s-4.267-68.267-12.8-102.4h-174.933z" />
<glyph unicode="&#xe91e;" glyph-name="lines" d="M0 814.933h1024v-149.333h-1024v149.333zM0 524.8h1024v-149.333h-1024v149.333zM0 230.4h1024v-149.333h-1024v149.333z" /> <glyph unicode="&#xe91e;" glyph-name="lines" d="M0 814.933h1024v-149.333h-1024v149.333zM0 524.8h1024v-149.333h-1024v149.333zM0 230.4h1024v-149.333h-1024v149.333z" />
<glyph unicode="&#xe91f;" glyph-name="logout" d="M405.333 243.2l81.067-81.067 281.6 285.867-285.867 285.867-76.8-81.067 145.067-149.333h-550.4v-115.2h550.4l-145.067-145.067zM908.8 960h-793.6c-64 0-115.2-51.2-115.2-115.2v-226.133h115.2v226.133h797.867v-797.867h-797.867v230.4h-115.2v-226.133c0-64 51.2-115.2 115.2-115.2h797.867c64 0 115.2 51.2 115.2 115.2v793.6c-4.267 64-55.467 115.2-119.467 115.2z" /> <glyph unicode="&#xe91f;" glyph-name="logout" d="M405.333 243.2l81.067-81.067 281.6 285.867-285.867 285.867-76.8-81.067 145.067-149.333h-550.4v-115.2h550.4l-145.067-145.067zM908.8 960h-793.6c-64 0-115.2-51.2-115.2-115.2v-226.133h115.2v226.133h797.867v-797.867h-797.867v230.4h-115.2v-226.133c0-64 51.2-115.2 115.2-115.2h797.867c64 0 115.2 51.2 115.2 115.2v793.6c-4.267 64-55.467 115.2-119.467 115.2z" />
@ -76,7 +76,7 @@
<glyph unicode="&#xe942;" glyph-name="basket" d="M230.4 28.8l-19.2 326.4c0 19.2 12.8 35.2 32 38.4 19.2 0 35.2-12.8 38.4-32l16-323.2c0-19.2-12.8-35.2-32-38.4 0 0-3.2 0-3.2 0-16-3.2-32 12.8-32 28.8zM387.2 0c19.2 0 35.2 16 35.2 35.2v329.6c0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2v-329.6c0-22.4 16-35.2 35.2-35.2zM512 3.2c19.2 0 35.2 16 35.2 35.2v326.4c0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2v-326.4c0-19.2 16-35.2 35.2-35.2zM764.8 3.2c0 0 0 0 0 0 19.2 0 35.2 16 35.2 32 6.4 150.4 9.6 316.8 9.6 320 0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2c0-6.4-6.4-230.4-9.6-316.8 0-16 16-35.2 35.2-35.2zM636.8 3.2c19.2 0 35.2 16 35.2 35.2v326.4c0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2v-326.4c0-19.2 16-35.2 35.2-35.2zM1024 537.6v-80c0-19.2-16-35.2-35.2-35.2h-28.8l-64-470.4c-3.2-16-16-28.8-35.2-28.8h-697.6c-16 0-32 12.8-35.2 28.8l-64 473.6h-28.8c-19.2 0-35.2 16-35.2 35.2v80c0 19.2 16 35.2 35.2 35.2h172.8l140.8 291.2c-3.2 9.6-6.4 22.4-6.4 35.2 6.4 38.4 41.6 67.2 80 60.8s67.2-41.6 60.8-80c-6.4-38.4-41.6-67.2-80-60.8 0 0 0 0 0 0l-112-249.6h438.4l-112 249.6c0 0 0 0 0 0-38.4-6.4-73.6 22.4-80 60.8s22.4 73.6 60.8 80c38.4 6.4 73.6-22.4 80-60.8 3.2-12.8 0-25.6-6.4-35.2l140.8-291.2h172.8c22.4-3.2 38.4-19.2 38.4-38.4zM886.4 425.6h-748.8l54.4-435.2h640l54.4 435.2z" /> <glyph unicode="&#xe942;" glyph-name="basket" d="M230.4 28.8l-19.2 326.4c0 19.2 12.8 35.2 32 38.4 19.2 0 35.2-12.8 38.4-32l16-323.2c0-19.2-12.8-35.2-32-38.4 0 0-3.2 0-3.2 0-16-3.2-32 12.8-32 28.8zM387.2 0c19.2 0 35.2 16 35.2 35.2v329.6c0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2v-329.6c0-22.4 16-35.2 35.2-35.2zM512 3.2c19.2 0 35.2 16 35.2 35.2v326.4c0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2v-326.4c0-19.2 16-35.2 35.2-35.2zM764.8 3.2c0 0 0 0 0 0 19.2 0 35.2 16 35.2 32 6.4 150.4 9.6 316.8 9.6 320 0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2c0-6.4-6.4-230.4-9.6-316.8 0-16 16-35.2 35.2-35.2zM636.8 3.2c19.2 0 35.2 16 35.2 35.2v326.4c0 19.2-16 35.2-35.2 35.2s-35.2-16-35.2-35.2v-326.4c0-19.2 16-35.2 35.2-35.2zM1024 537.6v-80c0-19.2-16-35.2-35.2-35.2h-28.8l-64-470.4c-3.2-16-16-28.8-35.2-28.8h-697.6c-16 0-32 12.8-35.2 28.8l-64 473.6h-28.8c-19.2 0-35.2 16-35.2 35.2v80c0 19.2 16 35.2 35.2 35.2h172.8l140.8 291.2c-3.2 9.6-6.4 22.4-6.4 35.2 6.4 38.4 41.6 67.2 80 60.8s67.2-41.6 60.8-80c-6.4-38.4-41.6-67.2-80-60.8 0 0 0 0 0 0l-112-249.6h438.4l-112 249.6c0 0 0 0 0 0-38.4-6.4-73.6 22.4-80 60.8s22.4 73.6 60.8 80c38.4 6.4 73.6-22.4 80-60.8 3.2-12.8 0-25.6-6.4-35.2l140.8-291.2h172.8c22.4-3.2 38.4-19.2 38.4-38.4zM886.4 425.6h-748.8l54.4-435.2h640l54.4 435.2z" />
<glyph unicode="&#xe943;" glyph-name="worker" d="M297.6 505.6c-44.8 0-80-35.2-80-83.2s35.2-83.2 80-83.2 80 35.2 80 83.2-35.2 83.2-80 83.2zM297.6 320c-54.4 0-163.2-28.8-163.2-83.2v-60.8h326.4v60.8c0 54.4-108.8 83.2-163.2 83.2zM880 444.8h-316.8c-16 0-28.8 12.8-28.8 28.8s12.8 28.8 28.8 28.8h316.8c16 0 25.6-12.8 25.6-28.8s-12.8-28.8-25.6-28.8zM880 176h-316.8c-16 0-28.8 12.8-28.8 25.6s12.8 25.6 28.8 25.6h316.8c16 0 25.6-12.8 25.6-25.6s-12.8-25.6-25.6-25.6zM880 310.4h-316.8c-16 0-28.8 12.8-28.8 25.6s12.8 25.6 28.8 25.6h316.8c16 0 25.6-12.8 25.6-25.6s-12.8-25.6-25.6-25.6zM624 912v-236.8c0-25.6-22.4-48-48-48h-131.2c-25.6 0-48 22.4-48 48v236.8c0 25.6 22.4 48 48 48h131.2c28.8 0 48-22.4 48-48zM1024 665.6v-640c0-51.2-41.6-89.6-89.6-89.6h-844.8c-48 0-89.6 41.6-89.6 89.6v640c0 51.2 41.6 89.6 89.6 89.6h275.2v-54.4h-275.2c-19.2 0-35.2-16-35.2-35.2v-640c0-19.2 16-35.2 35.2-35.2h841.6c19.2 0 35.2 16 35.2 35.2v640c0 19.2-16 35.2-35.2 35.2h-275.2v54.4h275.2c51.2 0 92.8-38.4 92.8-89.6z" /> <glyph unicode="&#xe943;" glyph-name="worker" d="M297.6 505.6c-44.8 0-80-35.2-80-83.2s35.2-83.2 80-83.2 80 35.2 80 83.2-35.2 83.2-80 83.2zM297.6 320c-54.4 0-163.2-28.8-163.2-83.2v-60.8h326.4v60.8c0 54.4-108.8 83.2-163.2 83.2zM880 444.8h-316.8c-16 0-28.8 12.8-28.8 28.8s12.8 28.8 28.8 28.8h316.8c16 0 25.6-12.8 25.6-28.8s-12.8-28.8-25.6-28.8zM880 176h-316.8c-16 0-28.8 12.8-28.8 25.6s12.8 25.6 28.8 25.6h316.8c16 0 25.6-12.8 25.6-25.6s-12.8-25.6-25.6-25.6zM880 310.4h-316.8c-16 0-28.8 12.8-28.8 25.6s12.8 25.6 28.8 25.6h316.8c16 0 25.6-12.8 25.6-25.6s-12.8-25.6-25.6-25.6zM624 912v-236.8c0-25.6-22.4-48-48-48h-131.2c-25.6 0-48 22.4-48 48v236.8c0 25.6 22.4 48 48 48h131.2c28.8 0 48-22.4 48-48zM1024 665.6v-640c0-51.2-41.6-89.6-89.6-89.6h-844.8c-48 0-89.6 41.6-89.6 89.6v640c0 51.2 41.6 89.6 89.6 89.6h275.2v-54.4h-275.2c-19.2 0-35.2-16-35.2-35.2v-640c0-19.2 16-35.2 35.2-35.2h841.6c19.2 0 35.2 16 35.2 35.2v640c0 19.2-16 35.2-35.2 35.2h-275.2v54.4h275.2c51.2 0 92.8-38.4 92.8-89.6z" />
<glyph unicode="&#xe944;" glyph-name="columnadd" d="M0 960h256v-256h-256v256zM0 192h256v-256h-256v256zM0 576h256v-256h-256v256zM913.067 512v-132.267h-204.8v-204.8h-136.533v204.8h-204.8v132.267h204.8v204.8h136.533v-204.8z" /> <glyph unicode="&#xe944;" glyph-name="columnadd" d="M0 960h256v-256h-256v256zM0 192h256v-256h-256v256zM0 576h256v-256h-256v256zM913.067 512v-132.267h-204.8v-204.8h-136.533v204.8h-204.8v132.267h204.8v204.8h136.533v-204.8z" />
<glyph unicode="&#xe945;" glyph-name="linesplit" d="M686.933 174.933h-119.467l-268.8 273.067 268.8 273.067h119.467v-153.6l337.067 196.267-337.067 196.267v-153.6h-153.6l-290.133-294.4h-243.2v-128h243.2l290.133-294.4h153.6v-153.6l337.067 196.267-337.067 196.267z" /> <glyph unicode="&#xe945;" glyph-name="linesplit" d="M686.933 217.6h-119.467l-268.8 230.4 268.8 230.4h119.467v-153.6l337.067 196.267-337.067 238.933v-153.6h-153.6l-290.133-251.733h-243.2v-213.333h243.2l290.133-251.733h153.6v-153.6l337.067 238.933-337.067 196.267z" />
<glyph unicode="&#xe946;" glyph-name="linedelete" d="M354.133 192l-98.133 98.133 157.867 153.6-157.867 157.867 98.133 102.4 157.867-157.867 157.867 153.6 98.133-98.133-157.867-157.867 157.867-153.6-98.133-98.133-157.867 157.867-157.867-157.867zM780.8 507.733l-64-64 59.733-55.467h247.467v119.467h-243.2zM307.2 443.733l-64 64h-243.2v-119.467h251.733l55.467 55.467z" /> <glyph unicode="&#xe946;" glyph-name="linedelete" d="M354.133 192l-98.133 98.133 157.867 153.6-157.867 157.867 98.133 102.4 157.867-157.867 157.867 153.6 98.133-98.133-157.867-157.867 157.867-153.6-98.133-98.133-157.867 157.867-157.867-157.867zM780.8 507.733l-64-64 59.733-55.467h247.467v119.467h-243.2zM307.2 443.733l-64 64h-243.2v-119.467h251.733l55.467 55.467z" />
<glyph unicode="&#xe947;" glyph-name="exit" d="M405.333 243.2l81.067-81.067 281.6 285.867-285.867 285.867-76.8-81.067 145.067-149.333h-550.4v-115.2h550.4l-145.067-145.067zM908.8 960h-793.6c-64 0-115.2-51.2-115.2-115.2v-226.133h115.2v226.133h797.867v-797.867h-797.867v230.4h-115.2v-226.133c0-64 51.2-115.2 115.2-115.2h797.867c64 0 115.2 51.2 115.2 115.2v793.6c-4.267 64-55.467 115.2-119.467 115.2z" /> <glyph unicode="&#xe947;" glyph-name="exit" d="M405.333 243.2l81.067-81.067 281.6 285.867-285.867 285.867-76.8-81.067 145.067-149.333h-550.4v-115.2h550.4l-145.067-145.067zM908.8 960h-793.6c-64 0-115.2-51.2-115.2-115.2v-226.133h115.2v226.133h797.867v-797.867h-797.867v230.4h-115.2v-226.133c0-64 51.2-115.2 115.2-115.2h797.867c64 0 115.2 51.2 115.2 115.2v793.6c-4.267 64-55.467 115.2-119.467 115.2z" />
<glyph unicode="&#xe948;" glyph-name="apps" d="M0 704h256v256h-256v-256zM384-64h256v256h-256v-256zM0-64h256v256h-256v-256zM0 320h256v256h-256v-256zM384 320h256v256h-256v-256zM768 960v-256h256v256h-256zM384 704h256v256h-256v-256zM768 320h256v256h-256v-256zM768-64h256v256h-256v-256z" /> <glyph unicode="&#xe948;" glyph-name="apps" d="M0 704h256v256h-256v-256zM384-64h256v256h-256v-256zM0-64h256v256h-256v-256zM0 320h256v256h-256v-256zM384 320h256v256h-256v-256zM768 960v-256h256v256h-256zM384 704h256v256h-256v-256zM768 320h256v256h-256v-256zM768-64h256v256h-256v-256z" />
@ -86,5 +86,6 @@
<glyph unicode="&#xe94c;" glyph-name="revision" d="M358.4 140.8h-102.4v102.4h81.067c0 0 0 4.267 0 4.267 0 34.133 8.533 68.267 21.333 98.133h-102.4v102.4h170.667c51.2 51.2 123.733 85.333 200.533 102.4h-371.2v102.4h512v-93.867c76.8-8.533 149.333-34.133 204.8-72.533v268.8c0 55.467-46.933 102.4-102.4 102.4h-213.333c-21.333 59.733-76.8 102.4-145.067 102.4s-123.733-42.667-145.067-102.4h-213.333c-55.467 0-102.4-46.933-102.4-102.4v-716.8c0-55.467 46.933-102.4 102.4-102.4h546.133c-157.867 8.533-290.133 89.6-341.333 204.8zM512 857.6c29.867 0 51.2-21.333 51.2-51.2s-21.333-51.2-51.2-51.2-51.2 21.333-51.2 51.2c0 29.867 21.333 51.2 51.2 51.2zM721.067 452.267c-136.533 0-251.733-85.333-302.933-204.8 46.933-119.467 162.133-204.8 302.933-204.8s251.733 85.333 302.933 204.8c-46.933 119.467-162.133 204.8-302.933 204.8zM721.067 110.933c-76.8 0-136.533 59.733-136.533 136.533s64 136.533 136.533 136.533 136.533-64 136.533-136.533-59.733-136.533-136.533-136.533zM721.067 328.533c-46.933 0-81.067-38.4-81.067-81.067s38.4-81.067 81.067-81.067c46.933 0 81.067 38.4 81.067 81.067s-34.133 81.067-81.067 81.067z" /> <glyph unicode="&#xe94c;" glyph-name="revision" d="M358.4 140.8h-102.4v102.4h81.067c0 0 0 4.267 0 4.267 0 34.133 8.533 68.267 21.333 98.133h-102.4v102.4h170.667c51.2 51.2 123.733 85.333 200.533 102.4h-371.2v102.4h512v-93.867c76.8-8.533 149.333-34.133 204.8-72.533v268.8c0 55.467-46.933 102.4-102.4 102.4h-213.333c-21.333 59.733-76.8 102.4-145.067 102.4s-123.733-42.667-145.067-102.4h-213.333c-55.467 0-102.4-46.933-102.4-102.4v-716.8c0-55.467 46.933-102.4 102.4-102.4h546.133c-157.867 8.533-290.133 89.6-341.333 204.8zM512 857.6c29.867 0 51.2-21.333 51.2-51.2s-21.333-51.2-51.2-51.2-51.2 21.333-51.2 51.2c0 29.867 21.333 51.2 51.2 51.2zM721.067 452.267c-136.533 0-251.733-85.333-302.933-204.8 46.933-119.467 162.133-204.8 302.933-204.8s251.733 85.333 302.933 204.8c-46.933 119.467-162.133 204.8-302.933 204.8zM721.067 110.933c-76.8 0-136.533 59.733-136.533 136.533s64 136.533 136.533 136.533 136.533-64 136.533-136.533-59.733-136.533-136.533-136.533zM721.067 328.533c-46.933 0-81.067-38.4-81.067-81.067s38.4-81.067 81.067-81.067c46.933 0 81.067 38.4 81.067 81.067s-34.133 81.067-81.067 81.067z" />
<glyph unicode="&#xe94d;" glyph-name="services" d="M951.467 217.6c0 8.533 0 21.333 0 29.867s0 21.333-4.267 29.867l64 51.2c4.267 4.267 8.533 12.8 4.267 21.333l-64 106.667c-4.267 8.533-12.8 8.533-17.067 8.533l-76.8-29.867c-17.067 12.8-34.133 21.333-51.2 29.867l-12.8 81.067c0 8.533-8.533 12.8-17.067 12.8h-123.733c-8.533 0-12.8-4.267-17.067-12.8l-12.8-81.067c-17.067-8.533-38.4-17.067-51.2-29.867l-76.8 29.867c-8.533 4.267-17.067 0-17.067-8.533l-64-106.667c-4.267-8.533-4.267-17.067 4.267-21.333l64-51.2c0-8.533-4.267-21.333-4.267-29.867s0-21.333 4.267-29.867l-55.467-51.2c-4.267-4.267-8.533-12.8-4.267-21.333l64-106.667c4.267-8.533 12.8-8.533 17.067-8.533l76.8 29.867c17.067-12.8 34.133-21.333 51.2-29.867l12.8-81.067c0-8.533 8.533-12.8 17.067-12.8h123.733c8.533 0 12.8 4.267 17.067 12.8l12.8 81.067c17.067 8.533 38.4 17.067 51.2 29.867l76.8-29.867c8.533-4.267 17.067 0 17.067 8.533l64 106.667c4.267 8.533 4.267 17.067-4.267 21.333 0 0-68.267 51.2-68.267 51.2zM721.067 132.267c-64 0-115.2 51.2-115.2 115.2s51.2 115.2 115.2 115.2 115.2-51.2 115.2-115.2c0-64-51.2-115.2-115.2-115.2zM345.6 174.933h-89.6v102.4h81.067c4.267 34.133 8.533 68.267 21.333 102.4h-102.4v102.4h162.133c34.133 42.667 72.533 76.8 119.467 102.4h-281.6v102.4h520.533v-59.733c51.2-8.533 102.4-25.6 145.067-51.2v281.6c0 55.467-46.933 102.4-102.4 102.4h-622.933c-55.467 0-102.4-46.933-102.4-102.4v-819.2c0-55.467 46.933-102.4 102.4-102.4h302.933c-81.067 55.467-136.533 140.8-153.6 238.933z" /> <glyph unicode="&#xe94d;" glyph-name="services" d="M951.467 217.6c0 8.533 0 21.333 0 29.867s0 21.333-4.267 29.867l64 51.2c4.267 4.267 8.533 12.8 4.267 21.333l-64 106.667c-4.267 8.533-12.8 8.533-17.067 8.533l-76.8-29.867c-17.067 12.8-34.133 21.333-51.2 29.867l-12.8 81.067c0 8.533-8.533 12.8-17.067 12.8h-123.733c-8.533 0-12.8-4.267-17.067-12.8l-12.8-81.067c-17.067-8.533-38.4-17.067-51.2-29.867l-76.8 29.867c-8.533 4.267-17.067 0-17.067-8.533l-64-106.667c-4.267-8.533-4.267-17.067 4.267-21.333l64-51.2c0-8.533-4.267-21.333-4.267-29.867s0-21.333 4.267-29.867l-55.467-51.2c-4.267-4.267-8.533-12.8-4.267-21.333l64-106.667c4.267-8.533 12.8-8.533 17.067-8.533l76.8 29.867c17.067-12.8 34.133-21.333 51.2-29.867l12.8-81.067c0-8.533 8.533-12.8 17.067-12.8h123.733c8.533 0 12.8 4.267 17.067 12.8l12.8 81.067c17.067 8.533 38.4 17.067 51.2 29.867l76.8-29.867c8.533-4.267 17.067 0 17.067 8.533l64 106.667c4.267 8.533 4.267 17.067-4.267 21.333 0 0-68.267 51.2-68.267 51.2zM721.067 132.267c-64 0-115.2 51.2-115.2 115.2s51.2 115.2 115.2 115.2 115.2-51.2 115.2-115.2c0-64-51.2-115.2-115.2-115.2zM345.6 174.933h-89.6v102.4h81.067c4.267 34.133 8.533 68.267 21.333 102.4h-102.4v102.4h162.133c34.133 42.667 72.533 76.8 119.467 102.4h-281.6v102.4h520.533v-59.733c51.2-8.533 102.4-25.6 145.067-51.2v281.6c0 55.467-46.933 102.4-102.4 102.4h-622.933c-55.467 0-102.4-46.933-102.4-102.4v-819.2c0-55.467 46.933-102.4 102.4-102.4h302.933c-81.067 55.467-136.533 140.8-153.6 238.933z" />
<glyph unicode="&#xe94e;" glyph-name="pets" d="M1024 571.733c-4.267 46.933-25.6 81.067-55.467 110.933-34.133 29.867-72.533 42.667-110.933 38.4 0 0-4.267 0-4.267 0 0 8.533 0 17.067-4.267 29.867-8.533 51.2-29.867 98.133-68.267 128-25.6 21.333-51.2 34.133-72.533 38.4-29.867 4.267-59.733 0-76.8-4.267-42.667-8.533-81.067-34.133-110.933-72.533-21.333 25.6-42.667 46.933-68.267 64-64 38.4-140.8 29.867-196.267-21.333-25.6-21.333-42.667-46.933-51.2-81.067-12.8-29.867-17.067-59.733-17.067-93.867-8.533 0-17.067 0-25.6 0-42.667 0-81.067-17.067-110.933-46.933-29.867-34.133-42.667-76.8-46.933-98.133-4.267-12.8-4.267-25.6-4.267-42.667 4.267-55.467 25.6-110.933 59.733-157.867 29.867-38.4 68.267-64 110.933-76.8-4.267-12.8-8.533-21.333-8.533-34.133 0-4.267-4.267-8.533-4.267-17.067-12.8-42.667-25.6-98.133 4.267-162.133 29.867-59.733 89.6-102.4 157.867-106.667 4.267 0 12.8 0 17.067 0 46.933 0 85.333 17.067 119.467 29.867 4.267 0 8.533 4.267 12.8 4.267 17.067 4.267 34.133 12.8 51.2 12.8 8.533 0 17.067-4.267 34.133-12.8s42.667-21.333 68.267-25.6c29.867-4.267 64-4.267 93.867 0 38.4 8.533 68.267 21.333 89.6 38.4 59.733 46.933 68.267 128 51.2 187.733-8.533 25.6-21.333 55.467-34.133 85.333 29.867 4.267 55.467 12.8 76.8 29.867 81.067 51.2 110.933 128 119.467 187.733 4.267 12.8 4.267 51.2 4.267 68.267zM541.867 674.133c4.267 42.667 21.333 81.067 42.667 115.2 34.133 42.667 93.867 68.267 136.533 25.6 0 0 0 0 0 0 21.333-21.333 34.133-51.2 34.133-81.067 4.267-38.4 0-72.533-17.067-106.667-17.067-38.4-38.4-68.267-76.8-89.6-46.933-25.6-102.4-8.533-119.467 42.667-4.267 29.867-4.267 68.267 0 93.867zM277.333 776.533c8.533 17.067 17.067 34.133 34.133 46.933 29.867 29.867 64 34.133 102.4 8.533 51.2-29.867 81.067-85.333 85.333-145.067 4.267-51.2-12.8-115.2-64-145.067-17.067-4.267-34.133-8.533-51.2-4.267-21.333 4.267-38.4 17.067-51.2 29.867-55.467 46.933-76.8 140.8-55.467 209.067zM123.733 413.867c-34.133 46.933-55.467 110.933-34.133 170.667 12.8 25.6 34.133 42.667 64 46.933 25.6 4.267 51.2-8.533 72.533-25.6 8.533-4.267 12.8-12.8 17.067-17.067 17.067-21.333 29.867-46.933 34.133-72.533 8.533-29.867 12.8-59.733 8.533-85.333-4.267-34.133-29.867-64-64-68.267-38.4-4.267-76.8 21.333-98.133 51.2zM755.2 76.8c-29.867-25.6-81.067-29.867-115.2-21.333-42.667 8.533-72.533 38.4-115.2 42.667-29.867 0-55.467-8.533-85.333-17.067-38.4-12.8-76.8-34.133-115.2-29.867-25.6 0-55.467 12.8-72.533 34.133-42.667 42.667-29.867 110.933-8.533 162.133 17.067 55.467 55.467 102.4 98.133 140.8 17.067 17.067 38.4 34.133 64 42.667 25.6 12.8 55.467 17.067 85.333 17.067 34.133 0 68.267 0 98.133-12.8s55.467-29.867 72.533-55.467c21.333-25.6 42.667-51.2 59.733-81.067 17.067-25.6 34.133-55.467 46.933-85.333 17.067-34.133 21.333-76.8 4.267-110.933 0-12.8-8.533-21.333-17.067-25.6zM942.933 516.267c-8.533-55.467-34.133-106.667-81.067-136.533-17.067-12.8-38.4-17.067-64-17.067-42.667 0-72.533 34.133-81.067 72.533-17.067 76.8 59.733 200.533 140.8 204.8 21.333 0 38.4-4.267 51.2-21.333 21.333-17.067 29.867-42.667 34.133-68.267 0 4.267 4.267-8.533 0-34.133z" /> <glyph unicode="&#xe94e;" glyph-name="pets" d="M1024 571.733c-4.267 46.933-25.6 81.067-55.467 110.933-34.133 29.867-72.533 42.667-110.933 38.4 0 0-4.267 0-4.267 0 0 8.533 0 17.067-4.267 29.867-8.533 51.2-29.867 98.133-68.267 128-25.6 21.333-51.2 34.133-72.533 38.4-29.867 4.267-59.733 0-76.8-4.267-42.667-8.533-81.067-34.133-110.933-72.533-21.333 25.6-42.667 46.933-68.267 64-64 38.4-140.8 29.867-196.267-21.333-25.6-21.333-42.667-46.933-51.2-81.067-12.8-29.867-17.067-59.733-17.067-93.867-8.533 0-17.067 0-25.6 0-42.667 0-81.067-17.067-110.933-46.933-29.867-34.133-42.667-76.8-46.933-98.133-4.267-12.8-4.267-25.6-4.267-42.667 4.267-55.467 25.6-110.933 59.733-157.867 29.867-38.4 68.267-64 110.933-76.8-4.267-12.8-8.533-21.333-8.533-34.133 0-4.267-4.267-8.533-4.267-17.067-12.8-42.667-25.6-98.133 4.267-162.133 29.867-59.733 89.6-102.4 157.867-106.667 4.267 0 12.8 0 17.067 0 46.933 0 85.333 17.067 119.467 29.867 4.267 0 8.533 4.267 12.8 4.267 17.067 4.267 34.133 12.8 51.2 12.8 8.533 0 17.067-4.267 34.133-12.8s42.667-21.333 68.267-25.6c29.867-4.267 64-4.267 93.867 0 38.4 8.533 68.267 21.333 89.6 38.4 59.733 46.933 68.267 128 51.2 187.733-8.533 25.6-21.333 55.467-34.133 85.333 29.867 4.267 55.467 12.8 76.8 29.867 81.067 51.2 110.933 128 119.467 187.733 4.267 12.8 4.267 51.2 4.267 68.267zM541.867 674.133c4.267 42.667 21.333 81.067 42.667 115.2 34.133 42.667 93.867 68.267 136.533 25.6 0 0 0 0 0 0 21.333-21.333 34.133-51.2 34.133-81.067 4.267-38.4 0-72.533-17.067-106.667-17.067-38.4-38.4-68.267-76.8-89.6-46.933-25.6-102.4-8.533-119.467 42.667-4.267 29.867-4.267 68.267 0 93.867zM277.333 776.533c8.533 17.067 17.067 34.133 34.133 46.933 29.867 29.867 64 34.133 102.4 8.533 51.2-29.867 81.067-85.333 85.333-145.067 4.267-51.2-12.8-115.2-64-145.067-17.067-4.267-34.133-8.533-51.2-4.267-21.333 4.267-38.4 17.067-51.2 29.867-55.467 46.933-76.8 140.8-55.467 209.067zM123.733 413.867c-34.133 46.933-55.467 110.933-34.133 170.667 12.8 25.6 34.133 42.667 64 46.933 25.6 4.267 51.2-8.533 72.533-25.6 8.533-4.267 12.8-12.8 17.067-17.067 17.067-21.333 29.867-46.933 34.133-72.533 8.533-29.867 12.8-59.733 8.533-85.333-4.267-34.133-29.867-64-64-68.267-38.4-4.267-76.8 21.333-98.133 51.2zM755.2 76.8c-29.867-25.6-81.067-29.867-115.2-21.333-42.667 8.533-72.533 38.4-115.2 42.667-29.867 0-55.467-8.533-85.333-17.067-38.4-12.8-76.8-34.133-115.2-29.867-25.6 0-55.467 12.8-72.533 34.133-42.667 42.667-29.867 110.933-8.533 162.133 17.067 55.467 55.467 102.4 98.133 140.8 17.067 17.067 38.4 34.133 64 42.667 25.6 12.8 55.467 17.067 85.333 17.067 34.133 0 68.267 0 98.133-12.8s55.467-29.867 72.533-55.467c21.333-25.6 42.667-51.2 59.733-81.067 17.067-25.6 34.133-55.467 46.933-85.333 17.067-34.133 21.333-76.8 4.267-110.933 0-12.8-8.533-21.333-17.067-25.6zM942.933 516.267c-8.533-55.467-34.133-106.667-81.067-136.533-17.067-12.8-38.4-17.067-64-17.067-42.667 0-72.533 34.133-81.067 72.533-17.067 76.8 59.733 200.533 140.8 204.8 21.333 0 38.4-4.267 51.2-21.333 21.333-17.067 29.867-42.667 34.133-68.267 0 4.267 4.267-8.533 0-34.133z" />
<glyph unicode="&#xe94f;" glyph-name="unavailable" d="M469.333 524.8v366.933h-136.533v-499.2zM290.133 345.6v546.133h-42.667v-588.8zM776.533 832v59.733h-42.667v-102.4zM644.267 699.733v192h-89.6c0 0 0-145.067 0-277.333l89.6 85.333zM866.133 682.667v-42.667c34.133-17.067 64-42.667 89.6-68.267v200.533l-89.6-89.6zM776.533 593.067l-64-64c8.533 0 17.067 4.267 25.6 4.267 85.333 0 149.333-68.267 149.333-149.333 0-85.333-68.267-149.333-149.333-149.333s-149.333 68.267-149.333 149.333c0 8.533 0 17.067 0 25.6l-68.267-68.267c8.533-38.4 21.333-72.533 46.933-102.4l-12.8-12.8h-25.6l-166.4-170.667 51.2-51.2 166.4 170.667v25.6l8.533 12.8c38.4-34.133 89.6-51.2 145.067-51.2 123.733 0 217.6 98.133 217.6 217.6 0 106.667-76.8 192-174.933 213.333zM157.867 213.333v678.4h-89.6v-733.867h29.867zM460.8 273.067l-119.467-115.2h21.333l102.4 102.4c-4.267 4.267-4.267 8.533-4.267 12.8zM964.267 960l59.733-59.733-964.267-964.267-59.733 59.733 964.267 964.267z" /> <glyph unicode="&#xe94f;" glyph-name="calendar" d="M883.2 866.133h-46.933v93.867h-93.867v-93.867h-465.067v93.867h-89.6v-93.867h-46.933c-51.2 0-93.867-42.667-93.867-93.867v-746.667c0-51.2 42.667-93.867 93.867-93.867h746.667c51.2 0 93.867 42.667 93.867 93.867v746.667c-4.267 51.2-46.933 93.867-98.133 93.867zM883.2 29.867h-742.4v605.867h746.667v-605.867z" />
<glyph unicode="&#xe950;" glyph-name="pbx" d="M512 960c-230.4 0-418.133-187.733-418.133-418.133v-324.267c0-76.8 64-140.8 140.8-140.8h140.8v371.2h-187.733v93.867c0 179.2 145.067 324.267 324.267 324.267s324.267-145.067 324.267-324.267v-93.867h-187.733v-371.2h187.733v-46.933h-324.267v-93.867h277.333c76.8 0 140.8 64 140.8 140.8v465.067c0 230.4-187.733 418.133-418.133 418.133z" />
</font></defs></svg> </font></defs></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 75 KiB

BIN
front/core/styles/salixfont.ttf
View File

Binary file not shown.

BIN
front/core/styles/salixfont.woff
View File

Binary file not shown.

2
modules/client/back/methods/client/specs/getCard.spec.js
View File

@ -7,6 +7,6 @@ describe('Client get', () => {
expect(result.id).toEqual(101); expect(result.id).toEqual(101);
expect(result.name).toEqual('Bruce Wayne'); expect(result.name).toEqual('Bruce Wayne');
expect(result.debt).toEqual(595.81); expect(result.debt).toEqual(598.45);
}); });
}); });

2
modules/client/back/methods/client/specs/summary.spec.js
View File

@ -17,7 +17,7 @@ describe('client summary()', () => {
it('should return a summary object containing debt', async() => { it('should return a summary object containing debt', async() => {
let result = await app.models.Client.summary(101); let result = await app.models.Client.summary(101);
expect(result.debt.debt).toEqual(595.81); expect(result.debt.debt).toEqual(598.45);
}); });
it('should return a summary object containing averageInvoiced', async() => { it('should return a summary object containing averageInvoiced', async() => {

2
modules/order/back/methods/order/specs/getTotalVolume.spec.js
View File

@ -5,6 +5,6 @@ describe('order getTotalVolume()', () => {
let result = await app.models.Order.getTotalVolume(1); let result = await app.models.Order.getTotalVolume(1);
expect(result.totalVolume).toEqual(0.066); expect(result.totalVolume).toEqual(0.066);
expect(result.totalBoxes).toBeFalsy(); expect(result.totalBoxes).toEqual(0.5);
}); });
}); });

8
modules/route/back/model-config.json Normal file
View File

@ -0,0 +1,8 @@
{
"Route": {
"dataSource": "vn"
},
"Vehicle": {
"dataSource": "vn"
}
}

69
modules/route/back/models/route.json Normal file
View File

@ -0,0 +1,69 @@
{
"name": "Route",
"base": "VnModel",
"options": {
"mysql": {
"table": "route"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"created": {
"type": "date"
},
"time": {
"type": "date"
},
"isOk": {
"type": "Number"
},
"kmStart": {
"type": "Number"
},
"kmEnd": {
"type": "Number"
},
"started": {
"type": "date"
},
"finished": {
"type": "date"
},
"gestdoc": {
"type": "date",
"mysql": {
"columnName": "gestdocFk"
}
},
"cost": {
"type": "Number"
},
"m3": {
"type": "Number"
},
"description": {
"type": "String"
}
},
"relations": {
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
},
"vehicle": {
"type": "belongsTo",
"model": "Vehicle",
"foreignKey": "vehicleFk"
},
"agencyMode": {
"type": "belongsTo",
"model": "AgencyMode",
"foreignKey": "agencyModeFk"
}
}
}

54
modules/route/back/models/vehicle.json Normal file
View File

@ -0,0 +1,54 @@
{
"name": "Vehicle",
"base": "VnModel",
"options": {
"mysql": {
"table": "vehicle"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"numberPlate": {
"type": "String"
},
"tradeMark": {
"type": "String"
},
"model": {
"type": "String"
},
"m3": {
"type": "Number"
},
"description": {
"type": "String"
},
"isActive": {
"type": "Number"
}
},
"relations": {
"company": {
"type": "belongsTo",
"model": "Company",
"foreignKey": "companyFk"
},
"warehouse": {
"type": "belongsTo",
"model": "Warehouse",
"foreignKey": "warehouseFk"
}
},
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
}

3
modules/ticket/back/methods/sale/priceDifference.js
View File

@ -59,6 +59,9 @@ module.exports = Self => {
salesObj.totalUnitPrice += sale.price; salesObj.totalUnitPrice += sale.price;
salesObj.totalNewPrice += sale.component.newPrice; salesObj.totalNewPrice += sale.component.newPrice;
salesObj.totalDifference += sale.component.difference; salesObj.totalDifference += sale.component.difference;
salesObj.totalUnitPrice = Math.round(salesObj.totalUnitPrice * 100) / 100;
salesObj.totalNewPrice = Math.round(salesObj.totalNewPrice * 100) / 100;
salesObj.totalDifference = Math.round(salesObj.totalDifference * 100) / 100;
}); });
return salesObj; return salesObj;

4
modules/ticket/back/methods/sale/specs/priceDifference.spec.js
View File

@ -11,7 +11,7 @@ describe('sale priceDifference()', () => {
let result = await app.models.Sale.priceDifference(1, data); let result = await app.models.Sale.priceDifference(1, data);
expect(result.totalUnitPrice).toEqual(22.33); expect(result.totalUnitPrice).toEqual(22.33);
expect(result.totalNewPrice).toEqual(22.29); expect(result.totalNewPrice).toEqual(22.27);
expect(result.totalDifference).toEqual(0.8); expect(result.totalDifference).toEqual(0.87);
}); });
}); });