Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto

back/methods/image/download.js

@@ -74,10 +74,13 @@ module.exports = Self => {
         const container = await models.ImageContainer.getContainer(collection);
         const rootPath = container.client.root;
         const fileSrc = path.join(rootPath, collection, size);
+
+        const ext = image.name.substring((image.name.length - 4));
+        const fileName = ext !== '.png' ? `${image.name}.png` : image.name;
         const file = {
-            path: `${fileSrc}/${image.name}.png`,
+            path: `${fileSrc}/${fileName}`,
             contentType: 'image/png',
-            name: `${image.name}.png`
+            name: image.name
         };
 
         if (!fs.existsSync(file.path)) return [];

back/methods/image/upload.js

@@ -1,6 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 const fs = require('fs-extra');
 const path = require('path');
+const uuid = require('uuid');
 
 module.exports = Self => {
     Self.remoteMethodCtx('upload', {
@@ -18,12 +19,6 @@ module.exports = Self => {
                 type: 'string',
                 description: 'The collection name',
                 required: true
-            },
-            {
-                arg: 'fileName',
-                type: 'string',
-                description: 'The file name',
-                required: true
             }],
         returns: {
             type: 'Object',
@@ -56,10 +51,12 @@ module.exports = Self => {
             const [uploadedFile] = Object.values(uploaded.files).map(file => {
                 return file[0];
             });
+
             const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
             srcFile = path.join(file.client.root, file.container, file.name);
 
-            await models.Image.registerImage(args.collection, srcFile, args.fileName, args.id);
+            const fileName = `${uuid.v4()}.png`;
+            await models.Image.registerImage(args.collection, srcFile, fileName, args.id);
         } catch (e) {
             if (fs.existsSync(srcFile))
                 await fs.unlink(srcFile);

back/models/image.js

@@ -84,9 +84,8 @@ module.exports = Self => {
             const container = await models.ImageContainer.container(collectionName);
             const rootPath = container.client.root;
             const collectionDir = path.join(rootPath, collectionName);
-            const file = `${fileName}.png`;
             const dstDir = path.join(collectionDir, 'full');
-            const dstFile = path.join(dstDir, file);
+            const dstFile = path.join(dstDir, fileName);
 
             const buffer = readChunk.sync(srcFilePath, 0, 12);
             const type = imageType(buffer);
@@ -102,7 +101,8 @@ module.exports = Self => {
                         width: bmpData.width,
                         height: bmpData.height,
                         channels: 4
-                    }
+                    },
+                    failOn: 'none'
                 };
             }
 
@@ -120,7 +120,7 @@ module.exports = Self => {
             const sizes = collection.sizes();
             for (let size of sizes) {
                 const dstDir = path.join(collectionDir, `${size.width}x${size.height}`);
-                const dstFile = path.join(dstDir, file);
+                const dstFile = path.join(dstDir, fileName);
                 const resizeOpts = {
                     withoutEnlargement: true,
                     fit: size.crop ? 'cover' : 'inside'

db/dump/fixtures.sql

@@ -228,13 +228,13 @@ INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`)
         (128,  1, 'The Best Bank', 'BBKKESMMMMMM'),
         (2100, 1, 'Caixa Bank',    'CAIXESBB');
 
-INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`)
+INSERT INTO `vn`.`accounting`(`id`, `bank`, `account`, `accountingTypeFk`, `entityFk`, `isActive`, `currencyFk`, `code`)
     VALUES
-        (1,     'Pay on receipt',           '5720000001', 3, 128,     1, 1),
-        (2,     'Cash',                     '5700000001', 2, 128,     1, 1),
-        (3,     'Compensation',             '4000000000', 8, 128,     1, 1),
-        (4,     'Transfers',                '4000000001', 1, 128,     1, 1),
-        (3117,  'Caixa Rural d''Algemesi',  '5720000000', 8, 2100,  1, 1);
+        (1,     'Pay on receipt',           '5720000001', 3, 128,     1, 1, 'payOnReceipt'),
+        (2,     'Cash',                     '5700000001', 2, 128,     1, 1, 'cash'),
+        (3,     'Compensation',             '4000000000', 8, 128,     1, 1, 'compensation'),
+        (4,     'Transfers',                '4000000001', 1, 128,     1, 1, 'transfers'),
+        (3117,  'Caixa Rural d''Algemesi',  '5720000000', 8, 2100,  1, 1, 'cra');
 
 INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
     VALUES
@@ -359,8 +359,8 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
         (1108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
         (1109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
         (1110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
-        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, NULL),
-        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, NULL);
+        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
+        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -736,7 +736,7 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des
         (12, 11, 3, 'Delivery after 10am');
 
 -- FIX for state hours on local, inter_afterInsert
-UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
+-- UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
 
 INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`)
     VALUES
@@ -1019,16 +1019,11 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE()),
         (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
         (39, 1, 32,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
 
-INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
-    VALUES
-        (1, 0),
-        (2, 1);
-
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
         (1,     28, 50),
@@ -1177,18 +1172,13 @@ INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `cr
         ('1', '7', '1', util.VN_CURDATE(), '1106'),
         ('2', '8', '5', util.VN_CURDATE(), '1106');
 
-INSERT INTO `vncontrol`.`accion`(`accion_id`, `accion`)
+INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `id`, `stateFk`)
     VALUES
-        (3,	'ACTION ONE'),
-        (4,	'ACTIOn TWO');
-
-INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `actionFk`, `id`, `stateFk`)
-    VALUES
-        (1,     0,  util.VN_CURDATE(), 5,  55, 3, 1, 14),
-        (1,     1,  util.VN_CURDATE(), 5,  54, 3, 2, 8),
-        (2,     1,  util.VN_CURDATE(), 10, 40, 4, 3, 8),
-        (3,     1,  util.VN_CURDATE(), 2,  40, 4, 4, 8),
-        (31,    1,  util.VN_CURDATE(), -5,  40, 4, 5, 8);
+        (1,     0,  util.VN_CURDATE(), 5,  55, 1, 14),
+        (1,     1,  util.VN_CURDATE(), 5,  54, 2, 8),
+        (2,     1,  util.VN_CURDATE(), 10, 40, 3, 8),
+        (3,     1,  util.VN_CURDATE(), 2,  40, 4, 8),
+        (31,    1,  util.VN_CURDATE(), -5,  40, 5, 8);
 
 INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`)
     VALUES
@@ -1375,7 +1365,7 @@ INSERT INTO `vn`.`recovery`(`id`, `clientFk`, `started`, `finished`, `amount`, `
         (3, 1102, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(),INTERVAL 1 MONTH), 50, 7),
         (4, 1103, util.VN_CURDATE(), NULL, 50, 7);
 
-INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
+INSERT INTO `bs`.`clientAnnualConsumption`(`clientFk`, `invoiced`)
     VALUES
         (1101, 1500),
         (1102, 100),
@@ -1949,7 +1939,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
     ENGINE = MEMORY
-    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)) as ended, '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-24') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`
 			WHERE `w`.`id` = 1109;
 
@@ -1985,28 +1975,24 @@ INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 900.50
     WHERE b.id = 1;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 1263.03
     WHERE b.id = 1106;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 2000
     WHERE b.id = 1107;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 1500
     WHERE b.id = 1108;
@@ -2020,7 +2006,7 @@ INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlement
         (20, 'Furlough',            '#97B92F', 'furlough',      1,      1),
         (21, 'Furlough half day',   '#778899', 'halfFurlough',  0.5,    1);
 
-INSERT INTO `postgresql`.`calendar_employee` (`businessFk`, `calendar_state_id`, `date`)
+INSERT INTO `vn`.`calendar` (`businessFk`, `dayOffTypeFk`, `dated`)
     VALUES
         (1,    6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
         (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
@@ -2491,6 +2477,10 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
         (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 1, 442, 1),
         (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
 
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`)
+    VALUES
+        (1, -2, '2% retention', 2);
+
 INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
     VALUES
         (1, util.VN_CURDATE(), 1, 336.99),
@@ -2730,7 +2720,7 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
     VALUES
         (1, 1109),
         (1, 1110),
-        (3, 1109),
+        (2, 1109),
 	    (1,9),
         (1,3);
 
@@ -2784,10 +2774,6 @@ INSERT INTO `vn`.`profileType` (`id`, `name`)
     VALUES
         (1, 'working');
 
-INSERT INTO `vn`.`newWorkerConfig` (`id`, `street`, `provinceFk`, `companyFk`, `profileTypeFk`, `roleFk`)
-    VALUES
-        (1, 'S/ ', 1, 442, 1, 1);
-
 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'dev', 'http://localhost:8080/#/'),

db/export-structure.sh

@@ -13,7 +13,6 @@ SCHEMAS=(
     stock
     util
     vn
-    vncontrol
 )
 
 IGNORETABLES=(

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -197,6 +197,7 @@ describe('Ticket Edit sale path', () => {
     });
 
     it('should check in the history that logs has been added', async() => {
+        await page.reload({waitUntil: ['networkidle0', 'domcontentloaded']});
         await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
         await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
         const result = await page.countElement(selectors.ticketSales.firstSaleHistory);

e2e/paths/05-ticket/18_index_payout.spec.js

@@ -63,6 +63,6 @@ describe('Ticket index payout path', () => {
         const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
 
         expect(count).toEqual(4);
-        expect(reference).toContain('Cash,Albaran: 7, 8Payment');
+        expect(reference).toContain('Cash, Albaran: 7, 8Payment');
     });
 });

e2e/paths/10-travel/03_descriptor.spec.js

@@ -113,15 +113,6 @@ describe('Travel descriptor path', () => {
         expect(message.text).toContain('Data saved!');
     });
 
-    it('should atempt to clone the travel and its entries using the descriptor menu but receive an error', async() => {
-        await page.waitToClick(selectors.travelDescriptor.dotMenu);
-        await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
-        await page.waitToClick(selectors.travelDescriptor.acceptClonation);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Unable to clone this travel');
-    });
-
     it('should update the landed date to a future date to enable cloneWithEntries', async() => {
         const nextMonth = Date.vnNew();
         nextMonth.setMonth(nextMonth.getMonth() + 1);

front/core/styles/icons/salixfont.css

@@ -32,6 +32,9 @@
 .icon-100:before {
   content: "\e95a";
 }
+.icon-clientUnpaid:before {
+  content: "\e95b";
+}
 .icon-history:before {
   content: "\e968";
 }
@@ -337,6 +340,9 @@
 .icon-solunion:before {
   content: "\e94e";
 }
+.icon-stowaway:before {
+  content: "\e94f";
+}
 .icon-splitline:before {
   content: "\e93e";
 }

front/core/styles/icons/salixfont.svg

@@ -82,9 +82,11 @@
 <glyph unicode="&#xe948;" glyph-name="linesprepaired" d="M870.4 857.6h-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.4h716.8c55.467 0 102.4 46.933 102.4 102.4v716.8c0 55.467-46.933 102.4-102.4 102.4zM512 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.2 21.333 51.2 51.2 51.2zM614.4 140.8h-358.4v102.4h358.4v-102.4zM768 345.6h-512v102.4h512v-102.4zM768 550.4h-512v102.4h512v-102.4z" />
 <glyph unicode="&#xe949;" glyph-name="control" d="M418.133 315.733l-128-123.733 256-256 469.333 469.333-128 128-341.333-341.333zM546.133 311.467l34.133 34.133h-68.267zM230.4 128l-59.733 64 153.6 153.6h-68.267v102.4h426.667l204.8 204.8 85.333-85.333v187.733c0 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.4h273.067l-196.267 192zM512 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.2zM256 652.8h512v-102.4h-512v102.4zM665.6-64h204.8c55.467 0 102.4 46.933 102.4 102.4v204.8l-307.2-307.2z" />
 <glyph unicode="&#xe94a;" 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="&#xe94b;" glyph-name="deaulter" d="M677.973-64c-30.72 35.84-61.867 70.827-91.307 107.52-40.96 51.2-80.64 103.253-121.173 154.88-16.64 21.333-21.76 20.48-30.72-4.693-13.227-36.693-25.6-73.387-40.107-109.653-5.12-12.8-13.227-26.88-24.32-34.56-51.627-34.987-104.107-69.12-157.867-100.693-10.667-6.4-30.72-5.547-41.813 0.853-8.107 4.693-12.373 23.893-11.093 35.84 0.853 8.96 11.093 19.627 19.627 25.6 39.253 26.453 78.933 51.627 119.040 76.8 18.347 11.52 30.293 26.027 35.84 47.787 12.373 48.213 27.307 95.573 39.253 143.36 8.533 33.707 26.88 58.88 56.32 77.227 40.533 25.173 80.64 52.053 120.747 78.507 6.4 4.267 10.24 11.52 15.36 17.493-7.253 2.56-14.933 7.253-22.187 6.827-75.52-6.4-151.467-13.227-226.987-20.48-2.133 0-4.693-0.853-6.827-0.853-22.613-1.707-39.253 10.24-40.96 29.867s12.373 33.707 35.413 35.84c45.227 4.267 90.88 8.96 136.107 12.8 65.707 5.547 131.84 10.667 197.547 15.36 26.027 1.707 53.76-21.76 67.413-55.467 9.813-23.893 5.12-46.080-18.347-65.28-49.92-40.107-100.693-78.933-151.040-118.187-23.040-17.92-23.893-23.467-6.4-46.507 58.453-78.080 116.48-156.587 174.933-234.667 27.307-36.693 25.173-50.773-12.373-75.52-5.12 0-9.813 0-14.080 0zM791.893 649.813c-43.093 1.28-76.373-31.573-77.227-75.52-0.853-44.373 29.44-76.8 72.107-77.653 45.227-1.28 77.653 29.44 78.080 73.813 0.427 45.227-29.44 78.080-72.96 79.36zM671.147 737.707c0-72.107-34.133-136.107-87.467-176.64l-235.52-21.76c-72.107 36.693-122.027 111.787-122.027 198.4 0 122.88 99.84 222.293 222.72 222.293 122.453 0 222.293-99.413 222.293-222.293zM592.213 680.533l-50.347 18.347c-2.133-8.533-5.12-16.213-9.813-22.613-5.12-6.4-10.24-11.947-16.213-17.067-5.973-4.267-12.373-8.107-19.2-11.093s-13.653-4.693-20.053-5.547c-17.92-2.987-33.707-0.427-48.64 6.827s-26.88 18.347-36.693 32.853l76.373 12.373 7.253 32.427-97.28-15.787c-1.28 5.547-2.987 11.093-3.84 16.64l-0.853 4.267 99.413 16.213 7.253 32.427-106.667-17.493c0.853 9.387 2.987 17.493 6.4 26.027 3.84 8.533 8.107 16.213 14.080 23.040 5.547 6.827 12.8 12.373 21.333 17.067s17.92 8.107 28.587 9.813c6.827 1.28 13.227 1.707 20.907 1.28s14.507-1.707 21.333-3.84c6.827-2.133 13.653-5.973 20.053-10.24 5.973-4.693 11.947-11.093 17.493-18.773l38.827 37.973c-13.227 17.92-30.293 31.147-52.053 39.253-21.76 8.533-46.080 10.667-73.387 6.4-19.627-2.987-36.267-9.387-51.2-17.92-14.507-8.533-26.88-19.2-37.547-32-10.667-12.373-18.773-26.027-23.893-40.96-5.547-14.507-8.96-29.867-9.813-45.653l-21.76-3.84-7.253-32.427 29.013 4.693 0.427-2.987c1.28-6.827 2.56-12.8 4.267-18.347l-23.467-3.84-8.107-32.427 43.52 7.253c6.827-13.653 15.787-26.027 26.027-36.693 10.24-11.52 22.187-20.48 35.413-27.733 13.227-7.68 27.307-12.8 42.667-15.787s31.573-3.413 47.36-0.853c12.373 2.133 24.32 5.12 35.84 10.667s22.613 11.52 32.853 19.2c10.24 8.107 18.347 16.64 26.027 26.453 6.827 9.387 12.373 20.48 15.36 32.427z" />
+<glyph unicode="&#xe94b;" glyph-name="defaulter" d="M677.973-64c-30.72 35.84-61.867 70.827-91.307 107.52-40.96 51.2-80.64 103.253-121.173 154.88-16.64 21.333-21.76 20.48-30.72-4.693-13.227-36.693-25.6-73.387-40.107-109.653-5.12-12.8-13.227-26.88-24.32-34.56-51.627-34.987-104.107-69.12-157.867-100.693-10.667-6.4-30.72-5.547-41.813 0.853-8.107 4.693-12.373 23.893-11.093 35.84 0.853 8.96 11.093 19.627 19.627 25.6 39.253 26.453 78.933 51.627 119.040 76.8 18.347 11.52 30.293 26.027 35.84 47.787 12.373 48.213 27.307 95.573 39.253 143.36 8.533 33.707 26.88 58.88 56.32 77.227 40.533 25.173 80.64 52.053 120.747 78.507 6.4 4.267 10.24 11.52 15.36 17.493-7.253 2.56-14.933 7.253-22.187 6.827-75.52-6.4-151.467-13.227-226.987-20.48-2.133 0-4.693-0.853-6.827-0.853-22.613-1.707-39.253 10.24-40.96 29.867s12.373 33.707 35.413 35.84c45.227 4.267 90.88 8.96 136.107 12.8 65.707 5.547 131.84 10.667 197.547 15.36 26.027 1.707 53.76-21.76 67.413-55.467 9.813-23.893 5.12-46.080-18.347-65.28-49.92-40.107-100.693-78.933-151.040-118.187-23.040-17.92-23.893-23.467-6.4-46.507 58.453-78.080 116.48-156.587 174.933-234.667 27.307-36.693 25.173-50.773-12.373-75.52-5.12 0-9.813 0-14.080 0zM791.893 649.813c-43.093 1.28-76.373-31.573-77.227-75.52-0.853-44.373 29.44-76.8 72.107-77.653 45.227-1.28 77.653 29.44 78.080 73.813 0.427 45.227-29.44 78.080-72.96 79.36zM671.147 737.707c0-72.107-34.133-136.107-87.467-176.64l-235.52-21.76c-72.107 36.693-122.027 111.787-122.027 198.4 0 122.88 99.84 222.293 222.72 222.293 122.453 0 222.293-99.413 222.293-222.293zM592.213 680.533l-50.347 18.347c-2.133-8.533-5.12-16.213-9.813-22.613-5.12-6.4-10.24-11.947-16.213-17.067-5.973-4.267-12.373-8.107-19.2-11.093s-13.653-4.693-20.053-5.547c-17.92-2.987-33.707-0.427-48.64 6.827s-26.88 18.347-36.693 32.853l76.373 12.373 7.253 32.427-97.28-15.787c-1.28 5.547-2.987 11.093-3.84 16.64l-0.853 4.267 99.413 16.213 7.253 32.427-106.667-17.493c0.853 9.387 2.987 17.493 6.4 26.027 3.84 8.533 8.107 16.213 14.080 23.040 5.547 6.827 12.8 12.373 21.333 17.067s17.92 8.107 28.587 9.813c6.827 1.28 13.227 1.707 20.907 1.28s14.507-1.707 21.333-3.84c6.827-2.133 13.653-5.973 20.053-10.24 5.973-4.693 11.947-11.093 17.493-18.773l38.827 37.973c-13.227 17.92-30.293 31.147-52.053 39.253-21.76 8.533-46.080 10.667-73.387 6.4-19.627-2.987-36.267-9.387-51.2-17.92-14.507-8.533-26.88-19.2-37.547-32-10.667-12.373-18.773-26.027-23.893-40.96-5.547-14.507-8.96-29.867-9.813-45.653l-21.76-3.84-7.253-32.427 29.013 4.693 0.427-2.987c1.28-6.827 2.56-12.8 4.267-18.347l-23.467-3.84-8.107-32.427 43.52 7.253c6.827-13.653 15.787-26.027 26.027-36.693 10.24-11.52 22.187-20.48 35.413-27.733 13.227-7.68 27.307-12.8 42.667-15.787s31.573-3.413 47.36-0.853c12.373 2.133 24.32 5.12 35.84 10.667s22.613 11.52 32.853 19.2c10.24 8.107 18.347 16.64 26.027 26.453 6.827 9.387 12.373 20.48 15.36 32.427z" />
 <glyph unicode="&#xe94c;" 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="albaran" d="M819.2 960h-622.933c-55.467 0-102.4-46.933-102.4-102.4v-819.2c0-55.467 46.933-102.4 102.4-102.4h622.933c55.467 0 102.4 46.933 102.4 102.4v819.2c0 55.467-46.933 102.4-102.4 102.4zM358.4 174.933h-102.4v102.4h503.467v-102.4h-401.067zM256 379.733v102.4h503.467v-102.4h-503.467zM759.467 584.533h-503.467v102.4h503.467v-102.4z" />
+<glyph unicode="&#xe94e;" glyph-name="solunion" d="M759.467 870.4v-136.533h-601.6c0 0-128-341.333 106.667-341.333s469.333 0 469.333 0 34.133 0 34.133-34.133-8.533-98.133-8.533-98.133h-541.867c0 0-247.467 29.867-204.8 320 0 0 8.533 140.8 72.533 298.667 0 0 21.333-8.533 85.333-8.533h588.8zM853.333 25.6c64 0 85.333-8.533 85.333-8.533 64 153.6 72.533 298.667 72.533 298.667 42.667 290.133-204.8 320-204.8 320h-541.867c0 0-8.533-64-8.533-98.133s34.133-34.133 34.133-34.133 238.933 0 469.333 0 106.667-341.333 106.667-341.333h-601.6v-136.533h588.8z" />
+<glyph unicode="&#xe94f;" glyph-name="stowaway" d="M1006.933 452.267l-260.267 106.667 29.867 29.867c4.267 4.267 4.267 12.8 4.267 17.067-4.267 4.267-8.533 8.533-12.8 8.533h-157.867c0 93.867 76.8 157.867 174.933 157.867 4.267 0 8.533 4.267 12.8 8.533s4.267 8.533 0 17.067l-81.067 153.6c-4.267 0-12.8 4.267-17.067 4.267-46.933 0-93.867-17.067-132.267-42.667-21.333-17.067-42.667-38.4-55.467-59.733-12.8 21.333-29.867 42.667-55.467 59.733-34.133 12.8-81.067 34.133-128 34.133-4.267 0-12.8-4.267-12.8-8.533l-85.333-153.6c-4.267-4.267-4.267-4.267 0-12.8 4.267-4.267 8.533-8.533 12.8-8.533 98.133 0 174.933-59.733 174.933-153.6v0h-140.8c-4.267 0-12.8-4.267-12.8-8.533-8.533-4.267-4.267-17.067 0-21.333l21.333-21.333-277.333-110.933c-8.533-8.533-12.8-12.8-8.533-21.333 0-8.533 8.533-12.8 17.067-12.8v0l98.133 4.267-81.067-85.333c0-4.267-4.267-8.533 0-12.8 0-4.267 4.267-8.533 8.533-8.533l85.333-34.133v-179.2c0-8.533 4.267-12.8 8.533-12.8l358.4-145.067h8.533l358.4 145.067c4.267 4.267 8.533 8.533 8.533 12.8v179.2l85.333 34.133c4.267 0 8.533 4.267 8.533 8.533s0 8.533-4.267 12.8l-68.267 98.133 102.4-4.267c8.533 0 12.8 4.267 17.067 12.8 8.533 0 4.267 4.267-4.267 12.8zM110.933 456.533l196.267 76.8 8.533-8.533-166.4-64-38.4-4.267zM153.6 285.867v0l-68.267 34.133 68.267 98.133 328.533-132.267-68.267-98.133-260.267 98.133zM490.667-29.867l-328.533 132.267v153.6l243.2-98.133h12.8c0 0 0 0 4.267 0v0c0 0 4.267 0 4.267 4.267l64 85.333c0-4.267 0-277.333 0-277.333zM490.667 324.267l-298.667 115.2 149.333 64 153.6-157.867v-17.067h-4.267zM529.067 337.067l157.867 157.867 140.8-55.467-298.667-115.2c0 0 0 12.8 0 12.8zM849.067 102.4l-328.533-132.267v281.6l64-85.333c0 0 0-4.267 4.267-4.267v0h17.067l243.2 98.133v-157.867zM938.667 324.267l-324.267-132.267-68.267 98.133 328.533 132.267 64-98.133zM870.4 460.8l-157.867 64 12.8 8.533 187.733-76.8-42.667 4.267z" />
 <glyph unicode="&#xe950;" glyph-name="agency-term" d="M789.333 266.667c-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 113.067c-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.2zM251.733 266.667c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4 102.4 46.933 102.4 102.4c0 59.733-46.933 102.4-102.4 102.4zM251.733 113.067c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2 51.2-21.333 51.2-51.2c0-25.6-25.6-51.2-51.2-51.2zM1006.933 539.733l-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-554.667c0-29.867 25.6-51.2 51.2-51.2h68.267c8.533 64 64 115.2 132.267 115.2 64 0 123.733-51.2 132.267-115.2h268.8c8.533 64 64 115.2 132.267 115.2s128-51.2 136.533-115.2h51.2c29.867 0 51.2 25.6 51.2 51.2v260.267c0 17.067-8.533 34.133-17.067 46.933v0zM725.333 684.8c0 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.8h-187.733c-8.533 0-8.533 4.267-8.533 8.533v145.067zM509.013 556.373c0-113.92-92.16-206.080-206.080-206.080s-206.080 92.16-206.080 206.080 92.16 206.507 206.080 206.507 206.080-92.587 206.080-206.507zM342.613 494.080h-87.893l-15.36-40.107h-78.933l100.693 230.827h76.373l100.693-230.827h-80.213l-15.36 40.107zM321.28 550.4l-22.613 58.027-22.187-58.027h44.8z" />
 <glyph unicode="&#xe951;" 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="&#xe952;" glyph-name="info" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM563.2 192h-102.4v307.2h102.4v-307.2zM563.2 601.6h-102.4v102.4h102.4v-102.4z" />
@@ -96,6 +98,7 @@
 <glyph unicode="&#xe958;" glyph-name="headercol" d="M362.667-64h302.933v678.4h-302.933v-678.4zM0-64h302.933v678.4h-302.933v-678.4zM721.067 614.4v-678.4h302.933v678.4h-302.933zM362.667 678.4h302.933v281.6h-302.933v-281.6zM0 678.4h302.933v281.6h-302.933v-281.6zM721.067 960v-281.6h302.933v281.6h-302.933z" />
 <glyph unicode="&#xe959;" glyph-name="reserva" d="M841.6 864c48 0 86.4-38.4 86.4-86.4v-662.4c0-48-38.4-86.4-86.4-86.4h-659.2c-48 3.2-86.4 41.6-86.4 89.6v659.2c0 48 38.4 86.4 86.4 86.4h659.2zM841.6 960h-659.2c-99.2 0-182.4-83.2-182.4-182.4v-662.4c0-96 83.2-179.2 182.4-179.2h662.4c99.2 0 182.4 83.2 182.4 182.4v659.2c-3.2 99.2-86.4 182.4-185.6 182.4v0zM611.2 192l-99.2 144h-108.8v-144h-118.4v512h220.8c44.8 0 83.2-6.4 118.4-22.4 32-16 57.6-35.2 76.8-64s25.6-60.8 25.6-99.2c0-38.4-9.6-70.4-28.8-99.2s-44.8-48-76.8-64l115.2-163.2h-124.8zM582.4 585.6c-19.2 16-44.8 22.4-80 22.4h-96v-179.2h96c35.2 0 64 6.4 80 22.4 19.2 16 28.8 38.4 28.8 67.2-3.2 28.8-9.6 51.2-28.8 67.2z" />
 <glyph unicode="&#xe95a;" glyph-name="100" d="M640 38.4l-17.067-17.067h-213.333v153.6h-153.6v102.4h200.533l102.4 102.4h-302.933v102.4h405.333l102.4 102.4h-507.733v102.4h520.533v-89.6l72.533 72.533c17.067 17.067 42.667 29.867 68.267 29.867 4.267 0 8.533 0 8.533 0v157.867c0 55.467-46.933 102.4-102.4 102.4h-627.2c-55.467 0-102.4-46.933-102.4-102.4v-819.2c0-55.467 46.933-102.4 102.4-102.4h627.2c55.467 0 102.4 46.933 102.4 102.4v285.867l-285.867-285.867zM917.333 635.733c8.533 0 17.067-4.267 21.333-8.533l76.8-76.8c12.8-12.8 12.8-34.133 0-46.933l-64-64-119.467 119.467 64 64c4.267 8.533 12.8 12.8 21.333 12.8zM797.867 529.067l119.467-123.733-320-320h-123.733v119.467l324.267 324.267z" />
+<glyph unicode="&#xe95b;" glyph-name="clientUnpaid" horiz-adv-x="1135" d="M1135.22-64v47.845h-84.359v927.41l8.574 0.42c3.118 0.18 6.295 0.36 9.473 0.36h23.683c14.21 0.060 28.36 0.060 42.569 0.060v47.905c-314.713-0.18-629.485-0.24-944.258-0.24h-190.902v-47.726h83.16s0-928.069 0-928.069h-83.16v-47.726h140.898c331.44 0 662.881 0 994.321-0.24zM821.526 911.255h180.17v-926.93h-180.17v926.93zM591.892 911.735h180.11v-926.93h-180.11v926.87zM362.258 911.735h180.17v-926.93h-180.17v926.93zM132.624 911.255h180.17v-926.93h-180.17v926.93zM748.139 719.694c4.916-1.079 9.653-2.578 14.27-4.197v142.157c-7.555 1.739-15.169 3.358-22.963 4.737-16.668 2.818-33.576 4.437-50.364 6.595h-52.642c-2.938-0.48-5.876-1.199-8.814-1.439-8.754-0.719-17.507-1.679-26.141-2.998v-144.735c47.785 14.569 97.19 10.732 146.654-0.060zM878.545 627.6c27.82 34.775 55.94 69.969 84.179 105.284-38.072 44.428-81.661 78.543-131.605 101.447v-162.842c16.368-13.61 31.357-28.899 47.426-43.828zM467.003 283.809c-0.3 0.6 0 1.559 0 3.058h65.892v101.806h-97.43c-6.535 32.437-3.477 64.693-4.257 97.849h101.687v101.866h-74.706c0.060 1.439 0 2.039 0.18 2.458 18.107 37.653 42.509 69.43 74.526 93.652v161.403c-3.298-1.379-6.655-2.818-9.893-4.317-60.496-28.599-111.34-66.012-151.091-113.438v-564.612c37.953-46.646 86.997-82.8 147.194-108.342 4.557-1.919 9.173-3.717 13.79-5.456v153.489c-26.921 20.505-48.445 48.085-65.832 80.702zM297.925 591.806c-1.919-6.056-4.617-7.794-10.852-7.734-35.075 0.3-70.149 0.18-105.224 0.18h-9.293v-93.652h100.787c0.899-33.156 1.799-65.233 2.758-98.149h-103.605v-101.746h9.293c36.693 0 73.447-0.36 110.14 0.24 5.276 0.12 8.694-0.839 11.212-3.238v319.389c-1.799-5.036-3.657-10.073-5.276-15.289zM736.688 286.866v101.806h-135.202v-101.806h135.202zM736.808 588.329h-135.322v-101.866h135.322v101.866zM954.27 163.236c-28.419 34.055-56.539 67.811-83.999 100.727-13.31-10.972-26.201-21.884-39.152-32.556v-169.258c13.49 6.415 26.681 13.79 39.571 22.304 32.257 21.345 59.777 47.726 83.58 78.783zM615.215 167.493c-4.677 0.839-9.233 1.799-13.73 2.938v-138.68c32.017-5.036 64.633-5.816 97.789-3.178 21.524 1.739 42.629 4.916 63.134 9.773v145.695c-45.447-21.524-95.031-25.781-147.194-16.548z" />
 <glyph unicode="&#xe95d;" glyph-name="sign" d="M725.333 960c72.533-72.533 145.067-145.067 217.6-217.6-4.267-4.267-8.533-12.8-17.067-17.067-179.2-179.2-358.4-362.667-537.6-541.867-8.533-8.533-25.6-17.067-38.4-21.333-81.067-21.333-166.4-42.667-247.467-64-4.267 0-12.8-4.267-21.333-4.267 0 8.533 0 17.067 4.267 21.333 21.333 85.333 42.667 166.4 64 251.733 4.267 8.533 8.533 21.333 17.067 25.6 183.467 187.733 371.2 371.2 554.667 554.667 0 8.533 0 12.8 4.267 12.8zM849.067 25.6c-25.6-21.333-46.933-42.667-72.533-59.733-29.867-17.067-59.733-25.6-89.6-29.867-21.333-4.267-42.667 0-55.467 12.8-12.8 8.533-25.6 46.933-38.4 51.2-4.267 0-12.8 0-17.067-4.267-68.267-25.6-145.067-55.467-221.867-55.467-106.667 0-209.067 0-315.733 0-4.267 0-8.533 0-12.8 0-4.267 4.267-12.8 8.533-12.8 12.8s8.533 12.8 12.8 17.067c4.267 4.267 12.8 0 21.333 0 102.4 0 204.8 0 307.2 4.267 76.8 0 153.6 25.6 221.867 64 8.533 4.267 12.8 12.8 12.8 21.333 4.267 55.467 12.8 106.667 42.667 153.6 17.067 29.867 42.667 51.2 81.067 55.467 55.467 0 85.333-38.4 64-89.6-17.067-34.133-42.667-64-64-89.6-21.333-21.333-51.2-38.4-72.533-55.467-4.267-4.267-8.533-17.067-8.533-21.333 8.533-34.133 29.867-51.2 59.733-42.667 29.867 4.267 59.733 17.067 81.067 34.133 25.6 17.067 46.933 42.667 72.533 64 8.533 8.533 17.067 21.333 29.867 25.6 8.533 4.267 21.333 8.533 29.867 4.267 4.267-4.267 8.533-21.333 4.267-29.867-8.533-21.333-17.067-42.667-25.6-64-4.267-8.533-8.533-25.6 0-34.133s29.867-4.267 38.4 4.267c25.6 17.067 51.2 34.133 72.533 55.467 8.533 8.533 17.067 17.067 25.6 8.533 4.267-4.267 4.267-21.333 0-29.867-25.6-34.133-59.733-59.733-102.4-72.533-46.933-12.8-76.8 17.067-68.267 64-4.267 12.8-4.267 17.067 0 25.6zM618.667 72.533c0 0 0-4.267 0-4.267s4.267 0 4.267 0c29.867 25.6 59.733 51.2 85.333 81.067 12.8 12.8 21.333 34.133 29.867 51.2 8.533 21.333 0 34.133-21.333 38.4-25.6 4.267-42.667-8.533-55.467-25.6-29.867-46.933-38.4-93.867-42.667-140.8z" />
 <glyph unicode="&#xe95e;" glyph-name="polizon" d="M1011.2 456.533l-264.533 106.667 29.867 29.867c4.267 4.267 4.267 12.8 4.267 17.067-4.267 4.267-8.533 8.533-12.8 8.533h-157.867c0 93.867 76.8 157.867 174.933 157.867 4.267 0 8.533 4.267 12.8 8.533s4.267 8.533 0 17.067l-81.067 153.6c-4.267 0-12.8 4.267-17.067 4.267-46.933 0-93.867-17.067-132.267-42.667-25.6-17.067-42.667-38.4-55.467-59.733-12.8 25.6-29.867 42.667-55.467 59.733-38.4 25.6-85.333 42.667-132.267 42.667-4.267 0-12.8-4.267-12.8-8.533l-81.067-153.6c-4.267-4.267-4.267-8.533 0-17.067 4.267-4.267 8.533-8.533 12.8-8.533 98.133 0 174.933-59.733 174.933-153.6v0h-140.8c-4.267 0-12.8-4.267-12.8-8.533-4.267-4.267 0-12.8 4.267-17.067l21.333-21.333-277.333-110.933c-8.533-8.533-12.8-12.8-8.533-21.333 0-8.533 8.533-12.8 17.067-12.8 0 0 0 0 0 0l98.133 4.267-76.8-98.133c0-4.267-4.267-8.533 0-12.8 0-4.267 4.267-8.533 8.533-8.533l85.333-34.133v-179.2c0-8.533 4.267-12.8 8.533-12.8l362.667-145.067c0 0 4.267 0 4.267 0s4.267 0 4.267 0l362.667 145.067c4.267 4.267 8.533 8.533 8.533 12.8v179.2l85.333 34.133c4.267 0 8.533 4.267 8.533 8.533s0 8.533-4.267 12.8l-72.533 98.133 102.4-4.267c8.533 0 12.8 4.267 17.067 12.8 0 8.533-4.267 12.8-12.8 17.067zM110.933 460.8l200.533 81.067 8.533-8.533-170.667-68.267-38.4-4.267zM153.6 294.4v4.267l-72.533 29.867 72.533 98.133 328.533-132.267-72.533-98.133-256 102.4v-4.267zM494.933-25.6l-328.533 132.267v153.6l243.2-98.133c0 0 4.267 0 4.267 0h4.267c0 0 4.267 0 4.267 0v0c0 0 0 0 4.267 0v0c0 0 4.267 0 4.267 4.267l64 85.333v-277.333zM494.933 328.533l-302.933 119.467 149.333 59.733 153.6-162.133v-17.067zM529.067 345.6l162.133 157.867 140.8-55.467-302.933-119.467v17.067zM857.6 106.667l-328.533-132.267v281.6l64-85.333c0 0 0-4.267 4.267-4.267v0c0 0 4.267 0 4.267 0v0c0 0 4.267 0 4.267 0v0 0c0 0 4.267 0 4.267 0l243.2 98.133v-157.867zM942.933 328.533l-328.533-132.267-72.533 98.133 328.533 132.267 72.533-98.133zM874.667 465.067l-162.133 64 12.8 8.533 187.733-76.8-38.4 4.267z" />
 <glyph unicode="&#xe95f;" glyph-name="solclaim" d="M1024 917.333v-938.667h-938.667v68.267h234.667v51.2h38.4c8.533-4.267 17.067-4.267 29.867-4.267h298.667c42.667 0 76.8 34.133 76.8 76.8 0 0 0 0 0 0 29.867 12.8 46.933 38.4 46.933 72.533 0 0 0 0 0 0 29.867 12.8 46.933 38.4 46.933 72.533s-21.333 59.733-46.933 72.533c0 0 0 0 0 0 0 42.667-34.133 76.8-76.8 76.8h-106.667c21.333 21.333 29.867 55.467 17.067 89.6-12.8 25.6-38.4 42.667-68.267 42.667-12.8 0-21.333-4.267-34.133-8.533l-217.6-98.133v29.867h-238.933v396.8h362.667v-209.067h209.067v209.067h366.933zM0 89.6h281.6v51.2h89.6c4.267-4.267 12.8-4.267 17.067-4.267h298.667c21.333 0 34.133 12.8 34.133 34.133s-12.8 34.133-34.133 34.133h-136.533v12.8h183.467c21.333 0 34.133 12.8 34.133 29.867 0 21.333-12.8 29.867-34.133 29.867h-179.2v12.8h234.667c21.333 0 34.133 8.533 34.133 29.867s-12.8 29.867-34.133 29.867h-230.4v12.8h183.467c21.333 0 29.867 12.8 29.867 34.133s-12.8 34.133-34.133 34.133h-230.4l93.867 64c12.8 8.533 21.333 29.867 12.8 46.933s-29.867 25.6-51.2 17.067l-251.733-119.467c-4.267 0-4.267-4.267-8.533-4.267-4.267-4.267-8.533-8.533-12.8-12.8h-8.533v55.467h-281.6v-388.267z" />

front/salix/components/upload-photo/index.html

@@ -69,14 +69,6 @@
                     value-field="code">
                 </vn-autocomplete>
             </vn-horizontal>
-            <vn-horizontal>
-                <vn-textfield
-                    vn-one 
-                    label="File name" 
-                    ng-model="$ctrl.newPhoto.fileName"
-                    required="true">
-                </vn-input-file>
-            </vn-horizontal>
         </vn-one>
     </vn-horizontal>
     </tpl-body>

front/salix/components/upload-photo/index.js

@@ -64,8 +64,7 @@ export default class UploadPhoto extends Component {
         this.editor = null;
         this.newPhoto = {
             id: id,
-            collection: collection,
-            fileName: id
+            collection: collection
         };
         this.$.dialog.show();
     }

loopback/common/methods/application/post.js

@@ -12,6 +12,7 @@ module.exports = Self => {
     });
 
     Self.post = async ctx => {
+        console.log(ctx.req.body);
         return ctx.req.body;
     };
 };

modules/claim/back/models/claim.json

@@ -77,6 +77,11 @@
             "type": "belongsTo",
             "model": "Ticket",
             "foreignKey": "ticketFk"
+        },
+        "claimDms": {
+            "type": "hasMany",
+            "model": "ClaimDms",
+            "foreignKey": "claimFk"
         }
     }
 }

modules/client/back/methods/client/specs/createWithUser.spec.js

@@ -10,7 +10,8 @@ describe('Client Create', () => {
         socialName: 'Deadpool Marvel',
         street: 'Wall Street',
         city: 'New York',
-        businessTypeFk: 'florist'
+        businessTypeFk: 'florist',
+        provinceFk: 1
     };
 
     beforeAll(async() => {