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: ' + 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