CHANGELOG.md

@@ -11,10 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 
 ### Changed
--
+- (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario
 
 ### Fixed
--
+- (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
+- (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
 
 ## [2304.01] - 2023-02-09
 

back/methods/account/recover-password.js

@@ -3,9 +3,9 @@ module.exports = Self => {
         description: 'Send email to the user',
         accepts: [
             {
-                arg: 'email',
+                arg: 'user',
                 type: 'string',
-                description: 'The email of user',
+                description: 'The user name or email',
                 required: true
             }
         ],
@@ -15,11 +15,20 @@ module.exports = Self => {
         }
     });
 
-    Self.recoverPassword = async function(email) {
+    Self.recoverPassword = async function(user) {
         const models = Self.app.models;
 
+        const usesEmail = user.indexOf('@') !== -1;
+        if (!usesEmail) {
+            const account = await models.Account.findOne({
+                fields: ['email'],
+                where: {name: user}
+            });
+            user = account.email;
+        }
+
         try {
-            await models.user.resetPassword({email, emailTemplate: 'recover-password'});
+            await models.user.resetPassword({email: user, emailTemplate: 'recover-password'});
         } catch (err) {
             if (err.code === 'EMAIL_NOT_FOUND')
                 return;

back/methods/campaign/latest.js

@@ -22,7 +22,7 @@ module.exports = Self => {
 
     Self.latest = async filter => {
         const conn = Self.dataSource.connector;
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setFullYear(minDate.getFullYear() - 1);
 
         const where = {dated: {gte: minDate}};

back/methods/campaign/spec/latest.spec.js

@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 
 describe('campaign latest()', () => {
     it('should return the campaigns from the last year', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         const result = await app.models.Campaign.latest();
         const randomIndex = Math.floor(Math.random() * result.length);
         const campaignDated = result[randomIndex].dated;
@@ -12,7 +12,7 @@ describe('campaign latest()', () => {
     });
 
     it('should return the campaigns from the current year', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         const currentYear = now.getFullYear();
         const result = await app.models.Campaign.latest({
             where: {dated: {like: `%${currentYear}%`}}

back/methods/campaign/spec/upcoming.spec.js

@@ -4,7 +4,7 @@ describe('campaign upcoming()', () => {
     it('should return the upcoming campaign but from the last year', async() => {
         const response = await app.models.Campaign.upcoming();
         const campaignDated = response.dated;
-        const now = new Date();
+        const now = Date.vnNew();
 
         expect(campaignDated).toEqual(jasmine.any(Date));
         expect(campaignDated).toBeLessThanOrEqual(now);

back/methods/campaign/upcoming.js

@@ -14,7 +14,7 @@ module.exports = Self => {
     });
 
     Self.upcoming = async() => {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setFullYear(minDate.getFullYear() - 1);
 
         return Self.findOne({

back/methods/chat/getServiceAuth.js

@@ -21,7 +21,7 @@ module.exports = Self => {
 
         if (!this.login) return;
 
-        if (Date.now() > this.login.expires)
+        if (Date.vnNow() > this.login.expires)
             this.login = await requestToken();
 
         return this.login;
@@ -48,7 +48,7 @@ module.exports = Self => {
                     userId: requestData.userId,
                     token: requestData.authToken
                 },
-                expires: Date.now() + (1000 * 60 * tokenLifespan)
+                expires: Date.vnNow() + (1000 * 60 * tokenLifespan)
             };
         }
     }

back/methods/chat/send.js

@@ -33,7 +33,7 @@ module.exports = Self => {
             await models.Chat.create({
                 senderFk: sender.id,
                 recipient: to,
-                dated: new Date(),
+                dated: Date.vnNew(),
                 checkUserStatus: 0,
                 message: message,
                 status: 0,

back/methods/chat/sendCheckingPresence.js

@@ -49,7 +49,7 @@ module.exports = Self => {
         await models.Chat.create({
             senderFk: sender.id,
             recipient: `@${recipient.name}`,
-            dated: new Date(),
+            dated: Date.vnNew(),
             checkUserStatus: 1,
             message: message,
             status: 0,

back/methods/chat/spec/sendQueued.spec.js

@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('Chat sendCheckingPresence()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(6, 0);
     const chatModel = models.Chat;
 

back/methods/collection/setSaleQuantity.js

@@ -24,7 +24,7 @@ module.exports = Self => {
         }
     });
 
-    Self.setSaleQuantity = async(saleId, quantity) => {
+    Self.setSaleQuantity = async(saleId, quantity, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;

back/methods/dms/deleteTrashFiles.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             where: {code: 'trash'}
         }, myOptions);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setMonth(date.getMonth() - 4);
 
         const dmsToDelete = await models.Dms.find({

back/methods/dms/saveSign.js

@@ -163,7 +163,7 @@ module.exports = Self => {
                     fields: ['alertLevel']
                 });
 
-                signedTime ? signedTime != undefined : signedTime = new Date();
+                signedTime ? signedTime != undefined : signedTime = Date.vnNew();
 
                 if (alertLevel >= 2) {
                     let dir;

back/methods/docuware/upload.js

@@ -127,7 +127,7 @@ module.exports = Self => {
         const uploadOptions = {
             headers: {
                 'Content-Type': 'multipart/form-data',
-                'X-File-ModifiedDate': new Date(),
+                'X-File-ModifiedDate': Date.vnNew(),
                 'Cookie': options.headers.headers.Cookie,
                 ...data.getHeaders()
             },

back/methods/edi/updateData.js

@@ -230,7 +230,7 @@ module.exports = Self => {
                         UPDATE edi.tableConfig
                             SET updated = ?
                         WHERE fileName = ?
-                `, [new Date(), baseName], options);
+                `, [Date.vnNew(), baseName], options);
         }
 
         console.log(`Updated table ${toTable}\n`);

back/methods/notification/clean.js

@@ -32,7 +32,7 @@ module.exports = Self => {
 
             if (!config.cleanDays) return;
 
-            const cleanDate = new Date();
+            const cleanDate = Date.vnNew();
             cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
 
             await models.NotificationQueue.destroyAll({

back/methods/notification/specs/clean.spec.js

@@ -10,7 +10,7 @@ describe('Notification Clean()', () => {
         const notification = await models.Notification.findOne({}, options);
         const notificationConfig = await models.NotificationConfig.findOne({});
 
-        const cleanDate = new Date();
+        const cleanDate = Date.vnNew();
         cleanDate.setDate(cleanDate.getDate() - (notificationConfig.cleanDays + 1));
 
         let before;

back/models/image.js

@@ -77,7 +77,7 @@ module.exports = Self => {
             const newImage = await Self.upsertWithWhere(data, {
                 name: fileName,
                 collectionFk: collectionName,
-                updated: (new Date).getTime()
+                updated: Date.vnNow()
             }, myOptions);
 
             // Resizes and saves the image

db/dump/fixtures.sql

@@ -2,7 +2,33 @@ CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
 UPDATE `util`.`config`
-    SET `environment`= 'test';
+    SET `environment`= 'development';
+
+-- FOR MOCK vn.time
+
+DROP PROCEDURE IF EXISTS `vn`.`mockVnTime`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`mockVnTime`()
+BEGIN
+
+		DECLARE vDate DATE;
+	SET vDate = '2000-01-01';
+
+	WHILE ( YEAR(vDate) <= 2002 ) DO
+	    INSERT IGNORE INTO vn.`time` (dated, period, `month`, `year`, `day`, week, yearMonth, salesYear)
+			VALUES (vDate, CONCAT(YEAR(vDate), (WEEK(vDate)+1)), MONTH(vDate), YEAR(vDate), DAY(vDate), WEEK(vDate)+1, CONCAT(YEAR(vDate), MONTH(vDate)), YEAR(vDate));
+
+	    SET vDate = DATE_ADD(vDate, INTERVAL 1 DAY);
+	END WHILE;
+
+END$$
+DELIMITER ;
+
+CALL `vn`.`mockVnTime`();
+DROP PROCEDURE IF EXISTS `vn`.`mockVnTime`;
+-- END MOCK vn.time
 
 ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1;
 ALTER TABLE `vn`.`address` AUTO_INCREMENT = 1;
@@ -934,10 +960,10 @@ INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`,
         (7,  2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),  1,  18, NULL,             94, NULL,NULL),
         (8,  3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),  1,  18, NULL,             94, 1,   NULL),
         (9,  3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 2,   NULL),
-        (10, 7, 7, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
-        (11, 7, 8, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
-        (12, 7, 9, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
-        (13, 1, 10,71, NOW(),                                           1,  18, NULL,             94, 3,   NULL);
+        (10, 7, 7, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (11, 7, 8, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (12, 7, 9, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (13, 1, 10,71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL);
 
 
 INSERT INTO `vn`.`expeditionState`(`id`, `created`, `expeditionFk`, `typeFk`, `userFk`)
@@ -1910,7 +1936,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
     ENGINE = MEMORY
-    SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL +1 YEAR)), '-12-25'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+    SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-12-25') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`;
 
 INSERT INTO `vn`.`business`(`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`,  `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
@@ -1920,7 +1946,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
     ENGINE = MEMORY
-    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)) as ended, '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`
 			WHERE `w`.`id` = 1109;
 

db/dump/mockDate.sql

@@ -3,18 +3,17 @@ USE `util`;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`mockedDate`;
-CREATE FUNCTION `util`.`mockedDate`() 
+CREATE FUNCTION `util`.`mockedDate`()
 RETURNS DATETIME
 DETERMINISTIC
 BEGIN
-    RETURN NOW();
-    -- '2022-01-19 08:00:00'
+    RETURN CONVERT_TZ('2001-01-01 11:00:00', 'utc', 'Europe/Madrid');
 END ;;
 DELIMITER ;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`VN_CURDATE`;
-CREATE FUNCTION `util`.`VN_CURDATE`() 
+CREATE FUNCTION `util`.`VN_CURDATE`()
 RETURNS DATE
 DETERMINISTIC
 BEGIN
@@ -24,7 +23,7 @@ DELIMITER ;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`VN_CURTIME`;
-CREATE FUNCTION `util`.`VN_CURTIME`() 
+CREATE FUNCTION `util`.`VN_CURTIME`()
 RETURNS TIME
 DETERMINISTIC
 BEGIN
@@ -34,10 +33,10 @@ DELIMITER ;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`VN_NOW`;
-CREATE FUNCTION `util`.`VN_NOW`() 
+CREATE FUNCTION `util`.`VN_NOW`()
 RETURNS DATETIME
 DETERMINISTIC
 BEGIN
-    RETURN mockedDate(); 
+    RETURN mockedDate();
 END ;;
-DELIMITER ;
+DELIMITER ;

db/tests/vn/buyUltimate.spec.js

@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('buyUltimate()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it(`should create buyUltimate temporal table and update it's values`, async() => {
         let stmts = [];
         let stmt;

db/tests/vn/buyUltimateFromInterval.spec.js

@@ -5,7 +5,7 @@ describe('buyUltimateFromInterval()', () => {
     let today;
     let future;
     beforeAll(() => {
-        let now = new Date();
+        let now = Date.vnNew();
         now.setHours(0, 0, 0, 0);
         today = now;
 

db/tests/vn/ticketCalculateClon.spec.js

@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('ticket ticketCalculateClon()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it('should add the ticket to the order containing the original ticket', async() => {
         let stmts = [];
         let stmt;

db/tests/vn/ticketCreateWithUser.spec.js

@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('ticket ticketCreateWithUser()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it('should confirm the procedure creates the expected ticket', async() => {
         let stmts = [];
         let stmt;

db/tests/vn/timeBusiness_calculateByUser.spec.js

@@ -3,9 +3,9 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('timeBusiness_calculateByUser()', () => {
     it('should return the expected hours for today', async() => {
-        let start = new Date();
+        let start = Date.vnNew();
         start.setHours(0, 0, 0, 0);
-        let end = new Date();
+        let end = Date.vnNew();
         end.setHours(0, 0, 0, 0);
 
         let stmts = [];

db/tests/vn/timeControl_calculateByUser.spec.js

@@ -3,11 +3,11 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('timeControl_calculateByUser()', () => {
     it(`should return today's worked hours`, async() => {
-        let start = new Date();
+        let start = Date.vnNew();
         start.setHours(0, 0, 0, 0);
         start.setDate(start.getDate() - 1);
 
-        let end = new Date();
+        let end = Date.vnNew();
         end.setHours(0, 0, 0, 0);
         end.setDate(end.getDate() + 1);
 
@@ -17,7 +17,7 @@ describe('timeControl_calculateByUser()', () => {
         stmts.push('START TRANSACTION');
 
         stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS 
+            DROP TEMPORARY TABLE IF EXISTS
                 tmp.timeControlCalculate,
                 tmp.timeBusinessCalculate
         `);
@@ -48,14 +48,14 @@ describe('timeControl_calculateByUser()', () => {
     });
 
     it(`should return the worked hours between last sunday and monday`, async() => {
-        let lastSunday = new Date();
+        let lastSunday = Date.vnNew();
         let daysSinceSunday = lastSunday.getDay();
         if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
             daysSinceSunday = 7;
         lastSunday.setHours(23, 0, 0, 0);
         lastSunday.setDate(lastSunday.getDate() - daysSinceSunday);
 
-        let monday = new Date();
+        let monday = Date.vnNew();
         let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday)
         monday.setHours(7, 0, 0, 0);
         monday.setDate(monday.getDate() - daysSinceMonday);
@@ -66,7 +66,7 @@ describe('timeControl_calculateByUser()', () => {
         stmts.push('START TRANSACTION');
 
         stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS 
+            DROP TEMPORARY TABLE IF EXISTS
                 tmp.timeControlCalculate,
                 tmp.timeBusinessCalculate
         `);

db/tests/vn/zone_getLanded.spec.js

@@ -6,7 +6,7 @@ describe('zone zone_getLanded()', () => {
         let stmts = [];
         let stmt;
         stmts.push('START TRANSACTION');
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         let params = {
@@ -40,7 +40,7 @@ describe('zone zone_getLanded()', () => {
     it(`should return data for a shipped tomorrow`, async() => {
         let stmts = [];
         let stmt;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         stmts.push('START TRANSACTION');

e2e/helpers/extensions.js

@@ -436,7 +436,7 @@ let actions = {
     },
 
     pickDate: async function(selector, date) {
-        date = date || new Date();
+        date = date || Date.vnNew();
 
         const timeZoneOffset = date.getTimezoneOffset() * 60000;
         const localDate = (new Date(date.getTime() - timeZoneOffset))

e2e/helpers/selectors.js

@@ -31,7 +31,7 @@ export default {
     },
     recoverPassword: {
         recoverPasswordButton: 'vn-login a[ui-sref="recover-password"]',
-        email: 'vn-recover-password vn-textfield[ng-model="$ctrl.email"]',
+        email: 'vn-recover-password vn-textfield[ng-model="$ctrl.user"]',
         sendEmailButton: 'vn-recover-password vn-submit',
     },
     accountIndex: {
@@ -1260,6 +1260,21 @@ export default {
         importBuysButton: 'vn-entry-buy-import button[type="submit"]'
     },
     entryLatestBuys: {
+        table: 'tbody > tr:not(.empty-rows)',
+        chip: 'vn-chip > vn-icon',
+        generalSearchInput: 'vn-textfield[ng-model="$ctrl.filter.search"]',
+        firstReignIcon: 'vn-horizontal.item-category  vn-one',
+        typeInput: 'vn-autocomplete[ng-model="$ctrl.filter.typeFk"]',
+        salesPersonInput: 'vn-autocomplete[ng-model="$ctrl.filter.salesPersonFk"]',
+        supplierInput: 'vn-autocomplete[ng-model="$ctrl.filter.supplierFk"]',
+        fromInput: 'vn-date-picker[ng-model="$ctrl.filter.from"]',
+        toInput: 'vn-date-picker[ng-model="$ctrl.filter.to"]',
+        activeCheck: 'vn-check[ng-model="$ctrl.filter.active"]',
+        floramondoCheck: 'vn-check[ng-model="$ctrl.filter.floramondo"]',
+        visibleCheck: 'vn-check[ng-model="$ctrl.filter.visible"]',
+        addTagButton: 'vn-icon-button[vn-tooltip="Add tag"]',
+        itemTagInput: 'vn-autocomplete[ng-model="itemTag.tagFk"]',
+        itemTagValueInput: 'vn-autocomplete[ng-model="itemTag.value"]',
         firstBuy: 'vn-entry-latest-buys tbody > tr:nth-child(1)',
         allBuysCheckBox: 'vn-entry-latest-buys thead vn-check',
         secondBuyCheckBox: 'vn-entry-latest-buys tbody tr:nth-child(2) vn-check[ng-model="buy.checked"]',

e2e/helpers/tests.js

@@ -1,6 +1,7 @@
 require('@babel/register')({presets: ['@babel/env']});
 require('core-js/stable');
 require('regenerator-runtime/runtime');
+require('vn-loopback/server/boot/date')();
 
 const axios = require('axios');
 const Docker = require('../../db/docker.js');

e2e/paths/01-salix/04_recoverPassword.spec.js

@@ -26,7 +26,7 @@ describe('RecoverPassword path', async() => {
         expect(message.text).toContain('Notification sent!');
     });
 
-    it('should send email', async() => {
+    it('should send email using email', async() => {
         await page.waitForState('login');
         await page.waitToClick(selectors.recoverPassword.recoverPasswordButton);
 
@@ -37,4 +37,16 @@ describe('RecoverPassword path', async() => {
 
         expect(message.text).toContain('Notification sent!');
     });
+
+    it('should send email using username', async() => {
+        await page.waitForState('login');
+        await page.waitToClick(selectors.recoverPassword.recoverPasswordButton);
+
+        await page.write(selectors.recoverPassword.email, 'BruceWayne');
+        await page.waitToClick(selectors.recoverPassword.sendEmailButton);
+        const message = await page.waitForSnackbar();
+        await page.waitForState('login');
+
+        expect(message.text).toContain('Notification sent!');
+    });
 });

e2e/paths/02-client/20_credit_insurance.spec.js

@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Client credit insurance path', () => {
     let browser;
     let page;
-    let previousMonth = new Date();
+    let previousMonth = Date.vnNew();
     previousMonth.setMonth(previousMonth.getMonth() - 1);
 
     beforeAll(async() => {

e2e/paths/03-worker/04_time_control.spec.js

@@ -22,7 +22,7 @@ describe('Worker time control path', () => {
     const hankPymId = 1107;
 
     it('should go to the next month, go to current month and go 1 month in the past', async() => {
-        let date = new Date();
+        let date = Date.vnNew();
         date.setDate(1);
         date.setMonth(date.getMonth() + 1);
         let month = date.toLocaleString('default', {month: 'long'});
@@ -32,7 +32,7 @@ describe('Worker time control path', () => {
 
         expect(result).toContain(month);
 
-        date = new Date();
+        date = Date.vnNew();
         date.setDate(1);
         month = date.toLocaleString('default', {month: 'long'});
 
@@ -41,7 +41,7 @@ describe('Worker time control path', () => {
 
         expect(result).toContain(month);
 
-        date = new Date();
+        date = Date.vnNew();
         date.setDate(1);
         date.setMonth(date.getMonth() - 1);
         const timestamp = Math.round(date.getTime() / 1000);

e2e/paths/03-worker/05_calendar.spec.js

@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 
 describe('Worker calendar path', () => {
     const reasonableTimeBetweenClicks = 300;
-    const date = new Date();
+    const date = Date.vnNew();
     const lastYear = (date.getFullYear() - 1).toString();
 
     let browser;

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -22,7 +22,7 @@ describe('Item fixed prices path', () => {
     });
 
     it('should fill the fixed price data', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
         await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
         await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -93,7 +93,7 @@ describe('Ticket Edit basic data path', () => {
 
     it(`should split ticket without negatives`, async() => {
         const newAgency = 'Gotham247';
-        const newDate = new Date();
+        const newDate = Date.vnNew();
         newDate.setDate(newDate.getDate() - 1);
 
         await page.accessToSearchResult('14');
@@ -127,7 +127,7 @@ describe('Ticket Edit basic data path', () => {
     });
 
     it(`should old ticket have old date and agency`, async() => {
-        const oldDate = new Date();
+        const oldDate = Date.vnNew();
         const oldAgency = 'Super-Man delivery';
 
         await page.accessToSearchResult('14');

e2e/paths/05-ticket/14_create_ticket.spec.js

@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Ticket create path', () => {
     let browser;
     let page;
-    let nextMonth = new Date();
+    let nextMonth = Date.vnNew();
     nextMonth.setMonth(nextMonth.getMonth() + 1);
 
     beforeAll(async() => {

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

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

e2e/paths/08-route/02_basic_data.spec.js

@@ -18,7 +18,7 @@ describe('Route basic Data path', () => {
     });
 
     it('should edit the route basic data', async() => {
-        const nextMonth = new Date();
+        const nextMonth = Date.vnNew();
         nextMonth.setMonth(nextMonth.getMonth() + 1);
 
         await page.autocompleteSearch(selectors.routeBasicData.worker, 'adminBossNick');

e2e/paths/09-invoice-in/03_basic_data.spec.js

@@ -19,7 +19,7 @@ describe('InvoiceIn basic data path', () => {
     });
 
     it(`should edit the invoiceIn basic data`, async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         await page.pickDate(selectors.invoiceInBasicData.issued, now);
         await page.pickDate(selectors.invoiceInBasicData.operated, now);
         await page.autocompleteSearch(selectors.invoiceInBasicData.supplier, 'Verdnatura');

e2e/paths/09-invoice-out/02_descriptor.spec.js

@@ -100,7 +100,7 @@ describe('InvoiceOut descriptor path', () => {
         });
 
         it(`should check the invoiceOut booked in the summary data`, async() => {
-            let today = new Date();
+            let today = Date.vnNew();
 
             let day = today.getDate();
             if (day < 10) day = `0${day}`;

e2e/paths/10-travel/01_create.spec.js

@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Travel create path', () => {
     let browser;
     let page;
-    const date = new Date();
+    const date = Date.vnNew();
     const day = 15;
     date.setDate(day);
 

e2e/paths/10-travel/02_basic_data_and_log.spec.js

@@ -22,7 +22,7 @@ describe('Travel basic data path', () => {
     });
 
     it('should set a wrong delivery date then receive an error on submit', async() => {
-        const lastMonth = new Date();
+        const lastMonth = Date.vnNew();
         lastMonth.setMonth(lastMonth.getMonth() - 1);
 
         await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);

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

@@ -123,7 +123,7 @@ describe('Travel descriptor path', () => {
     });
 
     it('should update the landed date to a future date to enable cloneWithEntries', async() => {
-        const nextMonth = new Date();
+        const nextMonth = Date.vnNew();
         nextMonth.setMonth(nextMonth.getMonth() + 1);
         await page.pickDate(selectors.travelBasicData.deliveryDate, nextMonth);
         await page.waitToClick(selectors.travelBasicData.save);

e2e/paths/12-entry/03_latestBuys.spec.js

@@ -4,10 +4,15 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Entry lastest buys path', () => {
     let browser;
     let page;
+    const httpRequests = [];
 
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
+        page.on('request', req => {
+            if (req.url().includes(`Buys/latestBuysFilter`))
+                httpRequests.push(req.url());
+        });
         await page.loginAndModule('buyer', 'entry');
     });
 
@@ -20,6 +25,87 @@ describe('Entry lastest buys path', () => {
         await page.waitForSelector(selectors.entryLatestBuys.editBuysButton, {visible: false});
     });
 
+    it('should filter by name', async() => {
+        await page.write(selectors.entryLatestBuys.generalSearchInput, 'Melee');
+        await page.keyboard.press('Enter');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('search=Melee')))).toBeDefined();
+    });
+
+    it('should filter by reign and type', async() => {
+        await page.click(selectors.entryLatestBuys.firstReignIcon);
+        await page.autocompleteSearch(selectors.entryLatestBuys.typeInput, 'Alstroemeria');
+        await page.click(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('categoryFk')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('typeFk')))).toBeDefined();
+    });
+
+    it('should filter by from date', async() => {
+        await page.pickDate(selectors.entryLatestBuys.fromInput, new Date());
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('from')))).toBeDefined();
+    });
+
+    it('should filter by to date', async() => {
+        await page.pickDate(selectors.entryLatestBuys.toInput, new Date());
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('to')))).toBeDefined();
+    });
+
+    it('should filter by sales person', async() => {
+        await page.autocompleteSearch(selectors.entryLatestBuys.salesPersonInput, 'buyerNick');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('salesPersonFk')))).toBeDefined();
+    });
+
+    it('should filter by supplier', async() => {
+        await page.autocompleteSearch(selectors.entryLatestBuys.supplierInput, 'Farmer King');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('supplierFk')))).toBeDefined();
+    });
+
+    it('should filter by active', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.activeCheck);
+        await page.waitToClick(selectors.entryLatestBuys.activeCheck);
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('active=true')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('active=false')))).toBeDefined();
+    });
+
+    it('should filter by visible', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.visibleCheck);
+        await page.waitToClick(selectors.entryLatestBuys.visibleCheck);
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('visible=true')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('visible=false')))).toBeDefined();
+    });
+
+    it('should filter by floramondo', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.floramondoCheck);
+        await page.waitToClick(selectors.entryLatestBuys.floramondoCheck);
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('floramondo=true')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('floramondo=false')))).toBeDefined();
+    });
+
+    it('should filter by tag Color', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.addTagButton);
+        await page.autocompleteSearch(selectors.entryLatestBuys.itemTagInput, 'Color');
+        await page.autocompleteSearch(selectors.entryLatestBuys.itemTagValueInput, 'Brown');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('tags')))).toBeDefined();
+    });
+
     it('should select all lines but one and then check the edit buys button appears', async() => {
         await page.waitToClick(selectors.entryLatestBuys.allBuysCheckBox);
         await page.waitToClick(selectors.entryLatestBuys.secondBuyCheckBox);

front/core/components/calendar/index.js

@@ -15,7 +15,7 @@ export default class Calendar extends FormInput {
     constructor($element, $scope, vnWeekDays, moment) {
         super($element, $scope);
         this.weekDays = vnWeekDays.locales;
-        this.defaultDate = new Date();
+        this.defaultDate = Date.vnNew();
         this.displayControls = true;
         this.moment = moment;
     }
@@ -115,8 +115,8 @@ export default class Calendar extends FormInput {
         let wday = date.getDay();
         let month = date.getMonth();
 
-        const currentDay = new Date().getDate();
-        const currentMonth = new Date().getMonth();
+        const currentDay = Date.vnNew().getDate();
+        const currentMonth = Date.vnNew().getMonth();
 
         let classes = {
             today: day === currentDay && month === currentMonth,

front/core/components/calendar/index.spec.js

@@ -2,7 +2,7 @@ describe('Component vnCalendar', () => {
     let controller;
     let $element;
 
-    let date = new Date();
+    let date = Date.vnNew();
     date.setHours(0, 0, 0, 0);
     date.setDate(1);
 
@@ -48,7 +48,7 @@ describe('Component vnCalendar', () => {
         it(`should return the selected element, then emit a 'selection' event`, () => {
             jest.spyOn(controller, 'emit');
 
-            const day = new Date();
+            const day = Date.vnNew();
             day.setHours(0, 0, 0, 0);
 
             const clickEvent = new Event('click');

front/core/components/date-picker/index.spec.js

@@ -4,7 +4,7 @@ describe('Component vnDatePicker', () => {
     let $ctrl;
 
     let today;
-    today = new Date();
+    today = Date.vnNew();
     today.setHours(0, 0, 0, 0);
 
     beforeEach(ngModule('vnCore'));

front/core/components/input-time/index.js

@@ -31,7 +31,7 @@ export default class InputTime extends Field {
 
             date = this.modelDate
                 ? new Date(this.modelDate)
-                : new Date();
+                : Date.vnNew();
             date.setHours(split[0], split[1], 0, 0);
         }
 

front/core/components/input-time/index.spec.js

@@ -20,7 +20,7 @@ describe('Component vnInputTime', () => {
 
     describe('field() setter', () => {
         it(`should display the formated the date`, () => {
-            let date = new Date();
+            let date = Date.vnNew();
             $ctrl.field = date;
             let displayed = $filter('date')(date, 'HH:mm');
 

front/core/services/date.js

@@ -0,0 +1,2 @@
+import * as date from 'vn-loopback/server/boot/date';
+date.default();

front/core/services/index.js

@@ -10,3 +10,4 @@ import './week-days';
 import './report';
 import './email';
 import './file';
+import './date';

front/salix/components/recover-password/index.html

@@ -1,7 +1,7 @@
 <h5 class="vn-mb-md vn-mt-lg" translate>Recover password</h5>
 <vn-textfield
-    label="Email"
-    ng-model="$ctrl.email"
+    label="User or recovery email"
+    ng-model="$ctrl.user"
     vn-focus>
 </vn-textfield>
 <div

front/salix/components/recover-password/index.js

@@ -20,7 +20,7 @@ export default class Controller {
 
     submit() {
         const params = {
-            email: this.email
+            user: this.user
         };
 
         this.$http.post('Accounts/recoverPassword', params)

front/salix/components/recover-password/locale/es.yml

@@ -1,3 +1,4 @@
 Recover password: Recuperar contraseña
 We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
 Notification sent!: ¡Notificación enviada!
+User or recovery email: Usuario o correo de recuperación

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

@@ -197,7 +197,7 @@ export default class UploadPhoto extends Component {
             timeout: this.canceler.promise,
             transformRequest: ([file]) => {
                 const formData = new FormData();
-                const now = new Date();
+                const now = Date.vnNew();
                 const timestamp = now.getTime();
                 const fileName = `${file.name}_${timestamp}`;
 

front/salix/index.js

@@ -1,5 +1,5 @@
 import './module';
 import './routes';
 import './components';
-import './services';
 import './styles';
+import 'vn-loopback/server/boot/date';

jest-front.js

@@ -14,6 +14,10 @@ import './modules/ticket/front/module.js';
 import './modules/travel/front/module.js';
 import './modules/worker/front/module.js';
 import './modules/shelving/front/module.js';
+import 'vn-loopback/server/boot/date';
+
+// Set NODE_ENV
+process.env.NODE_ENV = 'development';
 
 core.run(vnInterceptor => {
     vnInterceptor.setApiPath(null);
@@ -39,3 +43,4 @@ window.ngModule = function(moduleName, ...args) {
 
     return angular.mock.module(...fns);
 };
+

jest.front.config.js

@@ -1,5 +1,6 @@
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
+/* eslint max-len: ["error", { "code": 150 }]*/
 
 module.exports = {
     name: 'front end',

loopback/server/boot/date.js

@@ -0,0 +1,17 @@
+module.exports = () => {
+    Date.vnUTC = () => {
+        const env = process.env.NODE_ENV;
+        if (!env || env === 'development')
+            return new Date(Date.UTC(2001, 0, 1, 11));
+
+        return new Date(Date.UTC());
+    };
+
+    Date.vnNew = () => {
+        return new Date(Date.vnUTC());
+    };
+
+    Date.vnNow = () => {
+        return new Date(Date.vnUTC()).getTime();
+    };
+};

modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js

@@ -95,7 +95,7 @@ module.exports = Self => {
             }, myOptions);
 
             const claim = await models.Claim.findOne(filter, myOptions);
-            const today = new Date();
+            const today = Date.vnNew();
 
             const newRefundTicket = await models.Ticket.create({
                 clientFk: claim.ticket().clientFk,
@@ -172,7 +172,7 @@ module.exports = Self => {
 
     async function saveObservation(observation, options) {
         const query = `INSERT INTO vn.ticketObservation (ticketFk, observationTypeFk, description) VALUES(?, ?, ?)
-                        ON DUPLICATE KEY 
+                        ON DUPLICATE KEY
                             UPDATE description = CONCAT(vn.ticketObservation.description, VALUES(description),' ')`;
         await Self.rawSql(query, [
             observation.ticketFk,

modules/claim/back/methods/claim/createFromSales.js

@@ -60,7 +60,7 @@ module.exports = Self => {
             const landedPlusWeek = new Date(ticket.landed);
             landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
             const hasClaimManagerRole = await models.Account.hasRole(userId, 'claimManager', myOptions);
-            const isClaimable = landedPlusWeek >= new Date();
+            const isClaimable = landedPlusWeek >= Date.vnNew();
 
             if (ticket.isDeleted)
                 throw new UserError(`You can't create a claim for a removed ticket`);

modules/claim/back/methods/claim/regularizeClaim.js

@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethodCtx('regularizeClaim', {
-        description: `Imports lines from claimBeginning to a new ticket 
+        description: `Imports lines from claimBeginning to a new ticket
             with specific shipped, landed dates, agency and company`,
         accessType: 'WRITE',
         accepts: [{
@@ -135,10 +135,10 @@ module.exports = Self => {
     }
 
     async function getTicketId(params, options) {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
 
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         let ticket = await Self.app.models.Ticket.findOne({
@@ -155,8 +155,8 @@ module.exports = Self => {
     }
 
     async function createTicket(ctx, options) {
-        ctx.args.shipped = new Date();
-        ctx.args.landed = new Date();
+        ctx.args.shipped = Date.vnNew();
+        ctx.args.landed = Date.vnNew();
         ctx.args.agencyModeId = null;
         ctx.args.routeId = null;
 

modules/claim/back/methods/claim/specs/createFromSales.spec.js

@@ -54,7 +54,7 @@ describe('Claim createFromSales()', () => {
         try {
             const options = {transaction: tx};
 
-            const todayMinusEightDays = new Date();
+            const todayMinusEightDays = Date.vnNew();
             todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
 
             const ticket = await models.Ticket.findById(ticketId, null, options);
@@ -85,7 +85,7 @@ describe('Claim createFromSales()', () => {
         try {
             const options = {transaction: tx};
 
-            const todayMinusEightDays = new Date();
+            const todayMinusEightDays = Date.vnNew();
             todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
 
             const ticket = await models.Ticket.findById(ticketId, null, options);

modules/claim/back/methods/claim/specs/updateClaim.spec.js

@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('Update Claim', () => {
-    const newDate = new Date();
+    const newDate = Date.vnNew();
     const originalData = {
         ticketFk: 3,
         clientFk: 1101,

modules/claim/back/methods/claim/specs/updateClaimAction.spec.js

@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('Update Claim', () => {
-    const newDate = new Date();
+    const newDate = Date.vnNew();
     const original = {
         ticketFk: 3,
         clientFk: 1101,

modules/client/back/methods/client/consumptionSendQueued.js

@@ -32,7 +32,7 @@ module.exports = Self => {
                             c.id AS clientFk,
                             c.email AS clientEmail,
                             eu.email salesPersonEmail
-                    FROM client c 
+                    FROM client c
                         JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
                         JOIN ticket t ON t.clientFk = c.id
                         JOIN sale s ON s.ticketFk = t.id
@@ -61,10 +61,10 @@ module.exports = Self => {
                         SET status = 'printed',
                             printed = ?
                         WHERE id = ?`,
-                [new Date(), queue.id]);
+                [Date.vnNew(), queue.id]);
             } catch (error) {
                 await Self.rawSql(`
-                    UPDATE clientConsumptionQueue 
+                    UPDATE clientConsumptionQueue
                         SET status = ?
                     WHERE id = ?`,
                 [error.message, queue.id]);

modules/client/back/methods/client/createReceipt.js

@@ -51,7 +51,7 @@ module.exports = function(Self) {
     Self.createReceipt = async(ctx, options) => {
         const models = Self.app.models;
         const args = ctx.args;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         let tx;

modules/client/back/methods/client/getCard.js

@@ -74,7 +74,7 @@ module.exports = function(Self) {
             ]
         }, myOptions);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
         const data = await Self.rawSql(query, [id, date], myOptions);

modules/client/back/methods/client/getDebt.js

@@ -25,7 +25,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
         const [debt] = await Self.rawSql(query, [clientFk, date], myOptions);

modules/client/back/methods/client/lastActiveTickets.js

@@ -32,14 +32,14 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const ticket = await Self.app.models.Ticket.findById(ticketId, null, myOptions);
         const query = `
-            SELECT 
+            SELECT
                 t.id,
                 t.shipped,
-                a.name AS agencyName, 
+                a.name AS agencyName,
                 w.name AS warehouseName,
                 ad.nickname AS nickname,
                 ad.city AS city,
@@ -52,7 +52,7 @@ module.exports = Self => {
                 JOIN vn.warehouse w ON t.warehouseFk = w.id
                 JOIN vn.address ad ON t.addressFk = ad.id
                 JOIN vn.province pr ON ad.provinceFk = pr.id
-            WHERE t.shipped >= ? AND t.clientFk = ? AND ts.alertLevel = 0 
+            WHERE t.shipped >= ? AND t.clientFk = ? AND ts.alertLevel = 0
                 AND t.id <> ? AND t.warehouseFk = ?
             ORDER BY t.shipped
                 LIMIT 10`;

modules/client/back/methods/client/summary.js

@@ -125,7 +125,7 @@ module.exports = Self => {
     async function getRecoveries(recoveryModel, clientId, options) {
         const filter = {
             where: {
-                and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.now()}}]}]
+                and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.vnNow()}}]}]
             },
             limit: 1
         };

modules/client/back/methods/credit-classification/createWithInsurance.spec.js

@@ -23,7 +23,7 @@ describe('Client createWithInsurance', () => {
 
         try {
             const options = {transaction: tx};
-            const data = {clientFk: 1101, started: Date.now(), credit: 999, grade: 255};
+            const data = {clientFk: 1101, started: Date.vnNow(), credit: 999, grade: 255};
 
             const result = await models.CreditClassification.createWithInsurance(data, options);
 

modules/client/back/methods/defaulter/filter.js

@@ -51,7 +51,7 @@ module.exports = Self => {
 
         const stmts = [];
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const stmt = new ParameterizedSQL(
             `SELECT *
@@ -65,14 +65,14 @@ module.exports = Self => {
                         co.created,
                         co.text observation,
                         uw.id workerFk,
-                        uw.name workerName, 
+                        uw.name workerName,
                         c.creditInsurance,
                         d.defaulterSinced
                     FROM vn.defaulter d
                         JOIN vn.client c ON c.id = d.clientFk
                         LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
                         LEFT JOIN account.user u ON u.id = c.salesPersonFk
-                        LEFT JOIN account.user uw ON uw.id = co.workerFk 
+                        LEFT JOIN account.user uw ON uw.id = co.workerFk
                     WHERE
                         d.created = ?
                         AND d.amount > 0

modules/client/back/methods/recovery/hasActiveRecovery.js

@@ -27,7 +27,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `
             SELECT count(*) AS hasActiveRecovery

modules/client/back/models/client-sample.js

@@ -41,7 +41,7 @@ module.exports = Self => {
 
             // Disable old mandate
             if (oldMandate)
-                oldMandate.updateAttribute('finished', new Date());
+                oldMandate.updateAttribute('finished', Date.vnNew());
 
             // Create a new mandate
             await models.Mandate.create({

modules/client/front/balance/create/index.js

@@ -59,14 +59,17 @@ class Controller extends Dialog {
 
         if (value) {
             const accountingType = value.accountingType;
-            if (accountingType.receiptDescription != null) {
-                this.receipt.description = accountingType.receiptDescription;
-                if (this.originalDescription) this.receipt.description += `, ${this.originalDescription}`;
-            } else if (this.originalDescription)
-                this.receipt.description = this.originalDescription;
+
+            this.receipt.description = [];
+            if (accountingType.receiptDescription != null && accountingType.receiptDescription != '')
+                this.receipt.description.push(accountingType.receiptDescription);
+            if (this.originalDescription)
+                this.receipt.description.push(this.originalDescription);
+            this.receipt.description.join(', ');
+
             this.maxAmount = accountingType && accountingType.maxAmount;
 
-            this.receipt.payed = new Date();
+            this.receipt.payed = Date.vnNew();
             if (accountingType.daysInFuture)
                 this.receipt.payed.setDate(this.receipt.payed.getDate() + accountingType.daysInFuture);
         }

modules/client/front/balance/create/index.spec.js

@@ -38,7 +38,7 @@ describe('Client', () => {
                     }
                 };
 
-                expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2');
+                expect(controller.receipt.description.join(',')).toEqual('Cash,Albaran: 1, 2');
             });
         });
 

modules/client/front/consumption/index.js

@@ -17,11 +17,11 @@ class Controller extends Section {
     }
 
     setDefaultFilter() {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
         minDate.setMonth(minDate.getMonth() - 2);
 
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         this.filterParams = {

modules/client/front/consumption/index.spec.js

@@ -26,7 +26,7 @@ describe('Client', () => {
             it('should call the window.open function', () => {
                 jest.spyOn(window, 'open').mockReturnThis();
 
-                const now = new Date();
+                const now = Date.vnNew();
                 controller.$.model.userParams = {
                     from: now,
                     to: now
@@ -49,7 +49,7 @@ describe('Client', () => {
 
         describe('sendEmail()', () => {
             it('should make a GET query sending the report', () => {
-                const now = new Date();
+                const now = Date.vnNew();
                 controller.$.model.userParams = {
                     from: now,
                     to: now

modules/client/front/credit-insurance/create/index.js

@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.creditClassification = {
-            started: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm')
+            started: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm')
         };
     }
 

modules/client/front/credit-insurance/create/index.spec.js

@@ -24,7 +24,7 @@ describe('Client', () => {
 
         describe('onSubmit()', () => {
             it('should perform a POST query', () => {
-                let started = new Date();
+                let started = Date.vnNew();
                 controller.creditClassification = {
                     started: started,
                     credit: 300,

modules/client/front/credit-insurance/index/index.js

@@ -52,7 +52,7 @@ class Controller extends Section {
     }
 
     returnDialog() {
-        let params = {finished: Date.now()};
+        let params = {finished: Date.vnNow()};
         this.$http.patch(`CreditClassifications/${this.classificationId}`, params).then(() => {
             this._getClassifications(this.client.id);
         });

modules/client/front/credit-insurance/index/index.spec.js

@@ -39,7 +39,7 @@ describe('Client', () => {
 
             it(`should return false if finds a classification without due date`, () => {
                 controller.classifications = [
-                    {finished: Date.now()},
+                    {finished: Date.vnNow()},
                     {finished: null}
                 ];
 
@@ -50,8 +50,8 @@ describe('Client', () => {
 
             it(`should return true if all classifications are defined with due date`, () => {
                 controller.classifications = [
-                    {finished: Date.now()},
-                    {finished: Date.now()}
+                    {finished: Date.vnNow()},
+                    {finished: Date.vnNow()}
                 ];
 
                 let result = controller.canCreateNew();

modules/client/front/credit-insurance/insurance/create/index.js

@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.insurance = {
-            created: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss')
+            created: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm:ss')
         };
     }
 

modules/client/front/defaulter/index.js

@@ -82,7 +82,7 @@ export default class Controller extends Section {
 
     chipColor(date) {
         const day = 24 * 60 * 60 * 1000;
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         const observationShipped = new Date(date);

modules/client/front/defaulter/index.spec.js

@@ -38,14 +38,14 @@ describe('client defaulter', () => {
 
         describe('chipColor()', () => {
             it('should return undefined when the date is the present', () => {
-                let today = new Date();
+                let today = Date.vnNew();
                 let result = controller.chipColor(today);
 
                 expect(result).toEqual(undefined);
             });
 
             it('should return warning when the date is 10 days in the past', () => {
-                let pastDate = new Date();
+                let pastDate = Date.vnNew();
                 pastDate = pastDate.setDate(pastDate.getDate() - 11);
                 let result = controller.chipColor(pastDate);
 
@@ -53,7 +53,7 @@ describe('client defaulter', () => {
             });
 
             it('should return alert when the date is 20 days in the past', () => {
-                let pastDate = new Date();
+                let pastDate = Date.vnNew();
                 pastDate = pastDate.setDate(pastDate.getDate() - 21);
                 let result = controller.chipColor(pastDate);
 

modules/client/front/greuge/create/index.js

@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor(...args) {
         super(...args);
         this.greuge = {
-            shipped: new Date(),
+            shipped: Date.vnNew(),
             clientFk: this.$params.id
         };
     }

modules/client/front/notification/index.spec.js

@@ -39,7 +39,7 @@ describe('Client notification', () => {
 
         describe('campaignSelection() setter', () => {
             it('should set the campaign from and to properties', () => {
-                const dated = new Date();
+                const dated = Date.vnNew();
                 controller.campaignSelection = {
                     dated: dated,
                     scopeDays: 14
@@ -61,8 +61,8 @@ describe('Client notification', () => {
 
                 controller.$.filters = {hide: () => {}};
                 controller.campaign = {
-                    from: new Date(),
-                    to: new Date()
+                    from: Date.vnNew(),
+                    to: Date.vnNew()
                 };
 
                 const data = controller.$.model.data;

modules/client/front/recovery/create/index.js

@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.recovery = {
-            started: new Date()
+            started: Date.vnNew()
         };
     }
 

modules/client/front/recovery/index/index.js

@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
 class Controller extends Section {
     setFinished(recovery) {
         if (!recovery.finished) {
-            let params = {finished: Date.now()};
+            let params = {finished: Date.vnNow()};
             this.$http.patch(`Recoveries/${recovery.id}`, params).then(
                 () => this.$.model.refresh()
             );

modules/client/front/summary/index.js

@@ -100,7 +100,7 @@ class Controller extends Summary {
     }
 
     chipColor(date) {
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         const ticketShipped = new Date(date);

modules/client/front/summary/index.spec.js

@@ -76,14 +76,14 @@ describe('Client', () => {
 
         describe('chipColor()', () => {
             it('should return warning when the date is the present', () => {
-                let today = new Date();
+                let today = Date.vnNew();
                 let result = controller.chipColor(today);
 
                 expect(result).toEqual('warning');
             });
 
             it('should return success when the date is in the future', () => {
-                let futureDate = new Date();
+                let futureDate = Date.vnNew();
                 futureDate = futureDate.setDate(futureDate.getDate() + 10);
                 let result = controller.chipColor(futureDate);
 
@@ -91,7 +91,7 @@ describe('Client', () => {
             });
 
             it('should return undefined when the date is in the past', () => {
-                let pastDate = new Date();
+                let pastDate = Date.vnNew();
                 pastDate = pastDate.setDate(pastDate.getDate() - 10);
                 let result = controller.chipColor(pastDate);
 

modules/client/front/unpaid/index.js

@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
 export default class Controller extends Section {
     setDefaultDate(hasData) {
         if (hasData && !this.clientUnpaid.dated)
-            this.clientUnpaid.dated = new Date();
+            this.clientUnpaid.dated = Date.vnNew();
     }
 }
 

modules/client/front/unpaid/index.spec.js

@@ -14,7 +14,7 @@ describe('client unpaid', () => {
         describe('setDefaultDate()', () => {
             it(`should not set today date if has dated`, () => {
                 const hasData = true;
-                const yesterday = new Date();
+                const yesterday = Date.vnNew();
                 yesterday.setDate(yesterday.getDate() - 1);
 
                 controller.clientUnpaid = {

modules/entry/back/methods/entry/latestBuysFilter.js

@@ -150,10 +150,10 @@ module.exports = Self => {
 
         const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         stmt = new ParameterizedSQL(`
-            SELECT 
+            SELECT
                 i.image,
                 i.id AS itemFk,
                 i.size,
@@ -209,7 +209,7 @@ module.exports = Self => {
                 LEFT JOIN itemType t ON t.id = i.typeFk
                 LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
                 LEFT JOIN origin ori ON ori.id = i.originFk
-                LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR) 
+                LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR)
                 LEFT JOIN supplier s ON s.id = e.supplierFk`
         , [userConfig.warehouseFk, date]);
 

modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js

@@ -332,10 +332,10 @@ describe('Entry latests buys filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
-            const to = new Date();
+            const to = Date.vnNew();
             to.setHours(23, 59, 59, 999);
 
             const ctx = {

modules/entry/front/latest-buys-search-panel/index.html

@@ -1,198 +1,243 @@
-<mg-ajax path="Tags" options="mgIndex as tags"></mg-ajax>
-<div class="search-panel">
-    <form ng-submit="$ctrl.onSearch()">
-        <vn-horizontal>
-            <vn-textfield
-                label="General search"
-                ng-model="filter.search"
-                info="Search items by id, name or barcode"
-                vn-focus>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-                vn-focus
-                url="ItemCategories"
-                label="Category"
-                show-field="name"
-                value-field="id"
-                ng-model="filter.categoryFk">
-            </vn-autocomplete>
-            <vn-autocomplete
-                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 
-                disabled="false"
-                ng-model="filter.salesPersonFk"
-                url="Workers/activeWithRole"
-                show-field="nickname"
-                search-function="{firstName: $search}"
-                value-field="id"
-                where="{role: {inq: ['logistic', 'buyer']}}"
-                label="Buyer">
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                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-horizontal>
-        <vn-horizontal>
-            <vn-date-picker
-                vn-one
-                label="From"
-                ng-model="filter.from">
-            </vn-date-picker>
-            <vn-date-picker
-                vn-one
-                label="To"
-                ng-model="filter.to">
-            </vn-date-picker>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-check
-                label="Is active"
-                ng-model="filter.active"
-                triple-state="true">
-            </vn-check>
-            <vn-check
-                label="Is visible"
-                ng-model="filter.visible"
-                triple-state="true">
-            </vn-check>
-            <vn-check
-                label="Is floramondo"
-                ng-model="filter.floramondo"
-                triple-state="true">
-            </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-id="tag"
-                ng-model="itemTag.tagFk"
-                data="tags.model"
-                show-field="name"
-                label="Tag"
-                on-change="itemTag.value = null">
-            </vn-autocomplete>
-            <vn-textfield
-                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
-                vn-id="text"
-                label="Value"
-                ng-model="itemTag.value">
-            </vn-textfield>
-            <vn-autocomplete 
-                vn-one
-                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-pt-sm">
-            <vn-one class="text-subtitle1" translate>
-                More fields
-            </vn-one>
-            <vn-icon-button
-                vn-none
-                vn-bind="+"
-                vn-tooltip="Add field"
-                icon="add_circle"
-                ng-click="$ctrl.fieldFilters.push({})">
-            </vn-icon-button>
-        </vn-horizontal>
-        <vn-horizontal ng-repeat="fieldFilter in $ctrl.fieldFilters">
-            <vn-autocomplete
-                label="Field"
-                ng-model="fieldFilter.name"
-                data="$ctrl.moreFields"
-                value-field="name"
-                show-field="label"
-                show-filter="false"
-                translate-fields="['label']"
-                selection="info"
-                on-change="fieldFilter.value = null">
-            </vn-autocomplete>
-            <vn-one ng-switch="info.type">
-                <div ng-switch-when="Number">
-                    <vn-input-number
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-input-number>
-                </div>
-                <div ng-switch-when="Boolean">
-                    <vn-check
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-check>
-                </div>
-                <div ng-switch-when="Date">
-                    <vn-date-picker
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-date-picker>
-                </div>
-                <div ng-switch-default>
-                    <vn-textfield
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-textfield>
-                </div>
-            </vn-one>
-            <vn-icon-button
-                vn-none
-                vn-tooltip="Remove field"
-                icon="delete"
-                ng-click="$ctrl.removeField($index, fieldFilter.name)"
-                tabindex="-1">
-            </vn-icon-button>
-        </vn-horizontal>
-        <vn-horizontal class="vn-mt-lg">
-            <vn-submit label="Search"></vn-submit>
-        </vn-horizontal>
-    </form>
-</div>
+<vn-crud-model url="Tags" fields="['id','name', 'isFree']" data="$ctrl.tags" auto-load="true">
+<vn-crud-model url="ItemCategories" data="$ctrl.categories" auto-load="true"></vn-crud-model>
+<vn-side-menu side="right">
+    <vn-horizontal class="input">
+        <vn-textfield
+            label="General search"
+            ng-model="$ctrl.filter.search"
+            info="Search items by id, name or barcode"
+            vn-focus
+            ng-keydown="$ctrl.onKeyPress($event)">
+        </vn-textfield>
+    </vn-horizontal>
+    <vn-horizontal class="item-category">
+        <vn-autocomplete
+            vn-id="category"
+            data="$ctrl.categories"
+            ng-model="$ctrl.filter.categoryFk"
+            show-field="name"
+            value-field="id"
+            label="Category">
+        </vn-autocomplete>
+        <vn-one ng-repeat="category in $ctrl.categories">
+            <vn-icon
+                ng-class="{'active': $ctrl.filter.categoryFk == category.id}"
+                icon="{{::category.icon}}"
+                vn-tooltip="{{::category.name}}"
+                ng-click="$ctrl.changeCategory(category.id)">
+            </vn-icon>
+        </vn-one>
+    </vn-horizontal>
+    <vn-vertical class="input">
+        <vn-autocomplete
+            vn-id="type"
+            disabled="!$ctrl.filter.categoryFk"
+            url="ItemTypes"
+            label="Type"
+            where="{categoryFk: $ctrl.filter.categoryFk}"
+            show-field="name"
+            value-field="id"
+            ng-model="$ctrl.filter.typeFk"
+            fields="['categoryFk']"
+            include="'category'"
+            on-change="$ctrl.addFilters()">
+            <tpl-item>
+                <div>{{name}}</div>
+                <div class="text-caption text-secondary">
+                    {{category.name}}
+                </div> </tpl-item
+            >>
+        </vn-autocomplete>
+    </vn-vertical>
+    <vn-horizontal class="input horizontal">
+        <vn-autocomplete
+            vn-id="salesPerson"
+            disabled="false"
+            ng-model="$ctrl.filter.salesPersonFk"
+            url="Workers/activeWithRole"
+            show-field="nickname"
+            search-function="{firstName: $search}"
+            value-field="id"
+            where="{role: {inq: ['logistic', 'buyer']}}"
+            label="Buyer"
+            on-change="$ctrl.addFilters()">
+        </vn-autocomplete>
+        <vn-autocomplete
+            vn-id="supplier"
+            label="Supplier"
+            ng-model="$ctrl.filter.supplierFk"
+            url="Suppliers"
+            fields="['name','nickname']"
+            search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
+            show-field="name"
+            value-field="id"
+            on-change="$ctrl.addFilters()">
+            <tpl-item>{{name}}: {{nickname}}</tpl-item>
+        </vn-autocomplete>
+    </vn-horizontal>
+    <vn-vertical class="input">
+        <vn-date-picker
+            label="From"
+            ng-model="$ctrl.filter.from"
+            on-change="$ctrl.addFilters()">
+        </vn-date-picker>
+        <vn-date-picker
+            label="To"
+            ng-model="$ctrl.filter.to"
+            on-change="$ctrl.addFilters()">
+        </vn-date-picker>
+    </vn-vertical>
+    <vn-horizontal class="checks">
+        <vn-check
+            label="Is active"
+            ng-model="$ctrl.filter.active"
+            triple-state="true"
+            ng-click="$ctrl.addFilters()">
+        </vn-check>
+        <vn-check
+            label="Is visible"
+            ng-model="$ctrl.filter.visible"
+            triple-state="true"
+            ng-click="$ctrl.addFilters()">
+        </vn-check>
+        <vn-check
+            label="Is floramondo"
+            ng-model="$ctrl.filter.floramondo"
+            triple-state="true"
+            ng-click="$ctrl.addFilters()">
+        </vn-check>
+    </vn-horizontal>
+    <vn-horizontal class="tags">
+        <vn-one class="text-subtitle1" translate> Tags </vn-one>
+        <vn-icon-button
+            vn-none
+            vn-tooltip="Add tag"
+            icon="add_circle"
+            ng-click="$ctrl.filter.tags.push({})">
+        </vn-icon-button>
+    </vn-horizontal>
+    <vn-horizontal class="tags horizontal" ng-repeat="itemTag in $ctrl.filter.tags">
+        <vn-autocomplete
+            vn-id="tag"
+            data="$ctrl.tags"
+            ng-model="itemTag.tagFk"
+            show-field="name"
+            label="Tag"
+            on-change="itemTag.value = null">
+        </vn-autocomplete>
+        <vn-textfield
+            ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
+            label="Value"
+            ng-model="itemTag.value"
+            ng-keydown="$ctrl.onKeyPress($event)">
+        </vn-textfield>
+        <vn-autocomplete
+            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"
+            on-change="$ctrl.addFilters()">
+        </vn-autocomplete>
+        <vn-icon-button
+            vn-none
+            vn-tooltip="Remove tag"
+            icon="delete"
+            ng-click="$ctrl.removeTag(itemTag)">
+        </vn-icon-button>
+    </vn-horizontal>
+    <div class="chips">
+        <vn-chip
+            ng-if="$ctrl.filter.search"
+            removable="true"
+            vn-tooltip="Item id/name"
+            on-remove="$ctrl.removeItemFilter('search')"
+            class="colored">
+            <span>Id/Name: {{$ctrl.filter.search}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="category.selection"
+            removable="true"
+            vn-tooltip="Category"
+            on-remove="$ctrl.removeItemFilter('categoryFk')"
+            class="colored">
+            <span>{{category.selection.name}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="type.selection"
+            removable="true"
+            vn-tooltip="Type"
+            on-remove="$ctrl.removeItemFilter('typeFk')"
+            class="colored">
+            <span>{{type.selection.name}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="salesPerson.selection"
+            removable="true"
+            vn-tooltip="Sales person"
+            on-remove="$ctrl.removeItemFilter('salesPersonFk')"
+            class="colored">
+            <span>Sales person: {{salesPerson.selection.nickname}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="supplier.selection"
+            removable="true"
+            vn-tooltip="Supplier"
+            on-remove="$ctrl.removeItemFilter('supplierFk')"
+            class="colored">
+            <span>Supplier: {{supplier.selection.name}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.from"
+            removable="true"
+            vn-tooltip="From date"
+            on-remove="$ctrl.removeItemFilter('from')"
+            class="colored">
+            <span>From: {{$ctrl.filter.from | date:'dd/MM/yyyy'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.to"
+            removable="true"
+            vn-tooltip="To date"
+            on-remove="$ctrl.removeItemFilter('to')"
+            class="colored">
+            <span>To: {{$ctrl.filter.to | date:'dd/MM/yyyy'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.active != null"
+            removable="true"
+            vn-tooltip="Active"
+            on-remove="$ctrl.removeItemFilter('active')"
+            class="colored">
+            <span>Active: {{$ctrl.filter.active ? '✓' : '✗'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.floramondo != null"
+            removable="true"
+            vn-tooltip="Floramondo"
+            on-remove="$ctrl.removeItemFilter('floramondo')"
+            class="colored">
+            <span>Floramondo: {{$ctrl.filter.floramondo ? '✓' : '✗'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.visible != null"
+            removable="true"
+            vn-tooltip="Visible"
+            on-remove="$ctrl.removeItemFilter('visible')"
+            class="colored">
+            <span>Visible: {{$ctrl.filter.visible ? '✓' : '✗'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-repeat="chipTag in $ctrl.filter.tags"
+            removable="true"
+            vn-tooltip="Tag"
+            on-remove="$ctrl.removeTag(chipTag)"
+            class="colored"
+            ng-if="chipTag.value">
+            <span>{{$ctrl.showTagInfo(chipTag)}}</span>
+        </vn-chip>
+        </vn-chip>
+    </div>
+</vn-side-menu>

modules/entry/front/latest-buys-search-panel/index.js

@@ -1,67 +1,61 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
+import './style.scss';
 
 class Controller extends SearchPanel {
     constructor($element, $) {
         super($element, $);
-        let model = 'Item';
-        let moreFields = ['description', 'name'];
+    }
 
-        let properties;
-        let validations = window.validations;
+    $onInit() {
+        this.filter = {
+            isActive: true,
+            tags: []
+        };
+    }
 
-        if (validations && validations[model])
-            properties = validations[model].properties;
-        else
-            properties = {};
-
-        this.moreFields = [];
-        for (let field of moreFields) {
-            let prop = properties[field];
-            this.moreFields.push({
-                name: field,
-                label: prop ? prop.description : field,
-                type: prop ? prop.type : null
-            });
+    changeCategory(id) {
+        if (this.filter.categoryFk != id) {
+            this.filter.categoryFk = id;
+            this.addFilters();
         }
     }
 
-    get filter() {
-        let filter = this.$.filter;
-
-        for (let fieldFilter of this.fieldFilters)
-            filter[fieldFilter.name] = fieldFilter.value;
-
-        return filter;
+    removeItemFilter(param) {
+        this.filter[param] = null;
+        if (param == 'categoryFk') this.filter['typeFk'] = null;
+        this.addFilters();
     }
 
-    set filter(value) {
-        if (!value)
-            value = {};
-        if (!value.tags)
-            value.tags = [{}];
+    removeTag(tag) {
+        const index = this.filter.tags.indexOf(tag);
+        if (index > -1) this.filter.tags.splice(index, 1);
+        this.addFilters();
+    }
 
-        this.fieldFilters = [];
-        for (let field of this.moreFields) {
-            if (value[field.name] != undefined) {
-                this.fieldFilters.push({
-                    name: field.name,
-                    value: value[field.name],
-                    info: field
-                });
-            }
+    onKeyPress($event) {
+        if ($event.key === 'Enter')
+            this.addFilters();
+    }
+
+    addFilters() {
+        for (let i = 0; i < this.filter.tags.length; i++) {
+            if (!this.filter.tags[i].value)
+                this.filter.tags.splice(i, 1);
         }
-
-        this.$.filter = value;
+        return this.model.addFilter({}, this.filter);
     }
 
-    removeField(index, field) {
-        this.fieldFilters.splice(index, 1);
-        delete this.$.filter[field];
+    showTagInfo(itemTag) {
+        if (!itemTag.tagFk) return itemTag.value;
+        return `${this.tags.find(tag => tag.id == itemTag.tagFk).name}: ${itemTag.value}`;
     }
 }
 
 ngModule.component('vnLatestBuysSearchPanel', {
     template: require('./index.html'),
-    controller: Controller
+    controller: Controller,
+    bindings: {
+        model: '<'
+    }
 });