diff --git a/front/core/components/calendar/index.html b/front/core/components/calendar/index.html
index 2a5f369fb..8fdd2e7a4 100644
--- a/front/core/components/calendar/index.html
+++ b/front/core/components/calendar/index.html
@@ -19,7 +19,7 @@
icon="keyboard_arrow_right"
class="pointer"
ng-click="$ctrl.moveNext($ctrl.skip)"
- ng-show="$ctrl.displayControls"
+ ng-show="$ctrl.displayControls">
diff --git a/front/core/components/input-number/index.html b/front/core/components/input-number/index.html
index 3ff74a116..bebeb6a31 100644
--- a/front/core/components/input-number/index.html
+++ b/front/core/components/input-number/index.html
@@ -3,7 +3,7 @@
{
this.validateValue();
});
@@ -94,6 +94,7 @@ ngModule.component('vnInputNumber', {
min: '',
max: '',
step: '',
+ displayControls: '',
rule: '@?',
value: '=model',
validate: '&',
diff --git a/gulpfile.js b/gulpfile.js
index dfc91c050..ff68efaa1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -424,7 +424,8 @@ function dockerWait() {
user: dbConf.username,
password: dbConf.password,
host: dbConf.host,
- port: dbConf.port
+ port: dbConf.port,
+ dateStrings: true
};
log('Waiting for MySQL init process...');
diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js
index 03418307b..7ef2f920b 100644
--- a/loopback/server/connectors/vn-mysql.js
+++ b/loopback/server/connectors/vn-mysql.js
@@ -28,9 +28,6 @@ class VnMySQL extends MySQL {
return MySQL.prototype.fromColumnValue.call(this, prop, val);
let date = new Date(val);
- let locale = new Date(val);
- let offset = locale.getTimezoneOffset() * 60000;
- date.setTime(date.getTime() + offset);
return date;
}
@@ -57,7 +54,6 @@ class VnMySQL extends MySQL {
let locale = new Date(param);
let offset = locale.getTimezoneOffset() * 60000;
param.setTime(param.getTime() - offset);
- console.log(param);
}
}
}
diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json
index cfc7bd67e..6540c0de2 100644
--- a/loopback/server/datasources.json
+++ b/loopback/server/datasources.json
@@ -4,7 +4,7 @@
},
"vn": {
"connector": "vn-mysql",
- "timezone": "CET",
+ "timezone": "local",
"database": "vn",
"debug": false,
"host": "localhost",
diff --git a/modules/agency/front/basic-data/index.html b/modules/agency/front/basic-data/index.html
index e823458fa..4d0a67bdf 100644
--- a/modules/agency/front/basic-data/index.html
+++ b/modules/agency/front/basic-data/index.html
@@ -37,7 +37,8 @@
min="0"
step="1"
label="Traveling days"
- field="$ctrl.zone.travelingDays">
+ field="$ctrl.zone.travelingDays"
+ display-controls="false">
+ step="0.20"
+ display-controls="false">
+ step="0.20"
+ display-controls="false">
diff --git a/modules/agency/front/calendar/index.js b/modules/agency/front/calendar/index.js
index 133d6cdf3..4e84c73eb 100644
--- a/modules/agency/front/calendar/index.js
+++ b/modules/agency/front/calendar/index.js
@@ -56,8 +56,11 @@ class Controller {
const events = [];
value.forEach(event => {
+ let date = new Date(event.delivered);
+ date.setHours(0, 0, 0, 0);
+
events.push({
- date: event.delivered,
+ date: date,
color: 'green-circle',
title: 'Has delivery',
isRemovable: true
diff --git a/modules/agency/front/create/index.html b/modules/agency/front/create/index.html
index 4a4237fd9..0a8c08207 100644
--- a/modules/agency/front/create/index.html
+++ b/modules/agency/front/create/index.html
@@ -39,7 +39,8 @@
value="$ctrl.zone.travelingDays"
step="1"
label="Traveling days"
- field="$ctrl.zone.travelingDays">
+ field="$ctrl.zone.travelingDays"
+ display-controls="false">
+ min="0.00"
+ step="0.20"
+ display-controls="false">
+ min="0.00"
+ step="0.20"
+ display-controls="false">
diff --git a/modules/ticket/front/data/step-one/index.js b/modules/ticket/front/data/step-one/index.js
index f3e8bf300..54aac4c2f 100644
--- a/modules/ticket/front/data/step-one/index.js
+++ b/modules/ticket/front/data/step-one/index.js
@@ -1,5 +1,4 @@
import ngModule from '../../module';
-import {toJsonDate} from 'core/lib/date';
import './style.scss';
class Controller {
@@ -66,7 +65,7 @@ class Controller {
onChangeShipped(value) {
let data = {
- shipped: toJsonDate(value),
+ shipped: value,
addressFk: this.ticket.addressFk,
agencyModeFk: this.ticket.agencyModeFk,
warehouseFk: this.ticket.warehouseFk
@@ -128,7 +127,7 @@ class Controller {
let query = `/ticket/api/sales/${this.ticket.id}/priceDifference`;
let data = {
- landed: toJsonDate(this.ticket.landed),
+ landed: this.ticket.landed,
addressFk: this.ticket.addressFk,
agencyModeFk: this.ticket.agencyModeFk,
warehouseFk: this.ticket.warehouseFk
diff --git a/modules/ticket/front/data/step-one/index.spec.js b/modules/ticket/front/data/step-one/index.spec.js
index f72e2c43b..e7049394b 100644
--- a/modules/ticket/front/data/step-one/index.spec.js
+++ b/modules/ticket/front/data/step-one/index.spec.js
@@ -1,5 +1,4 @@
import './index.js';
-import {toJsonDate} from 'core/lib/date';
describe('Ticket', () => {
describe('Component vnTicketDataStepOne', () => {
@@ -68,7 +67,7 @@ describe('Ticket', () => {
warehouseFk: 1
};
let data = {
- shipped: toJsonDate(shipped),
+ shipped: shipped,
addressFk: 121,
agencyModeFk: 2,
warehouseFk: 1