dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good
Details
gitea/salix/test This commit looks good
Details
This commit is contained in:
parent
43f26d1bc9
commit
d404fc92c8
|
@ -19,7 +19,7 @@
|
||||||
icon="keyboard_arrow_right"
|
icon="keyboard_arrow_right"
|
||||||
class="pointer"
|
class="pointer"
|
||||||
ng-click="$ctrl.moveNext($ctrl.skip)"
|
ng-click="$ctrl.moveNext($ctrl.skip)"
|
||||||
ng-show="$ctrl.displayControls"
|
ng-show="$ctrl.displayControls">
|
||||||
</vn-icon>
|
</vn-icon>
|
||||||
</vn-auto>
|
</vn-auto>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -424,7 +424,8 @@ function dockerWait() {
|
||||||
user: dbConf.username,
|
user: dbConf.username,
|
||||||
password: dbConf.password,
|
password: dbConf.password,
|
||||||
host: dbConf.host,
|
host: dbConf.host,
|
||||||
port: dbConf.port
|
port: dbConf.port,
|
||||||
|
dateStrings: true
|
||||||
};
|
};
|
||||||
|
|
||||||
log('Waiting for MySQL init process...');
|
log('Waiting for MySQL init process...');
|
||||||
|
|
|
@ -28,9 +28,6 @@ class VnMySQL extends MySQL {
|
||||||
return MySQL.prototype.fromColumnValue.call(this, prop, val);
|
return MySQL.prototype.fromColumnValue.call(this, prop, val);
|
||||||
|
|
||||||
let date = new Date(val);
|
let date = new Date(val);
|
||||||
let locale = new Date(val);
|
|
||||||
let offset = locale.getTimezoneOffset() * 60000;
|
|
||||||
date.setTime(date.getTime() + offset);
|
|
||||||
|
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
|
@ -57,7 +54,6 @@ class VnMySQL extends MySQL {
|
||||||
let locale = new Date(param);
|
let locale = new Date(param);
|
||||||
let offset = locale.getTimezoneOffset() * 60000;
|
let offset = locale.getTimezoneOffset() * 60000;
|
||||||
param.setTime(param.getTime() - offset);
|
param.setTime(param.getTime() - offset);
|
||||||
console.log(param);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -245,6 +241,7 @@ class VnMySQL extends MySQL {
|
||||||
exports.VnMySQL = VnMySQL;
|
exports.VnMySQL = VnMySQL;
|
||||||
|
|
||||||
exports.initialize = function initialize(dataSource, callback) {
|
exports.initialize = function initialize(dataSource, callback) {
|
||||||
|
console.log(dataSource);
|
||||||
dataSource.driver = mysql;
|
dataSource.driver = mysql;
|
||||||
dataSource.connector = new VnMySQL(dataSource.settings);
|
dataSource.connector = new VnMySQL(dataSource.settings);
|
||||||
dataSource.connector.dataSource = dataSource;
|
dataSource.connector.dataSource = dataSource;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
},
|
},
|
||||||
"vn": {
|
"vn": {
|
||||||
"connector": "vn-mysql",
|
"connector": "vn-mysql",
|
||||||
"timezone": "CET",
|
"timezone": "local",
|
||||||
"database": "vn",
|
"database": "vn",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "localhost",
|
"host": "localhost",
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import ngModule from '../../module';
|
import ngModule from '../../module';
|
||||||
import {toJsonDate} from 'core/lib/date';
|
|
||||||
import './style.scss';
|
import './style.scss';
|
||||||
|
|
||||||
class Controller {
|
class Controller {
|
||||||
|
@ -66,7 +65,7 @@ class Controller {
|
||||||
|
|
||||||
onChangeShipped(value) {
|
onChangeShipped(value) {
|
||||||
let data = {
|
let data = {
|
||||||
shipped: toJsonDate(value),
|
shipped: value,
|
||||||
addressFk: this.ticket.addressFk,
|
addressFk: this.ticket.addressFk,
|
||||||
agencyModeFk: this.ticket.agencyModeFk,
|
agencyModeFk: this.ticket.agencyModeFk,
|
||||||
warehouseFk: this.ticket.warehouseFk
|
warehouseFk: this.ticket.warehouseFk
|
||||||
|
@ -128,7 +127,7 @@ class Controller {
|
||||||
|
|
||||||
let query = `/ticket/api/sales/${this.ticket.id}/priceDifference`;
|
let query = `/ticket/api/sales/${this.ticket.id}/priceDifference`;
|
||||||
let data = {
|
let data = {
|
||||||
landed: toJsonDate(this.ticket.landed),
|
landed: this.ticket.landed,
|
||||||
addressFk: this.ticket.addressFk,
|
addressFk: this.ticket.addressFk,
|
||||||
agencyModeFk: this.ticket.agencyModeFk,
|
agencyModeFk: this.ticket.agencyModeFk,
|
||||||
warehouseFk: this.ticket.warehouseFk
|
warehouseFk: this.ticket.warehouseFk
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import './index.js';
|
import './index.js';
|
||||||
import {toJsonDate} from 'core/lib/date';
|
|
||||||
|
|
||||||
describe('Ticket', () => {
|
describe('Ticket', () => {
|
||||||
describe('Component vnTicketDataStepOne', () => {
|
describe('Component vnTicketDataStepOne', () => {
|
||||||
|
@ -68,7 +67,7 @@ describe('Ticket', () => {
|
||||||
warehouseFk: 1
|
warehouseFk: 1
|
||||||
};
|
};
|
||||||
let data = {
|
let data = {
|
||||||
shipped: toJsonDate(shipped),
|
shipped: shipped,
|
||||||
addressFk: 121,
|
addressFk: 121,
|
||||||
agencyModeFk: 2,
|
agencyModeFk: 2,
|
||||||
warehouseFk: 1
|
warehouseFk: 1
|
||||||
|
|
Loading…
Reference in New Issue