From 02d89e5774f69a44c3cb35e267e9618ab48b178c Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Nov 2021 08:51:07 +0100 Subject: [PATCH 01/10] feat(item): add field genericFk in basic-data --- modules/entry/front/buy/import/index.js | 2 +- modules/item/back/models/item.json | 9 ++ modules/item/front/basic-data/index.html | 111 ++++++++++++++++++++ modules/item/front/basic-data/index.js | 59 +++++++++++ modules/item/front/basic-data/locale/es.yml | 3 +- 5 files changed, 182 insertions(+), 2 deletions(-) diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js index 2f13b2746..a88476240 100644 --- a/modules/entry/front/buy/import/index.js +++ b/modules/entry/front/buy/import/index.js @@ -133,7 +133,7 @@ class Controller extends Section { case 'producerFk': case 'typeFk': case 'size': - case 'ink': + case 'inkFk': where[key] = value; } } diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index fd4b6b079..d78e929ed 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -143,6 +143,10 @@ }, "isFloramondo": { "type": "boolean" + }, + "genericFk": { + "type": "number", + "description": "Generic item" } }, "relations": { @@ -176,6 +180,11 @@ "model": "Expense", "foreignKey": "expenseFk" }, + "id": { + "type": "belongsTo", + "model": "Item", + "foreignKey": "genericFk" + }, "tags": { "type": "hasMany", "model": "ItemTag", diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html index cec7a063f..02dd08ebc 100644 --- a/modules/item/front/basic-data/index.html +++ b/modules/item/front/basic-data/index.html @@ -137,6 +137,27 @@ ng-model="$ctrl.item.compression" rule> + + + {{::id}} - {{::name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID + Item + Size + Producer + Color + + + + + + + {{::item.id}} + + + {{::item.name}} + {{::item.size}} + {{::item.producer.name}} + {{::item.ink.name}} + + + + + + + \ No newline at end of file diff --git a/modules/item/front/basic-data/index.js b/modules/item/front/basic-data/index.js index 1a256c65b..f37836fc8 100644 --- a/modules/item/front/basic-data/index.js +++ b/modules/item/front/basic-data/index.js @@ -17,6 +17,65 @@ class Controller extends Section { return this.$http.patch(query, this.newIntrastat) .then(res => this.item.intrastatFk = res.data.id); } + + itemSearchFunc($search) { + return /^\d+$/.test($search) + ? {id: $search} + : {name: {like: '%' + $search + '%'}}; + } + + showFilterDialog(item) { + this.activeItem = item; + this.itemFilterParams = {}; + this.itemFilter = { + include: [ + { + relation: 'producer', + scope: { + fields: ['name'] + } + }, + { + relation: 'ink', + scope: { + fields: ['name'] + } + } + ] + }; + + this.$.filterDialog.show(); + } + + selectItem(id) { + this.activeItem['id'] = id; + this.$.filterDialog.hide(); + } + + filter() { + const filter = this.itemFilter; + const params = this.itemFilterParams; + const where = {}; + for (let key in params) { + const value = params[key]; + if (!value) continue; + + switch (key) { + case 'name': + where[key] = {like: `%${value}%`}; + break; + case 'producerFk': + case 'typeFk': + case 'size': + case 'inkFk': + where[key] = value; + } + } + + filter.where = where; + + this.$.itemsModel.applyFilter(filter); + } } ngModule.vnComponent('vnItemBasicData', { diff --git a/modules/item/front/basic-data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml index 9fd3ca3c4..d59752ebb 100644 --- a/modules/item/front/basic-data/locale/es.yml +++ b/modules/item/front/basic-data/locale/es.yml @@ -10,4 +10,5 @@ New intrastat: Nuevo intrastat Identifier: Identificador Fragile: Frágil Is shown at website, app that this item cannot travel (wreath, palms, ...): Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...) -Multiplier: Multiplicador \ No newline at end of file +Multiplier: Multiplicador +Generic: Genérico \ No newline at end of file From 5931692fac54f1d8c89ccb9e9f42d134ac1372c5 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Nov 2021 09:21:41 +0100 Subject: [PATCH 02/10] test(item_basic-data): add genericFk e2e --- db/dump/fixtures.sql | 37 +++++++++++++------------ e2e/helpers/selectors.js | 1 + e2e/paths/04-item/02_basic_data.spec.js | 25 +++++++++++------ 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index dd21ca847..c2879e26d 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -796,25 +796,26 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`) ('SER', 'Services'), ('VT', 'Sales'); -INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`) +INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, + `expenceFk`, `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo, genericFk`) VALUES - (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 1, 'VT', 0), - (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 2, 'VT', 0), - (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 5, 'VT', 0), - (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 3, 'VT', 0), - (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 3, 'VT', 0), - (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 4, 'VT', 0), - (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 4, 'VT', 0), - (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 5, 'VT', 0), - (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 4, 'VT', 1), - (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT', 0), - (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT', 0), - (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT', 0), - (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 0, 2, 'VT', 1), - (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 4, 'VT', 1), - (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0), - (16, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0), - (71, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'VT', 0); + (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 4, 'VT', 1, NULL), + (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 2, 'VT', 0, 9), + (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 5, 'VT', 0, NULL), + (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 1, 'VT', 0, NULL), + (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 3, 'VT', 0, NULL), + (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 3, 'VT', 0, NULL), + (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 4, 'VT', 0, NULL), + (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 4, 'VT', 0, NULL), + (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 5, 'VT', 0, NULL), + (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT', 0, NULL), + (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT', 0, NULL), + (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT', 0, NULL), + (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 0, 2, 'VT', 1, NULL), + (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 4, 'VT', 1, NULL), + (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL), + (16, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL), + (71, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'VT', 0, NULL); -- Update the taxClass after insert of the items UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2 diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index d8ebaa069..b95ecbd7f 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -382,6 +382,7 @@ export default { relevancy: 'vn-item-basic-data vn-input-number[ng-model="$ctrl.item.relevancy"]', origin: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]', compression: 'vn-item-basic-data vn-input-number[ng-model="$ctrl.item.compression"]', + generic: 'vn-autocomplete[ng-model="$ctrl.item.genericFk"]', isFragile: 'vn-check[ng-model="$ctrl.item.isFragile"]', longName: 'vn-textfield[ng-model="$ctrl.item.longName"]', isActiveCheckbox: 'vn-check[label="Active"]', diff --git a/e2e/paths/04-item/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js index defefe279..ff3bda13f 100644 --- a/e2e/paths/04-item/02_basic_data.spec.js +++ b/e2e/paths/04-item/02_basic_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('Item Edit basic data path', () => { +fdescribe('Item Edit basic data path', () => { let browser; let page; beforeAll(async() => { @@ -23,15 +23,17 @@ describe('Item Edit basic data path', () => { it(`should edit the item basic data`, async() => { await page.clearInput(selectors.itemBasicData.name); await page.write(selectors.itemBasicData.name, 'Rose of Purity'); - await page.autocompleteSearch(selectors.itemBasicData.type, 'Anthurium'); - await page.autocompleteSearch(selectors.itemBasicData.intrastat, 'Coral y materiales similares'); - await page.clearInput(selectors.itemBasicData.relevancy); - await page.write(selectors.itemBasicData.relevancy, '1'); - await page.autocompleteSearch(selectors.itemBasicData.origin, 'Spain'); - await page.clearInput(selectors.itemBasicData.compression); - await page.write(selectors.itemBasicData.compression, '2'); await page.clearInput(selectors.itemBasicData.longName); await page.write(selectors.itemBasicData.longName, 'RS Rose of Purity'); + await page.autocompleteSearch(selectors.itemBasicData.type, 'Anthurium'); + await page.autocompleteSearch(selectors.itemBasicData.intrastat, 'Coral y materiales similares'); + await page.autocompleteSearch(selectors.itemBasicData.origin, 'Spain'); + await page.clearInput(selectors.itemBasicData.relevancy); + await page.write(selectors.itemBasicData.relevancy, '1'); + await page.clearInput(selectors.itemBasicData.compression); + await page.write(selectors.itemBasicData.compression, '2'); + await page.clearInput(selectors.itemBasicData.generic); + await page.autocompleteSearch(selectors.itemBasicData.generic, '9'); await page.waitToClick(selectors.itemBasicData.isActiveCheckbox); await page.waitToClick(selectors.itemBasicData.priceInKgCheckbox); await page.waitToClick(selectors.itemBasicData.isFragile); @@ -101,6 +103,13 @@ describe('Item Edit basic data path', () => { expect(result).toEqual('2'); }); + it(`should confirm the item generic was edited`, async() => { + const result = await page + .waitToGetProperty(selectors.itemBasicData.generic, 'value'); + + expect(result).toEqual('9 - Melee Reinforced weapon combat fist 15cm'); + }); + it(`should confirm the item long name was edited`, async() => { const result = await page .waitToGetProperty(selectors.itemBasicData.longName, 'value'); From eea94136288f49e02f03f8ad2479264d451ffd5c Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 26 Nov 2021 08:34:32 +0100 Subject: [PATCH 03/10] fix(item_basic-data): controller, test e2e and model --- db/dump/fixtures.sql | 45 +++++++++++++----------- e2e/paths/04-item/02_basic_data.spec.js | 6 ++-- modules/item/back/models/item.json | 6 +--- modules/item/front/basic-data/index.html | 2 ++ modules/item/front/basic-data/index.js | 2 +- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index c2879e26d..4eb97cf50 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -796,31 +796,32 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`) ('SER', 'Services'), ('VT', 'Sales'); -INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, - `expenceFk`, `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo, genericFk`) +INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, + `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`) VALUES - (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 4, 'VT', 1, NULL), - (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 2, 'VT', 0, 9), - (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 5, 'VT', 0, NULL), - (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 1, 'VT', 0, NULL), - (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 3, 'VT', 0, NULL), - (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 3, 'VT', 0, NULL), - (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 4, 'VT', 0, NULL), - (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 4, 'VT', 0, NULL), - (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 5, 'VT', 0, NULL), - (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT', 0, NULL), - (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT', 0, NULL), - (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT', 0, NULL), - (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 0, 2, 'VT', 1, NULL), - (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 4, 'VT', 1, NULL), - (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL), - (16, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL), - (71, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'VT', 0, NULL); + (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 1, 'VT', 0, NULL), + (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 2, 'VT', 0, NULL), + (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 5, 'VT', 0, NULL), + (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 3, 'VT', 0, NULL), + (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 3, 'VT', 0, NULL), + (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 4, 'VT', 0, NULL), + (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 4, 'VT', 0, NULL), + (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 5, 'VT', 0, NULL), + (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 4, 'VT', 1, NULL), + (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT', 0, NULL), + (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT', 0, NULL), + (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT', 0, NULL), + (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 0, 2, 'VT', 1, NULL), + (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 4, 'VT', 1, NULL), + (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL), + (16, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL), + (71, 6, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'VT', 0, NULL); -- Update the taxClass after insert of the items UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2 WHERE `itemFk` IN(4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 71); + INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`, `started`, `ended`, `bonus`, `warehouseFk`, `created`) VALUES (1, 1, 0, 0, 2.5, 2, CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()), @@ -2419,4 +2420,8 @@ INSERT INTO `vn`.`expeditionScan` (`id`, `expeditionFk`, `scanned`, `palletFk`) (9, 9, CURDATE(), 1), (10, 10, CURDATE(), 1); -CALL `cache`.`last_buy_refresh`(FALSE); \ No newline at end of file +CALL `cache`.`last_buy_refresh`(FALSE); + +-- Update the genericFk after insert of the items + UPDATE `vn`.`item` SET `genericFk` = 9 + WHERE `id` = 2; \ No newline at end of file diff --git a/e2e/paths/04-item/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js index ff3bda13f..0bbb6ad12 100644 --- a/e2e/paths/04-item/02_basic_data.spec.js +++ b/e2e/paths/04-item/02_basic_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -fdescribe('Item Edit basic data path', () => { +describe('Item Edit basic data path', () => { let browser; let page; beforeAll(async() => { @@ -33,7 +33,7 @@ fdescribe('Item Edit basic data path', () => { await page.clearInput(selectors.itemBasicData.compression); await page.write(selectors.itemBasicData.compression, '2'); await page.clearInput(selectors.itemBasicData.generic); - await page.autocompleteSearch(selectors.itemBasicData.generic, '9'); + await page.autocompleteSearch(selectors.itemBasicData.generic, '16'); await page.waitToClick(selectors.itemBasicData.isActiveCheckbox); await page.waitToClick(selectors.itemBasicData.priceInKgCheckbox); await page.waitToClick(selectors.itemBasicData.isFragile); @@ -107,7 +107,7 @@ fdescribe('Item Edit basic data path', () => { const result = await page .waitToGetProperty(selectors.itemBasicData.generic, 'value'); - expect(result).toEqual('9 - Melee Reinforced weapon combat fist 15cm'); + expect(result).toEqual('16 - Pallet'); }); it(`should confirm the item long name was edited`, async() => { diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index d78e929ed..9b78264f7 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -143,10 +143,6 @@ }, "isFloramondo": { "type": "boolean" - }, - "genericFk": { - "type": "number", - "description": "Generic item" } }, "relations": { @@ -180,7 +176,7 @@ "model": "Expense", "foreignKey": "expenseFk" }, - "id": { + "generic": { "type": "belongsTo", "model": "Item", "foreignKey": "genericFk" diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html index 02dd08ebc..3bf1fc10b 100644 --- a/modules/item/front/basic-data/index.html +++ b/modules/item/front/basic-data/index.html @@ -158,6 +158,8 @@ + + Date: Fri, 26 Nov 2021 08:40:20 +0100 Subject: [PATCH 04/10] remove unnecessary intro and comment --- db/dump/fixtures.sql | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 4eb97cf50..b480a6d78 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -821,7 +821,6 @@ INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `d UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2 WHERE `itemFk` IN(4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 71); - INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`, `started`, `ended`, `bonus`, `warehouseFk`, `created`) VALUES (1, 1, 0, 0, 2.5, 2, CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()), @@ -2422,6 +2421,5 @@ INSERT INTO `vn`.`expeditionScan` (`id`, `expeditionFk`, `scanned`, `palletFk`) CALL `cache`.`last_buy_refresh`(FALSE); --- Update the genericFk after insert of the items - UPDATE `vn`.`item` SET `genericFk` = 9 - WHERE `id` = 2; \ No newline at end of file +UPDATE `vn`.`item` SET `genericFk` = 9 + WHERE `id` = 2; \ No newline at end of file From 25371ef97b3850b21d4af42333a95f2f6881a367 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 26 Nov 2021 09:06:58 +0100 Subject: [PATCH 05/10] Translation fix --- modules/invoiceOut/front/descriptor-menu/index.html | 2 +- modules/invoiceOut/front/descriptor-menu/locale/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/invoiceOut/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html index dbfd5fe82..3b30f891c 100644 --- a/modules/invoiceOut/front/descriptor-menu/index.html +++ b/modules/invoiceOut/front/descriptor-menu/index.html @@ -76,7 +76,7 @@ ng-click="$ctrl.showExportationLetter()" ng-show="$ctrl.invoiceOut.serial == 'E'" translate> - Show CIES letter + Show CITES letter diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml index 01e58633b..9c99037f7 100644 --- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml +++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml @@ -6,7 +6,7 @@ Delete Invoice: Eliminar factura Clone Invoice: Clonar factura Book invoice: Asentar factura Generate PDF invoice: Generar PDF factura -Show CIES letter: Ver carta CIES +Show CITES letter: Ver carta CITES InvoiceOut deleted: Factura eliminada Are you sure you want to delete this invoice?: Estas seguro de eliminar esta factura? Are you sure you want to clone this invoice?: Estas seguro de clonar esta factura? From eb101ffc761e92f23072e8b8748fe126b4a577e1 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 25 Nov 2021 14:14:01 +0100 Subject: [PATCH 06/10] refactor(fonts): updated fonts and changed invoiceOut icon --- front/core/styles/icons/salixfont.css | 531 ++++++++++++++----------- front/core/styles/icons/salixfont.svg | 225 ++++++----- front/core/styles/icons/salixfont.ttf | Bin 39328 -> 42184 bytes front/core/styles/icons/salixfont.woff | Bin 39404 -> 42260 bytes modules/invoiceOut/front/routes.json | 4 +- 5 files changed, 414 insertions(+), 346 deletions(-) diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index 48dd91a82..28c81552e 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -23,321 +23,376 @@ -moz-osx-font-smoothing: grayscale; } -.icon-preserved:before { - content: "\e963"; -} -.icon-treatments:before { - content: "\e964"; -} -.icon-funeral:before { - content: "\e965"; -} -.icon-handmadeArtificial:before { - content: "\e966"; -} -.icon-fixedPrice:before { - content: "\e962"; -} -.icon-accounts:before { - content: "\e95f"; -} -.icon-clientConsumption:before { - content: "\e960"; -} -.icon-lastBuy:before { - content: "\e961"; -} -.icon-zone:before { - content: "\e95d"; -} -.icon-inventory:before { - content: "\e95e"; -} -.icon-wiki:before { - content: "\e968"; -} -.icon-attach:before { - content: "\e96c"; -} -.icon-zone2:before { - content: "\e96d"; -} -.icon-net:before { - content: "\e95b"; -} -.icon-anonymous:before { - content: "\e95c"; -} -.icon-buyrequest:before { - content: "\e914"; -} -.icon-entry:before { - content: "\e959"; -} -.icon-thermometer:before { - content: "\e95a"; -} -.icon-deletedTicket:before { - content: "\e958"; -} -.icon-fruit:before { - content: "\e957"; -} -.icon-deliveryprices:before { - content: "\e956"; -} -.icon-basketadd:before { - content: "\e955"; -} -.icon-catalog:before { - content: "\e952"; -} -.icon-agency:before { - content: "\e910"; -} -.icon-delivery:before { - content: "\e94a"; -} -.icon-wand:before { - content: "\e954"; -} -.icon-unavailable:before { - content: "\e953"; -} -.icon-buscaman:before { - content: "\e951"; -} -.icon-pbx:before { - content: "\e950"; -} -.icon-calendar:before { - content: "\e94f"; -} -.icon-linesplit:before { - content: "\e945"; -} -.icon-invoices:before { - content: "\e91c"; -} -.icon-pets:before { - content: "\e94e"; -} .icon-100:before { - content: "\e940"; + content: "\e976"; } -.icon-accessory:before { - content: "\e90a"; +.icon-account:before { + content: "\e900"; + color: #000; } .icon-actions:before { - content: "\e900"; -} -.icon-addperson:before { content: "\e901"; } -.icon-albaran:before { +.icon-addperson:before { content: "\e902"; } -.icon-apps:before { - content: "\e948"; -} -.icon-artificial:before { +.icon-agency:before { content: "\e903"; } -.icon-barcode:before { +.icon-albaran:before { content: "\e904"; } -.icon-basket:before { - content: "\e942"; -} -.icon-bin:before { +.icon-anonymous:before { content: "\e905"; } -.icon-botanical:before { +.icon-apps:before { content: "\e906"; } -.icon-bucket:before { +.icon-artificial:before { content: "\e907"; } -.icon-claims:before { +.icon-attach:before { content: "\e908"; } -.icon-clone:before { +.icon-barcode:before { content: "\e909"; } -.icon-columnadd:before { - content: "\e944"; +.icon-basket:before { + content: "\e90a"; } -.icon-columndelete:before { - content: "\e90f"; -} -.icon-components:before { +.icon-basketadd:before { content: "\e90b"; } -.icon-consignatarios:before { - content: "\e90d"; -} -.icon-control:before { - content: "\e93f"; -} -.icon-credit:before { - content: "\e90e"; -} -.icon-details:before { - content: "\e911"; -} -.icon-disabled:before { - content: "\e91b"; -} -.icon-doc:before { - content: "\e913"; -} -.icon-exit:before { - content: "\e947"; -} -.icon-eye:before { - content: "\e915"; -} -.icon-fiscal:before { - content: "\e912"; -} -.icon-flower:before { - content: "\e916"; -} -.icon-frozen:before { - content: "\e917"; -} -.icon-greenery:before { - content: "\e93c"; -} -.icon-greuge:before { - content: "\e918"; -} -.icon-grid:before { - content: "\e919"; -} -.icon-handmade:before { +.icon-bin:before { content: "\e90c"; } -.icon-history:before { +.icon-botanical:before { + content: "\e90d"; +} +.icon-bucket:before { + content: "\e90e"; + color: #5f5f5f; +} +.icon-buscaman:before { + content: "\e90f"; +} +.icon-buyrequest:before { + content: "\e910"; +} +.icon-calc_volum .path1:before { + content: "\e911"; + color: rgb(0, 0, 0); +} +.icon-calc_volum .path2:before { + content: "\e912"; + margin-left: -1em; + color: rgb(0, 0, 0); +} +.icon-calc_volum .path3:before { + content: "\e913"; + margin-left: -1em; + color: rgb(0, 0, 0); +} +.icon-calc_volum .path4:before { + content: "\e914"; + margin-left: -1em; + color: rgb(0, 0, 0); +} +.icon-calc_volum .path5:before { + content: "\e915"; + margin-left: -1em; + color: rgb(0, 0, 0); +} +.icon-calc_volum .path6:before { + content: "\e916"; + margin-left: -1em; + color: rgb(255, 255, 255); +} +.icon-calendar:before { + content: "\e917"; +} +.icon-catalog:before { + content: "\e918"; +} +.icon-claims:before { + content: "\e919"; +} +.icon-client:before { content: "\e91a"; } -.icon-info:before { - content: "\e949"; +.icon-clone:before { + content: "\e91b"; } -.icon-item:before { - content: "\e941"; +.icon-columnadd:before { + content: "\e91c"; } -.icon-languaje:before { +.icon-columndelete:before { content: "\e91d"; } -.icon-linedelete:before { - content: "\e946"; -} -.icon-lines:before { +.icon-complementos:before { content: "\e91e"; } -.icon-linesprepaired:before { - content: "\e94b"; -} -.icon-logout:before { +.icon-components:before { content: "\e91f"; } -.icon-mana:before { +.icon-confeccion:before { content: "\e920"; } -.icon-mandatory:before { +.icon-consignatarios:before { content: "\e921"; } -.icon-niche:before { +.icon-control:before { content: "\e922"; } -.icon-no036:before { +.icon-credit:before { content: "\e923"; } -.icon-notes:before { +.icon-deletedTicketCross:before { content: "\e924"; } -.icon-noweb:before { +.icon-deleteline:before { content: "\e925"; } -.icon-onlinepayment:before { +.icon-delivery:before { content: "\e926"; } -.icon-package:before { +.icon-deliveryprices:before { content: "\e927"; } -.icon-payment:before { +.icon-details:before { content: "\e928"; } -.icon-person:before { +.icon-dfiscales:before { content: "\e929"; } -.icon-photo:before { +.icon-doc:before { content: "\e92a"; } -.icon-plant:before { +.icon-entry:before { content: "\e92b"; } -.icon-recovery:before { - content: "\e92d"; -} -.icon-regentry:before { - content: "\e92e"; -} -.icon-reserve:before { - content: "\e92f"; -} -.icon-revision:before { - content: "\e94c"; -} -.icon-risk:before { - content: "\e930"; -} -.icon-services:before { - content: "\e94d"; -} -.icon-settings:before { - content: "\e931"; -} -.icon-sms:before { - content: "\e932"; -} -.icon-solclaim:before { - content: "\e933"; -} -.icon-solunion:before { - content: "\e934"; -} -.icon-splur:before { - content: "\e935"; -} -.icon-stowaway:before { +.icon-exit:before { content: "\e92c"; } -.icon-supplier:before { +.icon-eye:before { + content: "\e92d"; +} +.icon-fixedPrice:before { + content: "\e92e"; +} +.icon-flor:before { + content: "\e92f"; +} +.icon-frozen:before { + content: "\e930"; +} +.icon-fruit:before { + content: "\e931"; +} +.icon-funeral:before { + content: "\e932"; +} +.icon-greuge:before { + content: "\e933"; +} +.icon-grid:before { + content: "\e934"; +} +.icon-handmadeArtificial:before { + content: "\e935"; +} +.icon-headercol:before { content: "\e936"; } -.icon-tags:before { +.icon-History:before { content: "\e937"; } -.icon-tax:before { +.icon-Inactivo:before { content: "\e938"; } -.icon-ticket:before { +.icon-info:before { content: "\e939"; } -.icon-traceability:before { +.icon-inventory:before { content: "\e93a"; } -.icon-transaction:before { +.icon-invoice:before { content: "\e93b"; } -.icon-volume:before { +.icon-invoiceIn:before { + content: "\e93c"; +} +.icon-invoice-in-create:before { content: "\e93d"; } -.icon-web:before { +.icon-invoiceOut:before { content: "\e93e"; } -.icon-worker:before { +.icon-item:before { + content: "\e93f"; +} +.icon-languaje:before { + content: "\e940"; +} +.icon-lineas:before { + content: "\e941"; +} +.icon-linesprepaired:before { + content: "\e942"; +} +.icon-logout:before { content: "\e943"; -} \ No newline at end of file +} +.icon-mana:before { + content: "\e944"; +} +.icon-mandatory:before { + content: "\e945"; +} +.icon-net:before { + content: "\e946"; +} +.icon-niche:before { + content: "\e947"; +} +.icon-no036:before { + content: "\e948"; +} +.icon-notes:before { + content: "\e949"; +} +.icon-noweb:before { + content: "\e94a"; +} +.icon-onlinepayment:before { + content: "\e94b"; +} +.icon-package:before { + content: "\e94c"; +} +.icon-payment:before { + content: "\e94d"; +} +.icon-pbx:before { + content: "\e94e"; +} +.icon-Person:before { + content: "\e94f"; +} +.icon-pets:before { + content: "\e950"; +} +.icon-photo:before { + content: "\e951"; +} +.icon-planta:before { + content: "\e952"; +} +.icon-stowaway:before { + content: "\e953"; +} +.icon-preserved:before { + content: "\e954"; +} +.icon-recovery:before { + content: "\e955"; +} +.icon-regentry:before { + content: "\e956"; +} +.icon-reserva:before { + content: "\e957"; +} +.icon-revision:before { + content: "\e958"; +} +.icon-riesgo:before { + content: "\e959"; +} +.icon-services:before { + content: "\e95a"; +} +.icon-settings:before { + content: "\e95b"; +} +.icon-shipment-01 .path1:before { + content: "\e95c"; + color: rgb(225, 225, 225); +} +.icon-shipment-01 .path2:before { + content: "\e95d"; + margin-left: -1em; + color: rgb(0, 0, 0); +} +.icon-sign:before { + content: "\e95e"; +} +.icon-sms:before { + content: "\e95f"; +} +.icon-solclaim:before { + content: "\e960"; +} +.icon-solunion:before { + content: "\e961"; +} +.icon-splitline:before { + content: "\e962"; +} +.icon-splur:before { + content: "\e963"; +} +.icon-stowaway-2:before { + content: "\e964"; +} +.icon-supplier:before { + content: "\e965"; +} +.icon-supplierfalse:before { + content: "\e966"; +} +.icon-tags:before { + content: "\e967"; +} +.icon-tax:before { + content: "\e968"; +} +.icon-thermometer:before { + content: "\e969"; +} +.icon-ticket:before { + content: "\e96a"; +} +.icon-traceability:before { + content: "\e96b"; +} +.icon-transaction:before { + content: "\e96c"; +} +.icon-treatments:before { + content: "\e96d"; +} +.icon-unavailable:before { + content: "\e96e"; +} +.icon-verde:before { + content: "\e96f"; +} +.icon-volume:before { + content: "\e970"; +} +.icon-wand:before { + content: "\e971"; +} +.icon-web:before { + content: "\e972"; +} +.icon-wiki:before { + content: "\e973"; +} +.icon-worker:before { + content: "\e974"; +} +.icon-zone:before { + content: "\e975"; +} diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index 42129b284..e4fe2300b 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -7,110 +7,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index f0e5ad047402962787849d7583699640640f8158..70fedcb59115b075f4be4a98b6e9ad814e564077 100644 GIT binary patch delta 11042 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 diff --git a/front/core/styles/icons/salixfont.woff b/front/core/styles/icons/salixfont.woff index 1cf4179ac1a23b5cf267217bdc9bfdb2e323cf95..93c96c2cd365257bd73524556ccded1738267f46 100644 GIT binary patch delta 10989 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 CuwcCa delta 8269 zcmai34|E&FncvyjKhkPf(rTrZrC7H9SW;}+mh818$B`2!bxe}R5JMc2kpCqnKth1< z_mLvnxDY7eVzzZ@&3vcD`@EfBxE!_+M3c^TrE?hB(6Eckox7tM)$35u5y@G0|$4C%&+K z)72bDwqoE?R!IA?cP`tslfhm=-!W6Xmu9tRu*uLo| zEPOykKUyny^EX_zY5NwyfJY9ovi{C>kH$E*)I^taXel&>-=#asGfda z;OKF#k?Y{*aGYWP_Ik6N?j-3{-pE_|PLhbrZX!z&63Zt8i9jNs0N4ur$m1=xB-`4O z$$}TZLXx#xieAt6-^yQ^?p`!>YkND{&42ODeQ&+BkN+f-N){PjF`3F_k}0%xZ!hLd zKm6J@-J@w%I@LX?>|@ApzPXtbxb>%x(@E^h!}+-e?2aR`xD?R+rWNZhD&Liob6b>d4mvA5fzu8Ox zj!OyD2|Wft5Kj}adWrpUQ*tiAZ6pCy5XkowtZq!mbzAdDKdB-2k~suK0mr0(pAiLS zmJziVH*O+<7ShxSz@${&yY%A^kSZHm3{GH(SB(5 z3j3kR#>zn$;;l#lPN~gOH|@nVvO~Y7@g@vd+1}uMDloS(jF-X5{)E)2Zz$c7-e-Aie$~2 z5$be~O@;efsvq!9stD16Xn$K>I7zmDxyp}@8dfyAFr65TM2bN(s;nCsS*JwJU{5r< zAdy}ejatTNMK;+sT zl}Q?`TQfVV>1|{nJH9Ks$J$@5M7!Q3fods3K2G&XZF1ZY+AiGn>QQnc+BG$OXK4=j zbgDGL?@Sb&S!dWg{Y-`ojP81Gk2TR1o!{8z-3Pc4vO%`;NidYex@)jALT6yJobD^NwdMj%O-nMF&fJRh z^mDlaEmE&k6?kWRI^E~hJ)T0crTt~BS0Yz-wYLwNrksj4cc^M8JbkR3*xvt0Fl|&t zuRbT8?tp&m^Z6**!SEq{%Go>kCGKwSKJGC01os^G0`~^@-()TB;mi$SiYA?6ss&Fj zKGUdcVwtH5Sqk_ebU_p9hT%YHF{6_xX?$l-Di4rdSl>CPK8l(E8PgINrogmtuiPYv z762Gxu%1F59U$Qe+7GO6Vw^==wsp@eV%W=b4Sb2%^9G|7n#$fZXv71S{AcNh3}8N< zAhemlDN1@)W5RCOFv6dju&>!*gx=`CqAggAcni_Z;cioC+gLDSUdboDVISJiOv3gL z)(6W&l2364RHebGMVwkdQ+$%FQcDZPwJ>!klHpVuG_BcdX1w08)1nSZ#-mb6lN6tf z8eKu6x2V_cP}cxk3#+mwNt!G<@X(?nljBxb_gZGH8XHqirM^vAueIG>))n^bjlD6F zQvH&3V`=EF()0_3-RJdPmQzAc8$&rY;GDB2%D-pdu`x?tvVX84v}&YAno=SPYzv0s z45-s6Dx;sfkkBg zO{uK7MJJV4Z#&G}-`l;o9N_{m@~7ydgd-wRh>vtYPJ2m-43I&xm@Fd~l8ec$WH-5k z+)eH!_mQuY!{i8gn0$*oLB2fakx`dZ%x8SU_|NTb&LY2?nD_|!ew|V{VPy1V= z=hCU;Ks9=1HkOmvEz0==e^CeG<^LC_=Iy`&TCrSrO%Zg@-1hn^Y|G5>dq}<*NJ8!A ziJXgPNYOIn#JMxzcFfGMWQLanelIC^rSX=b&*9|cMYPj$zUbi-MT;r6&+fQXzZ5@?2^%qlu#6Bu3)bc?K!EC$M;D;KdW{e)0LCvY$a6t~a)dvbA#^fzB&1IW1ea-Gk2U@A)D*e1 zShUtpp%EGuhKF}#LK6e~tDj6wouD$P^K}2Qsi~(iJ~fpIM~XYjnLTaQ$9JV}Ya1LN z*fTg8ZyFfS969pL-YiIr7mLHgNd$mm$j~>-BlbPOwrAe-G!=5V%dD4FG z&hOa=?z-2`e035o-=}v!C{%9#+6mtN_5F9-@1$R}=YQj=%Im|k$!r;_qXLiYc~0k= zVHlTktGN5Q2VmMMR0qtW0iB(TciAqjITHhC;AGcrCUb<~dHZWdNA{bEy8F#wkWYK1 zmUJ>k#?q+mvSyY)Fnn%LfO>syLG?fA@%ugQK;Ww=ZWQ8j2YCDl2>=WQgO>jqHV8y= zZ@?WH;0^cmkQ(3zA`JZ4UMh&$#z;~WJ0n+~A=1u@x(8t}c3dCj|~{RRHELWB%q zQJ=e7KIS%g-cTd(SC%pg)u(hHMd!R)=lkw}U!BuC=aNW-u)XoAneHM?^%wWCS=1|-$bNE_~RdimPn*i6q6CBAy?nwP50H+W#qfezpOm=^#NiJ zM^@O|cQ3X#wXU+eMsBeGrSCplUwA|1xz?k^erWl=%9m~&B$W?u-bO0F-tqx&|7*i~ z`_)VLRetV6G%_b75IgDcmIDZU7J*kI+$i(W6S|B7m5)1?$T8>BA4mpZz4Nk%bTjV; zaRduDU=X0_gK|O+;({@i&&+ZGtV}a1R#LWLB=XF$CU5M?WO!d@&1zB%cNl9{55SBK zjIQeMUo}{k0)`qsY8`b(mbP`yp53Q=w=9|7zov;?d6PK?^Y9td>bypFRJAN0pRVwF z>9WxSqypW!mkEYxQQb+RJYgNTM_1ogHLuqxz}M#e%Eh{> zdcCTu^Y1@<^Rv(1%yYVWksk4ws$Q->OV&CZu=V1A>f_%Rb-5uTiirl)FTN;7114m> z*_7Rm4|R1w)vI?Xn%d|gL%Ld>R`vM8=EI7YQuO}l^zgh-B~xb<8Kw|)?5ksxBd9B%y)p8Kx-ZDFnBOaNp5Tc-KXfla3!78lK%o_zGtL(ZV# zO$8B-WVM)Sbc914hQCGA3~8WP9FPo6Yw??%pZ#))GSIv4R^V(<}}afI60k)%aXqt5x>j?g$Y+}kp${up$Eer28dx?tPj+Z0qIma zbtbrAi_~%gkTCBrO;qAG{11_5nC(xYwBf##+KahMDIcyj)tMVCdI#_w=6IGoNqlItucZ=p_; z7imMrxX0lrV`N`EBk~7?bkp=s(Io`CLN0}hG~kdmzdx3_cEP|+IV$ilKoS*IF&Gi6 zqpGfHxmdh4yD>vvQT5y9gcnJ%>`>+@)9cY zE>|cQ6kTF_HoGp<-jXW{v@L_P5TF*Yh3L|>uJ+_|qluP~><&OKkVT;52;%jb970Ub z)q|#blw_N&?oyrxV);${Q5=y&F}V;1w-f=I>Gd_1%ff3pBuvn%XXd=6O^mt922Mav*)4xi$g~8;d=D?Q!@`bA( zutmrrU#MCnhsY4?EnEl&{5hERah+T@Oyxz~CT<59@Bjj8E@{6;J1;b>Vk}t8zp*4+ z-9AEdAlik!jF39u@Ag>c4pY0NRG!^-1L1I_&o5<|%E=IxvjZ#pNl#%eVODisP4l=( zTDH=-@k~FMK~s{0U}c1m&30UvJ(s*|R8PGwi=s?;)DA*(?BxKUomH%pInzi2O9Dia zp?%ifD>PW&kwwKMlK4A}m$ zh+&iS(t_*|f}=cTi(d0rs%u4AlD;U5S7Qkx3qT>HXnVY&^1q9YBZ4Fe-;||UqGJm$ zQ$^$1+8V!dB~h^`kEN;1Zy^qG7Wf24Wowb%aU^!#$UR26bS>RH%6)_T4w5vG?L37O z3f}~VoVh3vygFxUY(mBq7QRUF>Lgl{X;c%MoY{VsnT%VQ8GTDGcP4t~rlgf~`d6>+w??#p zE`_{dN;T@DVQ(vD%Cc0F@N*(-6c-eX(2yCSR}E)p`HjX#1F5=fAWI4VaVj-kMC#zs zsm(A6Z#Vh(tqw{l3 znwj_8lzFC4LnRhUCZPn>S0~v>ajk!pM>*#E_qPFG~Da@B5YdRV5TYs>j+#_`{U$iE(NX{jU+7$M6^N5VB8@3By9$6c9H1+kc z7j_&5Xez4cR9`%g8|^j+Ll4>Q%!UCGhY? zRw$4le;$aS=2ud~DM6O4F-xM97n}yXGRjjYk=zO|X-yiHk-Abt3JCRVwx}ck6&Wl+ zbQ%~|MP%Bdi=tYDiMI6xOQd}}<{*qOZY?vZ-Nn*$SX01F0wqir*ghm`T~31?TUTD7rP6|zrq`ZyZ=@h`hjG?%woNj4d8wq(N_>D%pDJD9*qKT|v zB{su~D2B6E-y$F(r<8-rG0;*xj3Vlf@L7OUibZ$=0M=y7@dC>f;A@a-Fsg5%E$JwN z?0%&_1Gm@gHkaPBG_foth~8!m8UZNCw2L&lpan?qYVq}Gq|)gN(rKnPj8xf+@4~@b zV?Fp{kfmNZHIjnQ#Ab@YE|V=HvHV}|(%kUZSt3rX9T3GBNQAABAifN$;bJ(kFaf_A z1Z7!Z-{^5B7N@`x7t#^Ic7syc>@u-6s>)PzTAO>YzCozjVY2n8@V{D!%?MhNl%;un z(eV64v=E7wqTt8+&ICKgXjc`wPJ$X>8qd{^T?&!{$IYtq5NjzKcnL<<(wLI`5l{fd zzLALyU;zDEy^L+NsI%=!`t>zJNR2X+!2S=35+};{H+V|F=Ug=?_s(-fWW(%jHykc5 zx~dLmF#PWZ1^o#ILs>ubX6-vs22sXQ)}S!hnG&#3}Vnfon7G0N%S$MrZnLE)_T*_lyv7dbcm<8~6Rth#G^&*8*1s?hW1)JRbaIc;l=KBmT&)$S<3g zHl1vaHa{7SM~7nX#qUb&X?ZQ#m%RMV)P3pR^sVXtm|dFvTI(ZiOWUq%JJ5Ebt(sYy z8E;?Jez;>{#~-p+WGA!lb@g=}>mKMnV6E&~oWC%?C;!btY0iCpU!MC&DOdW_ywv>E l{7)Ce7kser(?u(WeskWQB~$n~CW2S-*Kv``yd!Ut{{u Date: Fri, 26 Nov 2021 13:04:07 +0100 Subject: [PATCH 07/10] Updated icons --- modules/item/front/routes.json | 2 +- modules/monitor/front/index/tickets/index.html | 2 +- modules/ticket/front/index/index.html | 2 +- modules/ticket/front/routes.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json index 6d39083b4..9e21e1697 100644 --- a/modules/item/front/routes.json +++ b/modules/item/front/routes.json @@ -7,7 +7,7 @@ "menus": { "main": [ {"state": "item.index", "icon": "icon-item"}, - {"state": "item.request", "icon": "pan_tool"}, + {"state": "item.request", "icon": "icon-buyrequest"}, {"state": "item.waste.index", "icon": "icon-claims"}, {"state": "item.fixedPrice", "icon": "icon-fixedPrice"} ], diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index 34f2841fd..7c0eb83da 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -93,7 +93,7 @@ ng-show="::ticket.hasTicketRequest" translate-attr="{title: 'Purchase request'}" class="bright" - icon="icon-100"> + icon="icon-buyrequest"> + icon="icon-buyrequest"> Date: Fri, 26 Nov 2021 13:53:39 +0100 Subject: [PATCH 08/10] Updated fonts --- front/core/styles/icons/salixfont.css | 15 ++++++--------- front/core/styles/icons/salixfont.svg | 9 ++++----- front/core/styles/icons/salixfont.ttf | Bin 42184 -> 41716 bytes front/core/styles/icons/salixfont.woff | Bin 42260 -> 41792 bytes modules/invoiceIn/front/descriptor/index.html | 2 +- modules/invoiceIn/front/routes.json | 4 ++-- modules/invoiceOut/front/routes.json | 4 ++-- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index 28c81552e..8136b5fa6 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -71,7 +71,7 @@ } .icon-bucket:before { content: "\e90e"; - color: #5f5f5f; + color: #000; } .icon-buscaman:before { content: "\e90f"; @@ -204,7 +204,7 @@ .icon-headercol:before { content: "\e936"; } -.icon-History:before { +.icon-history:before { content: "\e937"; } .icon-Inactivo:before { @@ -219,13 +219,13 @@ .icon-invoice:before { content: "\e93b"; } -.icon-invoiceIn:before { +.icon-invoice-in:before { content: "\e93c"; } .icon-invoice-in-create:before { content: "\e93d"; } -.icon-invoiceOut:before { +.icon-invoice-out:before { content: "\e93e"; } .icon-item:before { @@ -234,7 +234,7 @@ .icon-languaje:before { content: "\e940"; } -.icon-lineas:before { +.icon-lines:before { content: "\e941"; } .icon-linesprepaired:before { @@ -342,9 +342,6 @@ .icon-splur:before { content: "\e963"; } -.icon-stowaway-2:before { - content: "\e964"; -} .icon-supplier:before { content: "\e965"; } @@ -395,4 +392,4 @@ } .icon-zone:before { content: "\e975"; -} +} \ No newline at end of file diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index e4fe2300b..109886300 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -62,17 +62,17 @@ - + - + - + - + @@ -107,7 +107,6 @@ - diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index 70fedcb59115b075f4be4a98b6e9ad814e564077..4dab32d993b67032f0b83dc43176629df9306926 100644 GIT binary patch delta 322 zcmX?clIhD)rU?r5FE_oaU|?XBVPIg0Nlz>;0MY_LK2VH-BR!`wtvBy~29V#tz%VBw zBQ-HaZjJ3`28OvefbwP;Kmqo{EanUh^MHC7R5Ef)D(*3fodEJpfO=l!TgG^JTF zFf0I>|1CGMqJUuvQyBxpLJ=TeAulmkGBqyzraMpoq+wn`esKu{Gf;|Q(UplinvETR zEFK091||j;21W*jm&q^7{{Q{|AEW@tV|bYg<}v<%EY2d%4AjWTz_2-u(YtALXRErD zOc0CA>v(>fuMFHQU>$dl)hqxpK=kA@^UWEnHnS{P&bWE~LSaT7$8An|&SEYiE^A!B pxW&2sa^L5X=c(s;!Arv{&xgZjh3^GF9iU#I4GdMA-z~bu2msamWQ_m- delta 689 zcmXw0Ur1AN6h3Fa`@46W4L98N+A@`FTQtG_(OrYGp6|bT!v`bx z;)A7_P=@nQg;p=YpoI3;1bYo63JNI*!=ONepn2ENpmX4S=R4o|&db?bS8cpeO;wFa z!MFPWSPlS}qv7NrLp|dMsE+pE=q1zsJB*J2r0ubu@U@C3eWw5xR+;XOv4QZKYhZkf z@#C@h(8y<1=?1_e$2{Nr6W!t4i!ZVOOFx(u9uBsIf_Pyfh~yDXHlZ|I)@GolD*XBaLJ-ft!AkfWywl@ zDEXPC0dY)!RI4?Wn3}6OO^^_dCxMo#j#pd&2i&x2Ghw^e)hlF~R&DlB5lAcsH(W9(+kQjDD$}2CndVKSTvNp{1 zRgfZf*MG8$CqxkL)3Op>rCwjD)0R;($3}!+@>9YU6EVSSc!B3SXTk|n15ex49`4z( zNGcLha;dopl1{9#MQt{WBt7#6b-E#`+ex7*$VJkhQfzI)qi*LQvo?OhRIW5W|8uqY z^e-r4&u8&*y`=j;&gAE19L?0FS1|K#LBg6Qb<=Wl$gA>!@7}pBf588>;OiLf|FVm>G6951J diff --git a/front/core/styles/icons/salixfont.woff b/front/core/styles/icons/salixfont.woff index 93c96c2cd365257bd73524556ccded1738267f46..492bc3b70a7fc0c104a5531b4f6f6ba99cf634fb 100644 GIT binary patch delta 375 zcmbPois`^HCb4pVH#Y`G1|V4Mz`zZn7ky!1oXogXc%r6KeGHHv^K#RxiuA+~H04-ja02ELF<0(vKd5O8H zK(Pj(#(5wd7k<;dAiuZ-=m&*~f4YqwfC_nl?qp(M0eVg0W%A3i|9}7g2Z{m>dCBlH z70hG&|5%(woSA_csD@$lCPwe3%~xC1rDTFwWM0Sf+k9orN1msi=LIhfuRI?PpB26r{B(eN Ofi^HyZMIr`ixB{B4Q`qM delta 753 zcmXYvT}YEr7{|}E=RNPckA@RBUs-<9nu{j5FMSu74RubZWs*+tqS(xB;Ku~T3@?=0 zjf9n`P=;$+A{9X}sHj~8t&lDQFA9n%2*jWZ4TAJt=atUkch2+t`JeMVaL(&@s>Syz znqcq*kqHZztVLuig8zls?ELZ=>5F5H2Wm=AqltTgM12^IW z;fsXa-DRFSh4P1kC*n*bBwfw&qYAsfX97#K~AjkB(I=l8DJz09a(eX7_5Qn@ve z-_Pfn#;({R2QlQoiyT1$nU~Oh<*TFGcC1(VTP z$P6aSDG;f{fjQI&$eHAAfufF&bRkl%hjI{ALkwvMDPVI{5Ky4}-b_xjUS;?Dp|x4w zgD&~`jvkQu62eILz~aPawuzu++aDYk2G++mq!$Y+q9%e zUtus*=(Qyjmzjk0T!121fTjem;RT-SS$L8#dwJTS_HmDoM3Rw+oJ%f80DGX?9<$pa zGUi(;RHwXS`t2l`LtG^FCCO~FK6M92GFkFEL*>+=lU&rq0#WUH?67~xS KnaV`(eS&`#>%YVR diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html index 6829a0daf..0cdd5f8b8 100644 --- a/modules/invoiceIn/front/descriptor/index.html +++ b/modules/invoiceIn/front/descriptor/index.html @@ -43,7 +43,7 @@
+ icon="icon-invoice-in">
diff --git a/modules/invoiceIn/front/routes.json b/modules/invoiceIn/front/routes.json index 599e6cb2d..bae496629 100644 --- a/modules/invoiceIn/front/routes.json +++ b/modules/invoiceIn/front/routes.json @@ -1,7 +1,7 @@ { "module": "invoiceIn", "name": "Invoices in", - "icon": "icon-invoiceIn", + "icon": "icon-invoice-in", "validations": true, "dependencies": [ "worker", @@ -11,7 +11,7 @@ "main": [ { "state": "invoiceIn.index", - "icon": "icon-invoiceIn" + "icon": "icon-invoice-in" } ], "card": [ diff --git a/modules/invoiceOut/front/routes.json b/modules/invoiceOut/front/routes.json index 5cb2a780c..09d9f3d33 100644 --- a/modules/invoiceOut/front/routes.json +++ b/modules/invoiceOut/front/routes.json @@ -1,12 +1,12 @@ { "module": "invoiceOut", "name": "Invoices out", - "icon": "icon-invoiceOut", + "icon": "icon-invoice-out", "validations" : true, "dependencies": ["worker", "client", "ticket"], "menus": { "main": [ - {"state": "invoiceOut.index", "icon": "icon-invoiceOut"} + {"state": "invoiceOut.index", "icon": "icon-invoice-out"} ] }, "routes": [ From 8bd1db2e97bc57c4c57eac5b3170c9f65acdd9f8 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 29 Nov 2021 10:10:53 +0100 Subject: [PATCH 09/10] remove unnecesary on-accept --- modules/entry/front/buy/import/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js index a88476240..2f13b2746 100644 --- a/modules/entry/front/buy/import/index.js +++ b/modules/entry/front/buy/import/index.js @@ -133,7 +133,7 @@ class Controller extends Section { case 'producerFk': case 'typeFk': case 'size': - case 'inkFk': + case 'ink': where[key] = value; } } From 49e9fcaa7ccbdfc0e149e2bca6e284de05ed4d93 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 29 Nov 2021 10:11:47 +0100 Subject: [PATCH 10/10] remove unnecesary on-accept --- modules/entry/front/buy/import/index.html | 1 - modules/entry/front/buy/import/index.js | 2 +- modules/item/front/basic-data/index.html | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/entry/front/buy/import/index.html b/modules/entry/front/buy/import/index.html index ada92fcc3..154e74ffc 100644 --- a/modules/entry/front/buy/import/index.html +++ b/modules/entry/front/buy/import/index.html @@ -113,7 +113,6 @@ diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js index 2f13b2746..a88476240 100644 --- a/modules/entry/front/buy/import/index.js +++ b/modules/entry/front/buy/import/index.js @@ -133,7 +133,7 @@ class Controller extends Section { case 'producerFk': case 'typeFk': case 'size': - case 'ink': + case 'inkFk': where[key] = value; } } diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html index 3bf1fc10b..e926e3180 100644 --- a/modules/item/front/basic-data/index.html +++ b/modules/item/front/basic-data/index.html @@ -230,7 +230,6 @@