5043-mock_Date #1260
|
@ -22,7 +22,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
Self.latest = async filter => {
|
Self.latest = async filter => {
|
||||||
const conn = Self.dataSource.connector;
|
const conn = Self.dataSource.connector;
|
||||||
const minDate = new Date();
|
const minDate = Date.vnNew();
|
||||||
minDate.setFullYear(minDate.getFullYear() - 1);
|
minDate.setFullYear(minDate.getFullYear() - 1);
|
||||||
|
|
||||||
const where = {dated: {gte: minDate}};
|
const where = {dated: {gte: minDate}};
|
||||||
|
|
|
@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
|
||||||
|
|
||||||
describe('campaign latest()', () => {
|
describe('campaign latest()', () => {
|
||||||
it('should return the campaigns from the last year', async() => {
|
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 result = await app.models.Campaign.latest();
|
||||||
const randomIndex = Math.floor(Math.random() * result.length);
|
const randomIndex = Math.floor(Math.random() * result.length);
|
||||||
const campaignDated = result[randomIndex].dated;
|
const campaignDated = result[randomIndex].dated;
|
||||||
|
@ -12,7 +12,7 @@ describe('campaign latest()', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return the campaigns from the current year', async() => {
|
it('should return the campaigns from the current year', async() => {
|
||||||
const now = new Date();
|
const now = Date.vnNew();
|
||||||
const currentYear = now.getFullYear();
|
const currentYear = now.getFullYear();
|
||||||
const result = await app.models.Campaign.latest({
|
const result = await app.models.Campaign.latest({
|
||||||
where: {dated: {like: `%${currentYear}%`}}
|
where: {dated: {like: `%${currentYear}%`}}
|
||||||
|
|
|
@ -4,7 +4,7 @@ describe('campaign upcoming()', () => {
|
||||||
it('should return the upcoming campaign but from the last year', async() => {
|
it('should return the upcoming campaign but from the last year', async() => {
|
||||||
const response = await app.models.Campaign.upcoming();
|
const response = await app.models.Campaign.upcoming();
|
||||||
const campaignDated = response.dated;
|
const campaignDated = response.dated;
|
||||||
const now = new Date();
|
const now = Date.vnNew();
|
||||||
|
|
||||||
expect(campaignDated).toEqual(jasmine.any(Date));
|
expect(campaignDated).toEqual(jasmine.any(Date));
|
||||||
expect(campaignDated).toBeLessThanOrEqual(now);
|
expect(campaignDated).toBeLessThanOrEqual(now);
|
||||||
|
|
|
@ -14,7 +14,7 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.upcoming = async() => {
|
Self.upcoming = async() => {
|
||||||
const minDate = new Date();
|
const minDate = Date.vnNew();
|
||||||
minDate.setFullYear(minDate.getFullYear() - 1);
|
minDate.setFullYear(minDate.getFullYear() - 1);
|
||||||
|
|
||||||
return Self.findOne({
|
return Self.findOne({
|
||||||
|
|
|
@ -21,7 +21,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
if (!this.login) return;
|
if (!this.login) return;
|
||||||
|
|
||||||
if (Date.now() > this.login.expires)
|
if (Date.vnNow() > this.login.expires)
|
||||||
this.login = await requestToken();
|
this.login = await requestToken();
|
||||||
|
|
||||||
return this.login;
|
return this.login;
|
||||||
|
@ -48,7 +48,7 @@ module.exports = Self => {
|
||||||
userId: requestData.userId,
|
userId: requestData.userId,
|
||||||
token: requestData.authToken
|
token: requestData.authToken
|
||||||
},
|
},
|
||||||
expires: Date.now() + (1000 * 60 * tokenLifespan)
|
expires: Date.vnNow() + (1000 * 60 * tokenLifespan)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ module.exports = Self => {
|
||||||
await models.Chat.create({
|
await models.Chat.create({
|
||||||
senderFk: sender.id,
|
senderFk: sender.id,
|
||||||
recipient: to,
|
recipient: to,
|
||||||
dated: new Date(),
|
dated: Date.vnNew(),
|
||||||
checkUserStatus: 0,
|
checkUserStatus: 0,
|
||||||
message: message,
|
message: message,
|
||||||
status: 0,
|
status: 0,
|
||||||
|
|
|
@ -49,7 +49,7 @@ module.exports = Self => {
|
||||||
await models.Chat.create({
|
await models.Chat.create({
|
||||||
senderFk: sender.id,
|
senderFk: sender.id,
|
||||||
recipient: `@${recipient.name}`,
|
recipient: `@${recipient.name}`,
|
||||||
dated: new Date(),
|
dated: Date.vnNew(),
|
||||||
checkUserStatus: 1,
|
checkUserStatus: 1,
|
||||||
message: message,
|
message: message,
|
||||||
status: 0,
|
status: 0,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
const models = require('vn-loopback/server/server').models;
|
const models = require('vn-loopback/server/server').models;
|
||||||
|
|
||||||
describe('Chat sendCheckingPresence()', () => {
|
describe('Chat sendCheckingPresence()', () => {
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
today.setHours(6, 0);
|
today.setHours(6, 0);
|
||||||
const chatModel = models.Chat;
|
const chatModel = models.Chat;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.setSaleQuantity = async(saleId, quantity) => {
|
Self.setSaleQuantity = async(saleId, quantity, options) => {
|
||||||
const models = Self.app.models;
|
const models = Self.app.models;
|
||||||
const myOptions = {};
|
const myOptions = {};
|
||||||
let tx;
|
let tx;
|
||||||
|
|
|
@ -32,7 +32,7 @@ module.exports = Self => {
|
||||||
where: {code: 'trash'}
|
where: {code: 'trash'}
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setMonth(date.getMonth() - 4);
|
date.setMonth(date.getMonth() - 4);
|
||||||
|
|
||||||
const dmsToDelete = await models.Dms.find({
|
const dmsToDelete = await models.Dms.find({
|
||||||
|
|
|
@ -163,7 +163,7 @@ module.exports = Self => {
|
||||||
fields: ['alertLevel']
|
fields: ['alertLevel']
|
||||||
});
|
});
|
||||||
|
|
||||||
signedTime ? signedTime != undefined : signedTime = new Date();
|
signedTime ? signedTime != undefined : signedTime = Date.vnNew();
|
||||||
|
|
||||||
if (alertLevel >= 2) {
|
if (alertLevel >= 2) {
|
||||||
let dir;
|
let dir;
|
||||||
|
|
|
@ -127,7 +127,7 @@ module.exports = Self => {
|
||||||
const uploadOptions = {
|
const uploadOptions = {
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'multipart/form-data',
|
'Content-Type': 'multipart/form-data',
|
||||||
'X-File-ModifiedDate': new Date(),
|
'X-File-ModifiedDate': Date.vnNew(),
|
||||||
'Cookie': options.headers.headers.Cookie,
|
'Cookie': options.headers.headers.Cookie,
|
||||||
...data.getHeaders()
|
...data.getHeaders()
|
||||||
},
|
},
|
||||||
|
|
|
@ -230,7 +230,7 @@ module.exports = Self => {
|
||||||
UPDATE edi.tableConfig
|
UPDATE edi.tableConfig
|
||||||
SET updated = ?
|
SET updated = ?
|
||||||
WHERE fileName = ?
|
WHERE fileName = ?
|
||||||
`, [new Date(), baseName], options);
|
`, [Date.vnNew(), baseName], options);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`Updated table ${toTable}\n`);
|
console.log(`Updated table ${toTable}\n`);
|
||||||
|
|
|
@ -32,7 +32,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
if (!config.cleanDays) return;
|
if (!config.cleanDays) return;
|
||||||
|
|
||||||
const cleanDate = new Date();
|
const cleanDate = Date.vnNew();
|
||||||
cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
|
cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
|
||||||
|
|
||||||
await models.NotificationQueue.destroyAll({
|
await models.NotificationQueue.destroyAll({
|
||||||
|
|
|
@ -10,7 +10,7 @@ describe('Notification Clean()', () => {
|
||||||
const notification = await models.Notification.findOne({}, options);
|
const notification = await models.Notification.findOne({}, options);
|
||||||
const notificationConfig = await models.NotificationConfig.findOne({});
|
const notificationConfig = await models.NotificationConfig.findOne({});
|
||||||
|
|
||||||
const cleanDate = new Date();
|
const cleanDate = Date.vnNew();
|
||||||
cleanDate.setDate(cleanDate.getDate() - (notificationConfig.cleanDays + 1));
|
cleanDate.setDate(cleanDate.getDate() - (notificationConfig.cleanDays + 1));
|
||||||
|
|
||||||
let before;
|
let before;
|
||||||
|
|
|
@ -77,7 +77,7 @@ module.exports = Self => {
|
||||||
const newImage = await Self.upsertWithWhere(data, {
|
const newImage = await Self.upsertWithWhere(data, {
|
||||||
name: fileName,
|
name: fileName,
|
||||||
collectionFk: collectionName,
|
collectionFk: collectionName,
|
||||||
updated: (new Date).getTime()
|
updated: Date.vnNow()
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
// Resizes and saves the image
|
// Resizes and saves the image
|
||||||
|
|
|
@ -2,7 +2,33 @@ CREATE SCHEMA IF NOT EXISTS `vn2008`;
|
||||||
CREATE SCHEMA IF NOT EXISTS `tmp`;
|
CREATE SCHEMA IF NOT EXISTS `tmp`;
|
||||||
|
|
||||||
UPDATE `util`.`config`
|
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`.`itemTaxCountry` AUTO_INCREMENT = 1;
|
||||||
ALTER TABLE `vn`.`address` 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),
|
(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),
|
(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),
|
(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),
|
(10, 7, 7, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
|
||||||
(11, 7, 8, 71, NOW(), 1, 18, NULL, 94, 3, NULL),
|
(11, 7, 8, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
|
||||||
(12, 7, 9, 71, NOW(), 1, 18, NULL, 94, 3, NULL),
|
(12, 7, 9, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
|
||||||
(13, 1, 10,71, 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`)
|
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
|
CREATE TEMPORARY TABLE tmp.worker
|
||||||
(PRIMARY KEY (id))
|
(PRIMARY KEY (id))
|
||||||
ENGINE = MEMORY
|
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`;
|
FROM `vn`.`worker` `w`;
|
||||||
|
|
||||||
INSERT INTO `vn`.`business`(`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`, `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
|
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
|
CREATE TEMPORARY TABLE tmp.worker
|
||||||
(PRIMARY KEY (id))
|
(PRIMARY KEY (id))
|
||||||
ENGINE = MEMORY
|
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`
|
FROM `vn`.`worker` `w`
|
||||||
WHERE `w`.`id` = 1109;
|
WHERE `w`.`id` = 1109;
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,7 @@ CREATE FUNCTION `util`.`mockedDate`()
|
||||||
RETURNS DATETIME
|
RETURNS DATETIME
|
||||||
DETERMINISTIC
|
DETERMINISTIC
|
||||||
BEGIN
|
BEGIN
|
||||||
RETURN NOW();
|
RETURN CONVERT_TZ('2001-01-01 11:00:00', 'utc', 'Europe/Madrid');
|
||||||
-- '2022-01-19 08:00:00'
|
|
||||||
END ;;
|
END ;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
|
|
||||||
describe('buyUltimate()', () => {
|
describe('buyUltimate()', () => {
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
it(`should create buyUltimate temporal table and update it's values`, async() => {
|
it(`should create buyUltimate temporal table and update it's values`, async() => {
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
let stmt;
|
let stmt;
|
||||||
|
|
|
@ -5,7 +5,7 @@ describe('buyUltimateFromInterval()', () => {
|
||||||
let today;
|
let today;
|
||||||
let future;
|
let future;
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
let now = new Date();
|
let now = Date.vnNew();
|
||||||
now.setHours(0, 0, 0, 0);
|
now.setHours(0, 0, 0, 0);
|
||||||
today = now;
|
today = now;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
|
|
||||||
describe('ticket ticketCalculateClon()', () => {
|
describe('ticket ticketCalculateClon()', () => {
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
it('should add the ticket to the order containing the original ticket', async() => {
|
it('should add the ticket to the order containing the original ticket', async() => {
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
let stmt;
|
let stmt;
|
||||||
|
|
|
@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
|
|
||||||
describe('ticket ticketCreateWithUser()', () => {
|
describe('ticket ticketCreateWithUser()', () => {
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
it('should confirm the procedure creates the expected ticket', async() => {
|
it('should confirm the procedure creates the expected ticket', async() => {
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
let stmt;
|
let stmt;
|
||||||
|
|
|
@ -3,9 +3,9 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
|
|
||||||
describe('timeBusiness_calculateByUser()', () => {
|
describe('timeBusiness_calculateByUser()', () => {
|
||||||
it('should return the expected hours for today', async() => {
|
it('should return the expected hours for today', async() => {
|
||||||
let start = new Date();
|
let start = Date.vnNew();
|
||||||
start.setHours(0, 0, 0, 0);
|
start.setHours(0, 0, 0, 0);
|
||||||
let end = new Date();
|
let end = Date.vnNew();
|
||||||
end.setHours(0, 0, 0, 0);
|
end.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
|
|
|
@ -3,11 +3,11 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
|
|
||||||
describe('timeControl_calculateByUser()', () => {
|
describe('timeControl_calculateByUser()', () => {
|
||||||
it(`should return today's worked hours`, async() => {
|
it(`should return today's worked hours`, async() => {
|
||||||
let start = new Date();
|
let start = Date.vnNew();
|
||||||
start.setHours(0, 0, 0, 0);
|
start.setHours(0, 0, 0, 0);
|
||||||
start.setDate(start.getDate() - 1);
|
start.setDate(start.getDate() - 1);
|
||||||
|
|
||||||
let end = new Date();
|
let end = Date.vnNew();
|
||||||
end.setHours(0, 0, 0, 0);
|
end.setHours(0, 0, 0, 0);
|
||||||
end.setDate(end.getDate() + 1);
|
end.setDate(end.getDate() + 1);
|
||||||
|
|
||||||
|
@ -48,14 +48,14 @@ describe('timeControl_calculateByUser()', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should return the worked hours between last sunday and monday`, async() => {
|
it(`should return the worked hours between last sunday and monday`, async() => {
|
||||||
let lastSunday = new Date();
|
let lastSunday = Date.vnNew();
|
||||||
let daysSinceSunday = lastSunday.getDay();
|
let daysSinceSunday = lastSunday.getDay();
|
||||||
if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
|
if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
|
||||||
daysSinceSunday = 7;
|
daysSinceSunday = 7;
|
||||||
lastSunday.setHours(23, 0, 0, 0);
|
lastSunday.setHours(23, 0, 0, 0);
|
||||||
lastSunday.setDate(lastSunday.getDate() - daysSinceSunday);
|
lastSunday.setDate(lastSunday.getDate() - daysSinceSunday);
|
||||||
|
|
||||||
let monday = new Date();
|
let monday = Date.vnNew();
|
||||||
let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday)
|
let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday)
|
||||||
monday.setHours(7, 0, 0, 0);
|
monday.setHours(7, 0, 0, 0);
|
||||||
monday.setDate(monday.getDate() - daysSinceMonday);
|
monday.setDate(monday.getDate() - daysSinceMonday);
|
||||||
|
|
|
@ -6,7 +6,7 @@ describe('zone zone_getLanded()', () => {
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
let stmt;
|
let stmt;
|
||||||
stmts.push('START TRANSACTION');
|
stmts.push('START TRANSACTION');
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
let params = {
|
let params = {
|
||||||
|
@ -40,7 +40,7 @@ describe('zone zone_getLanded()', () => {
|
||||||
it(`should return data for a shipped tomorrow`, async() => {
|
it(`should return data for a shipped tomorrow`, async() => {
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
let stmt;
|
let stmt;
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
stmts.push('START TRANSACTION');
|
stmts.push('START TRANSACTION');
|
||||||
|
|
|
@ -436,7 +436,7 @@ let actions = {
|
||||||
},
|
},
|
||||||
|
|
||||||
pickDate: async function(selector, date) {
|
pickDate: async function(selector, date) {
|
||||||
date = date || new Date();
|
date = date || Date.vnNew();
|
||||||
|
|
||||||
const timeZoneOffset = date.getTimezoneOffset() * 60000;
|
const timeZoneOffset = date.getTimezoneOffset() * 60000;
|
||||||
const localDate = (new Date(date.getTime() - timeZoneOffset))
|
const localDate = (new Date(date.getTime() - timeZoneOffset))
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
require('@babel/register')({presets: ['@babel/env']});
|
require('@babel/register')({presets: ['@babel/env']});
|
||||||
require('core-js/stable');
|
require('core-js/stable');
|
||||||
require('regenerator-runtime/runtime');
|
require('regenerator-runtime/runtime');
|
||||||
|
require('vn-loopback/server/boot/date')();
|
||||||
|
|
||||||
const axios = require('axios');
|
const axios = require('axios');
|
||||||
const Docker = require('../../db/docker.js');
|
const Docker = require('../../db/docker.js');
|
||||||
|
|
|
@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
|
||||||
describe('Client credit insurance path', () => {
|
describe('Client credit insurance path', () => {
|
||||||
let browser;
|
let browser;
|
||||||
let page;
|
let page;
|
||||||
let previousMonth = new Date();
|
let previousMonth = Date.vnNew();
|
||||||
previousMonth.setMonth(previousMonth.getMonth() - 1);
|
previousMonth.setMonth(previousMonth.getMonth() - 1);
|
||||||
|
|
||||||
beforeAll(async() => {
|
beforeAll(async() => {
|
||||||
|
|
|
@ -22,7 +22,7 @@ describe('Worker time control path', () => {
|
||||||
const hankPymId = 1107;
|
const hankPymId = 1107;
|
||||||
|
|
||||||
it('should go to the next month, go to current month and go 1 month in the past', async() => {
|
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.setDate(1);
|
||||||
date.setMonth(date.getMonth() + 1);
|
date.setMonth(date.getMonth() + 1);
|
||||||
let month = date.toLocaleString('default', {month: 'long'});
|
let month = date.toLocaleString('default', {month: 'long'});
|
||||||
|
@ -32,7 +32,7 @@ describe('Worker time control path', () => {
|
||||||
|
|
||||||
expect(result).toContain(month);
|
expect(result).toContain(month);
|
||||||
|
|
||||||
date = new Date();
|
date = Date.vnNew();
|
||||||
date.setDate(1);
|
date.setDate(1);
|
||||||
month = date.toLocaleString('default', {month: 'long'});
|
month = date.toLocaleString('default', {month: 'long'});
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ describe('Worker time control path', () => {
|
||||||
|
|
||||||
expect(result).toContain(month);
|
expect(result).toContain(month);
|
||||||
|
|
||||||
date = new Date();
|
date = Date.vnNew();
|
||||||
date.setDate(1);
|
date.setDate(1);
|
||||||
date.setMonth(date.getMonth() - 1);
|
date.setMonth(date.getMonth() - 1);
|
||||||
const timestamp = Math.round(date.getTime() / 1000);
|
const timestamp = Math.round(date.getTime() / 1000);
|
||||||
|
|
|
@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
describe('Worker calendar path', () => {
|
describe('Worker calendar path', () => {
|
||||||
const reasonableTimeBetweenClicks = 300;
|
const reasonableTimeBetweenClicks = 300;
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
const lastYear = (date.getFullYear() - 1).toString();
|
const lastYear = (date.getFullYear() - 1).toString();
|
||||||
|
|
||||||
let browser;
|
let browser;
|
||||||
|
|
|
@ -22,7 +22,7 @@ describe('Item fixed prices path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fill the fixed price data', async() => {
|
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.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
|
||||||
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
|
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
|
||||||
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');
|
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');
|
||||||
|
|
|
@ -93,7 +93,7 @@ describe('Ticket Edit basic data path', () => {
|
||||||
|
|
||||||
it(`should split ticket without negatives`, async() => {
|
it(`should split ticket without negatives`, async() => {
|
||||||
const newAgency = 'Gotham247';
|
const newAgency = 'Gotham247';
|
||||||
const newDate = new Date();
|
const newDate = Date.vnNew();
|
||||||
newDate.setDate(newDate.getDate() - 1);
|
newDate.setDate(newDate.getDate() - 1);
|
||||||
|
|
||||||
await page.accessToSearchResult('14');
|
await page.accessToSearchResult('14');
|
||||||
|
@ -127,7 +127,7 @@ describe('Ticket Edit basic data path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should old ticket have old date and agency`, async() => {
|
it(`should old ticket have old date and agency`, async() => {
|
||||||
const oldDate = new Date();
|
const oldDate = Date.vnNew();
|
||||||
const oldAgency = 'Super-Man delivery';
|
const oldAgency = 'Super-Man delivery';
|
||||||
|
|
||||||
await page.accessToSearchResult('14');
|
await page.accessToSearchResult('14');
|
||||||
|
|
|
@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
|
||||||
describe('Ticket create path', () => {
|
describe('Ticket create path', () => {
|
||||||
let browser;
|
let browser;
|
||||||
let page;
|
let page;
|
||||||
let nextMonth = new Date();
|
let nextMonth = Date.vnNew();
|
||||||
nextMonth.setMonth(nextMonth.getMonth() + 1);
|
nextMonth.setMonth(nextMonth.getMonth() + 1);
|
||||||
|
|
||||||
beforeAll(async() => {
|
beforeAll(async() => {
|
||||||
|
|
|
@ -18,7 +18,7 @@ describe('Route basic Data path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should edit the route basic data', async() => {
|
it('should edit the route basic data', async() => {
|
||||||
const nextMonth = new Date();
|
const nextMonth = Date.vnNew();
|
||||||
nextMonth.setMonth(nextMonth.getMonth() + 1);
|
nextMonth.setMonth(nextMonth.getMonth() + 1);
|
||||||
|
|
||||||
await page.autocompleteSearch(selectors.routeBasicData.worker, 'adminBossNick');
|
await page.autocompleteSearch(selectors.routeBasicData.worker, 'adminBossNick');
|
||||||
|
|
|
@ -19,7 +19,7 @@ describe('InvoiceIn basic data path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should edit the invoiceIn basic data`, async() => {
|
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.issued, now);
|
||||||
await page.pickDate(selectors.invoiceInBasicData.operated, now);
|
await page.pickDate(selectors.invoiceInBasicData.operated, now);
|
||||||
await page.autocompleteSearch(selectors.invoiceInBasicData.supplier, 'Verdnatura');
|
await page.autocompleteSearch(selectors.invoiceInBasicData.supplier, 'Verdnatura');
|
||||||
|
|
|
@ -100,7 +100,7 @@ describe('InvoiceOut descriptor path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`should check the invoiceOut booked in the summary data`, async() => {
|
it(`should check the invoiceOut booked in the summary data`, async() => {
|
||||||
let today = new Date();
|
let today = Date.vnNew();
|
||||||
|
|
||||||
let day = today.getDate();
|
let day = today.getDate();
|
||||||
if (day < 10) day = `0${day}`;
|
if (day < 10) day = `0${day}`;
|
||||||
|
|
|
@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
|
||||||
describe('Travel create path', () => {
|
describe('Travel create path', () => {
|
||||||
let browser;
|
let browser;
|
||||||
let page;
|
let page;
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
const day = 15;
|
const day = 15;
|
||||||
date.setDate(day);
|
date.setDate(day);
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ describe('Travel basic data path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set a wrong delivery date then receive an error on submit', async() => {
|
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);
|
lastMonth.setMonth(lastMonth.getMonth() - 1);
|
||||||
|
|
||||||
await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
|
await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
|
||||||
|
|
|
@ -123,7 +123,7 @@ describe('Travel descriptor path', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update the landed date to a future date to enable cloneWithEntries', async() => {
|
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);
|
nextMonth.setMonth(nextMonth.getMonth() + 1);
|
||||||
await page.pickDate(selectors.travelBasicData.deliveryDate, nextMonth);
|
await page.pickDate(selectors.travelBasicData.deliveryDate, nextMonth);
|
||||||
await page.waitToClick(selectors.travelBasicData.save);
|
await page.waitToClick(selectors.travelBasicData.save);
|
||||||
|
|
|
@ -15,7 +15,7 @@ export default class Calendar extends FormInput {
|
||||||
constructor($element, $scope, vnWeekDays, moment) {
|
constructor($element, $scope, vnWeekDays, moment) {
|
||||||
super($element, $scope);
|
super($element, $scope);
|
||||||
this.weekDays = vnWeekDays.locales;
|
this.weekDays = vnWeekDays.locales;
|
||||||
this.defaultDate = new Date();
|
this.defaultDate = Date.vnNew();
|
||||||
this.displayControls = true;
|
this.displayControls = true;
|
||||||
this.moment = moment;
|
this.moment = moment;
|
||||||
}
|
}
|
||||||
|
@ -115,8 +115,8 @@ export default class Calendar extends FormInput {
|
||||||
let wday = date.getDay();
|
let wday = date.getDay();
|
||||||
let month = date.getMonth();
|
let month = date.getMonth();
|
||||||
|
|
||||||
const currentDay = new Date().getDate();
|
const currentDay = Date.vnNew().getDate();
|
||||||
const currentMonth = new Date().getMonth();
|
const currentMonth = Date.vnNew().getMonth();
|
||||||
|
|
||||||
let classes = {
|
let classes = {
|
||||||
today: day === currentDay && month === currentMonth,
|
today: day === currentDay && month === currentMonth,
|
||||||
|
|
|
@ -2,7 +2,7 @@ describe('Component vnCalendar', () => {
|
||||||
let controller;
|
let controller;
|
||||||
let $element;
|
let $element;
|
||||||
|
|
||||||
let date = new Date();
|
let date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
date.setDate(1);
|
date.setDate(1);
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ describe('Component vnCalendar', () => {
|
||||||
it(`should return the selected element, then emit a 'selection' event`, () => {
|
it(`should return the selected element, then emit a 'selection' event`, () => {
|
||||||
jest.spyOn(controller, 'emit');
|
jest.spyOn(controller, 'emit');
|
||||||
|
|
||||||
const day = new Date();
|
const day = Date.vnNew();
|
||||||
day.setHours(0, 0, 0, 0);
|
day.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
const clickEvent = new Event('click');
|
const clickEvent = new Event('click');
|
||||||
|
|
|
@ -4,7 +4,7 @@ describe('Component vnDatePicker', () => {
|
||||||
let $ctrl;
|
let $ctrl;
|
||||||
|
|
||||||
let today;
|
let today;
|
||||||
today = new Date();
|
today = Date.vnNew();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
beforeEach(ngModule('vnCore'));
|
beforeEach(ngModule('vnCore'));
|
||||||
|
|
|
@ -31,7 +31,7 @@ export default class InputTime extends Field {
|
||||||
|
|
||||||
date = this.modelDate
|
date = this.modelDate
|
||||||
? new Date(this.modelDate)
|
? new Date(this.modelDate)
|
||||||
: new Date();
|
: Date.vnNew();
|
||||||
date.setHours(split[0], split[1], 0, 0);
|
date.setHours(split[0], split[1], 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ describe('Component vnInputTime', () => {
|
||||||
|
|
||||||
describe('field() setter', () => {
|
describe('field() setter', () => {
|
||||||
it(`should display the formated the date`, () => {
|
it(`should display the formated the date`, () => {
|
||||||
let date = new Date();
|
let date = Date.vnNew();
|
||||||
$ctrl.field = date;
|
$ctrl.field = date;
|
||||||
let displayed = $filter('date')(date, 'HH:mm');
|
let displayed = $filter('date')(date, 'HH:mm');
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
import * as date from 'vn-loopback/server/boot/date';
|
||||||
|
date.default();
|
|
@ -10,3 +10,4 @@ import './week-days';
|
||||||
import './report';
|
import './report';
|
||||||
import './email';
|
import './email';
|
||||||
import './file';
|
import './file';
|
||||||
|
import './date';
|
||||||
|
|
|
@ -197,7 +197,7 @@ export default class UploadPhoto extends Component {
|
||||||
timeout: this.canceler.promise,
|
timeout: this.canceler.promise,
|
||||||
transformRequest: ([file]) => {
|
transformRequest: ([file]) => {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
const now = new Date();
|
const now = Date.vnNew();
|
||||||
const timestamp = now.getTime();
|
const timestamp = now.getTime();
|
||||||
const fileName = `${file.name}_${timestamp}`;
|
const fileName = `${file.name}_${timestamp}`;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import './module';
|
import './module';
|
||||||
import './routes';
|
import './routes';
|
||||||
import './components';
|
import './components';
|
||||||
import './services';
|
|
||||||
import './styles';
|
import './styles';
|
||||||
|
import 'vn-loopback/server/boot/date';
|
||||||
|
|
|
@ -14,6 +14,10 @@ import './modules/ticket/front/module.js';
|
||||||
import './modules/travel/front/module.js';
|
import './modules/travel/front/module.js';
|
||||||
import './modules/worker/front/module.js';
|
import './modules/worker/front/module.js';
|
||||||
import './modules/shelving/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 => {
|
core.run(vnInterceptor => {
|
||||||
vnInterceptor.setApiPath(null);
|
vnInterceptor.setApiPath(null);
|
||||||
|
@ -39,3 +43,4 @@ window.ngModule = function(moduleName, ...args) {
|
||||||
|
|
||||||
return angular.mock.module(...fns);
|
return angular.mock.module(...fns);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
// For a detailed explanation regarding each configuration property, visit:
|
// For a detailed explanation regarding each configuration property, visit:
|
||||||
// https://jestjs.io/docs/en/configuration.html
|
// https://jestjs.io/docs/en/configuration.html
|
||||||
|
/* eslint max-len: ["error", { "code": 150 }]*/
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
name: 'front end',
|
name: 'front end',
|
||||||
|
|
|
@ -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();
|
||||||
|
};
|
||||||
|
};
|
|
@ -95,7 +95,7 @@ module.exports = Self => {
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
const claim = await models.Claim.findOne(filter, myOptions);
|
const claim = await models.Claim.findOne(filter, myOptions);
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
|
|
||||||
const newRefundTicket = await models.Ticket.create({
|
const newRefundTicket = await models.Ticket.create({
|
||||||
clientFk: claim.ticket().clientFk,
|
clientFk: claim.ticket().clientFk,
|
||||||
|
|
|
@ -60,7 +60,7 @@ module.exports = Self => {
|
||||||
const landedPlusWeek = new Date(ticket.landed);
|
const landedPlusWeek = new Date(ticket.landed);
|
||||||
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
||||||
const hasClaimManagerRole = await models.Account.hasRole(userId, 'claimManager', myOptions);
|
const hasClaimManagerRole = await models.Account.hasRole(userId, 'claimManager', myOptions);
|
||||||
const isClaimable = landedPlusWeek >= new Date();
|
const isClaimable = landedPlusWeek >= Date.vnNew();
|
||||||
|
|
||||||
if (ticket.isDeleted)
|
if (ticket.isDeleted)
|
||||||
throw new UserError(`You can't create a claim for a removed ticket`);
|
throw new UserError(`You can't create a claim for a removed ticket`);
|
||||||
|
|
|
@ -135,10 +135,10 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getTicketId(params, options) {
|
async function getTicketId(params, options) {
|
||||||
const minDate = new Date();
|
const minDate = Date.vnNew();
|
||||||
minDate.setHours(0, 0, 0, 0);
|
minDate.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
const maxDate = new Date();
|
const maxDate = Date.vnNew();
|
||||||
maxDate.setHours(23, 59, 59, 59);
|
maxDate.setHours(23, 59, 59, 59);
|
||||||
|
|
||||||
let ticket = await Self.app.models.Ticket.findOne({
|
let ticket = await Self.app.models.Ticket.findOne({
|
||||||
|
@ -155,8 +155,8 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function createTicket(ctx, options) {
|
async function createTicket(ctx, options) {
|
||||||
ctx.args.shipped = new Date();
|
ctx.args.shipped = Date.vnNew();
|
||||||
ctx.args.landed = new Date();
|
ctx.args.landed = Date.vnNew();
|
||||||
ctx.args.agencyModeId = null;
|
ctx.args.agencyModeId = null;
|
||||||
ctx.args.routeId = null;
|
ctx.args.routeId = null;
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ describe('Claim createFromSales()', () => {
|
||||||
try {
|
try {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
const todayMinusEightDays = new Date();
|
const todayMinusEightDays = Date.vnNew();
|
||||||
todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
|
todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
|
||||||
|
|
||||||
const ticket = await models.Ticket.findById(ticketId, null, options);
|
const ticket = await models.Ticket.findById(ticketId, null, options);
|
||||||
|
@ -85,7 +85,7 @@ describe('Claim createFromSales()', () => {
|
||||||
try {
|
try {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
const todayMinusEightDays = new Date();
|
const todayMinusEightDays = Date.vnNew();
|
||||||
todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
|
todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
|
||||||
|
|
||||||
const ticket = await models.Ticket.findById(ticketId, null, options);
|
const ticket = await models.Ticket.findById(ticketId, null, options);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
const app = require('vn-loopback/server/server');
|
const app = require('vn-loopback/server/server');
|
||||||
|
|
||||||
describe('Update Claim', () => {
|
describe('Update Claim', () => {
|
||||||
const newDate = new Date();
|
const newDate = Date.vnNew();
|
||||||
const originalData = {
|
const originalData = {
|
||||||
ticketFk: 3,
|
ticketFk: 3,
|
||||||
clientFk: 1101,
|
clientFk: 1101,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
const app = require('vn-loopback/server/server');
|
const app = require('vn-loopback/server/server');
|
||||||
|
|
||||||
describe('Update Claim', () => {
|
describe('Update Claim', () => {
|
||||||
const newDate = new Date();
|
const newDate = Date.vnNew();
|
||||||
const original = {
|
const original = {
|
||||||
ticketFk: 3,
|
ticketFk: 3,
|
||||||
clientFk: 1101,
|
clientFk: 1101,
|
||||||
|
|
|
@ -61,7 +61,7 @@ module.exports = Self => {
|
||||||
SET status = 'printed',
|
SET status = 'printed',
|
||||||
printed = ?
|
printed = ?
|
||||||
WHERE id = ?`,
|
WHERE id = ?`,
|
||||||
[new Date(), queue.id]);
|
[Date.vnNew(), queue.id]);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
await Self.rawSql(`
|
await Self.rawSql(`
|
||||||
UPDATE clientConsumptionQueue
|
UPDATE clientConsumptionQueue
|
||||||
|
|
|
@ -51,7 +51,7 @@ module.exports = function(Self) {
|
||||||
Self.createReceipt = async(ctx, options) => {
|
Self.createReceipt = async(ctx, options) => {
|
||||||
const models = Self.app.models;
|
const models = Self.app.models;
|
||||||
const args = ctx.args;
|
const args = ctx.args;
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
let tx;
|
let tx;
|
||||||
|
|
|
@ -74,7 +74,7 @@ module.exports = function(Self) {
|
||||||
]
|
]
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
|
const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
|
||||||
const data = await Self.rawSql(query, [id, date], myOptions);
|
const data = await Self.rawSql(query, [id, date], myOptions);
|
||||||
|
|
|
@ -25,7 +25,7 @@ module.exports = Self => {
|
||||||
if (typeof options == 'object')
|
if (typeof options == 'object')
|
||||||
Object.assign(myOptions, options);
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
|
const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
|
||||||
const [debt] = await Self.rawSql(query, [clientFk, date], myOptions);
|
const [debt] = await Self.rawSql(query, [clientFk, date], myOptions);
|
||||||
|
|
|
@ -32,7 +32,7 @@ module.exports = Self => {
|
||||||
if (typeof options == 'object')
|
if (typeof options == 'object')
|
||||||
Object.assign(myOptions, options);
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
const ticket = await Self.app.models.Ticket.findById(ticketId, null, myOptions);
|
const ticket = await Self.app.models.Ticket.findById(ticketId, null, myOptions);
|
||||||
const query = `
|
const query = `
|
||||||
|
|
|
@ -125,7 +125,7 @@ module.exports = Self => {
|
||||||
async function getRecoveries(recoveryModel, clientId, options) {
|
async function getRecoveries(recoveryModel, clientId, options) {
|
||||||
const filter = {
|
const filter = {
|
||||||
where: {
|
where: {
|
||||||
and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.now()}}]}]
|
and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.vnNow()}}]}]
|
||||||
},
|
},
|
||||||
limit: 1
|
limit: 1
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,7 +23,7 @@ describe('Client createWithInsurance', () => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const options = {transaction: tx};
|
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);
|
const result = await models.CreditClassification.createWithInsurance(data, options);
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
const stmts = [];
|
const stmts = [];
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
const stmt = new ParameterizedSQL(
|
const stmt = new ParameterizedSQL(
|
||||||
`SELECT *
|
`SELECT *
|
||||||
|
|
|
@ -27,7 +27,7 @@ module.exports = Self => {
|
||||||
if (typeof options == 'object')
|
if (typeof options == 'object')
|
||||||
Object.assign(myOptions, options);
|
Object.assign(myOptions, options);
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
const query = `
|
const query = `
|
||||||
SELECT count(*) AS hasActiveRecovery
|
SELECT count(*) AS hasActiveRecovery
|
||||||
|
|
|
@ -41,7 +41,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
// Disable old mandate
|
// Disable old mandate
|
||||||
if (oldMandate)
|
if (oldMandate)
|
||||||
oldMandate.updateAttribute('finished', new Date());
|
oldMandate.updateAttribute('finished', Date.vnNew());
|
||||||
|
|
||||||
// Create a new mandate
|
// Create a new mandate
|
||||||
await models.Mandate.create({
|
await models.Mandate.create({
|
||||||
|
|
|
@ -66,7 +66,7 @@ class Controller extends Dialog {
|
||||||
this.receipt.description = this.originalDescription;
|
this.receipt.description = this.originalDescription;
|
||||||
this.maxAmount = accountingType && accountingType.maxAmount;
|
this.maxAmount = accountingType && accountingType.maxAmount;
|
||||||
|
|
||||||
this.receipt.payed = new Date();
|
this.receipt.payed = Date.vnNew();
|
||||||
if (accountingType.daysInFuture)
|
if (accountingType.daysInFuture)
|
||||||
this.receipt.payed.setDate(this.receipt.payed.getDate() + accountingType.daysInFuture);
|
this.receipt.payed.setDate(this.receipt.payed.getDate() + accountingType.daysInFuture);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,11 +17,11 @@ class Controller extends Section {
|
||||||
}
|
}
|
||||||
|
|
||||||
setDefaultFilter() {
|
setDefaultFilter() {
|
||||||
const minDate = new Date();
|
const minDate = Date.vnNew();
|
||||||
minDate.setHours(0, 0, 0, 0);
|
minDate.setHours(0, 0, 0, 0);
|
||||||
minDate.setMonth(minDate.getMonth() - 2);
|
minDate.setMonth(minDate.getMonth() - 2);
|
||||||
|
|
||||||
const maxDate = new Date();
|
const maxDate = Date.vnNew();
|
||||||
maxDate.setHours(23, 59, 59, 59);
|
maxDate.setHours(23, 59, 59, 59);
|
||||||
|
|
||||||
this.filterParams = {
|
this.filterParams = {
|
||||||
|
|
|
@ -26,7 +26,7 @@ describe('Client', () => {
|
||||||
it('should call the window.open function', () => {
|
it('should call the window.open function', () => {
|
||||||
jest.spyOn(window, 'open').mockReturnThis();
|
jest.spyOn(window, 'open').mockReturnThis();
|
||||||
|
|
||||||
const now = new Date();
|
const now = Date.vnNew();
|
||||||
controller.$.model.userParams = {
|
controller.$.model.userParams = {
|
||||||
from: now,
|
from: now,
|
||||||
to: now
|
to: now
|
||||||
|
@ -49,7 +49,7 @@ describe('Client', () => {
|
||||||
|
|
||||||
describe('sendEmail()', () => {
|
describe('sendEmail()', () => {
|
||||||
it('should make a GET query sending the report', () => {
|
it('should make a GET query sending the report', () => {
|
||||||
const now = new Date();
|
const now = Date.vnNew();
|
||||||
controller.$.model.userParams = {
|
controller.$.model.userParams = {
|
||||||
from: now,
|
from: now,
|
||||||
to: now
|
to: now
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Controller extends Section {
|
||||||
constructor($element, $) {
|
constructor($element, $) {
|
||||||
super($element, $);
|
super($element, $);
|
||||||
this.creditClassification = {
|
this.creditClassification = {
|
||||||
started: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm')
|
started: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm')
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ describe('Client', () => {
|
||||||
|
|
||||||
describe('onSubmit()', () => {
|
describe('onSubmit()', () => {
|
||||||
it('should perform a POST query', () => {
|
it('should perform a POST query', () => {
|
||||||
let started = new Date();
|
let started = Date.vnNew();
|
||||||
controller.creditClassification = {
|
controller.creditClassification = {
|
||||||
started: started,
|
started: started,
|
||||||
credit: 300,
|
credit: 300,
|
||||||
|
|
|
@ -52,7 +52,7 @@ class Controller extends Section {
|
||||||
}
|
}
|
||||||
|
|
||||||
returnDialog() {
|
returnDialog() {
|
||||||
let params = {finished: Date.now()};
|
let params = {finished: Date.vnNow()};
|
||||||
this.$http.patch(`CreditClassifications/${this.classificationId}`, params).then(() => {
|
this.$http.patch(`CreditClassifications/${this.classificationId}`, params).then(() => {
|
||||||
this._getClassifications(this.client.id);
|
this._getClassifications(this.client.id);
|
||||||
});
|
});
|
||||||
|
|
|
@ -39,7 +39,7 @@ describe('Client', () => {
|
||||||
|
|
||||||
it(`should return false if finds a classification without due date`, () => {
|
it(`should return false if finds a classification without due date`, () => {
|
||||||
controller.classifications = [
|
controller.classifications = [
|
||||||
{finished: Date.now()},
|
{finished: Date.vnNow()},
|
||||||
{finished: null}
|
{finished: null}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -50,8 +50,8 @@ describe('Client', () => {
|
||||||
|
|
||||||
it(`should return true if all classifications are defined with due date`, () => {
|
it(`should return true if all classifications are defined with due date`, () => {
|
||||||
controller.classifications = [
|
controller.classifications = [
|
||||||
{finished: Date.now()},
|
{finished: Date.vnNow()},
|
||||||
{finished: Date.now()}
|
{finished: Date.vnNow()}
|
||||||
];
|
];
|
||||||
|
|
||||||
let result = controller.canCreateNew();
|
let result = controller.canCreateNew();
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Controller extends Section {
|
||||||
constructor($element, $) {
|
constructor($element, $) {
|
||||||
super($element, $);
|
super($element, $);
|
||||||
this.insurance = {
|
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')
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ export default class Controller extends Section {
|
||||||
|
|
||||||
chipColor(date) {
|
chipColor(date) {
|
||||||
const day = 24 * 60 * 60 * 1000;
|
const day = 24 * 60 * 60 * 1000;
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
const observationShipped = new Date(date);
|
const observationShipped = new Date(date);
|
||||||
|
|
|
@ -38,14 +38,14 @@ describe('client defaulter', () => {
|
||||||
|
|
||||||
describe('chipColor()', () => {
|
describe('chipColor()', () => {
|
||||||
it('should return undefined when the date is the present', () => {
|
it('should return undefined when the date is the present', () => {
|
||||||
let today = new Date();
|
let today = Date.vnNew();
|
||||||
let result = controller.chipColor(today);
|
let result = controller.chipColor(today);
|
||||||
|
|
||||||
expect(result).toEqual(undefined);
|
expect(result).toEqual(undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return warning when the date is 10 days in the past', () => {
|
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);
|
pastDate = pastDate.setDate(pastDate.getDate() - 11);
|
||||||
let result = controller.chipColor(pastDate);
|
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', () => {
|
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);
|
pastDate = pastDate.setDate(pastDate.getDate() - 21);
|
||||||
let result = controller.chipColor(pastDate);
|
let result = controller.chipColor(pastDate);
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Controller extends Section {
|
||||||
constructor(...args) {
|
constructor(...args) {
|
||||||
super(...args);
|
super(...args);
|
||||||
this.greuge = {
|
this.greuge = {
|
||||||
shipped: new Date(),
|
shipped: Date.vnNew(),
|
||||||
clientFk: this.$params.id
|
clientFk: this.$params.id
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ describe('Client notification', () => {
|
||||||
|
|
||||||
describe('campaignSelection() setter', () => {
|
describe('campaignSelection() setter', () => {
|
||||||
it('should set the campaign from and to properties', () => {
|
it('should set the campaign from and to properties', () => {
|
||||||
const dated = new Date();
|
const dated = Date.vnNew();
|
||||||
controller.campaignSelection = {
|
controller.campaignSelection = {
|
||||||
dated: dated,
|
dated: dated,
|
||||||
scopeDays: 14
|
scopeDays: 14
|
||||||
|
@ -61,8 +61,8 @@ describe('Client notification', () => {
|
||||||
|
|
||||||
controller.$.filters = {hide: () => {}};
|
controller.$.filters = {hide: () => {}};
|
||||||
controller.campaign = {
|
controller.campaign = {
|
||||||
from: new Date(),
|
from: Date.vnNew(),
|
||||||
to: new Date()
|
to: Date.vnNew()
|
||||||
};
|
};
|
||||||
|
|
||||||
const data = controller.$.model.data;
|
const data = controller.$.model.data;
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Controller extends Section {
|
||||||
constructor($element, $) {
|
constructor($element, $) {
|
||||||
super($element, $);
|
super($element, $);
|
||||||
this.recovery = {
|
this.recovery = {
|
||||||
started: new Date()
|
started: Date.vnNew()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import Section from 'salix/components/section';
|
||||||
class Controller extends Section {
|
class Controller extends Section {
|
||||||
setFinished(recovery) {
|
setFinished(recovery) {
|
||||||
if (!recovery.finished) {
|
if (!recovery.finished) {
|
||||||
let params = {finished: Date.now()};
|
let params = {finished: Date.vnNow()};
|
||||||
this.$http.patch(`Recoveries/${recovery.id}`, params).then(
|
this.$http.patch(`Recoveries/${recovery.id}`, params).then(
|
||||||
() => this.$.model.refresh()
|
() => this.$.model.refresh()
|
||||||
);
|
);
|
||||||
|
|
|
@ -100,7 +100,7 @@ class Controller extends Summary {
|
||||||
}
|
}
|
||||||
|
|
||||||
chipColor(date) {
|
chipColor(date) {
|
||||||
const today = new Date();
|
const today = Date.vnNew();
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
const ticketShipped = new Date(date);
|
const ticketShipped = new Date(date);
|
||||||
|
|
|
@ -76,14 +76,14 @@ describe('Client', () => {
|
||||||
|
|
||||||
describe('chipColor()', () => {
|
describe('chipColor()', () => {
|
||||||
it('should return warning when the date is the present', () => {
|
it('should return warning when the date is the present', () => {
|
||||||
let today = new Date();
|
let today = Date.vnNew();
|
||||||
let result = controller.chipColor(today);
|
let result = controller.chipColor(today);
|
||||||
|
|
||||||
expect(result).toEqual('warning');
|
expect(result).toEqual('warning');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return success when the date is in the future', () => {
|
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);
|
futureDate = futureDate.setDate(futureDate.getDate() + 10);
|
||||||
let result = controller.chipColor(futureDate);
|
let result = controller.chipColor(futureDate);
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ describe('Client', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return undefined when the date is in the past', () => {
|
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);
|
pastDate = pastDate.setDate(pastDate.getDate() - 10);
|
||||||
let result = controller.chipColor(pastDate);
|
let result = controller.chipColor(pastDate);
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import Section from 'salix/components/section';
|
||||||
export default class Controller extends Section {
|
export default class Controller extends Section {
|
||||||
setDefaultDate(hasData) {
|
setDefaultDate(hasData) {
|
||||||
if (hasData && !this.clientUnpaid.dated)
|
if (hasData && !this.clientUnpaid.dated)
|
||||||
this.clientUnpaid.dated = new Date();
|
this.clientUnpaid.dated = Date.vnNew();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ describe('client unpaid', () => {
|
||||||
describe('setDefaultDate()', () => {
|
describe('setDefaultDate()', () => {
|
||||||
it(`should not set today date if has dated`, () => {
|
it(`should not set today date if has dated`, () => {
|
||||||
const hasData = true;
|
const hasData = true;
|
||||||
const yesterday = new Date();
|
const yesterday = Date.vnNew();
|
||||||
yesterday.setDate(yesterday.getDate() - 1);
|
yesterday.setDate(yesterday.getDate() - 1);
|
||||||
|
|
||||||
controller.clientUnpaid = {
|
controller.clientUnpaid = {
|
||||||
|
|
|
@ -150,7 +150,7 @@ module.exports = Self => {
|
||||||
|
|
||||||
const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
|
const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
|
||||||
|
|
||||||
const date = new Date();
|
const date = Date.vnNew();
|
||||||
date.setHours(0, 0, 0, 0);
|
date.setHours(0, 0, 0, 0);
|
||||||
stmt = new ParameterizedSQL(`
|
stmt = new ParameterizedSQL(`
|
||||||
SELECT
|
SELECT
|
||||||
|
|
|
@ -332,10 +332,10 @@ describe('Entry latests buys filter()', () => {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const from = new Date();
|
const from = Date.vnNew();
|
||||||
from.setHours(0, 0, 0, 0);
|
from.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
const to = new Date();
|
const to = Date.vnNew();
|
||||||
to.setHours(23, 59, 59, 999);
|
to.setHours(23, 59, 59, 999);
|
||||||
|
|
||||||
const ctx = {
|
const ctx = {
|
||||||
|
|
|
@ -146,8 +146,8 @@ describe('InvoiceIn filter()', () => {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const from = new Date();
|
const from = Date.vnNew();
|
||||||
const to = new Date();
|
const to = Date.vnNew();
|
||||||
from.setHours(0, 0, 0, 0);
|
from.setHours(0, 0, 0, 0);
|
||||||
to.setHours(23, 59, 59, 999);
|
to.setHours(23, 59, 59, 999);
|
||||||
to.setDate(to.getDate() + 1);
|
to.setDate(to.getDate() + 1);
|
||||||
|
|
|
@ -78,7 +78,7 @@ describe('InvoiceIn', () => {
|
||||||
description: 'This is a description',
|
description: 'This is a description',
|
||||||
files: [{
|
files: [{
|
||||||
lastModified: 1668673957761,
|
lastModified: 1668673957761,
|
||||||
lastModifiedDate: new Date(),
|
lastModifiedDate: Date.vnNew(),
|
||||||
name: 'file-example.png',
|
name: 'file-example.png',
|
||||||
size: 19653,
|
size: 19653,
|
||||||
type: 'image/png',
|
type: 'image/png',
|
||||||
|
|
|
@ -75,7 +75,7 @@ class Controller extends Descriptor {
|
||||||
filter: {
|
filter: {
|
||||||
where: {
|
where: {
|
||||||
invoiceInFk: id,
|
invoiceInFk: id,
|
||||||
dueDated: {gte: new Date()}
|
dueDated: {gte: Date.vnNew()}
|
||||||
}
|
}
|
||||||
}})
|
}})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
|
|
|
@ -4,7 +4,7 @@ import Section from 'salix/components/section';
|
||||||
class Controller extends Section {
|
class Controller extends Section {
|
||||||
add() {
|
add() {
|
||||||
this.$.model.insert({
|
this.$.model.insert({
|
||||||
dueDated: new Date(),
|
dueDated: Date.vnNew(),
|
||||||
bankFk: this.vnConfig.local.bankFk
|
bankFk: this.vnConfig.local.bankFk
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ module.exports = Self => {
|
||||||
if (args.invoiceDate < args.maxShipped)
|
if (args.invoiceDate < args.maxShipped)
|
||||||
args.maxShipped = args.invoiceDate;
|
args.maxShipped = args.invoiceDate;
|
||||||
|
|
||||||
const minShipped = new Date();
|
const minShipped = Date.vnNew();
|
||||||
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
||||||
minShipped.setMonth(1);
|
minShipped.setMonth(1);
|
||||||
minShipped.setDate(1);
|
minShipped.setDate(1);
|
||||||
|
@ -149,7 +149,7 @@ module.exports = Self => {
|
||||||
async function getInvoiceableClients(ctx, options) {
|
async function getInvoiceableClients(ctx, options) {
|
||||||
const models = Self.app.models;
|
const models = Self.app.models;
|
||||||
const args = ctx.args;
|
const args = ctx.args;
|
||||||
const minShipped = new Date();
|
const minShipped = Date.vnNew();
|
||||||
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
||||||
|
|
||||||
const query = `SELECT
|
const query = `SELECT
|
||||||
|
|
|
@ -108,14 +108,14 @@ module.exports = Self => {
|
||||||
throw new UserError(`This client is not invoiceable`);
|
throw new UserError(`This client is not invoiceable`);
|
||||||
|
|
||||||
// Can't invoice tickets into future
|
// Can't invoice tickets into future
|
||||||
const tomorrow = new Date();
|
const tomorrow = Date.vnNew();
|
||||||
tomorrow.setDate(tomorrow.getDate() + 1);
|
tomorrow.setDate(tomorrow.getDate() + 1);
|
||||||
|
|
||||||
if (maxShipped >= tomorrow)
|
if (maxShipped >= tomorrow)
|
||||||
throw new UserError(`Can't invoice to future`);
|
throw new UserError(`Can't invoice to future`);
|
||||||
|
|
||||||
const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
|
const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
|
||||||
if (new Date() < maxInvoiceDate)
|
if (Date.vnNew() < maxInvoiceDate)
|
||||||
throw new UserError(`Can't invoice to past`);
|
throw new UserError(`Can't invoice to past`);
|
||||||
|
|
||||||
if (ticketId) {
|
if (ticketId) {
|
||||||
|
@ -177,7 +177,7 @@ module.exports = Self => {
|
||||||
WHERE serial = ? AND companyFk = ?`;
|
WHERE serial = ? AND companyFk = ?`;
|
||||||
const [maxIssued] = await models.InvoiceOut.rawSql(query,
|
const [maxIssued] = await models.InvoiceOut.rawSql(query,
|
||||||
[serial, companyId], options);
|
[serial, companyId], options);
|
||||||
const maxInvoiceDate = maxIssued && maxIssued.issued || new Date();
|
const maxInvoiceDate = maxIssued && maxIssued.issued || Date.vnNew();
|
||||||
|
|
||||||
return maxInvoiceDate;
|
return maxInvoiceDate;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
const models = require('vn-loopback/server/server').models;
|
const models = require('vn-loopback/server/server').models;
|
||||||
|
|
||||||
describe('InvoiceOut filter()', () => {
|
describe('InvoiceOut filter()', () => {
|
||||||
let today = new Date();
|
let today = Date.vnNew();
|
||||||
today.setHours(2, 0, 0, 0);
|
today.setHours(2, 0, 0, 0);
|
||||||
|
|
||||||
it('should return the invoice out matching ref', async() => {
|
it('should return the invoice out matching ref', async() => {
|
||||||
|
|
|
@ -5,7 +5,7 @@ describe('InvoiceOut invoiceClient()', () => {
|
||||||
const clientId = 1101;
|
const clientId = 1101;
|
||||||
const addressId = 121;
|
const addressId = 121;
|
||||||
const companyFk = 442;
|
const companyFk = 442;
|
||||||
const minShipped = new Date();
|
const minShipped = Date.vnNew();
|
||||||
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
||||||
minShipped.setMonth(1);
|
minShipped.setMonth(1);
|
||||||
minShipped.setDate(1);
|
minShipped.setDate(1);
|
||||||
|
@ -33,8 +33,8 @@ describe('InvoiceOut invoiceClient()', () => {
|
||||||
ctx.args = {
|
ctx.args = {
|
||||||
clientId: clientId,
|
clientId: clientId,
|
||||||
addressId: addressId,
|
addressId: addressId,
|
||||||
invoiceDate: new Date(),
|
invoiceDate: Date.vnNew(),
|
||||||
maxShipped: new Date(),
|
maxShipped: Date.vnNew(),
|
||||||
companyFk: companyFk,
|
companyFk: companyFk,
|
||||||
minShipped: minShipped
|
minShipped: minShipped
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@ class Controller extends Dialog {
|
||||||
constructor($element, $, $transclude) {
|
constructor($element, $, $transclude) {
|
||||||
super($element, $, $transclude);
|
super($element, $, $transclude);
|
||||||
this.invoice = {
|
this.invoice = {
|
||||||
maxShipped: new Date()
|
maxShipped: Date.vnNew()
|
||||||
};
|
};
|
||||||
this.clientsNumber = 'allClients';
|
this.clientsNumber = 'allClients';
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,8 +76,8 @@ describe('InvoiceOut', () => {
|
||||||
jest.spyOn(controller.vnApp, 'showError');
|
jest.spyOn(controller.vnApp, 'showError');
|
||||||
|
|
||||||
controller.invoice = {
|
controller.invoice = {
|
||||||
invoiceDate: new Date(),
|
invoiceDate: Date.vnNew(),
|
||||||
maxShipped: new Date()
|
maxShipped: Date.vnNew()
|
||||||
};
|
};
|
||||||
|
|
||||||
controller.responseHandler('accept');
|
controller.responseHandler('accept');
|
||||||
|
@ -88,14 +88,14 @@ describe('InvoiceOut', () => {
|
||||||
it('should make an http POST query and then call to the showSuccess() method', () => {
|
it('should make an http POST query and then call to the showSuccess() method', () => {
|
||||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||||
|
|
||||||
const minShipped = new Date();
|
const minShipped = Date.vnNew();
|
||||||
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
minShipped.setFullYear(minShipped.getFullYear() - 1);
|
||||||
minShipped.setMonth(1);
|
minShipped.setMonth(1);
|
||||||
minShipped.setDate(1);
|
minShipped.setDate(1);
|
||||||
minShipped.setHours(0, 0, 0, 0);
|
minShipped.setHours(0, 0, 0, 0);
|
||||||
controller.invoice = {
|
controller.invoice = {
|
||||||
invoiceDate: new Date(),
|
invoiceDate: Date.vnNew(),
|
||||||
maxShipped: new Date(),
|
maxShipped: Date.vnNew(),
|
||||||
fromClientId: 1101,
|
fromClientId: 1101,
|
||||||
toClientId: 1101,
|
toClientId: 1101,
|
||||||
companyFk: 442,
|
companyFk: 442,
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Controller extends Dialog {
|
||||||
|
|
||||||
this.isInvoicing = false;
|
this.isInvoicing = false;
|
||||||
this.invoice = {
|
this.invoice = {
|
||||||
maxShipped: new Date()
|
maxShipped: Date.vnNew()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
const models = require('vn-loopback/server/server').models;
|
const models = require('vn-loopback/server/server').models;
|
||||||
|
|
||||||
describe('upsertFixedPrice()', () => {
|
describe('upsertFixedPrice()', () => {
|
||||||
const now = new Date();
|
const now = Date.vnNew();
|
||||||
const fixedPriceId = 1;
|
const fixedPriceId = 1;
|
||||||
let originalFixedPrice;
|
let originalFixedPrice;
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue