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

db/changes/10271-wisemen/.keep

@@ -0,0 +1 @@
+12271-wisemen

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');

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)',
@@ -828,11 +840,13 @@ export default {
     },
     travelIndex: {
         anySearchResult: 'vn-travel-index vn-tbody > a',
-        firstSearchResult: 'vn-travel-index vn-tbody > a:nth-child(1)'
+        firstSearchResult: 'vn-travel-index vn-tbody > a:nth-child(1)',
+        firstTravelAddEntryButton: 'vn-travel-index a:nth-child(1) vn-icon[icon="icon-ticket"]',
     },
     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: {
@@ -866,6 +880,7 @@ export default {
         dotMenu: 'vn-travel-descriptor vn-icon-button[icon="more_vert"]',
         dotMenuClone: '#clone',
         dotMenuCloneWithEntries: '#cloneWithEntries',
+        dotMenuAddEntry: '[name="addEntry"]',
         acceptClonation: 'tpl-buttons > button[response="accept"]'
     },
     travelCreate: {
@@ -896,6 +911,10 @@ export default {
         volumetric: 'vn-zone-basic-data vn-check[ng-model="$ctrl.zone.isVolumetric"]',
         saveButton: 'vn-zone-basic-data vn-submit > button',
     },
+    entryCreate: {
+        travel: 'vn-entry-create vn-autocomplete[ng-model="$ctrl.entry.travelFk"]',
+        company: 'vn-entry-create vn-autocomplete[ng-model="$ctrl.entry.companyFk"]'
+    },
     entrySummary: {
         header: 'vn-entry-summary > vn-card > h5',
         reference: 'vn-entry-summary vn-label-value[label="Reference"]',

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() => {

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');
+    });
+});

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

@@ -33,6 +33,61 @@ describe('Travel descriptor path', () => {
         expect(state).toBe('travel.card.summary');
     });
 
+    it('should be redirected to the create entry view', async() => {
+        await page.waitToClick(selectors.travelDescriptor.dotMenu);
+        await page.waitToClick(selectors.travelDescriptor.dotMenuAddEntry);
+        await page.waitForState('entry.create');
+        const state = await page.getState();
+
+        expect(state).toBe('entry.create');
+    });
+
+    it('should check some data was imported from the travel', async() => {
+        const travel = await page.waitToGetProperty(selectors.entryCreate.travel, 'value');
+        const campany = await page.waitToGetProperty(selectors.entryCreate.company, 'value');
+
+        expect(travel).toContain('Warehouse');
+        expect(campany).toContain('VNL');
+    });
+
+    it('should navigate back to the travel index', async() => {
+        await page.waitToClick('.cancel');
+        await page.waitToClick(selectors.globalItems.homeButton);
+        await page.selectModule('travel');
+        await page.waitForState('travel.index');
+        const state = await page.getState();
+
+        expect(state).toBe('travel.index');
+    });
+
+    it('should click on the add entry button of the third result to be redirected to create entry', async() => {
+        await page.keyboard.press('Enter');
+        await page.waitToClick(selectors.travelIndex.firstTravelAddEntryButton);
+        await page.waitForState('entry.create');
+        const state = await page.getState();
+
+        expect(state).toBe('entry.create');
+    });
+
+    it('should check again some data was imported from the travel', async() => {
+        const travel = await page.waitToGetProperty(selectors.entryCreate.travel, 'value');
+        const campany = await page.waitToGetProperty(selectors.entryCreate.company, 'value');
+
+        expect(travel).toContain('Warehouse');
+        expect(campany).toContain('VNL');
+    });
+
+    it('should navigate to the travel summary of a given travel', async() => {
+        await page.waitToClick('.cancel');
+        await page.waitToClick(selectors.globalItems.homeButton);
+        await page.selectModule('travel');
+        await page.accessToSearchResult('3');
+        await page.waitForState('travel.card.summary');
+        const state = await page.getState();
+
+        expect(state).toBe('travel.card.summary');
+    });
+
     it('should be redirected to the create travel when using the clone option of the dot menu', async() => {
         await page.waitToClick(selectors.travelDescriptor.dotMenu);
         await page.waitToClick(selectors.travelDescriptor.dotMenuClone);

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);
     });
 });

loopback/locale/es.json

@@ -168,5 +168,6 @@
 	"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong> y un precio de <strong>{{price}} €</strong>",
 	"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong>",
 	"Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
-	"This BIC already exist.": "Este BIC ya existe."
+	"This BIC already exist.": "Este BIC ya existe.",
+	"That item doesn't exists": "Ese artículo no existe"
 }

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',

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

modules/entry/front/main/index.html

@@ -8,7 +8,7 @@
     <vn-searchbar
         vn-focus
         panel="vn-entry-search-panel"
-        info="Search entrys by id"
+        info="Search entry by id or a suppliers by name or alias"
         model="model">
     </vn-searchbar>
 </vn-portal>
@@ -16,3 +16,6 @@
     <vn-left-menu></vn-left-menu>
 </vn-portal>
 <ui-view></ui-view>
+
+
+

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>
             </vn-textfield>
         </vn-horizontal>
@@ -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">
+                <tpl-item>{{name}}: {{nickname}}</tpl-item>
             </vn-autocomplete>
             <vn-date-picker
                 vn-one

modules/entry/front/search-panel/locale/es.yml

@@ -5,3 +5,4 @@ From: Desde
 To: Hasta
 Agency: Agencia
 Warehouse: Almacén
+Search entry by id or a suppliers by name or alias: Buscar entrada por id o proveedores por nombre y alias

modules/item/back/methods/fixed-price/filter.js

@@ -0,0 +1,192 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    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];
+    };
+};

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);
+    });
+});

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));
+    });
+});

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;
+        }
+    };
+};
+

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

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();

modules/item/back/model-config.json

@@ -76,5 +76,8 @@
     },
     "TaxType": {
         "dataSource": "vn"
+    },
+    "FixedPrice": {
+        "dataSource": "vn"
     }
 }

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);
+};

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"
+        }
+    ]
+}

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": {

modules/item/front/fixed-price-search-panel/index.html

@@ -0,0 +1,136 @@
+<vn-crud-model
+    url="Tags"
+    fields="['id','name','isFree', 'sourceTable']"
+    data="tags"
+    auto-load="true">
+</vn-crud-model>
+<div class="search-panel">
+    <form class="vn-pa-lg" ng-submit="$ctrl.onSearch()">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="General search"
+                ng-model="filter.search"
+                vn-focus>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                url="ItemCategories"
+                label="Category"
+                show-field="name"
+                value-field="id"
+                ng-model="filter.categoryFk">
+            </vn-autocomplete>
+            <vn-autocomplete vn-one
+                url="ItemTypes"
+                label="Type"
+                where="{categoryFk: filter.categoryFk}"
+                show-field="name"
+                value-field="id"
+                ng-model="filter.typeFk"
+                fields="['categoryFk']"
+                include="'category'">
+                <tpl-item>
+                    <div>{{name}}</div>
+                    <div class="text-caption text-secondary">
+                        {{category.name}}
+                    </div>
+                </tpl-item>
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete 
+                vn-one
+                ng-model="filter.buyerFk"
+                url="Clients/activeWorkersWithRole"
+                show-field="nickname"
+                search-function="{firstName: $search}"
+                value-field="id"
+                where="{role: 'buyer'}"
+                label="Buyer">
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                label="Warehouse"
+                ng-model="filter.warehouseFk"
+                url="Warehouses">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-date-picker
+                vn-one
+                label="Started"
+                ng-model="filter.started">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="Ended"
+                ng-model="filter.ended">
+            </vn-date-picker>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-check vn-one 
+                triple-state="true" 
+                label="For me" 
+                ng-model="filter.mine">
+            </vn-check>
+            <vn-check vn-one 
+                triple-state="true" 
+                label="Minimum price" 
+                ng-model="filter.hasMinPrice">
+            </vn-check>
+        </vn-horizontal>
+        <vn-horizontal class="vn-pt-sm">
+            <vn-one class="text-subtitle1" translate>
+                Tags
+            </vn-one>
+            <vn-icon-button
+                vn-none
+                vn-bind="+"
+                vn-tooltip="Add tag"
+                icon="add_circle"
+                ng-click="filter.tags.push({})">
+            </vn-icon-button>
+        </vn-horizontal>
+        <vn-horizontal ng-repeat="itemTag in filter.tags">
+            <vn-autocomplete vn-two vn-id="tag"
+                label="Tag"
+                initial-data="itemTag.tag"
+                ng-model="itemTag.tagFk"
+                data="tags"
+                show-field="name"
+                on-change="itemTag.value = null"
+                rule>
+            </vn-autocomplete>
+            <vn-textfield vn-three
+                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
+                vn-id="text"
+                label="Value"
+                ng-model="itemTag.value"
+                rule>
+            </vn-textfield>
+            <vn-autocomplete vn-three
+                ng-show="tag.selection.isFree === false"
+                url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
+                search-function="{value: $search}"
+                label="Value"
+                ng-model="itemTag.value"
+                show-field="value"
+                value-field="value"
+                rule>
+            </vn-autocomplete>
+            <vn-icon-button
+                vn-none
+                vn-tooltip="Remove tag"
+                icon="delete"
+                ng-click="filter.tags.splice($index, 1)"
+                tabindex="-1">
+            </vn-icon-button>
+        </vn-horizontal>
+        <vn-horizontal class="vn-mt-lg">
+            <vn-submit label="Search"></vn-submit>
+        </vn-horizontal>
+    </form>
+</div>

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
+});

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

modules/item/front/fixed-price/index.html

@@ -0,0 +1,159 @@
+<vn-crud-model
+    vn-id="model"
+    url="FixedPrices/filter"
+    limit="20"
+    data="prices"
+    auto-load="true"
+    order="itemFk">
+</vn-crud-model>
+<vn-crud-model
+    auto-load="true"
+    url="Warehouses"
+    data="warehouses"
+    order="name">
+</vn-crud-model>
+<vn-portal slot="topbar">
+    <vn-searchbar
+        auto-state="false"
+        panel="vn-fixed-price-search-panel"
+        info="Search prices by item ID or code"
+        placeholder="Search fixed prices"
+        filter="{}"
+        model="model">
+    </vn-searchbar>
+</vn-portal>
+<div class="vn-w-xl">
+    <vn-card>
+        <vn-table model="model">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="itemFk">Item ID</vn-th>
+                    <vn-th field="itemFk">Item</vn-th>
+                    <vn-th field="warehouseFk">Warehouse</vn-th>
+                    <vn-th field="rate2">P.P.U.</vn-th>
+                    <vn-th field="rate3">P.P.P.</vn-th>
+                    <vn-th field="minPrice">Min price</vn-th>
+                    <vn-th field="started" style="width: 90px">Started</vn-th>
+                    <vn-th field="ended" style="width: 90px">Ended</vn-th>
+                    <vn-th shrink></vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="price in prices">
+                    <vn-td>
+                        <span
+                            ng-if="price.itemFk"
+                            ng-click="itemDescriptor.show($event, price.itemFk)"
+                            class="link">
+                            {{price.itemFk}}
+                        </span>
+                        <vn-autocomplete
+                            class="dense"
+                            ng-if="!price.itemFk"
+                            vn-focus
+                            url="Items"
+                            ng-model="price.itemFk"
+                            show-field="name"
+                            value-field="id"
+                            search-function="$ctrl.itemSearchFunc($search)"
+                            on-change="$ctrl.upsertPrice(price)"
+                            order="id DESC"
+                            tabindex="1">
+                            <tpl-item>
+                                {{::id}} - {{::name}}
+                            </tpl-item>
+                        </vn-autocomplete>
+                    </vn-td>
+                    <vn-td expand>
+                        <text>
+                            <vn-fetched-tags
+                                max-length="6"
+                                item="price"
+                                name="price.name"
+                                sub-name="price.subName"
+                                tabindex="-1">
+                            </vn-fetched-tags>
+                        </text>
+                    </vn-td>
+                    <vn-td>
+                        <vn-autocomplete
+                            vn-one
+                            label="Warehouse"
+                            ng-model="price.warehouseFk"
+                            url="Warehouses"
+                            on-change="$ctrl.upsertPrice(price)"
+                            tabindex="2">
+                        </vn-autocomplete>
+                    </vn-td>
+                    <vn-td-editable number>
+                        <text>{{price.rate2 | currency: 'EUR':2}}</text>
+                        <field>
+                            <vn-input-number
+                                class="dense"
+                                vn-focus
+                                ng-model="price.rate2"
+                                on-change="$ctrl.upsertPrice(price)">
+                            </vn-input-number>
+                        </field>
+                    </vn-td-editable>
+                    <vn-td-editable number>
+                        <text>{{price.rate3 | currency: 'EUR':2}}</text>
+                        <field>
+                            <vn-input-number
+                                class="dense"
+                                vn-focus
+                                ng-model="price.rate3"
+                                on-change="$ctrl.upsertPrice(price)">
+                            </vn-input-number>
+                        </field>
+                    </vn-td-editable>
+                    <vn-td-editable number>
+                        <text>{{(price.hasMinPrice ? (price.minPrice | currency: 'EUR':2) : "-")}}</text>
+                        <field>
+                            <vn-input-number
+                                class="dense"
+                                vn-focus
+                                ng-model="price.minPrice"
+                                on-change="$ctrl.upsertPrice(price)">
+                            </vn-input-number>
+                        </field>
+                    </vn-td-editable>
+                    <vn-td>
+                        <vn-date-picker
+                            vn-one
+                            label="Started"
+                            ng-model="price.started"
+                            on-change="$ctrl.upsertPrice(price)">
+                        </vn-date-picker>
+                    </vn-td>
+                    <vn-td>
+                        <vn-date-picker
+                            vn-one
+                            label="Ended"
+                            ng-model="price.ended"
+                            on-change="$ctrl.upsertPrice(price)">
+                        </vn-date-picker>
+                    </vn-td>
+                    <vn-td shrink>
+                        <vn-icon-button
+                            icon="delete"
+                            vn-tooltip="Delete"
+                            ng-click="$ctrl.removePrice($index)">
+                        </vn-icon-button>
+                    </vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+        <div class="vn-pa-md">
+            <vn-icon-button
+                vn-tooltip="Add fixed price"
+                icon="add_circle"
+                vn-bind="+"
+                ng-click="model.insert()">
+            </vn-icon-button>
+        </div>
+    </vn-card>
+</div>
+<vn-item-descriptor-popover
+    vn-id="itemDescriptor">
+</vn-item-descriptor-popover>

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
+});

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('<vn-fixed-price></vn-fixed-price>');
+            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();
+            });
+        });
+    });
+});

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

modules/item/front/fixed-price/style.scss

@@ -0,0 +1,5 @@
+@import "variables";
+
+vn-table vn-date-picker {
+    max-width: 90px;
+}

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';
 

modules/item/front/index/index.html

@@ -25,6 +25,7 @@
                 <vn-th field="origin" shrink>Origin</vn-th>
                 <vn-th field="salesperson" shrink>Buyer</vn-th>
                 <vn-th field="density" shrink>Density</vn-th>
+                <vn-th field="stemMultiplier" shrink>Multiplier</vn-th>
                 <vn-th field="active" shrink>Active</vn-th>
                 <vn-th></vn-th>
             </vn-tr>
@@ -78,6 +79,7 @@
                     </span>
                 </vn-td>
                 <vn-td shrink>{{::item.density}}</vn-td>
+                <vn-td shrink >{{::item.stemMultiplier}}</vn-td>
                 <vn-td shrink>
                     <vn-check
                         disabled="true"

modules/item/front/routes.json

@@ -8,7 +8,8 @@
         "main": [
             {"state": "item.index", "icon": "icon-item"},
             {"state": "item.request", "icon": "pan_tool"},
-            {"state": "item.waste", "icon": "icon-claims"}
+            {"state": "item.waste", "icon": "icon-claims"},
+            {"state": "item.fixedPrice", "icon": ""}
         ],
         "card": [
             {"state": "item.card.basicData", "icon": "settings"},
@@ -32,22 +33,26 @@
             "abstract": true,
             "description": "Items",
             "component": "vn-items"
-        }, {
+        },
+        {
             "url": "/index?q",
             "state": "item.index",
             "component": "vn-item-index",
             "description": "Items"
-        }, {
+        },
+        {
             "url": "/create",
             "state": "item.create",
             "component": "vn-item-create",
             "description": "New item"
-        }, {
+        },
+        {
             "url": "/:id",
             "state": "item.card",
             "abstract": true,
             "component": "vn-item-card"
-        }, {
+        },
+        {
             "url" : "/basic-data",
             "state": "item.card.basicData",
             "component": "vn-item-basic-data",
@@ -56,7 +61,8 @@
                 "item": "$ctrl.item"
             },
             "acl": ["buyer"]
-        }, {
+        },
+        {
             "url" : "/tags",
             "state": "item.card.tags",
             "component": "vn-item-tags",
@@ -65,13 +71,15 @@
                 "item-tags": "$ctrl.itemTags"
             },
             "acl": ["buyer", "replenisher"]
-        }, {
+        },
+        {
             "url" : "/tax",
             "state": "item.card.tax",
             "component": "vn-item-tax",
             "description": "Tax",
             "acl": ["administrative","buyer"]
-        }, {
+        },
+        {
             "url" : "/niche",
             "state": "item.card.niche",
             "component": "vn-item-niche",
@@ -80,7 +88,8 @@
                 "item": "$ctrl.item"
             },
             "acl": ["buyer","replenisher"]
-        }, {
+        },
+        {
             "url" : "/botanical",
             "state": "item.card.botanical",
             "component": "vn-item-botanical",
@@ -89,7 +98,8 @@
                 "item": "$ctrl.item"
             },
             "acl": ["buyer"]
-        }, {
+        },
+        {
             "url" : "/barcode",
             "state": "item.card.itemBarcode",
             "component": "vn-item-barcode",
@@ -98,7 +108,8 @@
                 "item": "$ctrl.item"
             },
             "acl": ["buyer","replenisher"]
-        }, {
+        },
+        {
             "url" : "/summary",
             "state": "item.card.summary",
             "component": "vn-item-summary",
@@ -106,7 +117,8 @@
             "params": {
                 "item": "$ctrl.item"
             }
-        }, {
+        },
+        {
             "url" : "/diary?warehouseFk&lineFk",
             "state": "item.card.diary",
             "component": "vn-item-diary",
@@ -115,7 +127,8 @@
                 "item": "$ctrl.item"
             },
             "acl": ["employee"]
-        }, {
+        },
+        {
             "url" : "/last-entries",
             "state": "item.card.last-entries",
             "component": "vn-item-last-entries",
@@ -124,12 +137,14 @@
                 "item": "$ctrl.item"
             },
             "acl": ["employee"]
-        }, {
+        },
+        {
             "url" : "/log",
             "state": "item.card.log",
             "component": "vn-item-log",
             "description": "Log"
-        }, {
+        },
+        {
             "url" : "/request?q",
             "state": "item.request",
             "component": "vn-item-request",
@@ -138,12 +153,20 @@
                 "item": "$ctrl.item"
             },
             "acl": ["employee"]
-        }, {
+        },
+        {
             "url" : "/waste",
             "state": "item.waste",
             "component": "vn-item-waste",
             "description": "Waste breakdown",
             "acl": ["buyer"]
+        },
+        {
+            "url" : "/fixed-price",
+            "state": "item.fixedPrice",
+            "component": "vn-fixed-price",
+            "description": "Fixed prices",
+            "acl": ["buyer"]
         }
     ]
 }

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>
             </vn-autocomplete>
             <vn-textfield vn-three

modules/order/front/catalog/index.js

@@ -25,8 +25,15 @@ class Controller extends Section {
     }
 
     $onChanges() {
+        this.getData().then(() => {
             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
 });

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();

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 = {

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;
 

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) {

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: {

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

modules/ticket/front/services/index.html

@@ -6,6 +6,7 @@
     auto-load="true">
 </vn-crud-model>
 <vn-crud-model
+    vn-id="typesModel"
     auto-load="true"
     url="TicketServiceTypes"
     data="ticketServiceTypes"

modules/ticket/front/services/index.js

@@ -35,6 +35,10 @@ class Controller extends Section {
             throw new UserError(`Name can't be empty`);
 
         return this.$http.post(`TicketServiceTypes`, this.$.newServiceType)
+            .then(res => {
+                this.$.typesModel.refresh();
+                return res;
+            })
             .then(res => service.ticketServiceTypeFk = res.data.id);
     }
 

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(`<div></div>`);
         controller = $componentController('vnTicketService', {$scope, $element});
     }));

modules/ticket/front/weekly/index.html

@@ -26,7 +26,7 @@
             <vn-tr>
                 <vn-th field="ticketFk" number>Ticket ID</vn-th>
                 <vn-th field="clientName">Client</vn-th>
-                <vn-th>Weekday</vn-th>
+                <vn-th>Shipment</vn-th>
                 <vn-th>Agency</vn-th>
                 <vn-th>Warehouse</vn-th>
                 <vn-th>Salesperson</vn-th>

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: Llegada
+Shipment: Salida

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

modules/travel/back/models/travel.json

@@ -37,6 +37,9 @@
         "m3": {
             "type": "Number"
         },
+        "kg": {
+            "type": "Number"
+        },
         "cargoSupplierFk": {
             "type": "Number"
         },

modules/travel/front/descriptor-menu/index.html

@@ -18,6 +18,12 @@
             translate>
             Clone travel and his entries
         </vn-item>
+        <a class="vn-item"
+            ui-sref="entry.create({travelFk: $ctrl.travel.id})"
+            name="addEntry"
+            translate>
+            Add entry
+        </a>
     </vn-list>
 </vn-menu>
 

modules/travel/front/descriptor-menu/locale/es.yml

@@ -1,3 +1,4 @@
 Clone travel: Clonar envío
+Add entry: Añadir entrada
 Clone travel and his entries: Clonar travel y sus entradas
 Do you want to clone this travel and all containing entries?: ¿Quieres clonar este travel y todas las entradas que contiene?

modules/travel/front/extra-community-search-panel/index.html

@@ -39,24 +39,28 @@
             <vn-date-picker
                 vn-one
                 label="Shipped from"
-                ng-model="filter.shippedFrom">
+                ng-model="filter.shippedFrom"
+                on-change="$ctrl.shippedFrom = value">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
                 label="Shipped to"
-                ng-model="filter.shippedTo">
+                ng-model="filter.shippedTo"
+                on-change="$ctrl.shippedTo = value">
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
                 vn-one
                 label="Landed from"
-                ng-model="filter.landedFrom">
+                ng-model="filter.landedFrom"
+                on-change="$ctrl.landedFrom = value">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
                 label="Landed to"
-                ng-model="filter.landedTo">
+                ng-model="filter.landedTo"
+                on-change="$ctrl.landedTo = value">
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
@@ -76,6 +80,13 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
+            <vn-autocomplete vn-one
+                label="Freighter"
+                ng-model="filter.cargoSupplierFk"
+                url="Suppliers"
+                show-field="name"
+                value-field="id">
+            </vn-autocomplete>
             <vn-autocomplete vn-one
                 label="Continent Out"
                 ng-model="filter.continent"

modules/travel/front/extra-community-search-panel/index.js

@@ -1,7 +1,59 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
 
+class Controller extends SearchPanel {
+    constructor($, $element) {
+        super($, $element);
+
+        this.filter = this.$.filter;
+    }
+
+    get shippedFrom() {
+        return this._shippedFrom;
+    }
+
+    set shippedFrom(value) {
+        this._shippedFrom = value;
+
+        if (!this.filter.shippedTo)
+            this.filter.shippedTo = value;
+    }
+
+    get shippedTo() {
+        return this._shippedTo;
+    }
+
+    set shippedTo(value) {
+        this._shippedTo = value;
+
+        if (!this.filter.shippedFrom)
+            this.filter.shippedFrom = value;
+    }
+
+    get landedFrom() {
+        return this._landedFrom;
+    }
+
+    set landedFrom(value) {
+        this._landedFrom = value;
+
+        if (!this.filter.landedTo)
+            this.filter.landedTo = value;
+    }
+
+    get landedTo() {
+        return this._landedTo;
+    }
+
+    set landedTo(value) {
+        this._landedTo = value;
+
+        if (!this.filter.landedFrom)
+            this.filter.landedFrom = value;
+    }
+}
+
 ngModule.vnComponent('vnExtraCommunitySearchPanel', {
     template: require('./index.html'),
-    controller: SearchPanel
+    controller: Controller
 });

modules/travel/front/extra-community/index.html

@@ -9,19 +9,27 @@
     <vn-searchbar
         vn-focus
         panel="vn-extra-community-search-panel"
+        info="Search by travel id or reference"
+        placeholder="Search by extra community travel"
         suggested-filter="$ctrl.defaultFilter"
         filter="$ctrl.defaultFilter"
-        info="Search by travel id or reference"
         auto-state="false"
         model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-data-viewer model="model" class="travel-list">
-    <vn-card ng-repeat="travel in travels" class="vn-mb-md">
+    <vn-card>
         <section class="vn-pa-md">
-            <vn-table vn-droppable="$ctrl.onDrop($event)" ng-attr-id="{{::travel.id}}">
+            <vn-tool-bar class="vn-mb-md">
+                <vn-button disabled="!model.userParams.landedFrom || !model.userParams.landedTo"
+                    icon="picture_as_pdf"
+                    ng-click="$ctrl.showReport()"
+                    vn-tooltip="Open as PDF">
+                </vn-button>
+            </vn-tool-bar>
+            <vn-table>
                 <vn-thead>
-                    <vn-tr ng-if="$index == 0">
+                    <vn-tr>
                         <vn-th shrink>Id</vn-th>
                         <vn-th expand>Supplier</vn-th>
                         <vn-th expand>Freighter</vn-th>
@@ -33,14 +41,14 @@
                         <vn-th expand translate-attr="{title: 'Warehouse Out'}">
                             Wh. Out
                         </vn-th>
-                        <vn-th expand>Shipped</vn-th>
+                        <vn-th expand>W. Shipped</vn-th>
                         <vn-th expand translate-attr="{title: 'Warehouse In'}">
                             Wh. In
                         </vn-th>
-                        <vn-th expand>Landed</vn-th>
+                        <vn-th expand>W. Landed</vn-th>
                     </vn-tr>
                 </vn-thead>
-                <vn-tbody>
+                <vn-tbody ng-repeat="travel in travels" class="vn-mb-md" vn-droppable="$ctrl.onDrop($event)" ng-attr-id="{{::travel.id}}">
                     <vn-tr class="header">
                         <vn-td>
                             <span class="link"
@@ -50,17 +58,26 @@
                         </vn-td>
                         <vn-td expand>{{::travel.agencyModeName}}</vn-td>
                         <vn-td expand>{{::travel.cargoSupplierNickname}}</vn-td>
-                        <vn-td-editable expand>
+                        <vn-td-editable name="reference" expand>
                             <text>{{travel.ref}}</text>
                             <field>
                                 <vn-textfield class="dense" vn-focus
                                     ng-model="travel.ref"
-                                    on-change="$ctrl.changeReference(travel)">
+                                    on-change="$ctrl.save(travel.id, {ref: value})">
                                 </vn-textfield>
                             </field>
                         </vn-td-editable>
                         <vn-td number>{{::travel.stickers}}</vn-td>
-                        <vn-td number>{{::travel.kg}}</vn-td>
+                        <vn-td-editable name="lockedKg" expand style="text-align: right">
+                            <text number>{{travel.kg}}</text>
+                            <field>
+                                <vn-input-number class="dense" vn-focus
+                                    ng-model="travel.kg"
+                                    on-change="$ctrl.save(travel.id, {kg: value})"
+                                    min="0">
+                                </vn-input-number>
+                            </field>
+                        </vn-td-editable>
                         <vn-td number>{{::travel.loadedKg}}</vn-td>
                         <vn-td number>{{::travel.volumeKg}}</vn-td>
                         <vn-td expand>{{::travel.warehouseOutName}}</vn-td>
@@ -80,17 +97,17 @@
                         <vn-td>{{::entry.supplierName}}</vn-td>
                         <vn-td></vn-td>
                         <vn-td expand>{{::entry.ref}}</vn-td>
-                        <vn-th number>{{::entry.stickers}}</vn-th>
+                        <vn-td number>{{::entry.stickers}}</vn-td>
                         <vn-td number></vn-td>
                         <vn-td number>{{::entry.loadedkg}}</vn-td>
                         <vn-td number>{{::entry.volumeKg}}</vn-td>
                         <vn-td>
-                            <span nf-if="::entry.notes" vn-tooltip="{{::entry.notes}}">
+                            <span ng-if="::entry.notes" vn-tooltip="{{::entry.notes}}">
                                 {{::entry.notes}}
                             </span>
                         </vn-td>
                         <vn-td>
-                            <span nf-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
+                            <span ng-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
                                 {{::entry.evaNotes}}
                             </span>
                         </vn-td>

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

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!');
+        });
+    });
 });

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
+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

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
     }
 

modules/travel/front/index/index.html

@@ -49,6 +49,11 @@
                             vn-tooltip="Clone"
                             icon="icon-clone">
                         </vn-icon-button>
+                        <vn-icon-button 
+                            vn-anchor="::{state: 'entry.create', params: {travelFk: travel.id}}"
+                            vn-tooltip="Add entry"
+                            icon="icon-ticket">
+                        </vn-icon-button>
                         <vn-icon-button
                             vn-click-stop="$ctrl.preview(travel)"
                             vn-tooltip="Preview"

modules/travel/front/thermograph/create/index.html

@@ -84,13 +84,6 @@
                     value-field="id">
                 </vn-autocomplete>
             </vn-horizontal>
-            <vn-horizontal>
-                <vn-textarea vn-one vn-focus
-                    label="Description" 
-                    ng-model="$ctrl.dms.description"
-                    rule>
-                </vn-textarea>
-            </vn-horizontal>
             <vn-horizontal>
                 <vn-input-file
                     vn-one 

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(`<vn-zone-calendar></vn-zone-calendar>`);
         controller = $componentController('vnZoneCalendar', {$element, $scope});

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 */

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;
     }
 };

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));

print/core/filters/zerofill.js

@@ -1,4 +1,3 @@
-const {KeyValueModel} = require('loopback');
 const Vue = require('vue');
 
 const zerofill = function(value, pad) {

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']
 };

print/templates/email/buyer-week-waste/buyer-week-waste.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('dear')}},</p>
                                 <p v-html="$t('description', [dated])"></p>
@@ -30,7 +30,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <table class="column-oriented">
                                     <thead>
                                         <tr>

print/templates/email/campaign-metrics/campaign-metrics.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('dear')}},</p>
                                 <p v-html="$t('description', [minDate, maxDate])"></p>

print/templates/email/claim-pickup-order/claim-pickup-order.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('description.dear')}},</p>
                                 <p>{{$t('description.instructions')}}</p>

print/templates/email/client-welcome/client-welcome.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('dearClient')}},</p>
                                 <p v-html="$t('clientData')"></p>

print/templates/email/delivery-note-link/delivery-note-link.html

@@ -27,7 +27,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('dear')}}</p>
                                 <p v-html="$t('description', [ticketId])"></p>
@@ -35,7 +35,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-px-lg">
+                            <div class="grid-block vn-px-ml">
                                 <p>{{$t('copyLink')}}</p>
                                 <div class="external-link vn-pa-sm vn-m-md">
                                     https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={{ticketId}}
@@ -44,7 +44,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <p v-html="$t('poll')"></p>
                                 <p v-html="$t('help')"></p>
                                 <p v-html="$t('conclusion')"></p>

print/templates/email/delivery-note/delivery-note.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('dear')}},</p>
                                 <p v-html="$t('description', [ticketId])"></p>

print/templates/email/driver-route/driver-route.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('description.instructions')}}</p>
                             </div>

print/templates/email/letter-debtor-nd/letter-debtor-nd.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{ $t('sections.introduction.title') }},</p>
                                 <p>{{ $t('sections.introduction.description') }}</p>
@@ -62,7 +62,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row" v-if="isPreview">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <attachment v-for="attachment in attachments" 
                                     v-bind:key="attachment.filename"
                                     v-bind:attachment="attachment"

print/templates/email/letter-debtor-st/letter-debtor-st.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }} {{$i18n.locale}}</h1>
                                 <p>{{ $t('sections.introduction.title') }},</p>
                                 <p>{{ $t('sections.introduction.description') }}</p>
@@ -45,7 +45,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row" v-if="isPreview">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <attachment v-for="attachment in attachments" 
                                     v-bind:key="attachment.filename"
                                     v-bind:attachment="attachment"

print/templates/email/payment-update/payment-update.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{ $t('sections.introduction.title') }},</p>
                                 <p v-html="`${$t('sections.introduction.description')}:`"></p>

print/templates/email/printer-setup/printer-setup.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('description.dear')}},</p>
                                 <p>{{$t('description.instructions')}}</p>
@@ -41,7 +41,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{$t('sections.help.title')}}</h1>
                                 <p>{{$t('sections.help.description')}}</p>
                                 <p v-html="$t('sections.help.remoteSupport')"></p>
@@ -49,7 +49,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <div v-if="client.salesPersonName">
                                     {{$t('salesPersonName')}}: <strong>{{client.salesPersonName}}</strong>
                                 </div>
@@ -64,7 +64,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row" v-if="isPreview">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <attachment v-for="attachment in attachments" 
                                     v-bind:key="attachment.filename"
                                     v-bind:attachment="attachment"

print/templates/email/sepa-core/sepa-core.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('description.dear')}},</p>
                                 <div v-html="$t('description.instructions')"></div>
@@ -31,7 +31,7 @@
                         </div>
                         <!-- Attachments block -->
                         <div class="grid-row" v-if="isPreview">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <attachment v-for="attachment in attachments" 
                                     v-bind:key="attachment.filename"
                                     v-bind:attachment="attachment"

print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.html

@@ -22,7 +22,7 @@
                         </div>
                         <!-- Block -->
                         <div class="grid-row">
-                            <div class="grid-block vn-pa-lg">
+                            <div class="grid-block vn-pa-ml">
                                 <h1>{{ $t('title') }}</h1>
                                 <p>{{$t('dear')}},</p>
                                 <p v-html="$t('description', [minDate, maxDate])"></p>

print/templates/reports/claim-pickup-order/claim-pickup-order.html

@@ -49,7 +49,7 @@
                                     </div>
                                 </div>
                                         
-                                <table class="column-oriented vn-mt-lg">
+                                <table class="column-oriented vn-mt-ml">
                                     <thead>
                                         <tr>
                                             <th>{{$t('reference')}}</th>

print/templates/reports/delivery-note/delivery-note.html

@@ -14,7 +14,7 @@
                             <div class="grid-block">
                                 <div class="columns">
                                     <div class="size50">
-                                        <div class="size75 vn-mt-lg">
+                                        <div class="size75 vn-mt-ml">
                                             <h1 class="title uppercase">{{$t('title')}}</h1>
                                             <table class="row-oriented ticket-info">
                                                 <tbody>

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) =>

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

print/templates/reports/entry-order/entry-order.html

@@ -54,7 +54,7 @@
                                 </div>
                 
                                 <!-- Buy block -->
-                                <table class="column-oriented vn-mt-lg">
+                                <table class="column-oriented vn-mt-ml">
                                     <thead>
                                         <tr>
                                             <th class="number">{{$t('boxes')}}</th>

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();

print/templates/reports/extra-community/assets/css/style.css

@@ -0,0 +1,7 @@
+h1 {
+    text-align: center;
+}
+
+th.align-right {
+    padding-right: 1em;
+}

print/templates/reports/extra-community/extra-community.html

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html v-bind:lang="$i18n.locale">
+    <body>
+        <table class="grid">
+            <tbody>
+                <tr>
+                    <td>
+                        <!-- Header block -->
+                        <report-header v-bind="$props"></report-header>
+                        <div class="grid-row">
+                            <div class="grid-block">
+                                <h1 class="title uppercase">{{$t('title')}}</h1>
+                            </div>
+                        </div>
+
+                        <!-- Block -->
+                        <div class="grid-row vn-mb-lg" v-for="travel in travels">
+                            <div class="grid-block">
+                                <div class="panel">
+                                    <div class="header">{{$t('information')}}</div>
+                                    <div class="body">
+                                        <div>
+                                            <table width="100%">
+                                                <tbody>
+                                                    <tr>
+                                                        <th class="font gray align-right">{{$t('reference')}}</th>
+                                                        <td>{{travel.ref}}</td>
+                                                        <th class="font gray align-right">{{$t('blockedKg')}}</th>
+                                                        <td>{{travel.kg | number($i18n.locale)}}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th class="font gray align-right">{{$t('packages')}}</th>
+                                                        <td>{{travel.stickers}}</td>
+                                                        <th class="font gray align-right">{{$t('volumeKg')}}</th>
+                                                        <td>{{travel.volumeKg | number($i18n.locale)}}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <th class="font gray align-right">{{$t('shipped')}}</th>
+                                                        <td>{{travel.shipped | date('%d-%m-%Y')}}</td>
+                                                        <th class="font gray align-right">{{$t('physicalKg')}}</th>
+                                                        <td>{{travel.loadedKg | number($i18n.locale)}}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <table class="column-oriented">
+                                    <thead>
+                                        <tr>
+                                            <th>{{$t('supplier')}}</th>
+                                            <th>{{$t('reference')}}</th>
+                                            <th class="number">{{$t('volKg')}}</th>
+                                            <th class="number">{{$t('phyKg')}}</th>
+                                            <th class="number">{{$t('packages')}}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr v-for="entry in travel.entries">
+                                            <td>{{entry.supplierName}}</td>
+                                            <td>{{entry.ref}}</td>
+                                            <td class="number">{{entry.volumeKg | number($i18n.locale)}}</td>
+                                            <td class="number">{{entry.loadedKg | number($i18n.locale)}}</td>
+                                            <td class="number">{{entry.stickers}}</td>
+                                        </tr>
+                                        <tr v-if="!travel.entries">
+                                            <td colspan="5" class="centered">{{$t('noRows')}}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <!-- Footer block -->
+                        <report-footer id="pageFooter"
+                            v-bind:left-text="dated"
+                            v-bind="$props">
+                        </report-footer>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>

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'
+    ]
+};

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

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

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