diff --git a/modules/client/front/notification/index.js b/modules/client/front/notification/index.js index 4be96bc17..faa062b25 100644 --- a/modules/client/front/notification/index.js +++ b/modules/client/front/notification/index.js @@ -86,7 +86,7 @@ export default class Controller extends Section { const params = JSON.stringify(data); this.$http.post('ClientConsumptionQueues', {params}) .then(() => this.$.filters.hide()) - .then(() => this.vnApp.showSuccess(this.$t('Notifications sent!'))); + .then(() => this.vnApp.showSuccess(this.$t('Notification sent!'))); } exprBuilder(param, value) { diff --git a/modules/client/front/notification/index.spec.js b/modules/client/front/notification/index.spec.js index ea082c403..4e754f6ad 100644 --- a/modules/client/front/notification/index.spec.js +++ b/modules/client/front/notification/index.spec.js @@ -69,15 +69,16 @@ describe('Client notification', () => { data[0].$checked = true; data[1].$checked = true; - const params = Object.assign({ + const args = Object.assign({ clients: [1101, 1102] }, controller.campaign); + const params = JSON.stringify(args); $httpBackend.expect('POST', `ClientConsumptionQueues`, {params}).respond(200, params); controller.onSendClientConsumption(); $httpBackend.flush(); - expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notifications sent!'); + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notification sent!'); }); }); diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js index 4f3813eb8..5e81e3827 100644 --- a/modules/ticket/back/methods/ticket/closeAll.js +++ b/modules/ticket/back/methods/ticket/closeAll.js @@ -18,6 +18,7 @@ module.exports = Self => { Self.closeAll = async() => { const toDate = new Date(); + toDate.setHours(0, 0, 0, 0); toDate.setDate(toDate.getDate() - 1); const todayMinDate = new Date(); diff --git a/modules/travel/front/extra-community/index.html b/modules/travel/front/extra-community/index.html index f19ab592e..fbf982b68 100644 --- a/modules/travel/front/extra-community/index.html +++ b/modules/travel/front/extra-community/index.html @@ -42,10 +42,10 @@ Id - + Supplier - + Agency @@ -100,7 +100,7 @@ {{::travel.id}} - + @@ -110,22 +110,23 @@ {{::travel.agencyModeName}} - {{::travel.stickers}} - {{::entry.ref}} + {{::entry.ref}} {{::entry.stickers}} {{::entry.loadedkg}} diff --git a/modules/travel/front/extra-community/style.scss b/modules/travel/front/extra-community/style.scss index 532a3056a..4b0dd6b22 100644 --- a/modules/travel/front/extra-community/style.scss +++ b/modules/travel/front/extra-community/style.scss @@ -3,7 +3,7 @@ vn-travel-extra-community { .header { margin-bottom: 16px; - font-size: 1.25rem; + font-size: 1.1rem; line-height: 1; padding: 7px; padding-bottom: 7px; @@ -29,10 +29,10 @@ vn-travel-extra-community { outline: 0; height: 65px; pointer-events: fill; - user-select:all; + user-select: all; } - tr[draggable] *::selection{ + tr[draggable] *::selection { background-color: transparent; } @@ -43,16 +43,19 @@ vn-travel-extra-community { tr[draggable].dragging { background-color: $color-primary-light; color: $color-font-light; - font-weight:bold; + font-weight: bold; } - .td-editable{ - input{ - font-size: 1.25rem!important; - } + .td-editable { + max-width: 200px; } - .number *{ - text-align: right; + vn-input-number.number { + min-width: 100px; + padding-right: 10px; + } + + .number * { + text-align: center; } }