{
const formData = new FormData();
- const now = new Date();
+ const now = Date.vnNew();
const timestamp = now.getTime();
const fileName = `${file.name}_${timestamp}`;
diff --git a/front/salix/index.js b/front/salix/index.js
index 5220f36f6..2488ef9b6 100644
--- a/front/salix/index.js
+++ b/front/salix/index.js
@@ -1,5 +1,5 @@
import './module';
import './routes';
import './components';
-import './services';
import './styles';
+import 'vn-loopback/server/boot/date';
diff --git a/front/salix/services/index.js b/front/salix/services/index.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/jest-front.js b/jest-front.js
index 6d7532260..eabda9110 100644
--- a/jest-front.js
+++ b/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);
};
+
diff --git a/jest.front.config.js b/jest.front.config.js
index a03c61d11..3289df8bb 100644
--- a/jest.front.config.js
+++ b/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',
diff --git a/loopback/server/boot/date.js b/loopback/server/boot/date.js
new file mode 100644
index 000000000..0875b6d5f
--- /dev/null
+++ b/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();
+ };
+};
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
index 22a48f83e..f0686ffa6 100644
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/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,
diff --git a/modules/claim/back/methods/claim/createFromSales.js b/modules/claim/back/methods/claim/createFromSales.js
index ba7bda71d..2ce3bc44b 100644
--- a/modules/claim/back/methods/claim/createFromSales.js
+++ b/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`);
diff --git a/modules/claim/back/methods/claim/regularizeClaim.js b/modules/claim/back/methods/claim/regularizeClaim.js
index ab8ea58a4..672c94947 100644
--- a/modules/claim/back/methods/claim/regularizeClaim.js
+++ b/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;
diff --git a/modules/claim/back/methods/claim/specs/createFromSales.spec.js b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
index 9151c361e..7cf663caf 100644
--- a/modules/claim/back/methods/claim/specs/createFromSales.spec.js
+++ b/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);
diff --git a/modules/claim/back/methods/claim/specs/updateClaim.spec.js b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
index 8d888eb40..113df35c9 100644
--- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js
+++ b/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,
diff --git a/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js b/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
index 4cd4ce528..12ab45fac 100644
--- a/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
+++ b/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,
diff --git a/modules/client/back/methods/client/consumptionSendQueued.js b/modules/client/back/methods/client/consumptionSendQueued.js
index 77e0e34f2..31b54b21d 100644
--- a/modules/client/back/methods/client/consumptionSendQueued.js
+++ b/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]);
diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
index a75ee8844..74fe2211e 100644
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/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;
diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js
index 21b3140bd..afbe36e49 100644
--- a/modules/client/back/methods/client/getCard.js
+++ b/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);
diff --git a/modules/client/back/methods/client/getDebt.js b/modules/client/back/methods/client/getDebt.js
index aafdbfa48..5f8a8c569 100644
--- a/modules/client/back/methods/client/getDebt.js
+++ b/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);
diff --git a/modules/client/back/methods/client/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js
index 03616a0e3..d662f75aa 100644
--- a/modules/client/back/methods/client/lastActiveTickets.js
+++ b/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`;
diff --git a/modules/client/back/methods/client/summary.js b/modules/client/back/methods/client/summary.js
index 48cb75f31..caa3d8033 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/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
};
diff --git a/modules/client/back/methods/credit-classification/createWithInsurance.spec.js b/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
index 95ff5025f..a5837bb90 100644
--- a/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
+++ b/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);
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index ce1d89818..748581913 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/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
diff --git a/modules/client/back/methods/recovery/hasActiveRecovery.js b/modules/client/back/methods/recovery/hasActiveRecovery.js
index 6b69d99d7..344b6b6ab 100644
--- a/modules/client/back/methods/recovery/hasActiveRecovery.js
+++ b/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
diff --git a/modules/client/back/models/client-sample.js b/modules/client/back/models/client-sample.js
index 787cc2ad8..5e4393042 100644
--- a/modules/client/back/models/client-sample.js
+++ b/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({
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index b64129e2e..68d19209d 100644
--- a/modules/client/front/balance/create/index.js
+++ b/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);
}
diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js
index 2c4ed1940..c0464b12b 100644
--- a/modules/client/front/balance/create/index.spec.js
+++ b/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');
});
});
diff --git a/modules/client/front/consumption/index.js b/modules/client/front/consumption/index.js
index d9b657318..eb3a10dd6 100644
--- a/modules/client/front/consumption/index.js
+++ b/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 = {
diff --git a/modules/client/front/consumption/index.spec.js b/modules/client/front/consumption/index.spec.js
index 33cbce58f..f2acddbca 100644
--- a/modules/client/front/consumption/index.spec.js
+++ b/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
diff --git a/modules/client/front/credit-insurance/create/index.js b/modules/client/front/credit-insurance/create/index.js
index 83dc18806..e3138e459 100644
--- a/modules/client/front/credit-insurance/create/index.js
+++ b/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')
};
}
diff --git a/modules/client/front/credit-insurance/create/index.spec.js b/modules/client/front/credit-insurance/create/index.spec.js
index 36a91ceca..c50afd5cf 100644
--- a/modules/client/front/credit-insurance/create/index.spec.js
+++ b/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,
diff --git a/modules/client/front/credit-insurance/index/index.js b/modules/client/front/credit-insurance/index/index.js
index 5f59c918a..b40025c65 100644
--- a/modules/client/front/credit-insurance/index/index.js
+++ b/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);
});
diff --git a/modules/client/front/credit-insurance/index/index.spec.js b/modules/client/front/credit-insurance/index/index.spec.js
index 8629db684..af072691a 100644
--- a/modules/client/front/credit-insurance/index/index.spec.js
+++ b/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();
diff --git a/modules/client/front/credit-insurance/insurance/create/index.js b/modules/client/front/credit-insurance/insurance/create/index.js
index 94de53352..9eae5bfa9 100644
--- a/modules/client/front/credit-insurance/insurance/create/index.js
+++ b/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')
};
}
diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js
index 4beadfda6..bfadc5c6a 100644
--- a/modules/client/front/defaulter/index.js
+++ b/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);
diff --git a/modules/client/front/defaulter/index.spec.js b/modules/client/front/defaulter/index.spec.js
index 0732c68a1..f92378d08 100644
--- a/modules/client/front/defaulter/index.spec.js
+++ b/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);
diff --git a/modules/client/front/greuge/create/index.js b/modules/client/front/greuge/create/index.js
index dcc0fa522..147ad9bcb 100644
--- a/modules/client/front/greuge/create/index.js
+++ b/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
};
}
diff --git a/modules/client/front/notification/index.spec.js b/modules/client/front/notification/index.spec.js
index 4e754f6ad..e1de104be 100644
--- a/modules/client/front/notification/index.spec.js
+++ b/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;
diff --git a/modules/client/front/recovery/create/index.js b/modules/client/front/recovery/create/index.js
index 4fd05eaa0..1779d647e 100644
--- a/modules/client/front/recovery/create/index.js
+++ b/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()
};
}
diff --git a/modules/client/front/recovery/index/index.js b/modules/client/front/recovery/index/index.js
index d53ded805..e89b6832c 100644
--- a/modules/client/front/recovery/index/index.js
+++ b/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()
);
diff --git a/modules/client/front/summary/index.js b/modules/client/front/summary/index.js
index 1f22612d2..877579e33 100644
--- a/modules/client/front/summary/index.js
+++ b/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);
diff --git a/modules/client/front/summary/index.spec.js b/modules/client/front/summary/index.spec.js
index 0261cef45..a05d48518 100644
--- a/modules/client/front/summary/index.spec.js
+++ b/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);
diff --git a/modules/client/front/unpaid/index.js b/modules/client/front/unpaid/index.js
index a8ff64386..fcf620b54 100644
--- a/modules/client/front/unpaid/index.js
+++ b/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();
}
}
diff --git a/modules/client/front/unpaid/index.spec.js b/modules/client/front/unpaid/index.spec.js
index bfeb7df19..0f6460a03 100644
--- a/modules/client/front/unpaid/index.spec.js
+++ b/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 = {
diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index b920f4b58..30d47a2a3 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/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]);
diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
index 9b1e60532..0578fcdd4 100644
--- a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
+++ b/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 = {
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
index 8cfab622a..075d6a8f7 100644
--- a/modules/entry/front/latest-buys-search-panel/index.html
+++ b/modules/entry/front/latest-buys-search-panel/index.html
@@ -1,198 +1,243 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{name}}
+
+ {{category.name}}
+
>
+
+
+
+
+
+
+ {{name}}: {{nickname}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tags
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Id/Name: {{$ctrl.filter.search}}
+
+
+ {{category.selection.name}}
+
+
+ {{type.selection.name}}
+
+
+ Sales person: {{salesPerson.selection.nickname}}
+
+
+ Supplier: {{supplier.selection.name}}
+
+
+ From: {{$ctrl.filter.from | date:'dd/MM/yyyy'}}
+
+
+ To: {{$ctrl.filter.to | date:'dd/MM/yyyy'}}
+
+
+ Active: {{$ctrl.filter.active ? '✓' : '✗'}}
+
+
+ Floramondo: {{$ctrl.filter.floramondo ? '✓' : '✗'}}
+
+
+ Visible: {{$ctrl.filter.visible ? '✓' : '✗'}}
+
+
+ {{$ctrl.showTagInfo(chipTag)}}
+
+
+
+
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js
index 83dc88724..4078580ea 100644
--- a/modules/entry/front/latest-buys-search-panel/index.js
+++ b/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: '<'
+ }
});
diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js
index 9e187a25a..c3c5acbfb 100644
--- a/modules/entry/front/latest-buys-search-panel/index.spec.js
+++ b/modules/entry/front/latest-buys-search-panel/index.spec.js
@@ -10,50 +10,46 @@ describe('Entry', () => {
beforeEach(angular.mock.inject($componentController => {
$element = angular.element(``);
controller = $componentController('vnLatestBuysSearchPanel', {$element});
+ controller.model = {addFilter: () => {}};
}));
- describe('filter() setter', () => {
- it(`should set the tags property to the scope filter with an empty array`, () => {
- const expectedFilter = {
- tags: [{}]
- };
- controller.filter = null;
+ describe('removeItemFilter()', () => {
+ it(`should remove param from filter`, () => {
+ controller.filter = {tags: [], categoryFk: 1, typeFk: 1};
+ const expectFilter = {tags: [], categoryFk: null, typeFk: null};
- expect(controller.filter).toEqual(expectedFilter);
- });
+ controller.removeItemFilter('categoryFk');
- it(`should set the tags property to the scope filter with an array of tags`, () => {
- const expectedFilter = {
- description: 'My item',
- tags: [{}]
- };
- const expectedFieldFilter = [{
- info: {
- label: 'description',
- name: 'description',
- type: null
- },
- name: 'description',
- value: 'My item'
- }];
- controller.filter = {
- description: 'My item'
- };
-
- expect(controller.filter).toEqual(expectedFilter);
- expect(controller.fieldFilters).toEqual(expectedFieldFilter);
+ expect(controller.filter).toEqual(expectFilter);
});
});
- describe('removeField()', () => {
- it(`should remove the description property from the fieldFilters and from the scope filter`, () => {
- const expectedFilter = {tags: [{}]};
- controller.filter = {description: 'My item'};
+ describe('removeTag()', () => {
+ it(`should remove tag from filter`, () => {
+ const tag = {tagFk: 1, value: 'Value'};
+ controller.filter = {tags: [tag]};
+ const expectFilter = {tags: []};
- controller.removeField(0, 'description');
+ controller.removeTag(tag);
- expect(controller.filter).toEqual(expectedFilter);
- expect(controller.fieldFilters).toEqual([]);
+ expect(controller.filter).toEqual(expectFilter);
+ });
+ });
+
+ describe('showTagInfo()', () => {
+ it(`should show tag value`, () => {
+ const tag = {value: 'Value'};
+ const result = controller.showTagInfo(tag);
+
+ expect(result).toEqual('Value');
+ });
+
+ it(`should show tag name and value`, () => {
+ const tag = {tagFk: 1, value: 'Value'};
+ controller.tags = [{id: 1, name: 'tagName'}];
+ const result = controller.showTagInfo(tag);
+
+ expect(result).toEqual('tagName: Value');
});
});
});
diff --git a/modules/entry/front/latest-buys-search-panel/style.scss b/modules/entry/front/latest-buys-search-panel/style.scss
new file mode 100644
index 000000000..ec189c7e4
--- /dev/null
+++ b/modules/entry/front/latest-buys-search-panel/style.scss
@@ -0,0 +1,70 @@
+@import "variables";
+
+vn-latest-buys-search-panel vn-side-menu div {
+ & > .input {
+ padding-left: $spacing-md;
+ padding-right: $spacing-md;
+ border-color: $color-spacer;
+ border-bottom: $border-thin;
+ }
+ & > .horizontal {
+ grid-auto-flow: column;
+ grid-column-gap: $spacing-sm;
+ align-items: center;
+ }
+ & > .checks {
+ padding: $spacing-md;
+ flex-wrap: wrap;
+ border-color: $color-spacer;
+ border-bottom: $border-thin;
+ }
+ & > .tags {
+ padding: $spacing-md;
+ padding-bottom: 0%;
+ padding-top: 0%;
+ align-items: center;
+ }
+ & > .chips {
+ display: flex;
+ flex-wrap: wrap;
+ padding: $spacing-md;
+ overflow: hidden;
+ max-width: 100%;
+ border-color: $color-spacer;
+ border-top: $border-thin;
+ }
+ & > .item-category {
+ padding: $spacing-sm;
+ justify-content: flex-start;
+ align-items: flex-start;
+ flex-wrap: wrap;
+
+ vn-autocomplete[vn-id="category"] {
+ display: none;
+ }
+
+ & > vn-one {
+ padding: $spacing-sm;
+ min-width: 33.33%;
+ text-align: center;
+ box-sizing: border-box;
+
+ & > vn-icon {
+ padding: $spacing-sm;
+ background-color: $color-font-secondary;
+ border-radius: 50%;
+ cursor: pointer;
+
+ &.active {
+ background-color: $color-main;
+ color: #fff;
+ }
+ & > i:before {
+ font-size: 2.6rem;
+ width: 16px;
+ height: 16px;
+ }
+ }
+ }
+ }
+}
diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html
index fc44ddfc2..727b19220 100644
--- a/modules/entry/front/latest-buys/index.html
+++ b/modules/entry/front/latest-buys/index.html
@@ -7,17 +7,11 @@
on-data-change="$ctrl.reCheck()"
auto-load="true">
-
-
-
+
+
+
-
+
{
const options = {transaction: tx};
try {
- const from = new Date();
- const to = new Date();
+ const from = Date.vnNew();
+ const to = Date.vnNew();
from.setHours(0, 0, 0, 0);
to.setHours(23, 59, 59, 999);
to.setDate(to.getDate() + 1);
diff --git a/modules/invoiceIn/front/basic-data/index.spec.js b/modules/invoiceIn/front/basic-data/index.spec.js
index 09aa08293..98710ac35 100644
--- a/modules/invoiceIn/front/basic-data/index.spec.js
+++ b/modules/invoiceIn/front/basic-data/index.spec.js
@@ -78,7 +78,7 @@ describe('InvoiceIn', () => {
description: 'This is a description',
files: [{
lastModified: 1668673957761,
- lastModifiedDate: new Date(),
+ lastModifiedDate: Date.vnNew(),
name: 'file-example.png',
size: 19653,
type: 'image/png',
diff --git a/modules/invoiceIn/front/descriptor/index.js b/modules/invoiceIn/front/descriptor/index.js
index 4dc89a459..e005211a3 100644
--- a/modules/invoiceIn/front/descriptor/index.js
+++ b/modules/invoiceIn/front/descriptor/index.js
@@ -75,7 +75,7 @@ class Controller extends Descriptor {
filter: {
where: {
invoiceInFk: id,
- dueDated: {gte: new Date()}
+ dueDated: {gte: Date.vnNew()}
}
}})
.then(res => {
diff --git a/modules/invoiceIn/front/dueDay/index.js b/modules/invoiceIn/front/dueDay/index.js
index 3cc1c81e8..ee9b13e5c 100644
--- a/modules/invoiceIn/front/dueDay/index.js
+++ b/modules/invoiceIn/front/dueDay/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
class Controller extends Section {
add() {
this.$.model.insert({
- dueDated: new Date(),
+ dueDated: Date.vnNew(),
bankFk: this.vnConfig.local.bankFk
});
}
diff --git a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
index d42184ae5..f3c7a5093 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
@@ -60,9 +60,9 @@ module.exports = Self => {
try {
query = `
SELECT MAX(issued) issued
- FROM vn.invoiceOut io
- JOIN vn.time t ON t.dated = io.issued
- WHERE io.serial = 'A'
+ FROM vn.invoiceOut io
+ JOIN vn.time t ON t.dated = io.issued
+ WHERE io.serial = 'A'
AND t.year = YEAR(?)
AND io.companyFk = ?`;
const [maxIssued] = await Self.rawSql(query, [
@@ -77,7 +77,7 @@ module.exports = Self => {
if (args.invoiceDate < args.maxShipped)
args.maxShipped = args.invoiceDate;
- const minShipped = new Date();
+ const minShipped = Date.vnNew();
minShipped.setFullYear(minShipped.getFullYear() - 1);
minShipped.setMonth(1);
minShipped.setDate(1);
@@ -131,11 +131,11 @@ module.exports = Self => {
const models = Self.app.models;
const args = ctx.args;
const query = `SELECT DISTINCT clientFk AS id
- FROM ticket t
+ FROM ticket t
JOIN ticketPackaging tp ON t.id = tp.ticketFk
JOIN client c ON c.id = t.clientFk
WHERE t.shipped BETWEEN '2017-11-21' AND ?
- AND t.clientFk >= ?
+ AND t.clientFk >= ?
AND (t.clientFk <= ? OR ? IS NULL)
AND c.isActive`;
return models.InvoiceOut.rawSql(query, [
@@ -149,16 +149,16 @@ module.exports = Self => {
async function getInvoiceableClients(ctx, options) {
const models = Self.app.models;
const args = ctx.args;
- const minShipped = new Date();
+ const minShipped = Date.vnNew();
minShipped.setFullYear(minShipped.getFullYear() - 1);
const query = `SELECT
c.id,
SUM(IFNULL
(
- s.quantity *
+ s.quantity *
s.price * (100-s.discount)/100,
- 0)
+ 0)
+ IFNULL(ts.quantity * ts.price,0)
) AS sumAmount,
c.hasToInvoiceByAddress,
@@ -170,7 +170,7 @@ module.exports = Self => {
LEFT JOIN ticketService ts ON ts.ticketFk = t.id
JOIN address a ON a.id = t.addressFk
JOIN client c ON c.id = t.clientFk
- WHERE ISNULL(t.refFk) AND c.id >= ?
+ WHERE ISNULL(t.refFk) AND c.id >= ?
AND (t.clientFk <= ? OR ? IS NULL)
AND t.shipped BETWEEN ? AND util.dayEnd(?)
AND t.companyFk = ? AND c.hasToInvoice
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
index 297afa8e8..a458aa18e 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
@@ -108,14 +108,14 @@ module.exports = Self => {
throw new UserError(`This client is not invoiceable`);
// Can't invoice tickets into future
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
if (maxShipped >= tomorrow)
throw new UserError(`Can't invoice to future`);
const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
- if (new Date() < maxInvoiceDate)
+ if (Date.vnNew() < maxInvoiceDate)
throw new UserError(`Can't invoice to past`);
if (ticketId) {
@@ -155,7 +155,7 @@ module.exports = Self => {
async function isInvoiceable(clientId, options) {
const models = Self.app.models;
const query = `SELECT (hasToInvoice AND isTaxDataChecked) AS invoiceable
- FROM client
+ FROM client
WHERE id = ?`;
const [result] = await models.InvoiceOut.rawSql(query, [clientId], options);
@@ -172,12 +172,12 @@ module.exports = Self => {
async function getMaxIssued(serial, companyId, options) {
const models = Self.app.models;
- const query = `SELECT MAX(issued) AS issued
- FROM invoiceOut
+ const query = `SELECT MAX(issued) AS issued
+ FROM invoiceOut
WHERE serial = ? AND companyFk = ?`;
const [maxIssued] = await models.InvoiceOut.rawSql(query,
[serial, companyId], options);
- const maxInvoiceDate = maxIssued && maxIssued.issued || new Date();
+ const maxInvoiceDate = maxIssued && maxIssued.issued || Date.vnNew();
return maxInvoiceDate;
}
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js
index e5cf5fda0..d3d789393 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('InvoiceOut filter()', () => {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(2, 0, 0, 0);
it('should return the invoice out matching ref', async() => {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js
index 5f890de26..9a0574dba 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js
@@ -5,7 +5,7 @@ describe('InvoiceOut invoiceClient()', () => {
const clientId = 1101;
const addressId = 121;
const companyFk = 442;
- const minShipped = new Date();
+ const minShipped = Date.vnNew();
minShipped.setFullYear(minShipped.getFullYear() - 1);
minShipped.setMonth(1);
minShipped.setDate(1);
@@ -33,8 +33,8 @@ describe('InvoiceOut invoiceClient()', () => {
ctx.args = {
clientId: clientId,
addressId: addressId,
- invoiceDate: new Date(),
- maxShipped: new Date(),
+ invoiceDate: Date.vnNew(),
+ maxShipped: Date.vnNew(),
companyFk: companyFk,
minShipped: minShipped
};
diff --git a/modules/invoiceOut/front/index/global-invoicing/index.js b/modules/invoiceOut/front/index/global-invoicing/index.js
index f772a4936..0c5773adc 100644
--- a/modules/invoiceOut/front/index/global-invoicing/index.js
+++ b/modules/invoiceOut/front/index/global-invoicing/index.js
@@ -6,7 +6,7 @@ class Controller extends Dialog {
constructor($element, $, $transclude) {
super($element, $, $transclude);
this.invoice = {
- maxShipped: new Date()
+ maxShipped: Date.vnNew()
};
this.clientsNumber = 'allClients';
}
diff --git a/modules/invoiceOut/front/index/global-invoicing/index.spec.js b/modules/invoiceOut/front/index/global-invoicing/index.spec.js
index e88b0b1d4..aa9674b0e 100644
--- a/modules/invoiceOut/front/index/global-invoicing/index.spec.js
+++ b/modules/invoiceOut/front/index/global-invoicing/index.spec.js
@@ -76,8 +76,8 @@ describe('InvoiceOut', () => {
jest.spyOn(controller.vnApp, 'showError');
controller.invoice = {
- invoiceDate: new Date(),
- maxShipped: new Date()
+ invoiceDate: Date.vnNew(),
+ maxShipped: Date.vnNew()
};
controller.responseHandler('accept');
@@ -88,14 +88,14 @@ describe('InvoiceOut', () => {
it('should make an http POST query and then call to the showSuccess() method', () => {
jest.spyOn(controller.vnApp, 'showSuccess');
- const minShipped = new Date();
+ const minShipped = Date.vnNew();
minShipped.setFullYear(minShipped.getFullYear() - 1);
minShipped.setMonth(1);
minShipped.setDate(1);
minShipped.setHours(0, 0, 0, 0);
controller.invoice = {
- invoiceDate: new Date(),
- maxShipped: new Date(),
+ invoiceDate: Date.vnNew(),
+ maxShipped: Date.vnNew(),
fromClientId: 1101,
toClientId: 1101,
companyFk: 442,
diff --git a/modules/invoiceOut/front/index/manual/index.js b/modules/invoiceOut/front/index/manual/index.js
index ed50e37da..3abe4b825 100644
--- a/modules/invoiceOut/front/index/manual/index.js
+++ b/modules/invoiceOut/front/index/manual/index.js
@@ -8,7 +8,7 @@ class Controller extends Dialog {
this.isInvoicing = false;
this.invoice = {
- maxShipped: new Date()
+ maxShipped: Date.vnNew()
};
}
diff --git a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
index 68eacfbad..5c3fec7d6 100644
--- a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
+++ b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('upsertFixedPrice()', () => {
- const now = new Date();
+ const now = Date.vnNew();
const fixedPriceId = 1;
let originalFixedPrice;
diff --git a/modules/item/back/methods/item-image-queue/downloadImages.js b/modules/item/back/methods/item-image-queue/downloadImages.js
index 05b223598..0f57856c7 100644
--- a/modules/item/back/methods/item-image-queue/downloadImages.js
+++ b/modules/item/back/methods/item-image-queue/downloadImages.js
@@ -27,7 +27,7 @@ module.exports = Self => {
});
for (let image of images) {
- const currentStamp = new Date().getTime();
+ const currentStamp = Date.vnNew().getTime();
const updatedStamp = image.updated.getTime();
const graceTime = Math.abs(currentStamp - updatedStamp);
const maxTTL = 3600 * 48 * 1000; // 48 hours in ms;
@@ -97,7 +97,7 @@ module.exports = Self => {
await row.updateAttributes({
error: error,
attempts: row.attempts + 1,
- updated: new Date()
+ updated: Date.vnNew()
});
}
diff --git a/modules/item/back/methods/item/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js
index b291ad9b4..612f64022 100644
--- a/modules/item/back/methods/item/getVisibleAvailable.js
+++ b/modules/item/back/methods/item/getVisibleAvailable.js
@@ -29,7 +29,7 @@ module.exports = Self => {
}
});
- Self.getVisibleAvailable = async(id, warehouseFk, dated = new Date(), options) => {
+ Self.getVisibleAvailable = async(id, warehouseFk, dated = Date.vnNew(), options) => {
const myOptions = {};
if (typeof options == 'object')
diff --git a/modules/item/back/methods/item/getWasteByItem.js b/modules/item/back/methods/item/getWasteByItem.js
index b93d534da..56b90b04a 100644
--- a/modules/item/back/methods/item/getWasteByItem.js
+++ b/modules/item/back/methods/item/getWasteByItem.js
@@ -32,7 +32,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 wastes = await Self.rawSql(`
SELECT *, 100 * dwindle / total AS percentage
@@ -43,7 +43,7 @@ module.exports = Self => {
sum(ws.saleTotal) AS total,
sum(ws.saleWaste) AS dwindle
FROM bs.waste ws
- WHERE buyer = ? AND family = ?
+ WHERE buyer = ? AND family = ?
AND year = YEAR(TIMESTAMPADD(WEEK,-1, ?))
AND week = WEEK(TIMESTAMPADD(WEEK,-1, ?), 1)
GROUP BY buyer, itemFk
diff --git a/modules/item/back/methods/item/getWasteByWorker.js b/modules/item/back/methods/item/getWasteByWorker.js
index 4c3c64a91..8fa351eed 100644
--- a/modules/item/back/methods/item/getWasteByWorker.js
+++ b/modules/item/back/methods/item/getWasteByWorker.js
@@ -19,7 +19,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 wastes = await Self.rawSql(`
SELECT *, 100 * dwindle / total AS percentage
diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js
index 0878e3242..dfbcaa69f 100644
--- a/modules/item/back/methods/item/regularize.js
+++ b/modules/item/back/methods/item/regularize.js
@@ -94,8 +94,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.companyId = null;
ctx.args.agencyModeId = null;
ctx.args.routeId = null;
@@ -106,10 +106,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({
diff --git a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
index 8e4864ee8..13b2417d7 100644
--- a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
+++ b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
@@ -8,7 +8,7 @@ describe('item getVisibleAvailable()', () => {
try {
const itemFk = 1;
const warehouseFk = 1;
- const dated = new Date();
+ const dated = Date.vnNew();
const result = await models.Item.getVisibleAvailable(itemFk, warehouseFk, dated, options);
@@ -29,7 +29,7 @@ describe('item getVisibleAvailable()', () => {
try {
const itemFk = 1;
const warehouseFk = 1;
- const dated = new Date();
+ const dated = Date.vnNew();
dated.setDate(dated.getDate() - 1);
const result = await models.Item.getVisibleAvailable(itemFk, warehouseFk, dated, options);
diff --git a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
index 25e661aee..00488e534 100644
--- a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
+++ b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
@@ -1,9 +1,9 @@
const {models} = require('vn-loopback/server/server');
describe('item lastEntriesFilter()', () => {
it('should return one entry for the given item', async() => {
- 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);
const tx = await models.Item.beginTransaction({});
@@ -23,11 +23,11 @@ describe('item lastEntriesFilter()', () => {
});
it('should return five entries for the given item', async() => {
- const minDate = new Date();
+ const minDate = Date.vnNew();
minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2, 1);
- const maxDate = new Date();
+ const maxDate = Date.vnNew();
maxDate.setHours(23, 59, 59, 59);
const tx = await models.Item.beginTransaction({});
diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js
index 0acc7c8f6..972c89ae0 100644
--- a/modules/item/front/descriptor/index.js
+++ b/modules/item/front/descriptor/index.js
@@ -83,7 +83,7 @@ class Controller extends Descriptor {
}
onUploadResponse() {
- const timestamp = new Date().getTime();
+ const timestamp = Date.vnNew().getTime();
const src = this.$rootScope.imagePath('catalog', '200x200', this.item.id);
const zoomSrc = this.$rootScope.imagePath('catalog', '1600x900', this.item.id);
const newSrc = `${src}&t=${timestamp}`;
diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index cc965a76e..945e1fd31 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -7,7 +7,7 @@ class Controller extends Section {
super($element, $scope);
this.$anchorScroll = $anchorScroll;
this.$location = $location;
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
this.today = today.toJSON();
}
diff --git a/modules/item/front/fixed-price/index.spec.js b/modules/item/front/fixed-price/index.spec.js
index db9579444..5f28e22b1 100644
--- a/modules/item/front/fixed-price/index.spec.js
+++ b/modules/item/front/fixed-price/index.spec.js
@@ -24,7 +24,7 @@ describe('fixed price', () => {
});
it('should perform an http request to update the price', () => {
- const now = new Date();
+ const now = Date.vnNew();
jest.spyOn(controller.vnApp, 'showSuccess');
$httpBackend.expectPATCH('FixedPrices/upsertFixedPrice').respond();
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 014761da9..0c6804838 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -5,11 +5,11 @@ class Controller extends Section {
constructor($element, $) {
super($element, $);
- const from = new Date();
+ const from = Date.vnNew();
from.setDate(from.getDate() - 75);
from.setHours(0, 0, 0, 0);
- const to = new Date();
+ const to = Date.vnNew();
to.setDate(to.getDate() + 10);
to.setHours(23, 59, 59, 59);
diff --git a/modules/item/front/request-search-panel/index.spec.js b/modules/item/front/request-search-panel/index.spec.js
index 2fb339209..56c76eabf 100644
--- a/modules/item/front/request-search-panel/index.spec.js
+++ b/modules/item/front/request-search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe(' Component vnRequestSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -26,7 +26,7 @@ describe(' Component vnRequestSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -35,8 +35,8 @@ describe(' Component vnRequestSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index 2fe08ada6..747cbeff2 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -7,10 +7,10 @@ export default class Controller extends Section {
super($element, $);
if (!this.$state.q) {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
- const nextWeek = new Date();
+ const nextWeek = Date.vnNew();
nextWeek.setHours(23, 59, 59, 59);
nextWeek.setDate(nextWeek.getDate() + 7);
@@ -27,7 +27,7 @@ export default class Controller extends Section {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
@@ -82,7 +82,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/item/front/request/index.spec.js b/modules/item/front/request/index.spec.js
index 0fc061023..aadeaddca 100644
--- a/modules/item/front/request/index.spec.js
+++ b/modules/item/front/request/index.spec.js
@@ -93,7 +93,7 @@ describe('Item', () => {
});
it(`should return "warning" if date is today`, () => {
- let date = new Date();
+ let date = Date.vnNew();
let result = controller.compareDate(date);
expect(result).toEqual('warning');
diff --git a/modules/mdb/back/methods/mdbApp/lock.js b/modules/mdb/back/methods/mdbApp/lock.js
index 98e61fb53..a12a93814 100644
--- a/modules/mdb/back/methods/mdbApp/lock.js
+++ b/modules/mdb/back/methods/mdbApp/lock.js
@@ -51,7 +51,7 @@ module.exports = Self => {
const updatedMdbApp = await mdbApp.updateAttributes({
userFk: userId,
- locked: new Date()
+ locked: Date.vnNew()
}, myOptions);
if (tx) await tx.commit();
diff --git a/modules/monitor/back/methods/sales-monitor/clientsFilter.js b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
index 09ea24eb1..13e38f8e1 100644
--- a/modules/monitor/back/methods/sales-monitor/clientsFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
@@ -34,7 +34,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 stmt = new ParameterizedSQL(`
SELECT
@@ -51,7 +51,7 @@ module.exports = Self => {
JOIN account.user u ON c.salesPersonFk = u.id
LEFT JOIN sharingCart sc ON sc.workerFk = c.salesPersonFk
AND ? BETWEEN sc.started AND sc.ended
- LEFT JOIN workerTeamCollegues wtc
+ LEFT JOIN workerTeamCollegues wtc
ON wtc.collegueFk = IFNULL(sc.workerSubstitute, c.salesPersonFk)`,
[date]);
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 7be130dda..881fc637a 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -104,7 +104,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const conn = Self.dataSource.connector;
const models = Self.app.models;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const args = ctx.args;
const myOptions = {};
diff --git a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
index bcb37830c..febfc5357 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
@@ -8,8 +8,8 @@ describe('SalesMonitor clientsFilter()', () => {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
- const from = new Date();
- const to = new Date();
+ const from = Date.vnNew();
+ const to = Date.vnNew();
from.setHours(0, 0, 0, 0);
to.setHours(23, 59, 59, 59);
@@ -35,9 +35,9 @@ describe('SalesMonitor clientsFilter()', () => {
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
- const today = new Date();
+ const today = Date.vnNew();
yesterday.setHours(0, 0, 0, 0);
today.setHours(23, 59, 59, 59);
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index d2e1a5bec..4e0fb85b7 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -26,9 +26,9 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -54,10 +54,10 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -205,10 +205,10 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
@@ -234,10 +234,10 @@ describe('SalesMonitor salesFilter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
diff --git a/modules/monitor/front/index/clients/index.js b/modules/monitor/front/index/clients/index.js
index 58613f09d..ac3ce9140 100644
--- a/modules/monitor/front/index/clients/index.js
+++ b/modules/monitor/front/index/clients/index.js
@@ -5,7 +5,7 @@ export default class Controller extends Section {
constructor($element, $) {
super($element, $);
- const date = new Date();
+ const date = Date.vnNew();
this.dateFrom = date;
this.dateTo = date;
this.filter = {
@@ -64,9 +64,9 @@ export default class Controller extends Section {
let from = this.dateFrom;
let to = this.dateTo;
if (!from)
- from = new Date();
+ from = Date.vnNew();
if (!to)
- to = new Date();
+ to = Date.vnNew();
const minHour = new Date(from);
minHour.setHours(0, 0, 0, 0);
const maxHour = new Date(to);
diff --git a/modules/monitor/front/index/orders/index.js b/modules/monitor/front/index/orders/index.js
index e3a47f68b..40100b79f 100644
--- a/modules/monitor/front/index/orders/index.js
+++ b/modules/monitor/front/index/orders/index.js
@@ -26,7 +26,7 @@ export default class Controller extends Section {
}
chipColor(date) {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const orderLanded = new Date(date);
diff --git a/modules/monitor/front/index/search-panel/index.spec.js b/modules/monitor/front/index/search-panel/index.spec.js
index f862e8d77..18cf1abfc 100644
--- a/modules/monitor/front/index/search-panel/index.spec.js
+++ b/modules/monitor/front/index/search-panel/index.spec.js
@@ -38,7 +38,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -49,7 +49,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -58,8 +58,8 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js
index 91d9079d8..2f2dead05 100644
--- a/modules/monitor/front/index/tickets/index.js
+++ b/modules/monitor/front/index/tickets/index.js
@@ -91,7 +91,7 @@ export default class Controller extends Section {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
@@ -105,7 +105,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/monitor/front/index/tickets/index.spec.js b/modules/monitor/front/index/tickets/index.spec.js
index 5d42743c1..c12ea6844 100644
--- a/modules/monitor/front/index/tickets/index.spec.js
+++ b/modules/monitor/front/index/tickets/index.spec.js
@@ -32,7 +32,7 @@ describe('Component vnMonitorSalesTickets', () => {
let params = controller.fetchParams({
scopeDays: 2
});
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
to.setDate(to.getDate() + params.scopeDays);
@@ -66,14 +66,14 @@ describe('Component vnMonitorSalesTickets', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -81,7 +81,7 @@ describe('Component vnMonitorSalesTickets', () => {
});
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.compareDate(pastDate);
@@ -99,7 +99,7 @@ describe('Component vnMonitorSalesTickets', () => {
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
- const now = new Date();
+ const now = Date.vnNew();
const today = now.getDate();
diff --git a/modules/order/back/methods/order/specs/new.spec.js b/modules/order/back/methods/order/specs/new.spec.js
index 5873189f8..f11367579 100644
--- a/modules/order/back/methods/order/specs/new.spec.js
+++ b/modules/order/back/methods/order/specs/new.spec.js
@@ -9,7 +9,7 @@ describe('order new()', () => {
try {
const options = {transaction: tx};
- const landed = new Date();
+ const landed = Date.vnNew();
const addressFk = 6;
const agencyModeFk = 1;
@@ -30,7 +30,7 @@ describe('order new()', () => {
try {
const options = {transaction: tx};
- const landed = new Date();
+ const landed = Date.vnNew();
const addressFk = 121;
const agencyModeFk = 1;
diff --git a/modules/order/front/basic-data/index.spec.js b/modules/order/front/basic-data/index.spec.js
index 01009d085..21dee0765 100644
--- a/modules/order/front/basic-data/index.spec.js
+++ b/modules/order/front/basic-data/index.spec.js
@@ -46,7 +46,7 @@ describe('Order', () => {
it('should set agencyModeFk to null and get the available agencies if the order has landed and client', async() => {
controller.order.agencyModeFk = 999;
controller.order.addressFk = 999;
- controller.order.landed = new Date();
+ controller.order.landed = Date.vnNew();
const expectedAgencies = [{id: 1}, {id: 2}];
diff --git a/modules/order/front/index/index.js b/modules/order/front/index/index.js
index a8e6e977e..750f2e226 100644
--- a/modules/order/front/index/index.js
+++ b/modules/order/front/index/index.js
@@ -8,7 +8,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
date = new Date(date);
diff --git a/modules/order/front/index/index.spec.js b/modules/order/front/index/index.spec.js
index 5b85b3333..abe336478 100644
--- a/modules/order/front/index/index.spec.js
+++ b/modules/order/front/index/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnOrderIndex', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let curDate = new Date();
+ let curDate = Date.vnNew();
let result = controller.compareDate(curDate);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -41,7 +41,7 @@ describe('Component vnOrderIndex', () => {
});
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.compareDate(pastDate);
diff --git a/modules/route/back/methods/agency-term/filter.js b/modules/route/back/methods/agency-term/filter.js
index 0ecec7e88..9d1268958 100644
--- a/modules/route/back/methods/agency-term/filter.js
+++ b/modules/route/back/methods/agency-term/filter.js
@@ -74,35 +74,35 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const stmts = [];
const stmt = new ParameterizedSQL(
`SELECT *
FROM (
- SELECT r.id routeFk,
- r.created,
- r.agencyModeFk,
+ SELECT r.id routeFk,
+ r.created,
+ r.agencyModeFk,
am.name agencyModeName,
- am.agencyFk,
+ am.agencyFk,
a.name agencyAgreement,
SUM(t.packages) packages,
r.m3,
- r.kmEnd - r.kmStart kmTotal,
- CAST(IFNULL(sat.routePrice,
- (sat.kmPrice * (GREATEST(r.kmEnd - r.kmStart , sat.minimumKm))
- + GREATEST(r.m3 , sat.minimumM3) * sat.m3Price)
- + sat.packagePrice * SUM(t.packages) )
+ r.kmEnd - r.kmStart kmTotal,
+ CAST(IFNULL(sat.routePrice,
+ (sat.kmPrice * (GREATEST(r.kmEnd - r.kmStart , sat.minimumKm))
+ + GREATEST(r.m3 , sat.minimumM3) * sat.m3Price)
+ + sat.packagePrice * SUM(t.packages) )
AS DECIMAL(10,2)) price,
r.invoiceInFk,
sat.supplierFk,
s.name supplierName
FROM vn.route r
- LEFT JOIN vn.agencyMode am ON r.agencyModeFk = am.id
+ LEFT JOIN vn.agencyMode am ON r.agencyModeFk = am.id
LEFT JOIN vn.agency a ON am.agencyFk = a.id
LEFT JOIN vn.ticket t ON t.routeFk = r.id
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
- LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
+ LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
WHERE r.created > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
GROUP BY r.id
) a`
diff --git a/modules/route/back/methods/agency-term/specs/filter.spec.js b/modules/route/back/methods/agency-term/specs/filter.spec.js
index d6c00e585..41e696157 100644
--- a/modules/route/back/methods/agency-term/specs/filter.spec.js
+++ b/modules/route/back/methods/agency-term/specs/filter.spec.js
@@ -3,7 +3,7 @@ const models = require('vn-loopback/server/server').models;
describe('AgencyTerm filter()', () => {
const authUserId = 9;
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(2, 0, 0, 0);
it('should return all results matching the filter', async() => {
@@ -57,10 +57,10 @@ describe('AgencyTerm 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 = {
diff --git a/modules/route/back/methods/route/specs/clone.spec.js b/modules/route/back/methods/route/specs/clone.spec.js
index d1fc6b297..9192854f8 100644
--- a/modules/route/back/methods/route/specs/clone.spec.js
+++ b/modules/route/back/methods/route/specs/clone.spec.js
@@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('route clone()', () => {
- const createdDate = new Date();
+ const createdDate = Date.vnNew();
it('should throw an error if the amount of ids pased to the clone function do no match the database', async() => {
const ids = [996, 997, 998, 999];
diff --git a/modules/route/back/methods/route/specs/filter.spec.js b/modules/route/back/methods/route/specs/filter.spec.js
index 9d481f21e..18c0ca04f 100644
--- a/modules/route/back/methods/route/specs/filter.spec.js
+++ b/modules/route/back/methods/route/specs/filter.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
const models = require('vn-loopback/server/server').models;
describe('Route filter()', () => {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(2, 0, 0, 0);
it('should return the routes matching "search"', async() => {
@@ -23,10 +23,10 @@ describe('Route 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 = {
args: {
diff --git a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
index bb38cb50e..0acc6c1a7 100644
--- a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
+++ b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
@@ -23,7 +23,7 @@ describe('route getSuggestedTickets()', () => {
await ticketInRoute.updateAttributes({
routeFk: null,
- landed: new Date()
+ landed: Date.vnNew()
}, options);
const result = await models.Route.getSuggestedTickets(routeID, options);
diff --git a/modules/route/back/methods/route/specs/insertTicket.spec.js b/modules/route/back/methods/route/specs/insertTicket.spec.js
index 7c60e755f..19d02e1ef 100644
--- a/modules/route/back/methods/route/specs/insertTicket.spec.js
+++ b/modules/route/back/methods/route/specs/insertTicket.spec.js
@@ -23,7 +23,7 @@ describe('route insertTicket()', () => {
const ticketInRoute = await app.models.Ticket.findById(ticketId, null, options);
await ticketInRoute.updateAttributes({
routeFk: null,
- landed: new Date()
+ landed: Date.vnNew()
}, options);
const result = await app.models.Route.insertTicket(routeId, ticketId, options);
diff --git a/modules/route/back/methods/route/updateWorkCenter.js b/modules/route/back/methods/route/updateWorkCenter.js
index 7796fba41..75169ce7e 100644
--- a/modules/route/back/methods/route/updateWorkCenter.js
+++ b/modules/route/back/methods/route/updateWorkCenter.js
@@ -33,12 +33,13 @@ module.exports = Self => {
}
try {
+ const date = Date.vnNew();
const [result] = await Self.rawSql(`
SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter
FROM vn.routeConfig r
LEFT JOIN vn.workerLabour wl ON wl.workerFk = ?
- AND CURDATE() BETWEEN wl.started AND IFNULL(wl.ended, CURDATE());
- `, [userId], myOptions);
+ AND ? BETWEEN wl.started AND IFNULL(wl.ended, ?);
+ `, [userId, date, date], myOptions);
const route = await models.Route.findById(id, null, myOptions);
await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions);
diff --git a/modules/route/front/index/index.js b/modules/route/front/index/index.js
index 94f6db09c..7c19a26cd 100644
--- a/modules/route/front/index/index.js
+++ b/modules/route/front/index/index.js
@@ -54,7 +54,7 @@ export default class Controller extends Section {
openClonationDialog() {
this.$.clonationDialog.show();
- this.createdDate = new Date();
+ this.createdDate = Date.vnNew();
}
cloneSelectedRoutes() {
diff --git a/modules/route/front/index/index.spec.js b/modules/route/front/index/index.spec.js
index c1f414d5e..399ece714 100644
--- a/modules/route/front/index/index.spec.js
+++ b/modules/route/front/index/index.spec.js
@@ -58,7 +58,7 @@ describe('Component vnRouteIndex', () => {
describe('cloneSelectedRoutes()', () => {
it('should perform an http request to Routes/clone', () => {
- controller.createdDate = new Date();
+ controller.createdDate = Date.vnNew();
$httpBackend.expect('POST', 'Routes/clone').respond();
controller.cloneSelectedRoutes();
diff --git a/modules/route/front/main/index.js b/modules/route/front/main/index.js
index 938f81bcc..8c57bbad6 100644
--- a/modules/route/front/main/index.js
+++ b/modules/route/front/main/index.js
@@ -3,11 +3,11 @@ import ModuleMain from 'salix/components/module-main';
export default class Route extends ModuleMain {
$postLink() {
- const to = new Date();
+ const to = Date.vnNew();
to.setDate(to.getDate() + 1);
to.setHours(0, 0, 0, 0);
- const from = new Date();
+ const from = Date.vnNew();
from.setDate(from.getDate());
from.setHours(0, 0, 0, 0);
@@ -21,7 +21,7 @@ export default class Route extends ModuleMain {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
diff --git a/modules/route/front/main/index.spec.js b/modules/route/front/main/index.spec.js
index e5724b493..0c16a7b1f 100644
--- a/modules/route/front/main/index.spec.js
+++ b/modules/route/front/main/index.spec.js
@@ -15,7 +15,7 @@ describe('Route Component vnRoute', () => {
let params = controller.fetchParams({
scopeDays: 2
});
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
to.setDate(to.getDate() + params.scopeDays);
diff --git a/modules/route/front/search-panel/index.spec.js b/modules/route/front/search-panel/index.spec.js
index 16e1a5cfc..ae15e16e4 100644
--- a/modules/route/front/search-panel/index.spec.js
+++ b/modules/route/front/search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe('Route Component vnRouteSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -26,7 +26,7 @@ describe('Route Component vnRouteSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -35,8 +35,8 @@ describe('Route Component vnRouteSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/supplier/front/consumption/index.js b/modules/supplier/front/consumption/index.js
index 8de6a1e71..9af0d1747 100644
--- a/modules/supplier/front/consumption/index.js
+++ b/modules/supplier/front/consumption/index.js
@@ -11,11 +11,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 = {
diff --git a/modules/supplier/front/consumption/index.spec.js b/modules/supplier/front/consumption/index.spec.js
index ebf19ccec..0ac531a68 100644
--- a/modules/supplier/front/consumption/index.spec.js
+++ b/modules/supplier/front/consumption/index.spec.js
@@ -28,7 +28,7 @@ describe('Supplier', () => {
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
@@ -86,7 +86,7 @@ describe('Supplier', () => {
{id: 1, email: 'batman@gothamcity.com'}
]);
- const now = new Date();
+ const now = Date.vnNew();
controller.$.model.userParams = {
from: now,
to: now
diff --git a/modules/supplier/front/descriptor/index.js b/modules/supplier/front/descriptor/index.js
index a26d9c510..9f23ce68c 100644
--- a/modules/supplier/front/descriptor/index.js
+++ b/modules/supplier/front/descriptor/index.js
@@ -13,7 +13,7 @@ class Controller extends Descriptor {
get entryFilter() {
if (!this.supplier) return null;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const from = new Date(date.getTime());
diff --git a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
index 67919e76c..ac397d38e 100644
--- a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
@@ -14,7 +14,7 @@ describe('ticket moveExpeditions()', () => {
const options = {transaction: tx};
myCtx.args = {
clientId: 1101,
- landed: new Date(),
+ landed: Date.vnNew(),
warehouseId: 1,
addressId: 121,
agencyModeId: 1,
diff --git a/modules/ticket/back/methods/sale/getClaimableFromTicket.js b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
index ecbc52b94..c51781f59 100644
--- a/modules/ticket/back/methods/sale/getClaimableFromTicket.js
+++ b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
@@ -24,24 +24,24 @@ 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
- s.id AS saleFk,
- t.id AS ticketFk,
+ SELECT
+ s.id AS saleFk,
+ t.id AS ticketFk,
t.landed,
- s.concept,
- s.itemFk,
- s.quantity,
- s.price,
- s.discount,
+ s.concept,
+ s.itemFk,
+ s.quantity,
+ s.price,
+ s.discount,
t.nickname
- FROM vn.ticket t
+ FROM vn.ticket t
INNER JOIN vn.sale s ON s.ticketFk = t.id
LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
- WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?)
+ WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?)
AND t.id = ? AND cb.id IS NULL
ORDER BY t.landed DESC, t.id DESC`;
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index c0c431636..febef9730 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -64,7 +64,7 @@ module.exports = Self => {
const refundTickets = [];
- const now = new Date();
+ const now = Date.vnNew();
const mappedTickets = new Map();
for (let ticketId of ticketsIds) {
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
index 746e1b7fc..175bc4e4b 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
+++ b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
@@ -9,7 +9,7 @@ describe('ticket changeState()', () => {
accessToken: {userId: 9},
};
const ctx = {req: activeCtx};
- const now = new Date();
+ const now = Date.vnNew();
const sampleTicket = {
shipped: now,
landed: now,
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index a009d63cf..6b8f9e71a 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -43,7 +43,7 @@ module.exports = function(Self) {
ticketBases => ticketBases.hasSomeNegativeBase
);
- const today = new Date();
+ const today = Date.vnNew();
const invalidTickets = tickets.some(ticket => {
const shipped = new Date(ticket.shipped);
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 327278c2b..3726d85b7 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -17,14 +17,14 @@ module.exports = Self => {
});
Self.closeAll = async() => {
- const toDate = new Date();
+ const toDate = Date.vnNew();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1);
- const todayMinDate = new Date();
+ const todayMinDate = Date.vnNew();
todayMinDate.setHours(0, 0, 0, 0);
- const todayMaxDate = new Date();
+ const todayMaxDate = Date.vnNew();
todayMaxDate.setHours(23, 59, 59, 59);
// Prevent closure for current day
@@ -32,7 +32,7 @@ module.exports = Self => {
throw new UserError('You cannot close tickets for today');
const tickets = await Self.rawSql(`
- SELECT
+ SELECT
t.id,
t.clientFk,
t.companyFk,
@@ -53,7 +53,7 @@ module.exports = Self => {
JOIN country co ON co.id = p.countryFk
LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
- AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
+ AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
AND util.dayEnd(?)
AND t.refFk IS NULL
GROUP BY t.id
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index a2add2e82..262b3fd74 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -137,7 +137,7 @@ module.exports = Self => {
Self.filter = async(ctx, filter, options) => {
const userId = ctx.req.accessToken.userId;
const conn = Self.dataSource.connector;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const models = Self.app.models;
const args = ctx.args;
@@ -295,10 +295,10 @@ module.exports = Self => {
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems');
stmt = new ParameterizedSQL(`
- CREATE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE TEMPORARY TABLE tmp.sale_getProblems
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
+ SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
@@ -350,7 +350,7 @@ module.exports = Self => {
const ticketsIndex = stmts.push(stmt) - 1;
stmts.push(
- `DROP TEMPORARY TABLE
+ `DROP TEMPORARY TABLE
tmp.filter,
tmp.ticket_problems`);
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index 4e9c22a24..9739f5985 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -26,7 +26,7 @@ module.exports = function(Self) {
Self.makeInvoice = async(ctx, ticketsIds, options) => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
- const date = new Date();
+ const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const myOptions = {};
diff --git a/modules/ticket/back/methods/ticket/restore.js b/modules/ticket/back/methods/ticket/restore.js
index c9bb126fd..722c3294e 100644
--- a/modules/ticket/back/methods/ticket/restore.js
+++ b/modules/ticket/back/methods/ticket/restore.js
@@ -38,7 +38,7 @@ module.exports = Self => {
}]
}, myOptions);
- const now = new Date();
+ const now = Date.vnNew();
const maxDate = new Date(ticket.updated);
maxDate.setHours(maxDate.getHours() + 1);
@@ -56,7 +56,7 @@ module.exports = Self => {
await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
}
- const fullYear = new Date().getFullYear();
+ const fullYear = Date.vnNew().getFullYear();
const newShipped = ticket.shipped;
const newLanded = ticket.landed;
newShipped.setFullYear(fullYear);
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index 8b7e1685d..806f80227 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -61,7 +61,7 @@ describe('ticket canBeInvoiced()', () => {
const ticket = await models.Ticket.findById(ticketId, null, options);
- const shipped = new Date();
+ const shipped = Date.vnNew();
shipped.setDate(shipped.getDate() + 1);
await ticket.updateAttribute('shipped', shipped, options);
diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index 3a9c2db50..d65c87654 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -4,8 +4,8 @@ const LoopBackContext = require('loopback-context');
describe('ticket componentUpdate()', () => {
const userID = 1101;
const ticketID = 11;
- const today = new Date();
- const tomorrow = new Date();
+ const today = Date.vnNew();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
@@ -19,11 +19,11 @@ describe('ticket componentUpdate()', () => {
beforeAll(async() => {
const deliveryComponenet = await models.Component.findOne({where: {code: 'delivery'}});
deliveryComponentId = deliveryComponenet.id;
- componentOfSaleSeven = `SELECT value
- FROM vn.saleComponent
+ componentOfSaleSeven = `SELECT value
+ FROM vn.saleComponent
WHERE saleFk = 7 AND componentFk = ${deliveryComponentId}`;
- componentOfSaleEight = `SELECT value
- FROM vn.saleComponent
+ componentOfSaleEight = `SELECT value
+ FROM vn.saleComponent
WHERE saleFk = 8 AND componentFk = ${deliveryComponentId}`;
[componentValue] = await models.SaleComponent.rawSql(componentOfSaleSeven);
firstvalueBeforeChange = componentValue.value;
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 688b0de61..6cc1a3ad2 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -26,9 +26,9 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -54,10 +54,10 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
const ctx = {req: {accessToken: {userId: 9}}, args: {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
index 7d3bc174d..11571bede 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
@@ -1,9 +1,9 @@
const models = require('vn-loopback/server/server').models;
describe('TicketFuture getTicketsAdvance()', () => {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
- let tomorrow = new Date();
+ let tomorrow = Date.vnNew();
tomorrow.setDate(today.getDate() + 1);
it('should return the tickets passing the required data', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
index 51639e304..44896493f 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('ticket getTicketsFuture()', () => {
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
it('should return the tickets passing the required data', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 275484f67..6b533e47c 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -5,8 +5,8 @@ describe('ticket merge()', () => {
const tickets = [{
originId: 13,
destinationId: 12,
- originShipped: new Date(),
- destinationShipped: new Date(),
+ originShipped: Date.vnNew(),
+ destinationShipped: Date.vnNew(),
workerFk: 1
}];
diff --git a/modules/ticket/back/methods/ticket/specs/new.spec.js b/modules/ticket/back/methods/ticket/specs/new.spec.js
index fce7cdceb..0a2f93bc4 100644
--- a/modules/ticket/back/methods/ticket/specs/new.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/new.spec.js
@@ -2,7 +2,7 @@ const models = require('vn-loopback/server/server').models;
let UserError = require('vn-loopback/util/user-error');
describe('ticket new()', () => {
- const today = new Date();
+ const today = Date.vnNew();
const ctx = {req: {accessToken: {userId: 1}}};
it('should throw an error if the client isnt frozen and isnt active', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index 5470382f9..1db1b6eaa 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -8,7 +8,7 @@ describe('sale priceDifference()', () => {
try {
const options = {transaction: tx};
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
const ctx = {req: {accessToken: {userId: 1106}}};
@@ -45,8 +45,8 @@ describe('sale priceDifference()', () => {
const ctx = {req: {accessToken: {userId: 1106}}};
ctx.args = {
id: 1,
- landed: new Date(),
- shipped: new Date(),
+ landed: Date.vnNew(),
+ shipped: Date.vnNew(),
addressId: 121,
zoneId: 3,
warehouseId: 1
@@ -68,7 +68,7 @@ describe('sale priceDifference()', () => {
try {
const options = {transaction: tx};
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
const ctx = {req: {accessToken: {userId: 1106}}};
diff --git a/modules/ticket/back/methods/ticket/specs/restore.spec.js b/modules/ticket/back/methods/ticket/specs/restore.spec.js
index bd976d124..3b35ae2b4 100644
--- a/modules/ticket/back/methods/ticket/specs/restore.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/restore.spec.js
@@ -24,8 +24,8 @@ describe('ticket restore()', () => {
let error;
const tx = await app.models.Ticket.beginTransaction({});
- const now = new Date();
- now.setHours(now.getHours() - 1);
+ const now = Date.vnNew();
+ now.setHours(now.getHours() - 1.1);
try {
const options = {transaction: tx};
@@ -46,7 +46,7 @@ describe('ticket restore()', () => {
it('should restore the ticket making its state no longer deleted', async() => {
const tx = await app.models.Ticket.beginTransaction({});
- const now = new Date();
+ const now = Date.vnNew();
try {
const options = {transaction: tx};
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index a29d2db97..779ada81a 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@@ -63,7 +63,7 @@ export default class Controller extends Section {
}
setDefaultFilter() {
- let today = new Date();
+ let today = Date.vnNew();
const tomorrow = new Date(today);
tomorrow.setDate(tomorrow.getDate() + 1);
this.filterParams = {
@@ -75,7 +75,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/advance/index.spec.js b/modules/ticket/front/advance/index.spec.js
index c5a04daee..6874f914b 100644
--- a/modules/ticket/front/advance/index.spec.js
+++ b/modules/ticket/front/advance/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnTicketAdvance', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -41,7 +41,7 @@ describe('Component vnTicketAdvance', () => {
});
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.compareDate(pastDate);
@@ -81,7 +81,7 @@ describe('Component vnTicketAdvance', () => {
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
- const now = new Date();
+ const now = Date.vnNew();
const today = now.getDate();
diff --git a/modules/ticket/front/basic-data/step-one/index.spec.js b/modules/ticket/front/basic-data/step-one/index.spec.js
index 2b14c18cc..30946dab0 100644
--- a/modules/ticket/front/basic-data/step-one/index.spec.js
+++ b/modules/ticket/front/basic-data/step-one/index.spec.js
@@ -67,7 +67,7 @@ describe('Ticket', () => {
jest.spyOn(controller, 'getShipped');
controller.ticket.addressFk = 99;
controller.addressId = 100;
- const landed = new Date();
+ const landed = Date.vnNew();
const expectedResult = {
landed: landed,
addressFk: 100,
@@ -101,7 +101,7 @@ describe('Ticket', () => {
describe('shipped() getter', () => {
it('should return the shipped property', () => {
- const shipped = new Date();
+ const shipped = Date.vnNew();
controller.ticket.shipped = shipped;
expect(controller.shipped).toEqual(shipped);
@@ -111,7 +111,7 @@ describe('Ticket', () => {
describe('shipped() setter', () => {
it('should set shipped property and call getLanded() method ', () => {
jest.spyOn(controller, 'getLanded');
- const shipped = new Date();
+ const shipped = Date.vnNew();
const expectedResult = {
shipped: shipped,
addressFk: 121,
@@ -126,7 +126,7 @@ describe('Ticket', () => {
describe('landed() getter', () => {
it('should return the landed property', () => {
- const landed = new Date();
+ const landed = Date.vnNew();
controller.ticket.landed = landed;
expect(controller.landed).toEqual(landed);
@@ -136,7 +136,7 @@ describe('Ticket', () => {
describe('landed() setter', () => {
it('should set shipped property and call getShipped() method ', () => {
jest.spyOn(controller, 'getShipped');
- const landed = new Date();
+ const landed = Date.vnNew();
const expectedResult = {
landed: landed,
addressFk: 121,
@@ -161,7 +161,7 @@ describe('Ticket', () => {
it('should set agencyModeId property and call getLanded() method', () => {
jest.spyOn(controller, 'getLanded');
controller.$.agencyMode = {selection: {warehouseFk: 1}};
- const shipped = new Date();
+ const shipped = Date.vnNew();
const agencyModeId = 8;
const expectedResult = {
shipped: shipped,
@@ -177,7 +177,7 @@ describe('Ticket', () => {
it('should do nothing if attempting to set the same agencyMode id', () => {
jest.spyOn(controller, 'getShipped');
- const landed = new Date();
+ const landed = Date.vnNew();
const agencyModeId = 7;
const expectedResult = {
landed: landed,
@@ -278,8 +278,8 @@ describe('Ticket', () => {
agencyModeFk: 1,
companyFk: 442,
warehouseFk: 1,
- shipped: new Date(),
- landed: new Date()
+ shipped: Date.vnNew(),
+ landed: Date.vnNew()
};
expect(controller.isFormInvalid()).toBeFalsy();
@@ -288,7 +288,7 @@ describe('Ticket', () => {
describe('onStepChange()', () => {
it('should call onStepChange method and return a NO_AGENCY_AVAILABLE signal error', async() => {
- let landed = new Date();
+ let landed = Date.vnNew();
landed.setHours(0, 0, 0, 0);
controller._ticket = {
@@ -299,7 +299,7 @@ describe('Ticket', () => {
agencyModeFk: 1,
companyFk: 442,
warehouseFk: 1,
- shipped: new Date(),
+ shipped: Date.vnNew(),
landed: landed
};
@@ -314,8 +314,8 @@ describe('Ticket', () => {
describe('getLanded()', () => {
it('should return an available landed date', async() => {
- const shipped = new Date();
- const expectedResult = {landed: new Date()};
+ const shipped = Date.vnNew();
+ const expectedResult = {landed: Date.vnNew()};
const params = {
shipped: shipped,
addressFk: 121,
@@ -336,8 +336,8 @@ describe('Ticket', () => {
describe('getShipped()', () => {
it('should return an available shipped date', async() => {
- const landed = new Date();
- const expectedResult = {shipped: new Date()};
+ const landed = Date.vnNew();
+ const expectedResult = {shipped: Date.vnNew()};
const params = {
landed: landed,
addressFk: 121,
@@ -358,7 +358,7 @@ describe('Ticket', () => {
describe('zoneWhere() getter', () => {
it('should return an object containing filter properties', async() => {
- const shipped = new Date();
+ const shipped = Date.vnNew();
controller.ticket.shipped = shipped;
const expectedResult = {
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index f6001c6b8..ff029db78 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -177,7 +177,7 @@ class Controller extends Section {
get canRestoreTicket() {
const isDeleted = this.ticket.isDeleted;
- const now = new Date();
+ const now = Date.vnNew();
const maxDate = new Date(this.ticket.updated);
maxDate.setHours(maxDate.getHours() + 1);
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 67dc0affa..babc22038 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -43,7 +43,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
describe('canRestoreTicket() getter', () => {
it('should return true for a ticket deleted within the last hour', () => {
controller.ticket.isDeleted = true;
- controller.ticket.updated = new Date();
+ controller.ticket.updated = Date.vnNew();
const result = controller.canRestoreTicket;
@@ -51,7 +51,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
});
it('should return false for a ticket deleted more than one hour ago', () => {
- const pastHour = new Date();
+ const pastHour = Date.vnNew();
pastHour.setHours(pastHour.getHours() - 2);
controller.ticket.isDeleted = true;
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 7ffe2fe5e..2d4432fe8 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
class Controller extends Section {
constructor($element, $scope) {
super($element, $scope);
- this.landed = new Date();
+ this.landed = Date.vnNew();
this.newRoute = null;
}
diff --git a/modules/ticket/front/expedition/index.spec.js b/modules/ticket/front/expedition/index.spec.js
index 5a538b1c8..71e32151c 100644
--- a/modules/ticket/front/expedition/index.spec.js
+++ b/modules/ticket/front/expedition/index.spec.js
@@ -76,7 +76,7 @@ describe('Ticket', () => {
it('should make a query and then call to the $state go() method', () => {
jest.spyOn(controller.$state, 'go').mockReturnThis();
- const landed = new Date();
+ const landed = Date.vnNew();
const ticket = {
clientFk: 1101,
landed: landed,
diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js
index 5fb2c8f82..81ef08825 100644
--- a/modules/ticket/front/future/index.js
+++ b/modules/ticket/front/future/index.js
@@ -57,7 +57,7 @@ export default class Controller extends Section {
}
setDefaultFilter() {
- const today = new Date();
+ const today = Date.vnNew();
this.filterParams = {
originDated: today,
@@ -68,7 +68,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/future/index.spec.js b/modules/ticket/front/future/index.spec.js
index c609a4891..188421298 100644
--- a/modules/ticket/front/future/index.spec.js
+++ b/modules/ticket/front/future/index.spec.js
@@ -2,7 +2,7 @@ import './index.js';
import crudModel from 'core/mocks/crud-model';
describe('Component vnTicketFuture', () => {
- const today = new Date();
+ const today = Date.vnNew();
let controller;
let $httpBackend;
@@ -32,7 +32,7 @@ describe('Component vnTicketFuture', () => {
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -40,7 +40,7 @@ describe('Component vnTicketFuture', () => {
});
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.compareDate(pastDate);
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 3039a2a03..42332ccc8 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -90,7 +90,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let timeTicket = new Date(date);
timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 03071654e..5046387b0 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -31,14 +31,14 @@ describe('Component vnTicketIndex', () => {
describe('compareDate()', () => {
it('should return warning when the date is the present', () => {
- let today = new Date();
+ let today = Date.vnNew();
let result = controller.compareDate(today);
expect(result).toEqual('warning');
});
it('should return sucess when the date is in the future', () => {
- let futureDate = new Date();
+ let futureDate = Date.vnNew();
futureDate = futureDate.setDate(futureDate.getDate() + 10);
let result = controller.compareDate(futureDate);
@@ -46,7 +46,7 @@ describe('Component vnTicketIndex', () => {
});
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.compareDate(pastDate);
diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js
index 1b807216b..3f9482fc4 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -22,7 +22,7 @@ export default class Ticket extends ModuleMain {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const from = new Date();
+ const from = Date.vnNew();
from.setHours(0, 0, 0, 0);
const to = new Date(from.getTime());
diff --git a/modules/ticket/front/package/index.js b/modules/ticket/front/package/index.js
index ed13f12d8..fd67ce583 100644
--- a/modules/ticket/front/package/index.js
+++ b/modules/ticket/front/package/index.js
@@ -6,7 +6,7 @@ class Controller extends Section {
this.$.model.insert({
packagingFk: null,
quantity: null,
- created: new Date(),
+ created: Date.vnNew(),
ticketFk: this.$params.id
});
}
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 618d4727d..f3fb89d04 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -51,7 +51,7 @@ class Controller extends Section {
const hasClaimManagerRole = this.aclService.hasAny(['claimManager']);
- return landedPlusWeek >= new Date() || hasClaimManagerRole;
+ return landedPlusWeek >= Date.vnNew() || hasClaimManagerRole;
}
return false;
}
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index fbee966fd..8585503cc 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -15,9 +15,9 @@ describe('Ticket', () => {
const ticket = {
id: 1,
clientFk: 1101,
- shipped: new Date(),
- landed: new Date(),
- created: new Date(),
+ shipped: Date.vnNew(),
+ landed: Date.vnNew(),
+ created: Date.vnNew(),
client: {salesPersonFk: 1},
address: {mobile: 111111111}
};
diff --git a/modules/ticket/front/search-panel/index.spec.js b/modules/ticket/front/search-panel/index.spec.js
index 41c32c047..df320b55b 100644
--- a/modules/ticket/front/search-panel/index.spec.js
+++ b/modules/ticket/front/search-panel/index.spec.js
@@ -38,7 +38,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.from = new Date();
+ controller.from = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
@@ -49,7 +49,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.to = new Date();
+ controller.to = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
@@ -58,8 +58,8 @@ describe('Ticket Component vnTicketSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = new Date();
- controller.filter.to = new Date();
+ controller.filter.from = Date.vnNew();
+ controller.filter.to = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/travel/back/methods/thermograph/createThermograph.js b/modules/travel/back/methods/thermograph/createThermograph.js
index 23d9d6037..75d967628 100644
--- a/modules/travel/back/methods/thermograph/createThermograph.js
+++ b/modules/travel/back/methods/thermograph/createThermograph.js
@@ -40,7 +40,7 @@ module.exports = Self => {
const models = Self.app.models;
let tx;
const myOptions = {};
- const date = new Date();
+ const date = Date.vnNew();
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/travel/back/methods/travel/cloneWithEntries.js b/modules/travel/back/methods/travel/cloneWithEntries.js
index 611f4e429..e5b6b1580 100644
--- a/modules/travel/back/methods/travel/cloneWithEntries.js
+++ b/modules/travel/back/methods/travel/cloneWithEntries.js
@@ -39,8 +39,8 @@ module.exports = Self => {
'ref'
]
});
- const started = new Date();
- const ended = new Date();
+ const started = Date.vnNew();
+ const ended = Date.vnNew();
if (!travel)
throw new UserError('Travel not found');
diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
index 2e79ff193..0e434e048 100644
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@@ -49,7 +49,7 @@ describe('Travel cloneWithEntries()', () => {
pending('#2687 - Cannot make a data rollback because of the triggers');
const warehouseThree = 3;
const agencyModeOne = 1;
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
travelBefore = await models.Travel.findById(travelId);
diff --git a/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js b/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
index 3693aae82..599851b55 100644
--- a/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
+++ b/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
@@ -95,10 +95,10 @@ describe('Travel extraCommunityFilter()', () => {
});
it('should return the routes matching "shipped from" and "landed to"', async() => {
- const from = new Date();
+ const from = Date.vnNew();
from.setDate(from.getDate() - 2);
from.setHours(0, 0, 0, 0);
- const to = new Date();
+ const to = Date.vnNew();
to.setHours(23, 59, 59, 999);
to.setDate(to.getDate() + 7);
const ctx = {
diff --git a/modules/travel/back/methods/travel/specs/filter.spec.js b/modules/travel/back/methods/travel/specs/filter.spec.js
index c739866a0..1a6ee895c 100644
--- a/modules/travel/back/methods/travel/specs/filter.spec.js
+++ b/modules/travel/back/methods/travel/specs/filter.spec.js
@@ -54,8 +54,8 @@ describe('Travel filter()', () => {
});
it('should return the routes matching "shipped from" and "shipped to"', async() => {
- const from = new Date();
- const to = new Date();
+ const from = Date.vnNew();
+ const to = Date.vnNew();
from.setHours(0, 0, 0, 0);
to.setHours(23, 59, 59, 999);
to.setDate(to.getDate() + 1);
diff --git a/modules/travel/front/create/index.spec.js b/modules/travel/front/create/index.spec.js
index e3f85d9ae..cdff8cfb9 100644
--- a/modules/travel/front/create/index.spec.js
+++ b/modules/travel/front/create/index.spec.js
@@ -53,7 +53,7 @@ describe('Travel Component vnTravelCreate', () => {
it(`should do nothing if there's no response data.`, () => {
controller.travel = {agencyModeFk: 4};
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
const query = `travels/getAverageDays?agencyModeFk=${controller.travel.agencyModeFk}`;
$httpBackend.expectGET(query).respond(undefined);
@@ -67,7 +67,7 @@ describe('Travel Component vnTravelCreate', () => {
it(`should fill the fields when it's selected a date and agency.`, () => {
controller.travel = {agencyModeFk: 1};
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 9);
const expectedResponse = {
id: 8,
diff --git a/modules/travel/front/extra-community/index.js b/modules/travel/front/extra-community/index.js
index 2389570b9..920339469 100644
--- a/modules/travel/front/extra-community/index.js
+++ b/modules/travel/front/extra-community/index.js
@@ -25,12 +25,12 @@ class Controller extends Section {
this.droppableElement = 'tbody[vn-droppable]';
const twoDays = 2;
- const shippedFrom = new Date();
+ const shippedFrom = Date.vnNew();
shippedFrom.setDate(shippedFrom.getDate() - twoDays);
shippedFrom.setHours(0, 0, 0, 0);
const sevenDays = 7;
- const landedTo = new Date();
+ const landedTo = Date.vnNew();
landedTo.setDate(landedTo.getDate() + sevenDays);
landedTo.setHours(23, 59, 59, 59);
diff --git a/modules/travel/front/index/index.js b/modules/travel/front/index/index.js
index 50036831f..7701289b7 100644
--- a/modules/travel/front/index/index.js
+++ b/modules/travel/front/index/index.js
@@ -20,7 +20,7 @@ export default class Controller extends Section {
}
compareDate(date) {
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
date = new Date(date);
diff --git a/modules/travel/front/index/index.spec.js b/modules/travel/front/index/index.spec.js
index 9abe46a64..9083c4519 100644
--- a/modules/travel/front/index/index.spec.js
+++ b/modules/travel/front/index/index.spec.js
@@ -50,7 +50,7 @@ describe('Travel Component vnTravelIndex', () => {
describe('compareDate()', () => {
it('should return warning if the date passed to compareDate() is todays', () => {
- const today = new Date();
+ const today = Date.vnNew();
const result = controller.compareDate(today);
@@ -58,7 +58,7 @@ describe('Travel Component vnTravelIndex', () => {
});
it('should return success if the date passed to compareDate() is in the future', () => {
- const tomorrow = new Date();
+ const tomorrow = Date.vnNew();
tomorrow.setDate(tomorrow.getDate() + 1);
const result = controller.compareDate(tomorrow);
@@ -67,7 +67,7 @@ describe('Travel Component vnTravelIndex', () => {
});
it('should return undefined if the date passed to compareDate() is in the past', () => {
- const yesterday = new Date();
+ const yesterday = Date.vnNew();
yesterday.setDate(yesterday.getDate() - 1);
const result = controller.compareDate(yesterday);
diff --git a/modules/travel/front/main/index.js b/modules/travel/front/main/index.js
index d6f103033..fbaf78c16 100644
--- a/modules/travel/front/main/index.js
+++ b/modules/travel/front/main/index.js
@@ -15,7 +15,7 @@ export default class Travel extends ModuleMain {
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
- const shippedFrom = new Date();
+ const shippedFrom = Date.vnNew();
shippedFrom.setHours(0, 0, 0, 0);
const shippedTo = new Date(shippedFrom.getTime());
diff --git a/modules/travel/front/main/index.spec.js b/modules/travel/front/main/index.spec.js
index 6d9db4dc8..bf5a27b41 100644
--- a/modules/travel/front/main/index.spec.js
+++ b/modules/travel/front/main/index.spec.js
@@ -15,7 +15,7 @@ describe('Travel Component vnTravel', () => {
let params = controller.fetchParams({
scopeDays: 2
});
- const shippedFrom = new Date();
+ const shippedFrom = Date.vnNew();
shippedFrom.setHours(0, 0, 0, 0);
const shippedTo = new Date(shippedFrom.getTime());
shippedTo.setDate(shippedTo.getDate() + params.scopeDays);
diff --git a/modules/travel/front/search-panel/index.spec.js b/modules/travel/front/search-panel/index.spec.js
index a1f3c36b3..884f4fb17 100644
--- a/modules/travel/front/search-panel/index.spec.js
+++ b/modules/travel/front/search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe('Travel Component vnTravelSearchPanel', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
- controller.shippedFrom = new Date();
+ controller.shippedFrom = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.shippedFrom).toBeDefined();
@@ -26,7 +26,7 @@ describe('Travel Component vnTravelSearchPanel', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
- controller.shippedTo = new Date();
+ controller.shippedTo = Date.vnNew();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.shippedTo).toBeDefined();
@@ -35,8 +35,8 @@ describe('Travel Component vnTravelSearchPanel', () => {
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.shippedFrom = new Date();
- controller.filter.shippedTo = new Date();
+ controller.filter.shippedFrom = Date.vnNew();
+ controller.filter.shippedTo = Date.vnNew();
controller.scopeDays = 1;
diff --git a/modules/worker/back/methods/calendar/absences.js b/modules/worker/back/methods/calendar/absences.js
index ddf38a604..8420ed770 100644
--- a/modules/worker/back/methods/calendar/absences.js
+++ b/modules/worker/back/methods/calendar/absences.js
@@ -35,12 +35,12 @@ module.exports = Self => {
Self.absences = async(ctx, workerFk, businessFk, year, options) => {
const models = Self.app.models;
- const started = new Date();
+ const started = Date.vnNew();
started.setFullYear(year);
started.setMonth(0);
started.setDate(1);
- const ended = new Date();
+ const ended = Date.vnNew();
ended.setFullYear(year);
ended.setMonth(12);
ended.setDate(0);
diff --git a/modules/worker/back/methods/calendar/specs/absences.spec.js b/modules/worker/back/methods/calendar/specs/absences.spec.js
index 2180a5312..365773182 100644
--- a/modules/worker/back/methods/calendar/specs/absences.spec.js
+++ b/modules/worker/back/methods/calendar/specs/absences.spec.js
@@ -6,7 +6,7 @@ describe('Worker absences()', () => {
const workerId = 1106;
const businessId = 1106;
- const now = new Date();
+ const now = Date.vnNew();
const year = now.getFullYear();
const [absences] = await app.models.Calendar.absences(ctx, workerId, businessId, year);
@@ -22,7 +22,7 @@ describe('Worker absences()', () => {
const businessId = 1106;
const ctx = {req: {accessToken: {userId: 9}}};
- const now = new Date();
+ const now = Date.vnNew();
const year = now.getFullYear();
const tx = await app.models.Calendar.beginTransaction({});
@@ -55,15 +55,15 @@ describe('Worker absences()', () => {
const workerId = 1106;
const userId = 1106;
- const today = new Date();
+ const today = Date.vnNew();
// getting how many days in a year
- const yearStart = new Date();
+ const yearStart = Date.vnNew();
yearStart.setHours(0, 0, 0, 0);
yearStart.setMonth(0);
yearStart.setDate(1);
- const yearEnd = new Date();
+ const yearEnd = Date.vnNew();
const currentYear = yearEnd.getFullYear();
yearEnd.setFullYear(currentYear + 1);
yearEnd.setHours(0, 0, 0, 0);
@@ -92,7 +92,7 @@ describe('Worker absences()', () => {
// normal test begins
const contract = await app.models.WorkerLabour.findById(businessId, null, options);
- const startingContract = new Date();
+ const startingContract = Date.vnNew();
startingContract.setHours(0, 0, 0, 0);
startingContract.setMonth(today.getMonth());
startingContract.setDate(1);
diff --git a/modules/worker/back/methods/holiday/getByWarehouse.js b/modules/worker/back/methods/holiday/getByWarehouse.js
index 093885d13..50029e62b 100644
--- a/modules/worker/back/methods/holiday/getByWarehouse.js
+++ b/modules/worker/back/methods/holiday/getByWarehouse.js
@@ -17,7 +17,7 @@ module.exports = Self => {
});
Self.getByWarehouse = async warehouseFk => {
- let beginningYear = new Date();
+ let beginningYear = Date.vnNew();
beginningYear.setMonth(0);
beginningYear.setDate(1);
beginningYear.setHours(0, 0, 0, 0);
diff --git a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
index 7825f38b8..4d9f98cc3 100644
--- a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
+++ b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
@@ -93,7 +93,7 @@ module.exports = Self => {
};
async function emailConfirm(buffer) {
- const now = new Date();
+ const now = Date.vnNew();
const from = JSON.stringify(Imap.parseHeader(buffer).from);
const subject = JSON.stringify(Imap.parseHeader(buffer).subject);
@@ -121,7 +121,7 @@ module.exports = Self => {
}
async function emailReply(buffer, emailBody) {
- const now = new Date();
+ const now = Date.vnNew();
const from = JSON.stringify(Imap.parseHeader(buffer).from);
const subject = JSON.stringify(Imap.parseHeader(buffer).subject);
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 78c212e9b..579a83112 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -42,8 +42,8 @@ module.exports = Self => {
let stmt;
if (!args.week || !args.year) {
- const from = new Date();
- const to = new Date();
+ const from = Date.vnNew();
+ const to = Date.vnNew();
const time = await models.Time.findOne({
where: {
@@ -79,7 +79,7 @@ module.exports = Self => {
week: args.week
};
await models.WorkerTimeControlMail.updateAll(where, {
- updated: new Date(), state: 'SENDED'
+ updated: Date.vnNew(), state: 'SENDED'
}, myOptions);
stmt = new ParameterizedSQL(
@@ -102,7 +102,7 @@ module.exports = Self => {
week: args.week
};
await models.WorkerTimeControlMail.updateAll(where, {
- updated: new Date(), state: 'SENDED'
+ updated: Date.vnNew(), state: 'SENDED'
}, myOptions);
stmt = new ParameterizedSQL(`CALL vn.timeControl_calculateAll(?, ?)`, [started, ended]);
@@ -223,11 +223,11 @@ module.exports = Self => {
let timeTableDecimalInSeconds = 0;
for (let journey of journeys) {
- const start = new Date();
+ const start = Date.vnNew();
const [startHours, startMinutes, startSeconds] = getTime(journey.start);
start.setHours(startHours, startMinutes, startSeconds, 0);
- const end = new Date();
+ const end = Date.vnNew();
const [endHours, endMinutes, endSeconds] = getTime(journey.end);
end.setHours(endHours, endMinutes, endSeconds, 0);
diff --git a/modules/worker/back/methods/worker-time-control/specs/filter.spec.js b/modules/worker/back/methods/worker-time-control/specs/filter.spec.js
index 927d83df3..0c4d229f2 100644
--- a/modules/worker/back/methods/worker-time-control/specs/filter.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/filter.spec.js
@@ -3,9 +3,9 @@ const models = require('vn-loopback/server/server').models;
describe('workerTimeControl filter()', () => {
it('should return 1 result filtering by id', async() => {
const ctx = {req: {accessToken: {userId: 1106}}, args: {workerFk: 1106}};
- const firstHour = new Date();
+ const firstHour = Date.vnNew();
firstHour.setHours(7, 0, 0, 0);
- const lastHour = new Date();
+ const lastHour = Date.vnNew();
lastHour.setDate(lastHour.getDate() + 1);
lastHour.setHours(15, 0, 0, 0);
@@ -21,9 +21,9 @@ describe('workerTimeControl filter()', () => {
it('should return a privilege error for a non subordinate worker', async() => {
const ctx = {req: {accessToken: {userId: 1107}}, args: {workerFk: 1106}};
- const firstHour = new Date();
+ const firstHour = Date.vnNew();
firstHour.setHours(7, 0, 0, 0);
- const lastHour = new Date();
+ const lastHour = Date.vnNew();
lastHour.setDate(lastHour.getDate() + 1);
lastHour.setHours(15, 0, 0, 0);
diff --git a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
index e9924c67b..e90c849b7 100644
--- a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
@@ -35,7 +35,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
let error;
try {
- ctx.args = {timed: new Date(), direction: 'in'};
+ ctx.args = {timed: Date.vnNew(), direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId);
} catch (e) {
error = e;
@@ -52,7 +52,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
let error;
try {
- ctx.args = {timed: new Date(), direction: 'in'};
+ ctx.args = {timed: Date.vnNew(), direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId);
} catch (e) {
error = e;
@@ -71,7 +71,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
try {
const options = {transaction: tx};
- const todayAtOne = new Date();
+ const todayAtOne = Date.vnNew();
todayAtOne.setHours(1, 0, 0, 0);
ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -95,7 +95,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
try {
const options = {transaction: tx};
- const todayAtOne = new Date();
+ const todayAtOne = Date.vnNew();
todayAtOne.setHours(1, 0, 0, 0);
ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -123,7 +123,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
try {
const options = {transaction: tx};
- const todayAtOne = new Date();
+ const todayAtOne = Date.vnNew();
todayAtOne.setHours(1, 0, 0, 0);
ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -151,7 +151,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
try {
const options = {transaction: tx};
- const todayAtOne = new Date();
+ const todayAtOne = Date.vnNew();
todayAtOne.setHours(1, 0, 0, 0);
ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -179,7 +179,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
try {
const options = {transaction: tx};
- const todayAtOne = new Date();
+ const todayAtOne = Date.vnNew();
todayAtOne.setHours(1, 0, 0, 0);
ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -204,7 +204,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
pending('https://redmine.verdnatura.es/issues/4707');
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- const date = new Date();
+ const date = Date.vnNew();
date.setDate(date.getDate() - 16);
date.setHours(8, 0, 0);
let error;
@@ -227,7 +227,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
it('should fail to add a time entry for a worker without an existing contract', async() => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- const date = new Date();
+ const date = Date.vnNew();
date.setFullYear(date.getFullYear() - 2);
let error;
@@ -252,7 +252,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -282,7 +282,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -316,7 +316,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -350,7 +350,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -384,7 +384,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -421,7 +421,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -456,7 +456,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -493,7 +493,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = jessicaJonesId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -528,7 +528,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = jessicaJonesId;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(date.getDate() - 21);
date = weekDay(date, monday);
let error;
@@ -565,7 +565,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setMonth(date.getMonth() - 2);
date.setDate(1);
let error;
@@ -600,7 +600,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setMonth(date.getMonth() - 2);
date.setDate(1);
let error;
@@ -634,7 +634,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
activeCtx.accessToken.userId = salesBossId;
const workerId = hankPymId;
- let date = new Date();
+ let date = Date.vnNew();
date.setMonth(date.getMonth() - 2);
date.setDate(1);
let error;
diff --git a/modules/worker/back/methods/worker/activeContract.js b/modules/worker/back/methods/worker/activeContract.js
index 05dcee6b5..d3d439cd0 100644
--- a/modules/worker/back/methods/worker/activeContract.js
+++ b/modules/worker/back/methods/worker/activeContract.js
@@ -27,7 +27,7 @@ module.exports = Self => {
if (!isSubordinate)
throw new UserError(`You don't have enough privileges`);
- const now = new Date();
+ const now = Date.vnNew();
return models.WorkerLabour.findOne({
where: {
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index 1467d6d6b..43a9f4d23 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -80,8 +80,8 @@ module.exports = Self => {
if (hasHoursRecorded && isNotHalfAbsence)
throw new UserError(`The worker has hours recorded that day`);
- const date = new Date();
- const now = new Date();
+ const date = Date.vnNew();
+ const now = Date.vnNew();
date.setHours(0, 0, 0, 0);
const [result] = await Self.rawSql(
`SELECT COUNT(*) halfHolidayCounter
diff --git a/modules/worker/back/methods/worker/holidays.js b/modules/worker/back/methods/worker/holidays.js
index 7f093a330..9c214e0f7 100644
--- a/modules/worker/back/methods/worker/holidays.js
+++ b/modules/worker/back/methods/worker/holidays.js
@@ -45,13 +45,13 @@ module.exports = Self => {
if (!isSubordinate)
throw new UserError(`You don't have enough privileges`);
- const started = new Date();
+ const started = Date.vnNew();
started.setFullYear(args.year);
started.setMonth(0);
started.setDate(1);
started.setHours(0, 0, 0, 0);
- const ended = new Date();
+ const ended = Date.vnNew();
ended.setFullYear(args.year);
ended.setMonth(12);
ended.setDate(0);
diff --git a/modules/worker/back/methods/worker/specs/createAbsence.spec.js b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
index 7214e815e..346e43c51 100644
--- a/modules/worker/back/methods/worker/specs/createAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
@@ -10,7 +10,7 @@ describe('Worker createAbsence()', () => {
args: {
businessFk: 18,
absenceTypeId: 1,
- dated: new Date()
+ dated: Date.vnNew()
}
};
@@ -45,7 +45,7 @@ describe('Worker createAbsence()', () => {
args: {
businessFk: 18,
absenceTypeId: 1,
- dated: new Date()
+ dated: Date.vnNew()
}
};
ctx.req.__ = value => {
@@ -82,7 +82,7 @@ describe('Worker createAbsence()', () => {
id: 1,
businessFk: 1,
absenceTypeId: 6,
- dated: new Date()
+ dated: Date.vnNew()
}
};
const workerId = 1;
@@ -111,7 +111,7 @@ describe('Worker createAbsence()', () => {
id: 1106,
businessFk: 1106,
absenceTypeId: 1,
- dated: new Date()
+ dated: Date.vnNew()
}
};
const workerId = 1106;
diff --git a/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js b/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js
index a105669cf..0f3f913dc 100644
--- a/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js
@@ -28,7 +28,7 @@ describe('Worker deleteAbsence()', () => {
const createdAbsence = await app.models.Calendar.create({
businessFk: businessId,
dayOffTypeFk: 1,
- dated: new Date()
+ dated: Date.vnNew()
}, options);
ctx.args = {absenceId: createdAbsence.id};
@@ -59,7 +59,7 @@ describe('Worker deleteAbsence()', () => {
const createdAbsence = await app.models.Calendar.create({
businessFk: businessId,
dayOffTypeFk: 1,
- dated: new Date()
+ dated: Date.vnNew()
}, options);
ctx.args = {absenceId: createdAbsence.id};
diff --git a/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js b/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
index 054a829e5..f5b06cc9e 100644
--- a/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
+++ b/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
@@ -3,10 +3,10 @@ const models = require('vn-loopback/server/server').models;
describe('Worker getWorkedHours()', () => {
it(`should return the expected hours and the worked hours of a given date`, async() => {
const workerID = 1106;
- const started = new Date();
+ const started = Date.vnNew();
started.setHours(0, 0, 0, 0);
- const ended = new Date();
+ const ended = Date.vnNew();
ended.setHours(23, 59, 59, 999);
const [result] = await models.Worker.getWorkedHours(workerID, started, ended);
diff --git a/modules/worker/back/methods/worker/specs/holidays.spec.js b/modules/worker/back/methods/worker/specs/holidays.spec.js
index d8310b738..f23b247ca 100644
--- a/modules/worker/back/methods/worker/specs/holidays.spec.js
+++ b/modules/worker/back/methods/worker/specs/holidays.spec.js
@@ -17,7 +17,7 @@ describe('Worker holidays()', () => {
});
it('should now get the absence calendar for a full year contract', async() => {
- const now = new Date();
+ const now = Date.vnNew();
const year = now.getFullYear();
ctx.args = {businessFk: businessId, year: year};
@@ -29,7 +29,7 @@ describe('Worker holidays()', () => {
});
it('should now get the payed holidays calendar for a worker', async() => {
- const now = new Date();
+ const now = Date.vnNew();
const year = now.getFullYear();
ctx.args = {businessFk: businessId, year: year};
diff --git a/modules/worker/back/methods/worker/specs/updateAbsence.spec.js b/modules/worker/back/methods/worker/specs/updateAbsence.spec.js
index 6339b3163..a624fc1d3 100644
--- a/modules/worker/back/methods/worker/specs/updateAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/updateAbsence.spec.js
@@ -21,7 +21,7 @@ describe('Worker updateAbsence()', () => {
createdAbsence = await app.models.Calendar.create({
businessFk: businessId,
dayOffTypeFk: 1,
- dated: new Date()
+ dated: Date.vnNew()
});
});
diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js
index 95e1fc134..4ca0fc929 100644
--- a/modules/worker/front/calendar/index.js
+++ b/modules/worker/front/calendar/index.js
@@ -5,7 +5,7 @@ import './style.scss';
class Controller extends Section {
constructor($element, $) {
super($element, $);
- this.date = new Date();
+ this.date = Date.vnNew();
this.events = {};
this.buildYearFilter();
}
@@ -15,7 +15,7 @@ class Controller extends Section {
}
set year(value) {
- const newYear = new Date();
+ const newYear = Date.vnNew();
newYear.setFullYear(value);
this.date = newYear;
@@ -76,7 +76,7 @@ class Controller extends Section {
}
buildYearFilter() {
- const now = new Date();
+ const now = Date.vnNew();
now.setFullYear(now.getFullYear() + 1);
const maxYear = now.getFullYear();
diff --git a/modules/worker/front/calendar/index.spec.js b/modules/worker/front/calendar/index.spec.js
index 1da4066d9..586a7223d 100644
--- a/modules/worker/front/calendar/index.spec.js
+++ b/modules/worker/front/calendar/index.spec.js
@@ -6,7 +6,7 @@ describe('Worker', () => {
let $httpParamSerializer;
let $scope;
let controller;
- let year = new Date().getFullYear();
+ let year = Date.vnNew().getFullYear();
beforeEach(ngModule('worker'));
@@ -67,7 +67,7 @@ describe('Worker', () => {
controller.getIsSubordinate = jest.fn();
controller.getActiveContract = jest.fn();
- let today = new Date();
+ let today = Date.vnNew();
let tomorrow = new Date(today.getTime());
tomorrow.setDate(tomorrow.getDate() + 1);
@@ -105,7 +105,7 @@ describe('Worker', () => {
describe('getContractHolidays()', () => {
it(`should return the worker holidays amount and then set the contractHolidays property`, () => {
- const today = new Date();
+ const today = Date.vnNew();
const year = today.getFullYear();
const serializedParams = $httpParamSerializer({year});
@@ -119,7 +119,7 @@ describe('Worker', () => {
describe('formatDay()', () => {
it(`should set the day element style`, () => {
- const today = new Date();
+ const today = Date.vnNew();
controller.events[today.getTime()] = {
name: 'Holiday',
@@ -170,7 +170,7 @@ describe('Worker', () => {
it(`should call to the create() method`, () => {
jest.spyOn(controller, 'create').mockReturnThis();
- const selectedDay = new Date();
+ const selectedDay = Date.vnNew();
const $event = {
target: {
closest: () => {
@@ -188,7 +188,7 @@ describe('Worker', () => {
it(`should call to the delete() method`, () => {
jest.spyOn(controller, 'delete').mockReturnThis();
- const selectedDay = new Date();
+ const selectedDay = Date.vnNew();
const expectedEvent = {
dated: selectedDay,
type: 'holiday',
@@ -212,7 +212,7 @@ describe('Worker', () => {
it(`should call to the edit() method`, () => {
jest.spyOn(controller, 'edit').mockReturnThis();
- const selectedDay = new Date();
+ const selectedDay = Date.vnNew();
const expectedEvent = {
dated: selectedDay,
type: 'leaveOfAbsence',
@@ -238,7 +238,7 @@ describe('Worker', () => {
it(`should make a HTTP POST query and then call to the repaintCanceller() method`, () => {
jest.spyOn(controller, 'repaintCanceller').mockReturnThis();
- const dated = new Date();
+ const dated = Date.vnNew();
const calendarElement = {};
const expectedResponse = {id: 10};
@@ -287,7 +287,7 @@ describe('Worker', () => {
const expectedParams = {absenceId: 10};
const calendarElement = {};
- const selectedDay = new Date();
+ const selectedDay = Date.vnNew();
const expectedEvent = {
dated: selectedDay,
type: 'leaveOfAbsence',
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index 2ff032def..ef2f64e85 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -82,7 +82,7 @@ class Controller extends Descriptor {
}
onUploadResponse() {
- const timestamp = new Date().getTime();
+ const timestamp = Date.vnNew().getTime();
const src = this.$rootScope.imagePath('user', '520x520', this.worker.id);
const zoomSrc = this.$rootScope.imagePath('user', '1600x1600', this.worker.id);
const newSrc = `${src}&t=${timestamp}`;
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index c3d3e5eab..f7379fea0 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -16,7 +16,7 @@ class Controller extends Section {
$postLink() {
const timestamp = this.$params.timestamp;
- let initialDate = new Date();
+ let initialDate = Date.vnNew();
if (timestamp) {
initialDate = new Date(timestamp * 1000);
@@ -199,7 +199,7 @@ class Controller extends Section {
getFinishTime() {
if (!this.weekDays) return;
- let today = new Date();
+ let today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let todayInWeek = this.weekDays.find(day => day.dated.getTime() === today.getTime());
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 4f317a5e6..b68162d39 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -18,7 +18,7 @@ describe('Component vnWorkerTimeControl', () => {
describe('date() setter', () => {
it(`should set the weekDays, the date in the controller and call fetchHours`, () => {
- let today = new Date();
+ let today = Date.vnNew();
jest.spyOn(controller, 'fetchHours').mockReturnThis();
controller.date = today;
@@ -33,7 +33,7 @@ describe('Component vnWorkerTimeControl', () => {
describe('hours() setter', () => {
it(`should set hours data at it's corresponding week day`, () => {
- let today = new Date();
+ let today = Date.vnNew();
jest.spyOn(controller, 'fetchHours').mockReturnThis();
controller.date = today;
@@ -64,7 +64,7 @@ describe('Component vnWorkerTimeControl', () => {
describe('getWorkedHours() ', () => {
it('should set the weekdays expected and worked hours plus the total worked hours', () => {
- let today = new Date();
+ let today = Date.vnNew();
jest.spyOn(controller, 'fetchHours').mockReturnThis();
controller.date = today;
@@ -117,7 +117,7 @@ describe('Component vnWorkerTimeControl', () => {
describe('save() ', () => {
it(`should make a query an then call to the fetchHours() method`, () => {
controller.fetchHours = jest.fn();
- controller.selectedRow = {id: 1, timed: new Date(), direction: 'in'};
+ controller.selectedRow = {id: 1, timed: Date.vnNew(), direction: 'in'};
controller.$.editEntry = {
hide: () => {}
};
diff --git a/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js b/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
index bc7aa1ed9..4f79b2315 100644
--- a/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
+++ b/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
@@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('Agency getAgenciesWithWarehouse()', () => {
- const today = new Date();
+ const today = Date.vnNew();
it('should return the agencies that can handle the given delivery request', async() => {
const tx = await app.models.Zone.beginTransaction({});
diff --git a/modules/zone/back/methods/agency/specs/getLanded.spec.js b/modules/zone/back/methods/agency/specs/getLanded.spec.js
index c199b2ba6..e2e6b3eb3 100644
--- a/modules/zone/back/methods/agency/specs/getLanded.spec.js
+++ b/modules/zone/back/methods/agency/specs/getLanded.spec.js
@@ -3,7 +3,7 @@ const models = require('vn-loopback/server/server').models;
describe('agency getLanded()', () => {
it('should return a landing date', async() => {
const ctx = {req: {accessToken: {userId: 1}}};
- const shipped = new Date();
+ const shipped = Date.vnNew();
shipped.setDate(shipped.getDate() + 1);
const addressFk = 121;
const agencyModeFk = 7;
diff --git a/modules/zone/back/methods/agency/specs/getShipped.spec.js b/modules/zone/back/methods/agency/specs/getShipped.spec.js
index f2b36fc94..43e2c1208 100644
--- a/modules/zone/back/methods/agency/specs/getShipped.spec.js
+++ b/modules/zone/back/methods/agency/specs/getShipped.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
describe('agency getShipped()', () => {
it('should return a shipment date', async() => {
- const landed = new Date();
+ const landed = Date.vnNew();
landed.setDate(landed.getDate() + 1);
const addressFk = 121;
const agencyModeFk = 7;
@@ -25,7 +25,7 @@ describe('agency getShipped()', () => {
});
it('should not return a shipment date', async() => {
- const newDate = new Date();
+ const newDate = Date.vnNew();
newDate.setMonth(newDate.getMonth() - 1);
const landed = newDate;
const addressFk = 121;
diff --git a/modules/zone/back/methods/agency/specs/landsThatDay.spec.js b/modules/zone/back/methods/agency/specs/landsThatDay.spec.js
index 7d207b383..ea10e708f 100644
--- a/modules/zone/back/methods/agency/specs/landsThatDay.spec.js
+++ b/modules/zone/back/methods/agency/specs/landsThatDay.spec.js
@@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('Agency landsThatDay()', () => {
- const today = new Date();
+ const today = Date.vnNew();
it('should return a list of agencies that can land a shipment on a day for an address', async() => {
const tx = await app.models.Agency.beginTransaction({});
diff --git a/modules/zone/back/methods/zone/deleteZone.js b/modules/zone/back/methods/zone/deleteZone.js
index fb228bcf4..e3846132b 100644
--- a/modules/zone/back/methods/zone/deleteZone.js
+++ b/modules/zone/back/methods/zone/deleteZone.js
@@ -22,7 +22,7 @@ module.exports = Self => {
const models = Self.app.models;
const token = ctx.req.accessToken;
const userId = token.userId;
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let tx;
diff --git a/modules/zone/back/methods/zone/getZoneClosing.js b/modules/zone/back/methods/zone/getZoneClosing.js
index 2a0088203..76706b55c 100644
--- a/modules/zone/back/methods/zone/getZoneClosing.js
+++ b/modules/zone/back/methods/zone/getZoneClosing.js
@@ -31,7 +31,7 @@ module.exports = Self => {
Object.assign(myOptions, options);
query = `
- SELECT *
+ SELECT *
FROM (
SELECT
DISTINCT z.id,
@@ -40,18 +40,21 @@ module.exports = Self => {
IFNULL(ze.hour, z.hour) as hour,
IFNULL(ze.price, z.price) as price
FROM vn.zone z
- JOIN agencyMode am ON am.id = z.agencyModeFk
- LEFT JOIN zoneEvent ze ON ze.zoneFk = z.id
- WHERE
- (
- dated = ?
- OR ? BETWEEN started AND ended
- OR INSTR(weekDays, SUBSTRING(DAYNAME(?), 1, 3) ) > 0
- )
+ JOIN vn.agencyMode am ON am.id = z.agencyModeFk
+ LEFT JOIN vn.zoneEvent ze ON ze.zoneFk = z.id
+ WHERE ((
+ ze.type = 'day'
+ AND ze.dated = ?
+ ) OR (
+ ze.type != 'day'
+ AND ze.weekDays & (1 << WEEKDAY(?))
+ AND (ze.started IS NULL OR ? >= ze.started)
+ AND (ze.ended IS NULL OR ? <= ze.ended)
+ ))
AND z.id IN (?)
ORDER BY type='day' DESC, type='range' DESC, type='indefinitely' DESC) z
GROUP BY z.id`;
- return Self.rawSql(query, [date, date, date, zoneIds], myOptions);
+ return Self.rawSql(query, [date, date, date, date, zoneIds], myOptions);
};
};
diff --git a/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js b/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
index 3a345f2ce..a34132be4 100644
--- a/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
+++ b/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
@@ -2,7 +2,7 @@ const models = require('vn-loopback/server/server').models;
describe('zone exclusionGeo()', () => {
const zoneId = 1;
- const today = new Date();
+ const today = Date.vnNew();
it(`should show an error when location isn't selected`, async() => {
const tx = await models.Zone.beginTransaction({});
diff --git a/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js b/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
index 8160ee05e..6fd6bb994 100644
--- a/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
+++ b/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
@@ -6,7 +6,7 @@ describe('zone getEventsFiltered()', () => {
try {
const options = {transaction: tx};
- const today = new Date();
+ const today = Date.vnNew();
const result = await models.Zone.getEventsFiltered(10, today, today, options);
@@ -26,7 +26,7 @@ describe('zone getEventsFiltered()', () => {
try {
const options = {transaction: tx};
- const today = new Date();
+ const today = Date.vnNew();
const result = await models.Zone.getEventsFiltered(9, today, today, options);
@@ -45,7 +45,7 @@ describe('zone getEventsFiltered()', () => {
try {
const options = {transaction: tx};
- const date = new Date();
+ const date = Date.vnNew();
date.setFullYear(date.getFullYear() - 2);
const dateTomorrow = new Date(date.setDate(date.getDate() + 1));
diff --git a/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js b/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js
index 4fb4b4e5c..cdd6fe584 100644
--- a/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js
+++ b/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js
@@ -6,7 +6,7 @@ describe('zone getZoneClosing()', () => {
try {
const options = {transaction: tx};
- const date = new Date();
+ const date = Date.vnNew();
const today = date.toISOString().split('T')[0];
const result = await models.Zone.getZoneClosing([1, 2, 3], today, options);
diff --git a/modules/zone/back/methods/zone/specs/includingExpired.spec.js b/modules/zone/back/methods/zone/specs/includingExpired.spec.js
index 98fdc272d..121a84887 100644
--- a/modules/zone/back/methods/zone/specs/includingExpired.spec.js
+++ b/modules/zone/back/methods/zone/specs/includingExpired.spec.js
@@ -50,7 +50,7 @@ describe('zone includingExpired()', () => {
it('should return an array containing available zones', async() => {
const ctx = {req: {accessToken: {userId: 1}}};
const where = {
- shipped: new Date(),
+ shipped: Date.vnNew(),
addressFk: addressId,
agencyModeFk: inhousePickupId,
warehouseFk: warehouseId
diff --git a/modules/zone/front/calendar/index.js b/modules/zone/front/calendar/index.js
index 3bc7158ef..288a8f328 100644
--- a/modules/zone/front/calendar/index.js
+++ b/modules/zone/front/calendar/index.js
@@ -8,7 +8,7 @@ class Controller extends Component {
this.vnWeekDays = vnWeekDays;
this.nMonths = 4;
- let date = new Date();
+ let date = Date.vnNew();
date.setDate(1);
date.setHours(0, 0, 0, 0);
this.date = date;
diff --git a/modules/zone/front/calendar/index.spec.js b/modules/zone/front/calendar/index.spec.js
index 338f47917..43280a9e8 100644
--- a/modules/zone/front/calendar/index.spec.js
+++ b/modules/zone/front/calendar/index.spec.js
@@ -22,7 +22,7 @@ describe('component vnZoneCalendar', () => {
it('should set the month property and then call the refreshEvents() method', () => {
jest.spyOn(controller, 'refreshEvents').mockReturnThis();
- controller.date = new Date();
+ controller.date = Date.vnNew();
expect(controller.refreshEvents).toHaveBeenCalledWith();
expect(controller.months.length).toEqual(4);
@@ -31,7 +31,7 @@ describe('component vnZoneCalendar', () => {
describe('step()', () => {
it('should set the date month to 4 months backwards', () => {
- const now = new Date();
+ const now = Date.vnNew();
now.setDate(15);
now.setMonth(now.getMonth() - 4);
@@ -44,7 +44,7 @@ describe('component vnZoneCalendar', () => {
});
it('should set the date month to 4 months forwards', () => {
- const now = new Date();
+ const now = Date.vnNew();
now.setDate(15);
now.setMonth(now.getMonth() + 4);
@@ -63,13 +63,13 @@ describe('component vnZoneCalendar', () => {
controller.data = {
exclusions: [{
- dated: new Date()
+ dated: Date.vnNew()
}],
events: [{
- dated: new Date()
+ dated: Date.vnNew()
}],
geoExclusions: [{
- dated: new Date()
+ dated: Date.vnNew()
}],
};
@@ -85,9 +85,9 @@ describe('component vnZoneCalendar', () => {
describe('refreshEvents()', () => {
it('should fill the days property with the events.', () => {
controller.data = [];
- controller.firstDay = new Date();
+ controller.firstDay = Date.vnNew();
- const lastDay = new Date();
+ const lastDay = Date.vnNew();
lastDay.setDate(lastDay.getDate() + 10);
controller.lastDay = lastDay;
@@ -114,7 +114,7 @@ describe('component vnZoneCalendar', () => {
jest.spyOn(controller, 'emit');
const $event = {};
- const $days = [new Date()];
+ const $days = [Date.vnNew()];
const $type = 'day';
const $weekday = 1;
@@ -136,7 +136,7 @@ describe('component vnZoneCalendar', () => {
describe('hasEvents()', () => {
it('should return true for an existing event on a date', () => {
- const dated = new Date();
+ const dated = Date.vnNew();
controller.days[dated.getTime()] = true;
@@ -148,7 +148,7 @@ describe('component vnZoneCalendar', () => {
describe('getClass()', () => {
it('should return the className "excluded" for an excluded date', () => {
- const dated = new Date();
+ const dated = Date.vnNew();
controller.exclusions = [];
controller.exclusions[dated.getTime()] = true;
@@ -159,7 +159,7 @@ describe('component vnZoneCalendar', () => {
});
it('should return the className "geoExcluded" for a date with geo excluded', () => {
- const dated = new Date();
+ const dated = Date.vnNew();
controller.geoExclusions = [];
controller.geoExclusions[dated.getTime()] = true;
diff --git a/modules/zone/front/create/index.js b/modules/zone/front/create/index.js
index 859204d8d..db337a9a3 100644
--- a/modules/zone/front/create/index.js
+++ b/modules/zone/front/create/index.js
@@ -7,7 +7,7 @@ export default class Controller extends Section {
travelingDays: 0,
price: 0.20,
bonus: 0.20,
- hour: new Date()
+ hour: Date.vnNew()
};
}
diff --git a/modules/zone/front/delivery-days/index.spec.js b/modules/zone/front/delivery-days/index.spec.js
index 63c87fbea..28705880c 100644
--- a/modules/zone/front/delivery-days/index.spec.js
+++ b/modules/zone/front/delivery-days/index.spec.js
@@ -103,7 +103,7 @@ describe('Zone Component vnZoneDeliveryDays', () => {
const target = document.createElement('div');
target.dispatchEvent(event);
- const day = new Date();
+ const day = Date.vnNew();
const events = [
{zoneFk: 1},
{zoneFk: 2},
diff --git a/modules/zone/front/descriptor/index.js b/modules/zone/front/descriptor/index.js
index 08ada0606..3f4863a60 100644
--- a/modules/zone/front/descriptor/index.js
+++ b/modules/zone/front/descriptor/index.js
@@ -28,7 +28,7 @@ class Controller extends Descriptor {
onDelete() {
const $t = this.$translate.instant;
- const today = new Date();
+ const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const filter = {where: {zoneFk: this.id, shipped: {gte: today}}};
this.$http.get(`Tickets`, {filter}).then(res => {
diff --git a/modules/zone/front/events/index.spec.js b/modules/zone/front/events/index.spec.js
index b4ff800d6..558d97b6f 100644
--- a/modules/zone/front/events/index.spec.js
+++ b/modules/zone/front/events/index.spec.js
@@ -68,7 +68,7 @@ describe('component vnZoneEvents', () => {
it('should call the createInclusion() method', () => {
jest.spyOn(controller, 'createInclusion').mockReturnThis();
- const weekday = {dated: new Date()};
+ const weekday = {dated: Date.vnNew()};
const days = [weekday];
const type = 'EventType';
const events = [];
@@ -114,7 +114,7 @@ describe('component vnZoneEvents', () => {
jest.spyOn(controller, 'createExclusion').mockReturnThis();
const weekday = {};
- const days = [{dated: new Date()}];
+ const days = [{dated: Date.vnNew()}];
const type = 'EventType';
const events = [];
const exclusions = [];
@@ -156,7 +156,7 @@ describe('component vnZoneEvents', () => {
it('shoud set the excludeSelected property and then call the excludeDialog show() method', () => {
controller.$.excludeDialog = {show: jest.fn()};
- const days = [new Date()];
+ const days = [Date.vnNew()];
controller.createExclusion(days);
expect(controller.excludeSelected).toBeDefined();
@@ -170,7 +170,7 @@ describe('component vnZoneEvents', () => {
controller.$.includeDialog = {show: jest.fn()};
const type = 'weekday';
- const days = [new Date()];
+ const days = [Date.vnNew()];
const weekday = 1;
controller.createInclusion(type, days, weekday);
@@ -187,7 +187,7 @@ describe('component vnZoneEvents', () => {
controller.$.includeDialog = {show: jest.fn()};
const type = 'nonListedType';
- const days = [new Date()];
+ const days = [Date.vnNew()];
const weekday = 1;
controller.createInclusion(type, days, weekday);
diff --git a/print/templates/email/buyer-week-waste/buyer-week-waste.js b/print/templates/email/buyer-week-waste/buyer-week-waste.js
index 9d4fe1ce1..1ae40cd98 100755
--- a/print/templates/email/buyer-week-waste/buyer-week-waste.js
+++ b/print/templates/email/buyer-week-waste/buyer-week-waste.js
@@ -13,7 +13,7 @@ module.exports = {
dated: function() {
const filters = this.$options.filters;
- return filters.date(new Date(), '%d-%m-%Y');
+ return filters.date(Date.vnNew(), '%d-%m-%Y');
}
},
methods: {
diff --git a/print/templates/email/osticket-report/osticket-report.js b/print/templates/email/osticket-report/osticket-report.js
index eb9c76a89..0d39947d5 100755
--- a/print/templates/email/osticket-report/osticket-report.js
+++ b/print/templates/email/osticket-report/osticket-report.js
@@ -37,7 +37,7 @@ module.exports = {
dated: function() {
const filters = this.$options.filters;
- return filters.date(new Date(), '%d-%m-%Y');
+ return filters.date(Date.vnNew(), '%d-%m-%Y');
},
startedTime: function() {
return new Date(this.started).getTime();
diff --git a/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js b/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
index 321862671..88645309d 100644
--- a/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
+++ b/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
@@ -26,7 +26,7 @@ module.exports = {
let QRdata = JSON.stringify({
company: 'vnl',
user: this.userFk,
- created: new Date(),
+ created: Date.vnNew(),
table: 'expeditionPallet',
id: this.id
});