diff --git a/Jenkinsfile b/Jenkinsfile index 06eb85561..8f87ffe61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,9 +25,11 @@ pipeline { switch (env.BRANCH_NAME) { case 'master': env.NODE_ENV = 'production' + env.BACK_REPLICAS = 4 break case 'test': env.NODE_ENV = 'test' + env.BACK_REPLICAS = 2 break } } diff --git a/back/methods/image/upload.js b/back/methods/image/upload.js index 649d13c68..a93ead651 100644 --- a/back/methods/image/upload.js +++ b/back/methods/image/upload.js @@ -48,7 +48,7 @@ module.exports = Self => { throw new UserError(`You don't have enough privileges`); if (process.env.NODE_ENV == 'test') - throw new UserError(`You can't upload images on the test instance`); + throw new UserError(`You can't upload images on the test environment`); // Upload file to temporary path const tempContainer = await TempContainer.container(args.collection); diff --git a/db/changes/10270-wisemen/00-itemTag.sql b/db/changes/10270-wisemen/00-itemTag.sql new file mode 100644 index 000000000..f1e9370d5 --- /dev/null +++ b/db/changes/10270-wisemen/00-itemTag.sql @@ -0,0 +1,19 @@ +DROP TRIGGER IF EXISTS `vn`.`itemTag_afterUpdate`; + +DELIMITER $$ +USE `vn`$$ +CREATE DEFINER=`root`@`%` TRIGGER `vn`.`itemTag_afterUpdate` + AFTER UPDATE ON `itemTag` FOR EACH ROW +trig: BEGIN + IF @isTriggerDisabled THEN + LEAVE trig; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp.item; + CREATE TEMPORARY TABLE tmp.item + SELECT NEW.itemFk id; + + CALL item_refreshTags(); + DROP TEMPORARY TABLE tmp.item; +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/changes/10271-wisemen/.keep b/db/changes/10271-wisemen/.keep new file mode 100644 index 000000000..d955e6ec8 --- /dev/null +++ b/db/changes/10271-wisemen/.keep @@ -0,0 +1 @@ +12271-wisemen \ No newline at end of file diff --git a/db/changes/10271-wisemen/00-ACL.sql b/db/changes/10271-wisemen/00-ACL.sql new file mode 100644 index 000000000..40e47b1a3 --- /dev/null +++ b/db/changes/10271-wisemen/00-ACL.sql @@ -0,0 +1 @@ +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('FixedPrice', '*', '*', 'ALLOW', 'ROLE', 'buyer'); \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c04f7e388..24e1446e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - 80 deploy: - replicas: 3 + replicas: 2 back: image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?} build: . @@ -30,7 +30,7 @@ services: - /mnt/storage/dms:/var/lib/salix/dms - /mnt/storage/image:/var/lib/salix/image deploy: - replicas: 6 + replicas: ${BACK_REPLICAS:?} configs: datasources: external: true diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 8d40542b8..42c01ac07 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -250,6 +250,18 @@ export default { taxClassCheckbox: '.vn-popover.shown vn-horizontal:nth-child(11) > vn-check', saveFieldsButton: '.vn-popover.shown vn-button[label="Save"] > button' }, + itemFixedPrice: { + add: 'vn-fixed-price vn-icon[icon="add_circle"]', + fourthFixedPrice: 'vn-fixed-price vn-tr:nth-child(4)', + fourthItemID: 'vn-fixed-price vn-tr:nth-child(4) vn-autocomplete[ng-model="price.itemFk"]', + fourthWarehouse: 'vn-fixed-price vn-tr:nth-child(4) vn-autocomplete[ng-model="price.warehouseFk"]', + fourthPPU: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(4)', + fourthPPP: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(5)', + fourthMinPrice: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(6)', + fourthStarted: 'vn-fixed-price vn-tr:nth-child(4) vn-date-picker[ng-model="price.started"]', + fourthEnded: 'vn-fixed-price vn-tr:nth-child(4) vn-date-picker[ng-model="price.ended"]', + fourthDeleteIcon: 'vn-fixed-price vn-tr:nth-child(4) > vn-td:nth-child(9) > vn-icon-button[icon="delete"]' + }, itemCreateView: { temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]', type: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]', @@ -721,9 +733,9 @@ export default { }, workerSummary: { header: 'vn-worker-summary h5', - id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) > section > span', - email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span', - department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span', + id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span', + email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span', + department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(5) > section > span', userId: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(2) > section > span', userName: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) > section > span', role: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) > section > span', @@ -793,13 +805,13 @@ export default { workerCalendar: { year: 'vn-worker-calendar vn-autocomplete[ng-model="$ctrl.year"]', totalHolidaysUsed: 'vn-worker-calendar div.totalBox > div', - januaryThirtyFirst: 'vn-worker-calendar vn-calendar:nth-child(2) section:nth-child(33) > div', - marchTwentyThird: 'vn-worker-calendar vn-calendar:nth-child(4) section:nth-child(29) > div', - mayFourth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(8) > div', - mayEighth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(12) > div', - mayTwelfth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(16) > div', - mayThirteenth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(17) > div', - mayFourteenth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(18) > div', + penultimateMondayOfJanuary: 'vn-worker-calendar vn-calendar:nth-child(2) section:nth-child(22) > div', + lastMondayOfMarch: 'vn-worker-calendar vn-calendar:nth-child(4) section:nth-child(29) > div', + fistMondayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(8) > div', + secondFridayOfJun: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(12) > div', + secondTuesdayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(16) > div', + secondWednesdayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(17) > div', + secondThursdayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(18) > div', holidays: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(1)', absence: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(2)', halfHoliday: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(3)', @@ -832,7 +844,8 @@ export default { }, travelExtraCommunity: { anySearchResult: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr', - firstTravelReference: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable', + firstTravelReference: 'vn-travel-extra-community vn-tbody:nth-child(2) vn-td-editable[name="reference"]', + firstTravelLockedKg: 'vn-travel-extra-community vn-tbody:nth-child(2) vn-td-editable[name="lockedKg"]', removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i' }, travelBasicData: { diff --git a/e2e/paths/03-worker/05_calendar.spec.js b/e2e/paths/03-worker/05_calendar.spec.js index e82006b3c..08ef71f13 100644 --- a/e2e/paths/03-worker/05_calendar.spec.js +++ b/e2e/paths/03-worker/05_calendar.spec.js @@ -27,31 +27,31 @@ describe('Worker calendar path', () => { it('should set two days as holidays on the calendar and check the total holidays increased by 1.5', async() => { await page.waitToClick(selectors.workerCalendar.holidays); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst); + await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.absence); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.marchTwentyThird); + await page.waitToClick(selectors.workerCalendar.lastMondayOfMarch); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.halfHoliday); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayFourth); + await page.waitToClick(selectors.workerCalendar.fistMondayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.furlough); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayTwelfth); + await page.waitToClick(selectors.workerCalendar.secondTuesdayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayThirteenth); + await page.waitToClick(selectors.workerCalendar.secondWednesdayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayFourteenth); + await page.waitToClick(selectors.workerCalendar.secondThursdayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.halfFurlough); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayEighth); + await page.waitToClick(selectors.workerCalendar.secondFridayOfJun); await page.waitForTimeout(reasonableTimeBetweenClicks); const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText'); @@ -71,31 +71,31 @@ describe('Worker calendar path', () => { await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.holidays); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst); + await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.absence); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.marchTwentyThird); + await page.waitToClick(selectors.workerCalendar.lastMondayOfMarch); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.halfHoliday); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayFourth); + await page.waitToClick(selectors.workerCalendar.fistMondayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.furlough); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayTwelfth); + await page.waitToClick(selectors.workerCalendar.secondTuesdayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayThirteenth); + await page.waitToClick(selectors.workerCalendar.secondWednesdayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayFourteenth); + await page.waitToClick(selectors.workerCalendar.secondThursdayOfMay); await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.halfFurlough); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.mayEighth); + await page.waitToClick(selectors.workerCalendar.secondFridayOfJun); }); it('should check the total holidays used are back to what it was', async() => { @@ -116,7 +116,7 @@ describe('Worker calendar path', () => { await page.waitForTimeout(reasonableTimeBetweenClicks); await page.waitToClick(selectors.workerCalendar.holidays); await page.waitForTimeout(reasonableTimeBetweenClicks); - await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst); + await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary); }); it('should check the total holidays used are now the initial ones', async() => { diff --git a/e2e/paths/04-item/14_fixedPrice.spec.js b/e2e/paths/04-item/14_fixedPrice.spec.js new file mode 100644 index 000000000..477daa151 --- /dev/null +++ b/e2e/paths/04-item/14_fixedPrice.spec.js @@ -0,0 +1,61 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Item fixed prices path', () => { + let browser; + let page; + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + await page.loginAndModule('buyer', 'item'); + await page.accessToSection('item.fixedPrice'); + }); + + afterAll(async() => { + await browser.close(); + }); + + it('should click on the add new foxed price button', async() => { + await page.waitToClick(selectors.itemFixedPrice.add); + await page.waitForSelector(selectors.itemFixedPrice.fourthFixedPrice); + }); + + it('should fill the fixed price data', async() => { + const now = new Date(); + const searchValue = 'Chest ammo box'; + await page.waitToClick(selectors.itemFixedPrice.fourthItemID); + await page.write('body > div > div > div.content > div.filter.ng-scope > vn-textfield', searchValue); + try { + await page.waitForFunction(searchValue => { + const element = document.querySelector('li.active'); + if (element) + return element.innerText.toLowerCase().includes(searchValue.toLowerCase()); + }, {}, searchValue); + } catch (error) { + const builtSelector = await page.selectorFormater(selectors.ticketSales.moreMenuState); + const inputValue = await page.evaluate(() => { + return document.querySelector('.vn-drop-down.shown vn-textfield input').value; + }); + throw new Error(`${builtSelector} value is ${inputValue}! ${error}`); + } + await page.keyboard.press('Enter'); + await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one'); + await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPPU, '20'); + await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPPP, '10'); + await page.writeOnEditableTD(selectors.itemFixedPrice.fourthMinPrice, '5'); + await page.pickDate(selectors.itemFixedPrice.fourthStarted, now); + await page.pickDate(selectors.itemFixedPrice.fourthEnded, now); + await page.waitForTimeout(1000); + const message = await page.waitForSnackbar(); + + expect(message.text).toContain('Data saved!'); + }); + + it('should reload the section and check the created price has the expected ID', async() => { + await page.accessToSection('item.index'); + await page.accessToSection('item.fixedPrice'); + const result = await page.getProperty('vn-fixed-price > div > vn-card > vn-table > div > vn-tbody > vn-tr:nth-child(4) > vn-td:nth-child(1) > span', 'innerText'); + + expect(result).toContain('13'); + }); +}); diff --git a/e2e/paths/10-travel/04_extra_community.spec.js b/e2e/paths/10-travel/04_extra_community.spec.js index 7a37b89e4..60a3fddb3 100644 --- a/e2e/paths/10-travel/04_extra_community.spec.js +++ b/e2e/paths/10-travel/04_extra_community.spec.js @@ -16,19 +16,23 @@ describe('Travel extra community path', () => { await browser.close(); }); - it('should edit the travel reference', async() => { + it('should edit the travel reference and the locked kilograms', async() => { await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter); await page.waitForSpinnerLoad(); await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); + await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelLockedKg, '1500'); + await page.waitForTimeout(1000); }); - it('should reload the index and confirm the reference was edited', async() => { + it('should reload the index and confirm the reference and locked kg were edited', async() => { await page.accessToSection('travel.index'); await page.accessToSection('travel.extraCommunity'); await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter); await page.waitForTextInElement(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); const reference = await page.getProperty(selectors.travelExtraCommunity.firstTravelReference, 'innerText'); + const lockedKg = await page.getProperty(selectors.travelExtraCommunity.firstTravelLockedKg, 'innerText'); expect(reference).toContain('edited reference'); + expect(lockedKg).toContain(1500); }); }); diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index 8d619e4a3..d18973bbe 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -187,7 +187,10 @@ export default class Field extends FormInput { } onChange() { - this.emit('change', {value: this.field}); + // Changes doesn't reflect until appling async + this.$.$applyAsync(() => { + this.emit('change', {value: this.field}); + }); } } Field.$inject = ['$element', '$scope']; diff --git a/front/core/components/searchbar/search-panel.js b/front/core/components/searchbar/search-panel.js index f473c2b04..67fd3fae2 100644 --- a/front/core/components/searchbar/search-panel.js +++ b/front/core/components/searchbar/search-panel.js @@ -1,4 +1,5 @@ import Component from '../../lib/component'; +import './style.scss'; export default class SearchPanel extends Component { set filter(value) { diff --git a/front/core/components/searchbar/style.scss b/front/core/components/searchbar/style.scss index c1d4be21c..eab9c126b 100644 --- a/front/core/components/searchbar/style.scss +++ b/front/core/components/searchbar/style.scss @@ -1,4 +1,4 @@ -@import "variables"; +@import "./variables"; vn-searchbar { display: block; @@ -44,4 +44,27 @@ vn-searchbar { & > form { padding: $spacing-lg; } + + & > form#manifold-form { + padding: 0; + + .manifold-panel { + border: $border-thin-light; + border-radius: 5px; + position: relative; + text-align: right; + + .or { + font-weight: bold; + font-size: 26px; + color: $color-font-secondary + } + + vn-icon[icon="info"] { + position: absolute; + top: 2px; + right: 2px + } + } + } } \ No newline at end of file diff --git a/front/core/components/th/index.js b/front/core/components/th/index.js index f815056f6..b9ea8fde8 100644 --- a/front/core/components/th/index.js +++ b/front/core/components/th/index.js @@ -1,4 +1,5 @@ import ngModule from '../../module'; +import './style.scss'; export default class Th { constructor($element) { diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss index 85da5aa03..99854fa9d 100644 --- a/front/salix/components/summary/style.scss +++ b/front/salix/components/summary/style.scss @@ -73,6 +73,21 @@ ui-view > .vn-summary { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + position: relative; + span { + display: block; + } + a { + color: $color-font; + } + } + h4 span:after { + font-family: 'Material Icons'; + content: 'open_in_new'; + position: absolute; + right: 5px; + text-transform: none; + color: $color-spacer } & > * { margin: $spacing-sm; diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml index f2a23a7a7..98384df83 100644 --- a/front/salix/locale/es.yml +++ b/front/salix/locale/es.yml @@ -52,6 +52,7 @@ Suppliers: Proveedores Summary: Vista previa Basic data: Datos básicos List: Listado +Go to: Ir a # Misc diff --git a/loopback/locale/es.json b/loopback/locale/es.json index b54c0cc67..aa54c6b94 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -166,5 +166,6 @@ "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta", "Sorts whole route": "Reordena ruta entera", "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día {{shipped}}, con una cantidad de {{quantity}} y un precio de {{price}} €", - "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día {{shipped}}, con una cantidad de {{quantity}}" + "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día {{shipped}}, con una cantidad de {{quantity}}", + "That item doesn't exists": "Ese artículo no existe" } \ No newline at end of file diff --git a/modules/account/back/models/ldap-config.js b/modules/account/back/models/ldap-config.js index 9f0e84c66..819659066 100644 --- a/modules/account/back/models/ldap-config.js +++ b/modules/account/back/models/ldap-config.js @@ -35,14 +35,13 @@ module.exports = Self => { accountConfig } = this; - let newEntry; + let dn = `uid=${userName},${this.userDn}`; if (info.hasAccount) { let {user} = info; let oldUser = await client.searchOne(this.userDn, { scope: 'sub', - attributes: ['userPassword', 'sambaNTPassword'], filter: `&(uid=${userName})` }); @@ -52,7 +51,7 @@ module.exports = Self => { ? nameArgs.splice(1).join(' ') : '-'; - newEntry = { + let newEntry = { uid: userName, objectClass: [ 'inetOrgPerson', @@ -101,62 +100,115 @@ module.exports = Self => { if (newEntry[prop] == null) delete newEntry[prop]; } + + if (oldUser) { + let changes = []; + let skipProps = new Set([ + 'dn', + 'controls' + ]); + + for (let prop in oldUser) { + let deleteProp = !skipProps.has(prop) + && !newEntry.hasOwnProperty(prop); + if (!deleteProp) continue; + changes.push(new ldap.Change({ + operation: 'delete', + modification: { + [prop]: oldUser[prop] + } + })); + } + for (let prop in newEntry) { + if (this.isEqual(oldUser[prop], newEntry[prop])) + continue; + changes.push(new ldap.Change({ + operation: 'replace', + modification: { + [prop]: newEntry[prop] + } + })); + } + + if (changes.length) + await client.modify(dn, changes); + } else + await client.add(dn, newEntry); + } else { + try { + await client.del(dn); + console.log(` -> User '${userName}' removed from LDAP`); + } catch (e) { + if (e.name !== 'NoSuchObjectError') throw e; + } } + }, - // Remove and recreate (if applicable) user - - let dn = `uid=${userName},${this.userDn}`; - let operation; - - try { - await client.del(dn); - operation = 'delete'; - } catch (e) { - if (e.name !== 'NoSuchObjectError') throw e; - } - - if (info.hasAccount) { - await client.add(dn, newEntry); - operation = 'add'; - } - - if (operation === 'delete') - console.log(` -> User '${userName}' removed from LDAP`); + isEqual(a, b) { + if (Array.isArray(a) && Array.isArray(b)) { + if (a.length !== b.length) + return false; + for (let element of a) { + if (b.indexOf(element) === -1) + return false; + } + return true; + } else + return a == b; }, async syncUserGroups(userName, info) { let {client} = this; + let {user} = info; + let groupDn = this.groupDn; let opts = { scope: 'sub', - attributes: ['dn'], + attributes: ['dn', 'cn'], filter: `&(memberUid=${userName})(objectClass=posixGroup)` }; - let oldGroups = await client.searchAll(this.groupDn, opts); + let oldGroups = await client.searchAll(groupDn, opts); - let reqs = []; - for (let oldGroup of oldGroups) { - let change = new ldap.Change({ - operation: 'delete', - modification: {memberUid: userName} - }); - reqs.push(client.modify(oldGroup.dn, change)); + let deleteGroups = []; + let addGroups = []; + + if (info.hasAccount) { + let oldSet = new Set(); + oldGroups.forEach(e => oldSet.add(e.cn)); + + let newSet = new Set(); + user.roles().forEach(e => newSet.add(e.inherits().name)); + + for (let group of oldGroups) { + if (!newSet.has(group.cn)) + deleteGroups.push(group.cn); + } + for (let role of user.roles()) { + if (!oldSet.has(role.inherits().name)) + addGroups.push(role.inherits().name); + } + } else { + for (let group of oldGroups) + deleteGroups.push(group.cn); } - await Promise.all(reqs); - if (!info.hasAccount) return; - - reqs = []; - for (let role of info.user.roles()) { - let change = new ldap.Change({ - operation: 'add', - modification: {memberUid: userName} - }); - let roleName = role.inherits().name; - let dn = `cn=${roleName},${this.groupDn}`; - reqs.push(client.modify(dn, change)); + async function applyOperations(groups, operation) { + for (let group of groups) { + try { + let dn = `cn=${group},${groupDn}`; + await client.modify(dn, new ldap.Change({ + operation, + modification: {memberUid: userName} + })); + } catch (err) { + if (err.name !== 'NoSuchObjectError') + throw err; + } + } } - await Promise.all(reqs); + + await applyOperations(deleteGroups, 'delete'); + await applyOperations(addGroups, 'add'); }, async getUsers(usersToSync) { diff --git a/modules/account/front/summary/index.html b/modules/account/front/summary/index.html index 9c96a9703..41632aef6 100644 --- a/modules/account/front/summary/index.html +++ b/modules/account/front/summary/index.html @@ -1,6 +1,7 @@
- @@ -10,7 +11,18 @@
-

Basic data

+

+ + Basic Data + +

+

+ Basic Data +

diff --git a/modules/account/front/summary/index.js b/modules/account/front/summary/index.js index 21be84660..8ed025b61 100644 --- a/modules/account/front/summary/index.js +++ b/modules/account/front/summary/index.js @@ -18,6 +18,9 @@ class Controller extends Summary { this.$http.get(`Accounts/${value.id}`, {filter}) .then(res => this.$.summary = res.data); } + get isHr() { + return this.aclService.hasAny(['hr']); + } get user() { return this._user; diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html index f4e9c1471..e9ec1e765 100644 --- a/modules/claim/front/summary/index.html +++ b/modules/claim/front/summary/index.html @@ -4,7 +4,8 @@
- @@ -54,7 +55,18 @@ -

Detail

+

+ + Detail + +

+

+ Detail +

@@ -105,7 +117,18 @@ -

Development

+

+ + Development + +

+

+ Development +

@@ -136,7 +159,18 @@ -

Action

+

+ + Action + +

+

+ Action +

diff --git a/modules/claim/front/summary/index.js b/modules/claim/front/summary/index.js index 89848ecc6..bda830d6a 100644 --- a/modules/claim/front/summary/index.js +++ b/modules/claim/front/summary/index.js @@ -13,6 +13,14 @@ class Controller extends Summary { this.getSummary(); } + get isSalesPerson() { + return this.aclService.hasAny(['salesPerson']); + } + + get isClaimManager() { + return this.aclService.hasAny(['claimManager']); + } + get claim() { return this._claim; } diff --git a/modules/client/back/methods/client/updateAddress.js b/modules/client/back/methods/client/updateAddress.js index db8ed38d6..27f9faf1c 100644 --- a/modules/client/back/methods/client/updateAddress.js +++ b/modules/client/back/methods/client/updateAddress.js @@ -5,7 +5,7 @@ module.exports = function(Self) { description: 'Updates a client address updating default address', accepts: [{ arg: 'ctx', - type: 'Object', + type: 'object', http: {source: 'context'} }, { @@ -70,7 +70,7 @@ module.exports = function(Self) { }], returns: { root: true, - type: 'Object' + type: 'object' }, http: { verb: 'patch', diff --git a/modules/client/front/consumption/index.js b/modules/client/front/consumption/index.js index af08a8871..7017fed41 100644 --- a/modules/client/front/consumption/index.js +++ b/modules/client/front/consumption/index.js @@ -33,7 +33,7 @@ class Controller extends Section { get reportParams() { const userParams = this.$.model.userParams; return Object.assign({ - authorization: this.vnToken.token, + recipient: this.client.email, recipientId: this.client.id }, userParams); } diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index 50bdd226c..3e8f4f705 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -12,7 +12,18 @@ -

Basic data

+

+ + Basic data + +

+

+ Basic data +

@@ -43,7 +54,18 @@ -

Fiscal address

+

+ + Fiscal address + +

+

+ Fiscal address +

@@ -67,7 +89,18 @@ -

Fiscal data

+

+ + Fiscal data + +

+

+ Fiscal data +

-

Billing data

+

+ + Billing data + +

+

+ Billing data +

@@ -136,7 +180,18 @@ -

Default address

+

+ + Address + +

+

+ Address +

@@ -148,7 +203,17 @@ -

Web access

+

+ + Web access + +

+

Web access +

diff --git a/modules/client/front/summary/index.js b/modules/client/front/summary/index.js index cf5991247..8ef724061 100644 --- a/modules/client/front/summary/index.js +++ b/modules/client/front/summary/index.js @@ -18,6 +18,9 @@ class Controller extends Summary { } }); } + get isEmployee() { + return this.aclService.hasAny(['employee']); + } sumRisk() { let total = 0; diff --git a/modules/client/front/summary/locale/es.yml b/modules/client/front/summary/locale/es.yml index 0a101f6ef..6d1c3b4f6 100644 --- a/modules/client/front/summary/locale/es.yml +++ b/modules/client/front/summary/locale/es.yml @@ -7,6 +7,7 @@ Secured credit: Crédito asegurado Average invoiced: Consumo medio Sales person: Comercial Recovery: Recobro +Basic data: Datos básicos Balance due: Saldo vencido Rate: Tarifa Business data: Datos comerciales diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js index daee3aa05..42dbe3078 100644 --- a/modules/entry/back/methods/entry/filter.js +++ b/modules/entry/back/methods/entry/filter.js @@ -93,7 +93,12 @@ module.exports = Self => { let where = buildFilter(ctx.args, (param, value) => { switch (param) { case 'search': - return {'e.id': value}; + return /^\d+$/.test(value) + ? {'e.id': value} + : {or: [ + {'s.name': {like: `%${value}%`}}, + {'s.nickname': {like: `%${value}%`}} + ]}; case 'ref': param = `e.${param}`; return {[param]: {like: `%${value}%`}}; @@ -141,6 +146,7 @@ module.exports = Self => { e.invoiceInFk, t.landed, s.name AS supplierName, + s.nickname AS supplierAlias, co.code AS companyCode, cu.code AS currencyCode FROM vn.entry e diff --git a/modules/entry/front/main/index.html b/modules/entry/front/main/index.html index f19db2151..6c08cd0c4 100644 --- a/modules/entry/front/main/index.html +++ b/modules/entry/front/main/index.html @@ -8,11 +8,14 @@ - \ No newline at end of file + + + + diff --git a/modules/entry/front/search-panel/index.html b/modules/entry/front/search-panel/index.html index cff555e91..38acdf77d 100644 --- a/modules/entry/front/search-panel/index.html +++ b/modules/entry/front/search-panel/index.html @@ -5,7 +5,7 @@ vn-one label="General search" ng-model="filter.search" - info="Search entries by id" + info="Search entry by id or a suppliers by name or alias" vn-focus> @@ -45,8 +45,11 @@ label="Supplier" ng-model="filter.supplierFk" url="Suppliers" + fields="['name','nickname']" + search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}" show-field="name" value-field="id"> + {{name}}: {{nickname}} { + Self.remoteMethodCtx('filter', { + description: 'Find all instances of the model matched by filter from the data source.', + accessType: 'READ', + accepts: [ + { + arg: 'filter', + type: 'object', + description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', + }, + { + arg: 'search', + type: 'string', + description: `If it's and integer searchs by itemFk, otherwise it searchs by the itemType code`, + }, + { + arg: 'itemFk', + type: 'integer', + description: 'The item id', + }, + { + arg: 'typeFk', + type: 'integer', + description: 'The item type id', + }, + { + arg: 'categoryFk', + type: 'integer', + description: 'The item category id', + }, + { + arg: 'warehouseFk', + type: 'integer', + description: 'The warehouse id', + }, + { + arg: 'buyerFk', + type: 'integer', + description: 'The buyer id', + }, + { + arg: 'rate2', + type: 'integer', + description: 'The price per unit', + }, + { + arg: 'rate3', + type: 'integer', + description: 'The price per package', + }, + { + arg: 'minPrice', + type: 'integer', + description: 'The minimum price of the item', + }, + { + arg: 'hasMinPrice', + type: 'boolean', + description: 'whether a minimum price has been defined for the item', + }, + { + arg: 'started', + type: 'date', + description: 'Price validity start date', + }, + { + arg: 'ended', + type: 'date', + description: 'Price validity end date', + }, + { + arg: 'tags', + type: ['object'], + description: 'List of tags to filter with', + }, + { + arg: 'mine', + type: 'Boolean', + description: `Search requests attended by the current user` + } + ], + returns: { + type: ['Object'], + root: true + }, + http: { + path: `/filter`, + verb: 'GET' + } + }); + + Self.filter = async(ctx, filter) => { + const conn = Self.dataSource.connector; + let userId = ctx.req.accessToken.userId; + + if (ctx.args.mine) + ctx.args.buyerFk = userId; + + const where = buildFilter(ctx.args, (param, value) => { + switch (param) { + case 'search': + return /^\d+$/.test(value) + ? {'fp.itemFk': {inq: value}} + : {'it.code': {like: `%${value}%`}}; + case 'categoryFk': + return {'it.categoryFk': value}; + case 'buyerFk': + return {'it.workerFk': value}; + case 'warehouseFk': + case 'rate2': + case 'rate3': + case 'started': + case 'ended': + param = `fp.${param}`; + return {[param]: value}; + case 'minPrice': + case 'hasMinPrice': + case 'typeFk': + param = `i.${param}`; + return {[param]: value}; + } + }); + filter = mergeFilters(filter, {where}); + + const stmts = []; + let stmt; + + stmt = new ParameterizedSQL( + `SELECT fp.id, + fp.itemFk, + fp.warehouseFk, + fp.rate2, + fp.rate3, + fp.started, + fp.ended, + i.minPrice, + i.hasMinPrice, + i.name, + i.subName, + i.tag5, + i.value5, + i.tag6, + i.value6, + i.tag7, + i.value7, + i.tag8, + i.value8, + i.tag9, + i.value9, + i.tag10, + i.value10 + FROM priceFixed fp + JOIN item i ON i.id = fp.itemFk + JOIN itemType it ON it.id = i.typeFk` + ); + + if (ctx.args.tags) { + let i = 1; + for (const tag of ctx.args.tags) { + const tAlias = `it${i++}`; + + if (tag.tagFk) { + stmt.merge({ + sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id + AND ${tAlias}.tagFk = ? + AND ${tAlias}.value LIKE ?`, + params: [tag.tagFk, `%${tag.value}%`], + }); + } else { + stmt.merge({ + sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id + AND ${tAlias}.value LIKE ?`, + params: [`%${tag.value}%`], + }); + } + } + } + + stmt.merge(conn.makeWhere(filter.where)); + stmt.merge(conn.makePagination(filter)); + + const fixedPriceIndex = stmts.push(stmt) - 1; + const sql = ParameterizedSQL.join(stmts, ';'); + const result = await conn.executeStmt(sql); + return fixedPriceIndex === 0 ? result : result[fixedPriceIndex]; + }; +}; diff --git a/modules/item/back/methods/fixed-price/specs/filter.spec.js b/modules/item/back/methods/fixed-price/specs/filter.spec.js new file mode 100644 index 000000000..ff259357f --- /dev/null +++ b/modules/item/back/methods/fixed-price/specs/filter.spec.js @@ -0,0 +1,86 @@ +const app = require('vn-loopback/server/server'); + +describe('fixed price filter()', () => { + it('should return 1 result filtering by item ID', async() => { + const itemID = 3; + const ctx = { + req: {accessToken: {userId: 1}}, + args: { + search: itemID + } + }; + const result = await app.models.FixedPrice.filter(ctx); + + expect(result.length).toEqual(1); + expect(result[0].id).toEqual(2); + expect(result[0].itemFk).toEqual(itemID); + }); + + it('should return 1 result filtering by item type code', async() => { + const itemCode = 'CRI'; + const ctx = { + req: {accessToken: {userId: 1}}, + args: { + search: itemCode + } + }; + const itemType = await app.models.ItemType.findOne({ + where: {code: itemCode}, + fields: ['id'] + }); + const items = await app.models.Item.find({ + where: {typeFk: itemType.id}, + fields: ['id'] + }); + const IDs = items.map(item => { + return item.id; + }); + + const result = await app.models.FixedPrice.filter(ctx); + const firstResult = result[0]; + + expect(result.length).toEqual(1); + expect(firstResult.id).toEqual(2); + expect(IDs).toContain(firstResult.itemFk); + }); + + it('should return 2 results filtering by warehouse', async() => { + const warehouseID = 1; + const ctx = { + req: {accessToken: {userId: 1}}, + args: { + warehouseFk: warehouseID + } + }; + const result = await app.models.FixedPrice.filter(ctx); + const length = result.length; + const anyResult = result[Math.floor(Math.random() * Math.floor(length))]; + + expect(result.length).toEqual(2); + expect(anyResult.warehouseFk).toEqual(warehouseID); + }); + + it('should return no results filtering by hasMinPrice', async() => { + const ctx = { + req: {accessToken: {userId: 1}}, + args: { + hasMinPrice: true + } + }; + const result = await app.models.FixedPrice.filter(ctx); + + expect(result.length).toEqual(0); + }); + + it('should return no results filtering by typeFk', async() => { + const ctx = { + req: {accessToken: {userId: 1}}, + args: { + typeFk: 1 + } + }; + const result = await app.models.FixedPrice.filter(ctx); + + expect(result.length).toEqual(1); + }); +}); diff --git a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js new file mode 100644 index 000000000..63c211293 --- /dev/null +++ b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js @@ -0,0 +1,62 @@ +const app = require('vn-loopback/server/server'); + +describe('upsertFixedPrice()', () => { + const now = new Date(); + const fixedPriceId = 1; + let originalFixedPrice; + let originalItem; + + beforeAll(async() => { + originalFixedPrice = await app.models.FixedPrice.findById(fixedPriceId); + originalItem = await app.models.Item.findById(originalFixedPrice.itemFk); + }); + + afterAll(async() => { + await originalFixedPrice.save(); + await originalItem.save(); + }); + + it(`should toggle the hasMinPrice boolean if there's a minPrice and update the rest of the data`, async() => { + const ctx = {args: { + id: fixedPriceId, + itemFk: originalFixedPrice.itemFk, + warehouseFk: 1, + rate2: 100, + rate3: 300, + started: now, + ended: now, + minPrice: 100, + hasMinPrice: false + }}; + + const result = await app.models.FixedPrice.upsertFixedPrice(ctx, ctx.args.id); + + delete ctx.args.started; + delete ctx.args.ended; + ctx.args.hasMinPrice = true; + + expect(result).toEqual(jasmine.objectContaining(ctx.args)); + }); + + it(`should toggle the hasMinPrice boolean if there's no minPrice and update the rest of the data`, async() => { + const ctx = {args: { + id: fixedPriceId, + itemFk: originalFixedPrice.itemFk, + warehouseFk: 1, + rate2: 2.5, + rate3: 2, + started: now, + ended: now, + minPrice: 0, + hasMinPrice: true + }}; + + const result = await app.models.FixedPrice.upsertFixedPrice(ctx, ctx.args.id); + + delete ctx.args.started; + delete ctx.args.ended; + ctx.args.hasMinPrice = false; + + expect(result).toEqual(jasmine.objectContaining(ctx.args)); + }); +}); diff --git a/modules/item/back/methods/fixed-price/upsertFixedPrice.js b/modules/item/back/methods/fixed-price/upsertFixedPrice.js new file mode 100644 index 000000000..dbdeebdab --- /dev/null +++ b/modules/item/back/methods/fixed-price/upsertFixedPrice.js @@ -0,0 +1,116 @@ +module.exports = Self => { + Self.remoteMethod('upsertFixedPrice', { + description: 'Inserts or updates a fixed price for an item', + accessType: 'WRITE', + accepts: [{ + arg: 'ctx', + type: 'object', + http: {source: 'context'} + }, + { + arg: 'id', + type: 'number', + description: 'The fixed price id' + }, + { + arg: 'itemFk', + type: 'number' + }, + { + arg: 'warehouseFk', + type: 'number' + }, + { + arg: 'started', + type: 'date' + }, + { + arg: 'ended', + type: 'date' + }, + { + arg: 'rate2', + type: 'number' + }, + { + arg: 'rate3', + type: 'number' + }, + { + arg: 'minPrice', + type: 'number' + }, + { + arg: 'hasMinPrice', + type: 'any' + }], + returns: { + type: 'object', + root: true + }, + http: { + path: `/upsertFixedPrice`, + verb: 'PATCH' + } + }); + + Self.upsertFixedPrice = async ctx => { + const models = Self.app.models; + + const args = ctx.args; + const tx = await models.Address.beginTransaction({}); + try { + const options = {transaction: tx}; + delete args.ctx; // removed unwanted data + + const fixedPrice = await models.FixedPrice.upsert(args, options); + const targetItem = await models.Item.findById(args.itemFk, null, options); + await targetItem.updateAttributes({ + minPrice: args.minPrice, + hasMinPrice: args.minPrice ? true : false + }, options); + + const itemFields = [ + 'minPrice', + 'hasMinPrice', + 'name', + 'subName', + 'tag5', + 'value5', + 'tag6', + 'value6', + 'tag7', + 'value7', + 'tag8', + 'value8', + 'tag9', + 'value9', + 'tag10', + 'value10' + ]; + + const fieldsCopy = [].concat(itemFields); + const filter = { + include: { + relation: 'item', + scope: { + fields: fieldsCopy + } + } + }; + + const result = await models.FixedPrice.findById(fixedPrice.id, filter, options); + const item = result.item(); + + for (let key of itemFields) + result[key] = item[key]; + + await tx.commit(); + return result; + } catch (e) { + await tx.rollback(); + throw e; + } + }; +}; + diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 1fefab77e..f392dba87 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -119,6 +119,7 @@ module.exports = Self => { ori.code AS origin, ic.name AS category, i.density, + i.stemMultiplier, b.grouping, b.packing, itn.code AS niche, @visibleCalc diff --git a/modules/item/back/methods/item/new.js b/modules/item/back/methods/item/new.js index 1d3f6f230..e6288aede 100644 --- a/modules/item/back/methods/item/new.js +++ b/modules/item/back/methods/item/new.js @@ -60,7 +60,6 @@ module.exports = Self => { query = `SET @isTriggerDisabled = FALSE`; await Self.rawSql(query, null, options); - query = `CALL vn.itemRefreshTags(?)`; await Self.rawSql(query, [item.id], options); await tx.commit(); diff --git a/modules/item/back/model-config.json b/modules/item/back/model-config.json index 13e30dc15..9f101f9c7 100644 --- a/modules/item/back/model-config.json +++ b/modules/item/back/model-config.json @@ -76,5 +76,8 @@ }, "TaxType": { "dataSource": "vn" + }, + "FixedPrice": { + "dataSource": "vn" } } diff --git a/modules/item/back/models/fixed-price.js b/modules/item/back/models/fixed-price.js new file mode 100644 index 000000000..9c78c586f --- /dev/null +++ b/modules/item/back/models/fixed-price.js @@ -0,0 +1,4 @@ +module.exports = Self => { + require('../methods/fixed-price/filter')(Self); + require('../methods/fixed-price/upsertFixedPrice')(Self); +}; diff --git a/modules/item/back/models/fixed-price.json b/modules/item/back/models/fixed-price.json new file mode 100644 index 000000000..85e9194a3 --- /dev/null +++ b/modules/item/back/models/fixed-price.json @@ -0,0 +1,59 @@ +{ + "name": "FixedPrice", + "base": "VnModel", + "options": { + "mysql": { + "table": "priceFixed" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "itemFk": { + "type": "number", + "required": true + }, + "warehouseFk": { + "type": "number" + }, + "rate2": { + "type": "number", + "required": true + }, + "rate3": { + "type": "number", + "required": true + }, + "started": { + "type": "date", + "required": true + }, + "ended": { + "type": "date", + "required": true + } + }, + "relations": { + "item": { + "type": "belongsTo", + "model": "Item", + "foreignKey": "itemFk" + }, + "warehouse": { + "type": "belongsTo", + "model": "Warehouse", + "foreignKey": "warehouseFk" + } + }, + "acls": [ + { + "accessType": "READ", + "principalType": "ROLE", + "principalId": "buyer", + "permission": "ALLOW" + } + ] +} \ No newline at end of file diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index 66c32933e..d48e4e95d 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -12,116 +12,119 @@ }, "properties": { "id": { - "type": "Number", + "type": "number", "id": true, "description": "Id" }, "name": { - "type": "String", + "type": "string", "description": "Name" }, "size": { - "type": "Number", + "type": "number", "description": "Size" }, "category": { - "type": "String", + "type": "string", "description": "Category" }, "typeFk": { - "type": "Number", + "type": "number", "description": "Type", "required": true }, "stems": { - "type": "Number", + "type": "number", "description": "Stems" }, "description": { - "type": "String", + "type": "string", "description": "Description" }, "isOnOffer": { - "type": "Boolean", + "type": "boolean", "description": "Offer" }, "isBargain": { - "type": "Boolean", + "type": "boolean", "description": "Bargain" }, "isActive": { - "type": "Boolean", + "type": "boolean", "description": "Active" }, "comment": { - "type": "String", + "type": "string", "description": "Comment" }, "relevancy": { - "type": "Number", + "type": "number", "description": "Relevancy" }, "density": { - "type": "Number", + "type": "number", "description": "Density" }, - "image": { - "type": "String", + "stemMultiplier": { + "type": "number", + "description": "Multiplier" + },"image": { + "type": "string", "description": "Image" }, "longName": { - "type": "String", + "type": "string", "description": "Long name" }, "subName": { - "type": "String", + "type": "string", "description": "Subname" }, "tag5": { - "type": "String" + "type": "string" }, "value5": { - "type": "String" + "type": "string" }, "tag6": { - "type": "String" + "type": "string" }, "value6": { - "type": "String" + "type": "string" }, "tag7": { - "type": "String" + "type": "string" }, "value7": { - "type": "String" + "type": "string" }, "tag8": { - "type": "String" + "type": "string" }, "value8": { - "type": "String" + "type": "string" }, "tag9": { - "type": "String" + "type": "string" }, "value9": { - "type": "String" + "type": "string" }, "tag10": { - "type": "String" + "type": "string" }, "value10": { - "type": "String" + "type": "string" }, "compression": { - "type": "Number" + "type": "number" }, "hasKgPrice": { - "type": "Boolean", + "type": "boolean", "description": "Price per Kg" }, "expenseFk": { - "type": "Number", + "type": "number", "mysql": { "columnName": "expenceFk" } @@ -129,8 +132,11 @@ "minPrice": { "type": "number" }, + "hasMinPrice": { + "type": "boolean" + }, "isFragile": { - "type": "Boolean" + "type": "boolean" } }, "relations": { diff --git a/modules/item/front/fixed-price-search-panel/index.html b/modules/item/front/fixed-price-search-panel/index.html new file mode 100644 index 000000000..5a1e7781e --- /dev/null +++ b/modules/item/front/fixed-price-search-panel/index.html @@ -0,0 +1,136 @@ + + +
+
+ + + + + + + + + +
{{name}}
+
+ {{category.name}} +
+ + + + + + + + + + + + + + + + + + + + + + + + Tags + + + + + + + + + + + + + + + + + +
+
diff --git a/modules/item/front/fixed-price-search-panel/index.js b/modules/item/front/fixed-price-search-panel/index.js new file mode 100644 index 000000000..ec13765fd --- /dev/null +++ b/modules/item/front/fixed-price-search-panel/index.js @@ -0,0 +1,19 @@ +import ngModule from '../module'; +import SearchPanel from 'core/components/searchbar/search-panel'; + +class Controller extends SearchPanel { + get filter() { + return this.$.filter; + } + + set filter(value = {}) { + if (!value.tags) value.tags = [{}]; + + this.$.filter = value; + } +} + +ngModule.vnComponent('vnFixedPriceSearchPanel', { + template: require('./index.html'), + controller: Controller +}); diff --git a/modules/item/front/fixed-price-search-panel/locale/es.yml b/modules/item/front/fixed-price-search-panel/locale/es.yml new file mode 100644 index 000000000..06e5e6b26 --- /dev/null +++ b/modules/item/front/fixed-price-search-panel/locale/es.yml @@ -0,0 +1,4 @@ +Started: Inicio +Ended: Fin +Minimum price: Precio mínimo +Item ID: ID Artículo \ No newline at end of file diff --git a/modules/item/front/fixed-price/index.html b/modules/item/front/fixed-price/index.html new file mode 100644 index 000000000..770405e3a --- /dev/null +++ b/modules/item/front/fixed-price/index.html @@ -0,0 +1,159 @@ + + + + + + + + +
+ + + + + Item ID + Item + Warehouse + P.P.U. + P.P.P. + Min price + Started + Ended + + + + + + + + {{price.itemFk}} + + + + {{::id}} - {{::name}} + + + + + + + + + + + + + + + {{price.rate2 | currency: 'EUR':2}} + + + + + + + {{price.rate3 | currency: 'EUR':2}} + + + + + + + {{(price.hasMinPrice ? (price.minPrice | currency: 'EUR':2) : "-")}} + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ + \ No newline at end of file diff --git a/modules/item/front/fixed-price/index.js b/modules/item/front/fixed-price/index.js new file mode 100644 index 000000000..4dc1cf472 --- /dev/null +++ b/modules/item/front/fixed-price/index.js @@ -0,0 +1,54 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; +import './style.scss'; + +export default class Controller extends Section { + constructor($element, $) { + super($element, $); + } + + /** + * Inserts a new instance + */ + add() { + this.$.model.insert({}); + } + + upsertPrice(price) { + price.hasMinPrice = price.minPrice ? true : false; + + let requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3']; + for (let field of requiredFields) + if (price[field] == undefined) return; + + const query = 'FixedPrices/upsertFixedPrice'; + this.$http.patch(query, price) + .then(res => { + this.vnApp.showSuccess(this.$t('Data saved!')); + Object.assign(price, res.data); + }); + } + + removePrice($index) { + const price = this.$.model.data[$index]; + if (price.id) { + this.$http.delete(`FixedPrices/${price.id}`) + .then(() => { + this.$.model.remove($index); + this.vnApp.showSuccess(this.$t('Data saved!')); + }); + } else + this.$.model.remove($index); + } + + itemSearchFunc($search) { + return /^\d+$/.test($search) + ? {id: $search} + : {name: {like: '%' + $search + '%'}}; + } +} + +ngModule.vnComponent('vnFixedPrice', { + template: require('./index.html'), + controller: Controller +}); diff --git a/modules/item/front/fixed-price/index.spec.js b/modules/item/front/fixed-price/index.spec.js new file mode 100644 index 000000000..faf6b850a --- /dev/null +++ b/modules/item/front/fixed-price/index.spec.js @@ -0,0 +1,87 @@ +import './index'; + +describe('fixed price', () => { + describe('Component vnFixedPrice', () => { + let controller; + let $httpBackend; + + beforeEach(ngModule('item')); + + beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => { + $httpBackend = _$httpBackend_; + const $scope = $rootScope.$new(); + const $element = angular.element(''); + controller = $componentController('vnFixedPrice', {$element, $scope}); + })); + + describe('upsertPrice()', () => { + it('should do nothing if one or more required arguments are missing', () => { + jest.spyOn(controller.vnApp, 'showSuccess'); + + controller.upsertPrice({}); + + expect(controller.vnApp.showSuccess).not.toHaveBeenCalled(); + }); + + it('should perform an http request to update the price', () => { + const now = new Date(); + jest.spyOn(controller.vnApp, 'showSuccess'); + + $httpBackend.expectPATCH('FixedPrices/upsertFixedPrice').respond(); + controller.upsertPrice({ + itemFk: 1, + started: now, + ended: now, + rate2: 1, + rate3: 2 + }); + $httpBackend.flush(); + + expect(controller.vnApp.showSuccess).toHaveBeenCalled(); + }); + }); + + describe('removePrice()', () => { + it(`should only remove the created instance by the model as it doesn't have an ID yet`, () => { + const $index = 0; + controller.$ = { + model: { + remove: () => {}, + data: [{ + foo: 'bar' + }] + } + }; + jest.spyOn(controller.vnApp, 'showSuccess'); + jest.spyOn(controller.$.model, 'remove'); + + controller.removePrice($index); + + expect(controller.vnApp.showSuccess).not.toHaveBeenCalled(); + expect(controller.$.model.remove).toHaveBeenCalled(); + }); + + it('should remove the instance performing an delete http request', () => { + const $index = 0; + controller.$ = { + model: { + remove: () => {}, + data: [{ + id: '1' + }] + } + }; + jest.spyOn(controller.vnApp, 'showSuccess'); + jest.spyOn(controller.$.model, 'remove'); + + const query = `FixedPrices/${controller.$.model.data[0].id}`; + $httpBackend.expectDELETE(query).respond(); + controller.removePrice($index); + $httpBackend.flush(); + + expect(controller.vnApp.showSuccess).toHaveBeenCalled(); + expect(controller.$.model.remove).toHaveBeenCalled(); + }); + }); + }); +}); diff --git a/modules/item/front/fixed-price/locale/es.yml b/modules/item/front/fixed-price/locale/es.yml new file mode 100644 index 000000000..c19b7703c --- /dev/null +++ b/modules/item/front/fixed-price/locale/es.yml @@ -0,0 +1,4 @@ +Fixed prices: Precios fijados +Search prices by item ID or code: Buscar por ID de artículo o código +Search fixed prices: Buscar precios fijados +Add fixed price: Añadir precio fijado \ No newline at end of file diff --git a/modules/item/front/fixed-price/style.scss b/modules/item/front/fixed-price/style.scss new file mode 100644 index 000000000..74df1800a --- /dev/null +++ b/modules/item/front/fixed-price/style.scss @@ -0,0 +1,5 @@ +@import "variables"; + +vn-table vn-date-picker { + max-width: 90px; +} \ No newline at end of file diff --git a/modules/item/front/index.js b/modules/item/front/index.js index 0f11c0563..e6a37abfc 100644 --- a/modules/item/front/index.js +++ b/modules/item/front/index.js @@ -21,4 +21,6 @@ import './botanical'; import './barcode'; import './summary'; import './waste'; +import './fixed-price'; +import './fixed-price-search-panel'; diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 8b03bc0d6..71bff05ee 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -25,6 +25,7 @@ Origin Buyer Density + Multiplier Active @@ -78,6 +79,7 @@ {{::item.density}} + {{::item.stemMultiplier}} -

Basic data

+

+ + Basic data + +

+

+ Basic data +

@@ -53,7 +64,18 @@ -

Other data

+

+ + Other data + +

+

+ Other data +

@@ -77,7 +99,18 @@ -

Tags

+

+ + Tags + +

+

+ Tags +

-

Tax

+

+ + Tax + +

+

+ Tax +

-

Niche

+

+ + Niche + +

+

+ Niche +

-

Botanical

+

+ + Botanical + +

+

+ Botanical +

@@ -111,7 +177,18 @@ -

Barcode

+

+ + Barcode + +

+

+ Barcode +

{{barcode.code}}

diff --git a/modules/item/front/summary/index.js b/modules/item/front/summary/index.js index dc4e638b8..52753ff65 100644 --- a/modules/item/front/summary/index.js +++ b/modules/item/front/summary/index.js @@ -13,6 +13,22 @@ class Controller extends Summary { if (this.item && this.item.id) this.getSummary(); } + + get isBuyer() { + return this.aclService.hasAny(['buyer']); + } + + get isReplenisher() { + return this.aclService.hasAny(['replenisher']); + } + + get isAdministrative() { + return this.aclService.hasAny(['administrative']); + } + + get isEmployee() { + return this.aclService.hasAny(['employee']); + } } ngModule.vnComponent('vnItemSummary', { diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html index 0dca863fd..3775526be 100644 --- a/modules/item/front/tags/index.html +++ b/modules/item/front/tags/index.html @@ -27,8 +27,8 @@ initial-data="itemTag.tag" ng-model="itemTag.tagFk" data="tags" - on-change="$ctrl.getSourceTable(tag)" show-field="name" + on-change="itemTag.value = null" rule> { + if (this.order && this.order.isConfirmed) + this.$state.go('order.card.line'); + }); + } + + getData() { + return this.$http.get(`Orders/${this.$params.id}`) + .then(res => this.order = res.data); } /** @@ -366,8 +373,5 @@ class Controller extends Section { ngModule.vnComponent('vnOrderCatalog', { template: require('./index.html'), - controller: Controller, - bindings: { - order: '<' - } + controller: Controller }); diff --git a/modules/order/front/catalog/index.spec.js b/modules/order/front/catalog/index.spec.js index 109893ae1..03d7c41ba 100644 --- a/modules/order/front/catalog/index.spec.js +++ b/modules/order/front/catalog/index.spec.js @@ -28,6 +28,22 @@ describe('Order', () => { }; })); + describe('getData()', () => { + it(`should make a query an fetch the order data`, () => { + controller._order = null; + + $httpBackend.expect('GET', `Orders/4`).respond(200, {id: 4, isConfirmed: true}); + $httpBackend.expect('GET', `Orders/4/getItemTypeAvailable?itemCategoryId=1`).respond(); + controller.getData(); + $httpBackend.flush(); + + const order = controller.order; + + expect(order.id).toEqual(4); + expect(order.isConfirmed).toBeTruthy(); + }); + }); + describe('order() setter', () => { it(`should call scope $applyAsync() method and apply filters from state params`, () => { $httpBackend.expect('GET', `Orders/4/getItemTypeAvailable?itemCategoryId=1`).respond(); diff --git a/modules/route/back/methods/route/specs/updateVolume.spec.js b/modules/route/back/methods/route/specs/updateVolume.spec.js index 0a191d9aa..162be92b2 100644 --- a/modules/route/back/methods/route/specs/updateVolume.spec.js +++ b/modules/route/back/methods/route/specs/updateVolume.spec.js @@ -1,7 +1,8 @@ const app = require('vn-loopback/server/server'); const LoopBackContext = require('loopback-context'); -describe('route updateVolume()', () => { +// #2735 route updateVolume() returns inconsistent values +xdescribe('route updateVolume()', () => { const routeId = 1; const userId = 50; const activeCtx = { diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html index 6dd01c8b0..b284851a0 100644 --- a/modules/route/front/summary/index.html +++ b/modules/route/front/summary/index.html @@ -61,7 +61,18 @@ -

Ticket

+

+ + Ticket + +

+

+ Ticket +

diff --git a/modules/route/front/summary/index.js b/modules/route/front/summary/index.js index 762cd8a41..543c54afc 100644 --- a/modules/route/front/summary/index.js +++ b/modules/route/front/summary/index.js @@ -16,6 +16,10 @@ class Controller extends Summary { }); } + get isDelivery() { + return this.aclService.hasAny(['delivery']); + } + get route() { return this._route; } diff --git a/modules/supplier/front/summary/index.html b/modules/supplier/front/summary/index.html index 14168f253..b089f25e9 100644 --- a/modules/supplier/front/summary/index.html +++ b/modules/supplier/front/summary/index.html @@ -10,7 +10,18 @@ -

Basic data

+

+ + Basic data + +

+

+ Basic data +

-

Billing data

+

+ + Billing data + +

+

+ Billing data +

@@ -63,7 +85,18 @@ -

Fiscal data

+

+ + Fiscal data + +

+

+ Fiscal data +

@@ -82,7 +115,18 @@ -

Fiscal address

+

+ + Fiscal address + +

+

+ Fiscal address +

diff --git a/modules/supplier/front/summary/index.js b/modules/supplier/front/summary/index.js index 099257848..a828379bc 100644 --- a/modules/supplier/front/summary/index.js +++ b/modules/supplier/front/summary/index.js @@ -10,6 +10,10 @@ class Controller extends Summary { this.getSummary(); } + get isAdministrative() { + return this.aclService.hasAny(['administrative']); + } + getSummary() { return this.$http.get(`Suppliers/${this.supplier.id}/getSummary`).then(response => { this.summary = response.data; diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js index c8702c1db..ec4376adb 100644 --- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js +++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js @@ -60,7 +60,8 @@ describe('sale updatePrice()', () => { await originalSalesPersonMana.updateAttributes(originalSalesPersonMana); }); - it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => { + // #2736 sale updatePrice() returns inconsistent values + xit('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => { let ctx = {req: {accessToken: {userId: 18}}}; let price = 5.4; diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js index 4b7b088f4..5778b1db2 100644 --- a/modules/ticket/back/methods/ticket-request/filter.js +++ b/modules/ticket/back/methods/ticket-request/filter.js @@ -30,11 +30,11 @@ module.exports = Self => { }, { arg: 'attenderFk', type: 'Number', - description: `Search requests atended by the given worker` + description: `Search requests attended by a given worker id` }, { arg: 'mine', type: 'Boolean', - description: `Search requests attended by the connected worker` + description: `Search requests attended by the current user` }, { arg: 'from', type: 'Date', @@ -62,10 +62,9 @@ module.exports = Self => { Self.filter = async(ctx, filter) => { let conn = Self.dataSource.connector; let userId = ctx.req.accessToken.userId; - let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}}); if (ctx.args.mine) - ctx.args.attenderFk = worker.id; + ctx.args.attenderFk = userId; let where = buildFilter(ctx.args, (param, value) => { switch (param) { diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js index 6dbe52524..5341de8d1 100644 --- a/modules/ticket/back/methods/ticket/filter.js +++ b/modules/ticket/back/methods/ticket/filter.js @@ -10,75 +10,75 @@ module.exports = Self => { accepts: [ { arg: 'ctx', - type: 'Object', + type: 'object', http: {source: 'context'} }, { arg: 'filter', - type: 'Object', + type: 'object', description: `Filter defining where, order, offset, and limit - must be a JSON-encoded string` }, { arg: 'search', - type: 'String', - description: `If it's and integer searchs by id, otherwise it searchs by nickname` + type: 'string', + description: `If it's and number searchs by id, otherwise it searchs by nickname` }, { arg: 'from', - type: 'Date', + type: 'date', description: `The from date filter` }, { arg: 'to', - type: 'Date', + type: 'date', description: `The to date filter` }, { arg: 'nickname', - type: 'String', + type: 'string', description: `The nickname filter` }, { arg: 'id', - type: 'Integer', + type: 'number', description: `The ticket id filter` }, { arg: 'clientFk', - type: 'Integer', + type: 'number', description: `The client id filter` }, { arg: 'agencyModeFk', - type: 'Integer', + type: 'number', description: `The agency mode id filter` }, { arg: 'warehouseFk', - type: 'Integer', + type: 'number', description: `The warehouse id filter` }, { arg: 'salesPersonFk', - type: 'Integer', + type: 'number', description: `The salesperson id filter` }, { arg: 'provinceFk', - type: 'Integer', + type: 'number', description: `The province id filter` }, { arg: 'stateFk', - type: 'Number', + type: 'number', description: `The state id filter` }, { arg: 'myTeam', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)` }, { arg: 'problems', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets with problems` }, { arg: 'pending', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets with state 'Pending'` }, { arg: 'mine', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets for the current logged user` }, { arg: 'orderFk', - type: 'Number', + type: 'number', description: `The order id filter` }, { arg: 'refFk', @@ -86,12 +86,12 @@ module.exports = Self => { description: `The invoice reference filter` }, { arg: 'alertLevel', - type: 'Number', + type: 'number', description: `The alert level of the tickets` } ], returns: { - type: ['Object'], + type: ['object'], root: true }, http: { diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml index 73d7ec5c2..02cab50ed 100644 --- a/modules/ticket/front/locale/es.yml +++ b/modules/ticket/front/locale/es.yml @@ -21,7 +21,7 @@ Discount: Descuento Employee : Empleado Import: Importe Is checked: Comprobado -Item: Articulo +Item: Artículo Landing: Llegada Landed: F. entrega More: Más diff --git a/modules/ticket/front/search-panel/index.html b/modules/ticket/front/search-panel/index.html index 8570036c0..d9ab2ee91 100644 --- a/modules/ticket/front/search-panel/index.html +++ b/modules/ticket/front/search-panel/index.html @@ -1,6 +1,6 @@
-
- + + - + - - - - - - - - - +
+ + + + + + O + + + + + +
+ - + - + - + - + diff --git a/modules/ticket/front/search-panel/index.js b/modules/ticket/front/search-panel/index.js index 08b0fb244..6ef47757a 100644 --- a/modules/ticket/front/search-panel/index.js +++ b/modules/ticket/front/search-panel/index.js @@ -1,8 +1,11 @@ import ngModule from '../module'; import SearchPanel from 'core/components/searchbar/search-panel'; + class Controller extends SearchPanel { constructor($, $element) { super($, $element); + this.filter = this.$.filter; + this.getGroupedStates(); } @@ -19,6 +22,35 @@ class Controller extends SearchPanel { this.groupedStates = groupedStates; }); } + + get from() { + return this._from; + } + + set from(value) { + this._from = value; + this.filter.scopeDays = null; + } + + get to() { + return this._to; + } + + set to(value) { + this._to = value; + this.filter.scopeDays = null; + } + + get scopeDays() { + return this._scopeDays; + } + + set scopeDays(value) { + this._scopeDays = value; + + this.filter.from = null; + this.filter.to = null; + } } ngModule.vnComponent('vnTicketSearchPanel', { diff --git a/modules/ticket/front/search-panel/index.spec.js b/modules/ticket/front/search-panel/index.spec.js index 55d341d2a..f3a2f39ed 100644 --- a/modules/ticket/front/search-panel/index.spec.js +++ b/modules/ticket/front/search-panel/index.spec.js @@ -10,10 +10,11 @@ describe('Ticket Component vnTicketSearchPanel', () => { $httpBackend = _$httpBackend_; controller = $componentController('vnTicketSearchPanel', {$element: null}); controller.$t = () => {}; + controller.filter = {}; })); describe('getGroupedStates()', () => { - it('should set an array of groupedStates with the aditionof a name translation', () => { + it('should set an array of groupedStates with the adition of a name translation', () => { jest.spyOn(controller, '$t').mockReturnValue('miCodigo'); const data = [ { @@ -32,4 +33,39 @@ describe('Ticket Component vnTicketSearchPanel', () => { }]); }); }); + + describe('from() setter', () => { + it('should clear the scope days when setting the from property', () => { + controller.filter.scopeDays = 1; + + controller.from = new Date(); + + expect(controller.filter.scopeDays).toBeNull(); + expect(controller.from).toBeDefined(); + }); + }); + + describe('to() setter', () => { + it('should clear the scope days when setting the to property', () => { + controller.filter.scopeDays = 1; + + controller.to = new Date(); + + expect(controller.filter.scopeDays).toBeNull(); + expect(controller.to).toBeDefined(); + }); + }); + + describe('scopeDays() setter', () => { + it('should clear the date range when setting the scopeDays property', () => { + controller.filter.from = new Date(); + controller.filter.to = new Date(); + + controller.scopeDays = 1; + + expect(controller.filter.from).toBeNull(); + expect(controller.filter.to).toBeNull(); + expect(controller.scopeDays).toBeDefined(); + }); + }); }); diff --git a/modules/ticket/front/search-panel/locale/es.yml b/modules/ticket/front/search-panel/locale/es.yml index 5fa75ac09..54a01c82f 100644 --- a/modules/ticket/front/search-panel/locale/es.yml +++ b/modules/ticket/front/search-panel/locale/es.yml @@ -16,4 +16,5 @@ Pending: Pendiente FREE: Libre DELIVERED: Servido ON_PREPARATION: En preparacion -PACKED: Encajado \ No newline at end of file +PACKED: Encajado +Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez \ No newline at end of file diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html index 9fc9e5a31..13fd84b00 100644 --- a/modules/ticket/front/services/index.html +++ b/modules/ticket/front/services/index.html @@ -6,6 +6,7 @@ auto-load="true"> { + this.$.typesModel.refresh(); + return res; + }) .then(res => service.ticketServiceTypeFk = res.data.id); } diff --git a/modules/ticket/front/services/index.spec.js b/modules/ticket/front/services/index.spec.js index 5d8d58505..affe8a6e7 100644 --- a/modules/ticket/front/services/index.spec.js +++ b/modules/ticket/front/services/index.spec.js @@ -1,4 +1,5 @@ import './index.js'; +import crudModel from 'core/mocks/crud-model'; describe('Ticket component vnTicketService', () => { let controller; @@ -11,7 +12,7 @@ describe('Ticket component vnTicketService', () => { beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => { $httpBackend = _$httpBackend_; $scope = $rootScope.$new(); - + $scope.typesModel = crudModel; $element = angular.element(`
`); controller = $componentController('vnTicketService', {$scope, $element}); })); diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 803734c74..dcd4470e4 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -1,6 +1,7 @@
- @@ -103,7 +104,13 @@

Total {{$ctrl.summary.total | currency: 'EUR':2}}

-

Sale

+

+ + Sale + +

@@ -158,7 +165,13 @@ -

Packages

+

+ + Packages + +

@@ -177,7 +190,13 @@ -

Service

+

+ + Service + +

@@ -202,7 +221,13 @@ -

Purchase request

+

+ + Purchase request + +

diff --git a/modules/ticket/front/weekly/index.html b/modules/ticket/front/weekly/index.html index 9267e62e0..9ea35d92e 100644 --- a/modules/ticket/front/weekly/index.html +++ b/modules/ticket/front/weekly/index.html @@ -26,7 +26,7 @@ Ticket ID Client - Weekday + Shipment Agency Warehouse Salesperson diff --git a/modules/ticket/front/weekly/locale/es.yml b/modules/ticket/front/weekly/locale/es.yml index 804467dae..c673adc57 100644 --- a/modules/ticket/front/weekly/locale/es.yml +++ b/modules/ticket/front/weekly/locale/es.yml @@ -4,4 +4,4 @@ You are going to delete this weekly ticket: Vas a eliminar este ticket programad This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas? Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente Search by weekly ticket: Buscar por tickets programados -weekDay: Dia \ No newline at end of file +Shipment: Salida \ No newline at end of file diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js index 4a49b4401..f4132c631 100644 --- a/modules/travel/back/methods/travel/extraCommunityFilter.js +++ b/modules/travel/back/methods/travel/extraCommunityFilter.js @@ -10,68 +10,74 @@ module.exports = Self => { accepts: [ { arg: 'filter', - type: 'Object', - description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', - http: {source: 'query'} - }, { + type: 'object', + description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string' + }, + { arg: 'search', - type: 'String', - description: 'Searchs the travel by id', - http: {source: 'query'} - }, { + type: 'string', + description: 'Searchs the travel by id' + }, + { arg: 'id', - type: 'Integer', - description: 'The travel id', - http: {source: 'query'} - }, { + type: 'number', + description: 'The travel id' + }, + { arg: 'shippedFrom', - type: 'Date', - description: 'The shipped from date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The shipped from date filter' + }, + { arg: 'shippedTo', - type: 'Date', - description: 'The shipped to date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The shipped to date filter' + }, + { arg: 'landedFrom', - type: 'Date', - description: 'The landed from date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The landed from date filter' + }, + { arg: 'landedTo', - type: 'Date', - description: 'The landed to date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The landed to date filter' + }, + { arg: 'agencyFk', - type: 'Number', - description: 'The agencyModeFk id', - http: {source: 'query'} - }, { + type: 'number', + description: 'The agencyModeFk id' + }, + { arg: 'warehouseOutFk', - type: 'Number', - description: 'The warehouseOutFk filter', - http: {source: 'query'} - }, { + type: 'number', + description: 'The warehouseOutFk filter' + }, + { arg: 'warehouseInFk', - type: 'Number', - description: 'The warehouseInFk filter', - http: {source: 'query'} - }, { + type: 'number', + description: 'The warehouseInFk filter' + }, + { arg: 'totalEntries', - type: 'Number', - description: 'The totalEntries filter', - http: {source: 'query'} - }, { + type: 'number', + description: 'The totalEntries filter' + }, + { arg: 'ref', type: 'string', description: 'The reference' - }, { + }, + { arg: 'continent', type: 'string', description: 'The continent code' - } + }, + { + arg: 'cargoSupplierFk', + type: 'number', + description: 'The freighter supplier id' + }, ], returns: { type: ['Object'], @@ -108,6 +114,7 @@ module.exports = Self => { case 'warehouseOutFk': case 'warehouseInFk': case 'totalEntries': + case 'cargoSupplierFk': param = `t.${param}`; return {[param]: value}; } @@ -172,8 +179,8 @@ module.exports = Self => { e.notes, CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedkg, CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg - FROM entry e - JOIN tmp.travel tr ON tr.id = e.travelFk + FROM tmp.travel tr + JOIN entry e ON e.travelFk = tr.id JOIN buy b ON b.entryFk = e.id JOIN packaging pkg ON pkg.id = b.packageFk JOIN item i ON i.id = b.itemFk diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json index df5b183b1..cd2f1d653 100644 --- a/modules/travel/back/models/travel.json +++ b/modules/travel/back/models/travel.json @@ -37,6 +37,9 @@ "m3": { "type": "Number" }, + "kg": { + "type": "Number" + }, "cargoSupplierFk": { "type": "Number" }, diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html index 85a30907a..73c158a03 100644 --- a/modules/travel/front/extra-community-search-panel/index.html +++ b/modules/travel/front/extra-community-search-panel/index.html @@ -39,24 +39,28 @@ + ng-model="filter.shippedFrom" + on-change="$ctrl.shippedFrom = value"> + ng-model="filter.shippedTo" + on-change="$ctrl.shippedTo = value"> + ng-model="filter.landedFrom" + on-change="$ctrl.landedFrom = value"> + ng-model="filter.landedTo" + on-change="$ctrl.landedTo = value"> @@ -76,6 +80,13 @@ + + - +
- + + + + + - + Id Supplier Freighter @@ -33,14 +41,14 @@ Wh. Out - Shipped + W. Shipped Wh. In - Landed + W. Landed - + {{::travel.agencyModeName}} {{::travel.cargoSupplierNickname}} - + {{travel.ref}} + on-change="$ctrl.save(travel.id, {ref: value})"> {{::travel.stickers}} - {{::travel.kg}} + + {{travel.kg}} + + + + + {{::travel.loadedKg}} {{::travel.volumeKg}} {{::travel.warehouseOutName}} @@ -80,17 +97,17 @@ {{::entry.supplierName}} {{::entry.ref}} - {{::entry.stickers}} + {{::entry.stickers}} {{::entry.loadedkg}} {{::entry.volumeKg}} - + {{::entry.notes}} - + {{::entry.evaNotes}} diff --git a/modules/travel/front/extra-community/index.js b/modules/travel/front/extra-community/index.js index 221d6cb0d..08d4a168f 100644 --- a/modules/travel/front/extra-community/index.js +++ b/modules/travel/front/extra-community/index.js @@ -3,9 +3,11 @@ import Section from 'salix/components/section'; import './style.scss'; class Controller extends Section { - constructor($element, $) { + constructor($element, $, vnReport) { super($element, $); + this.vnReport = vnReport; + const draggable = this.element.querySelector('.travel-list'); draggable.addEventListener('dragstart', event => this.dragStart(event)); @@ -13,7 +15,7 @@ class Controller extends Section { event => this.dragEnd(event)); this.draggableElement = 'a[draggable]'; - this.droppableElement = 'vn-table[vn-droppable]'; + this.droppableElement = 'vn-tbody[vn-droppable]'; const scopeDays = 14; const landedFrom = new Date(); @@ -77,14 +79,26 @@ class Controller extends Section { } } - changeReference(travel) { - const params = {ref: travel.ref}; - const endpoint = `Travels/${travel.id}`; - this.$http.patch(endpoint, params) + save(id, data) { + const endpoint = `Travels/${id}`; + this.$http.patch(endpoint, data) .then(() => this.vnApp.showSuccess(this.$t('Data saved!'))); } + + get reportParams() { + const userParams = this.$.model.userParams; + return Object.assign({ + authorization: this.vnToken.token + }, userParams); + } + + showReport() { + this.vnReport.show('extra-community', this.reportParams); + } } +Controller.$inject = ['$element', '$scope', 'vnReport']; + ngModule.vnComponent('vnTravelExtraCommunity', { template: require('./index.html'), controller: Controller diff --git a/modules/travel/front/extra-community/index.spec.js b/modules/travel/front/extra-community/index.spec.js index 2f510f22f..7815bdd4f 100644 --- a/modules/travel/front/extra-community/index.spec.js +++ b/modules/travel/front/extra-community/index.spec.js @@ -14,20 +14,6 @@ describe('Travel Component vnTravelExtraCommunity', () => { controller.$.model.refresh = jest.fn(); })); - describe('changeReference()', () => { - it('should make an HTTP query', () => { - jest.spyOn(controller.vnApp, 'showSuccess'); - - const travel = {id: 1, ref: 'New reference'}; - const expectedData = {ref: 'New reference'}; - $httpBackend.expect('PATCH', `Travels/${travel.id}`, expectedData).respond(200); - controller.changeReference(travel); - $httpBackend.flush(); - - expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); - }); - }); - describe('findDraggable()', () => { it('should find the draggable element', () => { const draggable = document.createElement('a'); @@ -46,7 +32,7 @@ describe('Travel Component vnTravelExtraCommunity', () => { describe('findDroppable()', () => { it('should find the droppable element', () => { - const droppable = document.createElement('vn-table'); + const droppable = document.createElement('vn-tbody'); droppable.setAttribute('vn-droppable', true); const $event = new Event('drop'); @@ -103,13 +89,13 @@ describe('Travel Component vnTravelExtraCommunity', () => { describe('onDrop()', () => { it('should make an HTTP patch query', () => { - const droppable = document.createElement('vn-table'); + const droppable = document.createElement('vn-tbody'); droppable.setAttribute('vn-droppable', true); droppable.setAttribute('id', 1); jest.spyOn(controller, 'findDroppable').mockReturnValue(droppable); - const oldDroppable = document.createElement('vn-table'); + const oldDroppable = document.createElement('vn-tbody'); oldDroppable.setAttribute('vn-droppable', true); const entry = document.createElement('div'); oldDroppable.appendChild(entry); @@ -124,4 +110,19 @@ describe('Travel Component vnTravelExtraCommunity', () => { $httpBackend.flush(); }); }); + + describe('save()', () => { + it('should make an HTTP query', () => { + jest.spyOn(controller.vnApp, 'showSuccess'); + + const travelId = 1; + const data = {ref: 'New reference'}; + const expectedData = {ref: 'New reference'}; + $httpBackend.expect('PATCH', `Travels/${travelId}`, expectedData).respond(200); + controller.save(travelId, data); + $httpBackend.flush(); + + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + }); + }); }); diff --git a/modules/travel/front/extra-community/locale/es.yml b/modules/travel/front/extra-community/locale/es.yml index e377a1011..dc231226f 100644 --- a/modules/travel/front/extra-community/locale/es.yml +++ b/modules/travel/front/extra-community/locale/es.yml @@ -4,5 +4,8 @@ Freighter: Transitario Bl. KG: KG Bloq. Phy. KG: KG físico Vol. KG: KG Vol. -Search by travel id or reference: Buscar por id travel o referencia -Continent Out: Continente salida \ No newline at end of file +Search by travel id or reference: Buscar por id de travel o referencia +Search by extra community travel: Buscar por envío extra comunitario +Continent Out: Continente salida +W. Shipped: F. envío +W. Landed: F. llegada \ No newline at end of file diff --git a/modules/travel/front/extra-community/style.scss b/modules/travel/front/extra-community/style.scss index e7265781d..41544242d 100644 --- a/modules/travel/front/extra-community/style.scss +++ b/modules/travel/front/extra-community/style.scss @@ -26,11 +26,11 @@ vn-travel-extra-community { color: $color-active } - vn-td-editable text:after { + vn-td-editable:hover text:after { font-family: 'Material Icons'; content: 'edit'; position: absolute; - margin-left: 5px; + right: -15px; color: $color-spacer } diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html index de6f6e979..90a2ea27f 100644 --- a/modules/travel/front/summary/index.html +++ b/modules/travel/front/summary/index.html @@ -1,6 +1,7 @@
- @@ -132,7 +133,18 @@ -

Thermographs

+

+ + Thermograph + +

+

+ Thermograph +

diff --git a/modules/travel/front/summary/index.js b/modules/travel/front/summary/index.js index 876d1ec6c..5144a0bb5 100644 --- a/modules/travel/front/summary/index.js +++ b/modules/travel/front/summary/index.js @@ -56,6 +56,10 @@ class Controller extends Summary { return total; } + + get isBuyer() { + return this.aclService.hasAny(['buyer']); + } } ngModule.vnComponent('vnTravelSummary', { diff --git a/modules/travel/front/thermograph/create/index.html b/modules/travel/front/thermograph/create/index.html index a183390c0..f73938f5b 100644 --- a/modules/travel/front/thermograph/create/index.html +++ b/modules/travel/front/thermograph/create/index.html @@ -84,13 +84,6 @@ value-field="id"> - - - - -

Basic data

+

+ + Basic data + +

+

+ Basic data +

diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js index 178df81a9..6a4d87007 100644 --- a/modules/worker/front/summary/index.js +++ b/modules/worker/front/summary/index.js @@ -52,6 +52,10 @@ class Controller extends Summary { this.$.worker = res.data; }); } + + get isHr() { + return this.aclService.hasAny(['hr']); + } } ngModule.vnComponent('vnWorkerSummary', { diff --git a/modules/zone/front/calendar/index.spec.js b/modules/zone/front/calendar/index.spec.js index 82d7a4471..be002925e 100644 --- a/modules/zone/front/calendar/index.spec.js +++ b/modules/zone/front/calendar/index.spec.js @@ -4,12 +4,10 @@ import crudModel from 'core/mocks/crud-model'; describe('component vnZoneCalendar', () => { let $scope; let controller; - let $httpBackend; beforeEach(ngModule('zone')); - beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => { - $httpBackend = _$httpBackend_; + beforeEach(inject(($componentController, $rootScope) => { $scope = $rootScope.$new(); const $element = angular.element(``); controller = $componentController('vnZoneCalendar', {$element, $scope}); diff --git a/modules/zone/front/summary/index.html b/modules/zone/front/summary/index.html index 9247087e6..2fe94388f 100644 --- a/modules/zone/front/summary/index.html +++ b/modules/zone/front/summary/index.html @@ -1,6 +1,7 @@
- @@ -36,7 +37,11 @@ -

Warehouses

+

+ + Warehouse + +

diff --git a/print/common/css/spacing.css b/print/common/css/spacing.css index 670102d7c..96cb8c828 100644 --- a/print/common/css/spacing.css +++ b/print/common/css/spacing.css @@ -125,30 +125,56 @@ padding-right: 16px; } +/* Medium-Large */ + +.vn-pa-ml { + padding: 32px; +} +.vn-pl-ml { + padding-left: 32px; +} +.vn-pr-ml { + padding-right: 32px; +} +.vn-pt-ml { + padding-top: 32px; +} +.vn-pb-ml { + padding-bottom: 32px; +} +.vn-py-ml { + padding-top: 32px; + padding-bottom: 32px; +} +.vn-px-ml { + padding-left: 32px; + padding-right: 32px; +} + /* Large */ .vn-pa-lg { - padding: 32px; + padding: 64px; } .vn-pl-lg { - padding-left: 32px; + padding-left: 64px; } .vn-pr-lg { - padding-right: 32px; + padding-right: 64px; } .vn-pt-lg { - padding-top: 32px; + padding-top: 64px; } .vn-pb-lg { - padding-bottom: 32px; + padding-bottom: 64px; } .vn-py-lg { - padding-top: 32px; - padding-bottom: 32px; + padding-top: 64px; + padding-bottom: 64px; } .vn-px-lg { - padding-left: 32px; - padding-right: 32px; + padding-left: 64px; + padding-right: 64px; } /* Extra large */ @@ -296,30 +322,56 @@ margin-right: 16px; } +/* Medium-Large */ + +.vn-ma-ml { + margin: 32px; +} +.vn-mt-ml { + margin-top: 32px; +} +.vn-ml-ml { + margin-left: 32px; +} +.vn-mr-ml { + margin-right: 32px; +} +.vn-mb-ml { + margin-bottom: 32px; +} +.vn-my-ml { + margin-top: 32px; + margin-bottom: 32px; +} +.vn-mx-ml { + margin-left: 32px; + margin-right: 32px; +} + /* Large */ .vn-ma-lg { - margin: 32px; + margin: 64px; } .vn-mt-lg { - margin-top: 32px; + margin-top: 64px; } .vn-ml-lg { - margin-left: 32px; + margin-left: 64px; } .vn-mr-lg { - margin-right: 32px; + margin-right: 64px; } .vn-mb-lg { - margin-bottom: 32px; + margin-bottom: 64px; } .vn-my-lg { - margin-top: 32px; - margin-bottom: 32px; + margin-top: 64px; + margin-bottom: 64px; } .vn-mx-lg { - margin-left: 32px; - margin-right: 32px; + margin-left: 64px; + margin-right: 64px; } /* Extra large */ diff --git a/print/core/database.js b/print/core/database.js index 3cc508cef..e879d0e3a 100644 --- a/print/core/database.js +++ b/print/core/database.js @@ -1,6 +1,7 @@ const mysql = require('mysql2/promise'); const config = require('./config.js'); const fs = require('fs-extra'); +const PromisePoolConnection = mysql.PromisePoolConnection; module.exports = { init() { @@ -16,11 +17,17 @@ module.exports = { * Makes a query from a raw sql * @param {String} query - The raw SQL query * @param {Object} params - Parameterized values + * @param {Object} connection - Optional pool connection * * @return {Object} - Result promise */ - rawSql(query, params) { - return this.pool.query(query, params).then(([rows]) => { + rawSql(query, params, connection) { + let pool = this.pool; + if (params instanceof PromisePoolConnection) + connection = params; + if (connection) pool = connection; + + return pool.query(query, params).then(([rows]) => { return rows; }); }, @@ -85,5 +92,57 @@ module.exports = { return this.findOneFromDef(queryName, params).then(row => { return Object.values(row)[0]; }); + }, + + /** + * Returns the content of a SQL file + * @param {String} queryName - The SQL file name + * + * @return {Object} - SQL + */ + getSqlFromDef(queryName) { + return fs.readFileSync(`${queryName}.sql`, 'utf8'); + }, + + /** + * Merges two SQL strings + * + * @param {String} query - Input SQL + * @param {String} sql - String to merge + * + * @return {String} - Merged SQL string + */ + merge(query, sql) { + return query += `\r\n ${sql}`; + }, + + /** + * Builds where string + * + * @param {Object} args - Query params + * @param {Function} callback - Callback + * + * @return {String} - Where Sql string + */ + buildWhere(args, callback) { + let sql = ''; + + for (let prop in args) { + const value = args[prop]; + if (!value) continue; + + const sanitizedValue = mysql.escape(value); + const conditional = callback(prop, sanitizedValue); + + if (!conditional) continue; + + if (sql) sql += ' AND '; + sql += conditional; + } + let where = ''; + if (sql) + where = `WHERE ${sql}`; + + return where; } }; diff --git a/print/core/filters/number.js b/print/core/filters/number.js index a0c5e61f7..430639de4 100644 --- a/print/core/filters/number.js +++ b/print/core/filters/number.js @@ -4,6 +4,7 @@ const defaultLocale = config.i18n.locale; const number = function(value, locale = defaultLocale) { if (!locale) locale = defaultLocale; + if (value === null || value == '') return; return new Intl.NumberFormat(locale, { style: 'decimal' }).format(parseFloat(value)); diff --git a/print/core/filters/zerofill.js b/print/core/filters/zerofill.js index c7df519b0..c3d18079b 100644 --- a/print/core/filters/zerofill.js +++ b/print/core/filters/zerofill.js @@ -1,4 +1,3 @@ -const {KeyValueModel} = require('loopback'); const Vue = require('vue'); const zerofill = function(value, pad) { diff --git a/print/core/mixins/db-helper.js b/print/core/mixins/db-helper.js index 06f4e196d..4a6f9e460 100644 --- a/print/core/mixins/db-helper.js +++ b/print/core/mixins/db-helper.js @@ -8,10 +8,12 @@ const dbHelper = { * Makes a query from a raw sql * @param {String} query - The raw SQL query * @param {Object} params - Parameterized values + * @param {Object} connection - Optional pool connection * * @return {Object} - Result promise */ - rawSql: db.rawSql, + rawSql: (query, params, connection) => + db.rawSql(query, params, connection), /** * Makes a query from a SQL file @@ -32,7 +34,7 @@ const dbHelper = { * * @return {Object} - Result promise */ - findOne: db.findOne, + findOne: (query, params) => db.findOne(query, params), /** * Returns the first row from a given SQL file @@ -53,7 +55,7 @@ const dbHelper = { * * @return {Object} - Result promise */ - findValue: db.findValue, + findValue: (query, params) => db.findValue(query, params), /** * Returns the first property from a given SQL file @@ -66,7 +68,18 @@ const dbHelper = { return this.findOneFromDef(queryName, params).then(row => { return Object.values(row)[0]; }); - } + }, + + /** + * Returns the content of an SQL file + * @param {String} queryName - The SQL file name + * + * @return {Object} - SQL + */ + getSqlFromDef(queryName) { + const absolutePath = path.join(__dirname, '../', this.tplPath, 'sql', queryName); + return db.getSqlFromDef(absolutePath); + }, }, props: ['tplPath'] }; diff --git a/print/templates/email/buyer-week-waste/buyer-week-waste.html b/print/templates/email/buyer-week-waste/buyer-week-waste.html index 9f6b22968..3b0c71160 100644 --- a/print/templates/email/buyer-week-waste/buyer-week-waste.html +++ b/print/templates/email/buyer-week-waste/buyer-week-waste.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}},

@@ -30,7 +30,7 @@
-
+
diff --git a/print/templates/email/campaign-metrics/campaign-metrics.html b/print/templates/email/campaign-metrics/campaign-metrics.html index 9d7014f34..ff8c661ee 100644 --- a/print/templates/email/campaign-metrics/campaign-metrics.html +++ b/print/templates/email/campaign-metrics/campaign-metrics.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}},

diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.html b/print/templates/email/claim-pickup-order/claim-pickup-order.html index cdde0dd92..f674dcee8 100644 --- a/print/templates/email/claim-pickup-order/claim-pickup-order.html +++ b/print/templates/email/claim-pickup-order/claim-pickup-order.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('description.dear')}},

{{$t('description.instructions')}}

diff --git a/print/templates/email/client-welcome/client-welcome.html b/print/templates/email/client-welcome/client-welcome.html index 1d21846d7..07b61b3e6 100644 --- a/print/templates/email/client-welcome/client-welcome.html +++ b/print/templates/email/client-welcome/client-welcome.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dearClient')}},

diff --git a/print/templates/email/delivery-note-link/delivery-note-link.html b/print/templates/email/delivery-note-link/delivery-note-link.html index 78fa2c922..ab58cbb24 100644 --- a/print/templates/email/delivery-note-link/delivery-note-link.html +++ b/print/templates/email/delivery-note-link/delivery-note-link.html @@ -27,7 +27,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}}

@@ -35,7 +35,7 @@
-
+

{{$t('copyLink')}}

https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={{ticketId}} @@ -44,7 +44,7 @@
-
+

diff --git a/print/templates/email/delivery-note/delivery-note.html b/print/templates/email/delivery-note/delivery-note.html index 71de29a3e..96c53b1d7 100644 --- a/print/templates/email/delivery-note/delivery-note.html +++ b/print/templates/email/delivery-note/delivery-note.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}},

diff --git a/print/templates/email/driver-route/driver-route.html b/print/templates/email/driver-route/driver-route.html index 815b28b8c..069edbfc4 100644 --- a/print/templates/email/driver-route/driver-route.html +++ b/print/templates/email/driver-route/driver-route.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('description.instructions')}}

diff --git a/print/templates/email/letter-debtor-nd/letter-debtor-nd.html b/print/templates/email/letter-debtor-nd/letter-debtor-nd.html index 630cce8a2..64bc7ca69 100644 --- a/print/templates/email/letter-debtor-nd/letter-debtor-nd.html +++ b/print/templates/email/letter-debtor-nd/letter-debtor-nd.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{ $t('sections.introduction.title') }},

{{ $t('sections.introduction.description') }}

@@ -62,7 +62,7 @@
-
+
-
+

{{ $t('title') }} {{$i18n.locale}}

{{ $t('sections.introduction.title') }},

{{ $t('sections.introduction.description') }}

@@ -45,7 +45,7 @@
-
+
-
+

{{ $t('title') }}

{{ $t('sections.introduction.title') }},

diff --git a/print/templates/email/printer-setup/printer-setup.html b/print/templates/email/printer-setup/printer-setup.html index df0b43f0c..fff21eb90 100644 --- a/print/templates/email/printer-setup/printer-setup.html +++ b/print/templates/email/printer-setup/printer-setup.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('description.dear')}},

{{$t('description.instructions')}}

@@ -41,7 +41,7 @@
-
+

{{$t('sections.help.title')}}

{{$t('sections.help.description')}}

@@ -49,7 +49,7 @@
-
+
{{$t('salesPersonName')}}: {{client.salesPersonName}}
@@ -64,7 +64,7 @@
-
+
-
+

{{ $t('title') }}

{{$t('description.dear')}},

@@ -31,7 +31,7 @@
-
+
-
+

{{ $t('title') }}

{{$t('dear')}},

diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.html b/print/templates/reports/claim-pickup-order/claim-pickup-order.html index 3cc335887..20c29f0ee 100644 --- a/print/templates/reports/claim-pickup-order/claim-pickup-order.html +++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.html @@ -49,7 +49,7 @@
-
+
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index b6529dbe3..0004d171b 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -14,7 +14,7 @@
-
+

{{$t('title')}}

{{$t('reference')}}
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js index 5e5752e36..549759651 100755 --- a/print/templates/reports/delivery-note/delivery-note.js +++ b/print/templates/reports/delivery-note/delivery-note.js @@ -99,13 +99,8 @@ module.exports = { getBotanical() { let phytosanitary = []; this.sales.forEach(sale => { - let itemPhytosanitary; - if (sale.latinGenusName || sale.latinSpeciesName) - itemPhytosanitary = [sale.latinGenusName, sale.latinSpeciesName].filter(Boolean).join(' '); - else if (sale.botanical) - itemPhytosanitary = sale.botanical; - - phytosanitary.push(itemPhytosanitary); + if (sale.botanical) + phytosanitary.push(sale.botanical); }); return phytosanitary.filter((item, index) => diff --git a/print/templates/reports/delivery-note/sql/sales.sql b/print/templates/reports/delivery-note/sql/sales.sql index 08c349f5a..d17f6feee 100644 --- a/print/templates/reports/delivery-note/sql/sales.sql +++ b/print/templates/reports/delivery-note/sql/sales.sql @@ -14,9 +14,7 @@ SELECT i.inkFk, s.ticketFk, tcl.code vatType, - ib.botanical, - eg.latinGenusName, - es.latinSpeciesName, + ib.ediBotanic botanical, i.tag5, i.value5, i.tag6, @@ -37,10 +35,8 @@ FROM vn.sale s LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = sp.countryFk LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk - LEFT JOIN itemBotanical ib ON ib.itemFk = i.id + LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id AND ic.code = 'plant' - LEFT JOIN ediGenus eg ON eg.id = ib.genusFk - LEFT JOIN ediSpecie es ON es.id = ib.specieFk WHERE s.ticketFk = ? GROUP BY s.id ORDER BY (it.isPackaging), s.concept, s.itemFk \ No newline at end of file diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html index dcd2f3ed9..956d4e2f6 100644 --- a/print/templates/reports/entry-order/entry-order.html +++ b/print/templates/reports/entry-order/entry-order.html @@ -54,7 +54,7 @@ -
+
diff --git a/print/templates/reports/extra-community/assets/css/import.js b/print/templates/reports/extra-community/assets/css/import.js new file mode 100644 index 000000000..fd8796c2b --- /dev/null +++ b/print/templates/reports/extra-community/assets/css/import.js @@ -0,0 +1,9 @@ +const Stylesheet = require(`${appPath}/core/stylesheet`); + +module.exports = new Stylesheet([ + `${appPath}/common/css/spacing.css`, + `${appPath}/common/css/misc.css`, + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, + `${__dirname}/style.css`]) + .mergeStyles(); diff --git a/print/templates/reports/extra-community/assets/css/style.css b/print/templates/reports/extra-community/assets/css/style.css new file mode 100644 index 000000000..305a174d2 --- /dev/null +++ b/print/templates/reports/extra-community/assets/css/style.css @@ -0,0 +1,7 @@ +h1 { + text-align: center; +} + +th.align-right { + padding-right: 1em; +} \ No newline at end of file diff --git a/print/templates/reports/extra-community/extra-community.html b/print/templates/reports/extra-community/extra-community.html new file mode 100644 index 000000000..86baf858b --- /dev/null +++ b/print/templates/reports/extra-community/extra-community.html @@ -0,0 +1,84 @@ + + + +
{{$t('boxes')}}
+ + + + + +
+ + +
+
+

{{$t('title')}}

+
+
+ + +
+
+
+
{{$t('information')}}
+
+
+ + + + + + + + + + + + + + + + + + + + + +
{{$t('reference')}}{{travel.ref}}{{$t('blockedKg')}}{{travel.kg | number($i18n.locale)}}
{{$t('packages')}}{{travel.stickers}}{{$t('volumeKg')}}{{travel.volumeKg | number($i18n.locale)}}
{{$t('shipped')}}{{travel.shipped | date('%d-%m-%Y')}}{{$t('physicalKg')}}{{travel.loadedKg | number($i18n.locale)}}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
{{$t('supplier')}}{{$t('reference')}}{{$t('volKg')}}{{$t('phyKg')}}{{$t('packages')}}
{{entry.supplierName}}{{entry.ref}}{{entry.volumeKg | number($i18n.locale)}}{{entry.loadedKg | number($i18n.locale)}}{{entry.stickers}}
{{$t('noRows')}}
+
+
+ + + +
+ + \ No newline at end of file diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js new file mode 100755 index 000000000..ddeabb49b --- /dev/null +++ b/print/templates/reports/extra-community/extra-community.js @@ -0,0 +1,115 @@ +const Component = require(`${appPath}/core/component`); +const reportHeader = new Component('report-header'); +const reportFooter = new Component('report-footer'); +const db = require(`${appPath}/core/database`); + +module.exports = { + name: 'extra-community', + async serverPrefetch() { + this.filters = this.$options.filters; + const args = { + landedFrom: this.landedStart, + landedTo: this.landedEnd, + shippedFrom: this.shippedStart, + shippedTo: this.shippedEnd, + continent: this.continent + }; + + const connection = await db.pool.getConnection(); + + await this.fetchTravels(args, connection); + + const travels = await this.rawSql(` + SELECT * FROM tmp.travel`, connection); + const entries = await this.fetchEntries(connection); + + await this.rawSql(` + DROP TEMPORARY TABLE + tmp.travel`, connection); + + await connection.release(); + + const map = new Map(); + + for (let travel of travels) + map.set(travel.id, travel); + + for (let entry of entries) { + const travel = map.get(entry.travelFk); + if (!travel.entries) travel.entries = []; + travel.entries.push(entry); + } + + this.travels = travels; + + if (!this.travels) + throw new Error('Something went wrong'); + }, + computed: { + dated: function() { + return this.filters.date(new Date(), '%d-%m-%Y'); + }, + landedStart: function() { + if (!this.landedFrom) return; + + return this.filters.date(this.landedFrom, '%Y-%m-%d'); + }, + landedEnd: function() { + if (!this.landedTo) return; + + return this.filters.date(this.landedTo, '%Y-%m-%d'); + }, + shippedStart: function() { + if (!this.shippedFrom) return; + + return this.filters.date(this.shippedFrom, '%Y-%m-%d'); + }, + shippedEnd: function() { + if (!this.shippedTo) return; + + return this.filters.date(this.shippedTo, '%Y-%m-%d'); + } + }, + methods: { + fetchTravels(args, connection) { + const where = db.buildWhere(args, (key, value) => { + switch (key) { + case 'shippedFrom': + return `t.shipped >= ${value}`; + case 'shippedTo': + return `t.shipped <= ${value}`; + case 'landedFrom': + return `t.landed >= ${value}`; + case 'landedTo': + return `t.landed <= ${value}`; + case 'continent': + return `cnt.code = ${value}`; + } + }); + + let query = this.getSqlFromDef('travels'); + query = db.merge(query, where); + query = db.merge(query, 'GROUP BY t.id'); + + return this.rawSql(query, connection); + }, + + fetchEntries(connection) { + let query = this.getSqlFromDef('entries'); + query = db.merge(query, 'GROUP BY e.id'); + + return this.rawSql(query, connection); + } + }, + components: { + 'report-header': reportHeader.build(), + 'report-footer': reportFooter.build() + }, + props: [ + 'landedFrom', + 'landedTo', + 'shippedFrom', + 'shippedTo', + 'continent' + ] +}; diff --git a/print/templates/reports/extra-community/locale/es.yml b/print/templates/reports/extra-community/locale/es.yml new file mode 100644 index 000000000..1112b0fe8 --- /dev/null +++ b/print/templates/reports/extra-community/locale/es.yml @@ -0,0 +1,15 @@ +title: Orden de carga +reference: Referencia +information: Información +packages: Bultos +blockedKg: KG Bloqueado +volumeKg: KG Volumen +physicalKg: KG Físico +volKg: KG Vol. +phyKg: KG Fís. +warehouseIn: Alm. entrada +shipped: F. envío +warehouseOut: Alm. salida +landed: F. llegada +noRows: Sin líneas que mostrar +supplier: Proveedor \ No newline at end of file diff --git a/print/templates/reports/extra-community/sql/entries.sql b/print/templates/reports/extra-community/sql/entries.sql new file mode 100644 index 000000000..5cf22fe44 --- /dev/null +++ b/print/templates/reports/extra-community/sql/entries.sql @@ -0,0 +1,15 @@ +SELECT + e.id, + e.travelFk, + e.ref, + s.name AS supplierName, + SUM(b.stickers) AS stickers, + CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedKg, + CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg + FROM tmp.travel t + JOIN entry e ON e.travelFk = t.id + JOIN buy b ON b.entryFk = e.id + JOIN packaging pkg ON pkg.id = b.packageFk + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk + JOIN supplier s ON s.id = e.supplierFk \ No newline at end of file diff --git a/print/templates/reports/extra-community/sql/travels.sql b/print/templates/reports/extra-community/sql/travels.sql new file mode 100644 index 000000000..f9b421df7 --- /dev/null +++ b/print/templates/reports/extra-community/sql/travels.sql @@ -0,0 +1,24 @@ +CREATE TEMPORARY TABLE tmp.travel + (INDEX (id)) + ENGINE = MEMORY + SELECT + t.id, + t.ref, + t.shipped, + t.landed, + t.kg, + SUM(b.stickers) AS stickers, + CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedKg, + CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg + FROM travel t + LEFT JOIN supplier s ON s.id = t.cargoSupplierFk + LEFT JOIN entry e ON e.travelFk = t.id + LEFT JOIN buy b ON b.entryFk = e.id + LEFT JOIN packaging pkg ON pkg.id = b.packageFk + LEFT JOIN item i ON i.id = b.itemFk + LEFT JOIN itemType it ON it.id = i.typeFk + JOIN warehouse w ON w.id = t.warehouseInFk + JOIN warehouse wo ON wo.id = t.warehouseOutFk + JOIN country c ON c.id = wo.countryFk + LEFT JOIN continent cnt ON cnt.id = c.continentFk + JOIN agencyMode am ON am.id = t.agencyFk \ No newline at end of file