diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js index fb36e3279..ee964b534 100644 --- a/e2e/helpers/extensions.js +++ b/e2e/helpers/extensions.js @@ -6,6 +6,102 @@ import config from './config.js'; let currentUser; +let asyncActions = { + // Generic extensions + + clickIfExists: async function(selector) { + let exists = await this.exists(selector); + if (exists) await this.click(selector); + return exists; + }, + + // Salix specific extensions + + changeLanguageToEnglish: async function() { + let langSelector = '.user-popover vn-autocomplete[ng-model="$ctrl.lang"]'; + + let lang = await this.waitToClick('#user') + .wait(langSelector) + .waitToGetProperty(`${langSelector} input`, 'value'); + + if (lang !== 'English') + await this.autocompleteSearch(langSelector, 'English'); + }, + + login: async function(userName) { + if (currentUser !== userName) { + let logoutClicked = await this.clickIfExists('#logout'); + + if (logoutClicked) { + let buttonSelector = '.vn-dialog.shown button[response=ACCEPT]'; + this.wait(buttonSelector => { + return document.querySelector(buttonSelector) != null + || location.hash == '#!/login'; + }, buttonSelector); + await this.clickIfExists(buttonSelector); + } + + try { + await this.waitForURL('#!/login'); + } catch (e) { + this.goto(`${config.url}/#!/login`); + } + + await this.wait(`vn-login input[name=user]`) + .clearInput(`vn-login input[name=user]`) + .write(`vn-login input[name=user]`, userName) + .write(`vn-login input[name=password]`, 'nightmare') + .click(`vn-login input[type=submit]`) + .waitForURL('#!/') + .changeLanguageToEnglish(); + + currentUser = userName; + } else + await this.waitToClick('vn-topbar a[ui-sref="home"]'); + }, + + waitForLogin: async function(userName) { + await this.login(userName); + }, + + selectModule: async function(moduleName) { + let snakeName = moduleName.replace(/[\w]([A-Z])/g, m => { + return m[0] + '-' + m[1]; + }).toLowerCase(); + + await this.waitToClick(`vn-home a[ui-sref="${moduleName}.index"]`) + .waitForURL(snakeName); + }, + + loginAndModule: async function(userName, moduleName) { + await this.login(userName) + .selectModule(moduleName); + }, + + datePicker: async function(selector, changeMonth, day) { + let date = new Date(); + if (changeMonth) date.setMonth(date.getMonth() + changeMonth); + date.setDate(day ? day : 16); + date = date.toISOString().substr(0, 10); + + await this.wait(selector) + .evaluate((selector, date) => { + let input = document.querySelector(selector).$ctrl.input; + input.value = date; + input.dispatchEvent(new Event('change')); + }, selector, date); + }, + + pickTime: async function(selector, time) { + await this.wait(selector) + .evaluate((selector, time) => { + let input = document.querySelector(selector).$ctrl.input; + input.value = time; + input.dispatchEvent(new Event('change')); + }, selector, time); + } +}; + let actions = { clearTextarea: function(selector, done) { this.wait(selector) @@ -28,48 +124,6 @@ let actions = { .catch(done); }, - login: function(userName, done) { - if (currentUser) - this.waitToClick('#logout'); - - let doLogin = () => { - this.wait(`vn-login input[name=user]`) - .clearInput(`vn-login input[name=user]`) - .write(`vn-login input[name=user]`, userName) - .write(`vn-login input[name=password]`, 'nightmare') - .click(`vn-login input[type=submit]`) - .then(() => { - currentUser = userName; - done(); - }) - .catch(done); - }; - - this.waitForURL('#!/login') - .then(doLogin) - .catch(() => { - this.goto(`${config.url}/#!/login`) - .then(doLogin) - .catch(done); - }); - }, - - waitForLogin: function(userName, done) { - if (currentUser === userName) { - return this.waitToClick('vn-topbar a[ui-sref="home"]') - .waitForURL('#!/') - .changeLanguageToEnglish() - .then(done) - .catch(done); - } - return this.login(userName) - .waitForURL('#!/') - .url() - .changeLanguageToEnglish() - .then(done) - .catch(done); - }, - resetLogin: function(done) { this.then(() => { currentUser = undefined; @@ -78,41 +132,6 @@ let actions = { .catch(done); }, - changeLanguageToEnglish: function(done) { - let langSelector = '.user-popover vn-autocomplete[ng-model="$ctrl.lang"]'; - - this.waitToClick('#user') - .wait(langSelector) - .waitToGetProperty(`${langSelector} input`, 'value') - .then(lang => { - if (lang === 'English') { - this.then(done) - .catch(done); - } else { - this.autocompleteSearch(langSelector, 'English') - .then(done) - .catch(done); - } - }); - }, - - selectModule: function(moduleName, done) { - let snakeName = moduleName.replace(/[\w]([A-Z])/g, m => { - return m[0] + '-' + m[1]; - }).toLowerCase(); - this.waitToClick(`vn-home a[ui-sref="${moduleName}.index"]`) - .waitForURL(snakeName) - .then(done) - .catch(done); - }, - - loginAndModule: function(userName, moduleName, done) { - this.waitForLogin(userName) - .selectModule(moduleName) - .then(done) - .catch(done); - }, - parsedUrl: function(done) { this.url() .then(url => { @@ -419,51 +438,6 @@ let actions = { }); }, - pickTime: function(selector, time, done) { - this.wait(selector) - .evaluate((selector, time) => { - let input = document.querySelector(selector); - input.value = time; - input.dispatchEvent(new Event('change')); - }, selector, time) - .then(done) - .catch(done); - }, - - datePicker: function(selector, changeMonth, day, done) { - this.wait(selector) - .mousedown(`${selector} input`) - .wait('.flatpickr-calendar.open'); - - if (changeMonth > 0) - this.mousedown(`.flatpickr-calendar.open .flatpickr-next-month`); - if (changeMonth < 0) - this.mousedown(`.flatpickr-calendar.open .flatpickr-prev-month`); - - let daySelector; - - if (!day) - daySelector = `.flatpickr-calendar.open .flatpickr-day:nth-child(16)`; - if (day) - daySelector = `.flatpickr-calendar.open .flatpickr-day[aria-label~="${day},"]:not(.prevMonthDay):not(.nextMonthDay)`; - - this.wait(selector => { - return document.querySelector(selector); - }, daySelector) - .evaluate(selector => { - let event = new MouseEvent('mousedown', { - bubbles: true, - cancelable: true, - view: window - }); - document.querySelector(selector).dispatchEvent(event); - }, daySelector) - .then(done) - .catch(() => { - done(new Error(`.datePicker(), for ${daySelector} timed out`)); - }); - }, - reloadSection: function(sectionRoute, done) { this.waitToClick('vn-icon[icon="desktop_windows"]') .wait('vn-card.summary') @@ -516,6 +490,16 @@ let actions = { }, }; +for (let name in asyncActions) { + let fn = asyncActions[name]; + + Nightmare.action(name, function(...args) { + let done = args[args.length - 1]; + fn.apply(this, args) + .then(res => done(null, res), done); + }); +} + Object.keys(actions).forEach(function(name) { let fn = actions[name]; Nightmare.action(name, fn); diff --git a/e2e/helpers/nightmare.js b/e2e/helpers/nightmare.js index 75794c28d..6706b6dc4 100644 --- a/e2e/helpers/nightmare.js +++ b/e2e/helpers/nightmare.js @@ -1,4 +1,6 @@ const Nightmare = require('nightmare'); +const config = require('./config.js'); + let nightmare; module.exports = function createNightmare(width = 1280, height = 720) { @@ -25,5 +27,5 @@ module.exports = function createNightmare(width = 1280, height = 720) { }); nightmare.header('Accept-Language', 'en'); - return nightmare; + return nightmare.goto(config.url); }; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 5d8fd487c..bc68f96e4 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -363,7 +363,7 @@ export default { moreMenuMakeInvoice: '.vn-popover.shown .vn-drop-down li[name="Make invoice"]', moreMenuChangeShippedHour: '.vn-popover.shown .vn-drop-down li[name="Change shipped hour"]', changeShippedHourDialog: 'vn-ticket-descriptor vn-dialog[vn-id="changeShippedDialog"]', - changeShippedHourInput: 'vn-ticket-descriptor vn-dialog[vn-id="changeShippedDialog"] vn-input-time[vn-id="newShipped"]', + changeShippedHourInput: 'vn-dialog[vn-id="changeShippedDialog"] [ng-model="$ctrl.newShipped"]', addStowawayDialogFirstTicket: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog vn-table vn-tbody vn-tr', shipButton: 'vn-ticket-descriptor > div > div.body > div.quicklinks vn-icon[icon="icon-stowaway"]', thursdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(4)', @@ -421,7 +421,6 @@ export default { firstSaleQuantity: 'vn-input-number[ng-model="sale.quantity"]:nth-child(1) input', firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(5)', firstSaleQuantityClearInput: 'vn-textfield[ng-model="sale.quantity"] div.suffix > i', - firstSaleIdInput: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete input', firstSaleIdAutocomplete: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete', idAutocompleteFirstResult: '.vn-popover.shown .vn-drop-down li', firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(7) > span', @@ -672,7 +671,7 @@ export default { saveButton: 'vn-worker-pbx vn-submit[label="Save"] input' }, workerTimeControl: { - timeDialogInput: 'vn-worker-time-control > vn-dialog input', + timeDialogInput: '.vn-dialog.shown [ng-model="$ctrl.newTime"]', mondayAddTimeButton: 'vn-worker-time-control > div > vn-card > div > vn-horizontal > vn-table > div > vn-tfoot > vn-tr:nth-child(2) > vn-td:nth-child(1) > vn-icon-button > button > vn-icon', tuesdayAddTimeButton: 'vn-worker-time-control > div > vn-card > div > vn-horizontal > vn-table > div > vn-tfoot > vn-tr:nth-child(2) > vn-td:nth-child(2) > vn-icon-button > button > vn-icon', wednesdayAddTimeButton: 'vn-worker-time-control > div > vn-card > div > vn-horizontal > vn-table > div > vn-tfoot > vn-tr:nth-child(2) > vn-td:nth-child(3) > vn-icon-button > button > vn-icon', diff --git a/e2e/paths/01-login/01_login.spec.js b/e2e/paths/01-login/01_login.spec.js index a33be0c25..e5a70703e 100644 --- a/e2e/paths/01-login/01_login.spec.js +++ b/e2e/paths/01-login/01_login.spec.js @@ -1,5 +1,4 @@ import createNightmare from '../../helpers/nightmare'; -import config from '../../helpers/config.js'; describe('Login path', () => { @@ -10,7 +9,6 @@ describe('Login path', () => { const password = 'nightmare'; const result = await nightmare - .goto(`${config.url}/#!/login`) .wait(`vn-login input[name=user]`) .write(`vn-login input[name=user]`, username) .write(`vn-login input[name=password]`, password) diff --git a/e2e/paths/05-ticket-module/12_descriptor.spec.js b/e2e/paths/05-ticket-module/12_descriptor.spec.js index 5c80bbfe8..b9c6c7c87 100644 --- a/e2e/paths/05-ticket-module/12_descriptor.spec.js +++ b/e2e/paths/05-ticket-module/12_descriptor.spec.js @@ -34,7 +34,7 @@ describe('Ticket descriptor path', () => { const result = await nightmare .waitToClick(selectors.ticketDescriptor.moreMenu) .waitToClick(selectors.ticketDescriptor.moreMenuChangeShippedHour) - .write(selectors.ticketDescriptor.changeShippedHourInput, '08:15') + .pickTime(selectors.ticketDescriptor.changeShippedHourInput, '08:15') .waitToClick(selectors.ticketDescriptor.acceptChangeHourButton) .waitForLastSnackbar(); diff --git a/front/core/components/autocomplete/index.html b/front/core/components/autocomplete/index.html index 2e5cc39f6..c0caf061b 100755 --- a/front/core/components/autocomplete/index.html +++ b/front/core/components/autocomplete/index.html @@ -1,6 +1,6 @@
+ on-close-start="$ctrl.focus()"> \ No newline at end of file diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js index 69114d028..49dd14b07 100755 --- a/front/core/components/autocomplete/index.js +++ b/front/core/components/autocomplete/index.js @@ -228,7 +228,7 @@ export default class Autocomplete extends Field { event.preventDefault(); } - onContainerMouseDown(event) { + onContainerClick(event) { if (event.defaultPrevented) return; event.preventDefault(); this.showDropDown(); @@ -260,6 +260,7 @@ export default class Autocomplete extends Field { } showDropDown(search) { + if (this.readonly) return; this.assignDropdownProps(); this.$.dropDown.show(this.container, search); } diff --git a/front/core/components/autocomplete/style.scss b/front/core/components/autocomplete/style.scss index af45902cc..6be42c3bc 100755 --- a/front/core/components/autocomplete/style.scss +++ b/front/core/components/autocomplete/style.scss @@ -20,4 +20,7 @@ vn-autocomplete.vn-field { } } } + &.readonly > .container > .icons.post { + display: none; + } } diff --git a/front/core/components/date-picker/index.js b/front/core/components/date-picker/index.js index e46cde17e..933123485 100644 --- a/front/core/components/date-picker/index.js +++ b/front/core/components/date-picker/index.js @@ -1,15 +1,40 @@ import ngModule from '../../module'; import Field from '../field'; -import {Flatpickr} from '../../vendor'; import './style.scss'; class DatePicker extends Field { - constructor($element, $scope, $compile, $translate) { + constructor($element, $scope, $compile, $translate, $filter) { super($element, $scope, $compile); this.$translate = $translate; + this.$filter = $filter; - this.input = $compile(``)($scope)[0]; - this.initPicker(); + this.input = $compile(``)($scope)[0]; + this.input.addEventListener('change', () => this.onValueUpdate()); + } + + onValueUpdate() { + let date = null; + let value = this.input.value; + + if (value) { + date = new Date(value); + + if (this.field) { + let orgDate = this.field instanceof Date + ? this.field + : new Date(this.field); + + date.setHours( + orgDate.getHours(), + orgDate.getMinutes(), + orgDate.getSeconds(), + orgDate.getMilliseconds() + ); + } + } + + super.field = date; + this.$.$applyAsync(); } get field() { @@ -18,69 +43,10 @@ class DatePicker extends Field { set field(value) { super.field = value; - - let date = value; - if (date && !(date instanceof Date)) - date = new Date(date); - - this.picker.setDate(fixDate(date)); - } - - set options(value) { - let selectedDates = this.picker.selectedDates || []; - this._options = value; - this.initPicker(); - this.picker.setDate(selectedDates[0]); - } - - get options() { - return this._options; - } - - initPicker() { - let locale = this.$translate.use(); - let format = locale == 'es' ? 'd-m-Y' : 'Y-m-d'; - - let options = this.options || {}; - let defaultOptions = { - locale: locale, - dateFormat: format, - enableTime: false, - disableMobile: true, - onValueUpdate: () => this.onValueUpdate() - }; - - if (options.enableTime) { - Object.assign(defaultOptions, { - dateFormat: `${format} h:i`, - time_24hr: true - }); - } - - let mergedOptions = Object.assign({}, - defaultOptions, - options - ); - - if (this.picker) this.picker.destroy(); - this.picker = new Flatpickr(this.input, mergedOptions); - } - - onValueUpdate() { - let date = null; - - if (this.picker.selectedDates.length) - date = this.picker.selectedDates[0]; - - super.field = fixDate(date, -1); - this.$.$applyAsync(); - } - - $onDestroy() { - this.picker.destroy(); + this.input.value = this.$filter('dateTime')(value, 'yyyy-MM-dd'); } } -DatePicker.$inject = ['$element', '$scope', '$compile', '$translate']; +DatePicker.$inject = ['$element', '$scope', '$compile', '$translate', '$filter']; ngModule.vnComponent('vnDatePicker', { controller: DatePicker, @@ -88,12 +54,3 @@ ngModule.vnComponent('vnDatePicker', { options: ' { let $filter; let $element; let $ctrl; - let today; beforeEach(angular.mock.module('vnCore', $translateProvider => { $translateProvider.translations('en', {}); @@ -13,9 +12,6 @@ describe('Component vnDatePicker', () => { $element = $compile(``)($rootScope); $ctrl = $element.controller('vnDatePicker'); - - today = new Date(); - today.setUTCHours(0, 0, 0, 0); })); afterEach(() => { @@ -24,22 +20,14 @@ describe('Component vnDatePicker', () => { describe('field() setter', () => { it(`should display the formated the date`, () => { - $ctrl.field = today; + let today; + today = new Date(); + today.setUTCHours(0, 0, 0, 0); + $ctrl.field = today; let displayed = $filter('dateTime')(today, 'yyyy-MM-dd'); expect($ctrl.value).toEqual(displayed); }); }); - - describe('options() setter', () => { - it(`should display the date with the new format`, () => { - $ctrl.options = {dateFormat: 'Y-m'}; - $ctrl.field = today; - - let displayed = $filter('dateTime')(today, 'yyyy-MM'); - - expect($ctrl.value).toEqual(displayed); - }); - }); }); diff --git a/front/core/components/drop-down/drop-down.html b/front/core/components/drop-down/drop-down.html index e9a37a675..2e4db921d 100755 --- a/front/core/components/drop-down/drop-down.html +++ b/front/core/components/drop-down/drop-down.html @@ -1,7 +1,8 @@ + on-close="$ctrl.onClose()" + on-close-start="$ctrl.emit('closeStart')">
this.$.input.focus()); this.emit('open'); } diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index bc60af0d3..1004aeb05 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -69,10 +69,12 @@ export default class Field extends FormInput { } set name(value) { + // super.name = value; this.input.name = value; } get name() { + // return super.name; return this.input.name; } @@ -181,8 +183,8 @@ export default class Field extends FormInput { } onClick() { - if (event.defaultPrevented) return; - event.preventDefault(); + // if (event.defaultPrevented) return; + // event.preventDefault(); if (this.input !== document.activeElement) this.focus(); diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss index 30b33a5df..9d45da3d2 100644 --- a/front/core/components/field/style.scss +++ b/front/core/components/field/style.scss @@ -64,12 +64,33 @@ color: inherit; box-sizing: border-box; min-height: 56px; - + } + & > input { + position: relative; + + &[type=time], + &[type=date], + &[type=password] { + opacity: 0; + transition: opacity 200ms ease-in-out; + cursor: pointer; + } &[type=time], &[type=date] { clip-path: inset(0 20px 0 0); - opacity: 0; - transition: opacity 200ms ease-in-out; + + &::-webkit-inner-spin-button, + &::-webkit-clear-button { + display: none; + -webkit-appearance: none; + } + &::-webkit-calendar-picker-indicator { + position: absolute; + height: 100%; + width: 100%; + opacity: 0; + cursor: pointer; + } } &[type=number] { -moz-appearance: textfield; @@ -83,6 +104,15 @@ &:invalid { box-shadow: none; } + &:-internal-autofill-selected { + &, + &:hover, + &:focus, + &:active, + &:valid { + box-shadow: 0 0 0 40px $color-bg-panel inset; + } + } } } } @@ -172,7 +202,8 @@ } & > .control > * { &[type=time], - &[type=date] { + &[type=date], + &[type=password] { opacity: 1; } } diff --git a/front/core/components/input-time/index.js b/front/core/components/input-time/index.js index 9c6ae0e4a..3dc01e0c7 100644 --- a/front/core/components/input-time/index.js +++ b/front/core/components/input-time/index.js @@ -25,7 +25,10 @@ export default class InputTime extends Field { if (value) { let split = value.split(':').map(i => parseInt(i) || null); - date = new Date(this.field || null); + + date = this.field instanceof Date + ? this.field + : new Date(this.field || null); date.setHours(split[0], split[1], 0, 0); } diff --git a/front/core/components/popover/popover.js b/front/core/components/popover/popover.js index af6edb79a..39b44e206 100644 --- a/front/core/components/popover/popover.js +++ b/front/core/components/popover/popover.js @@ -109,6 +109,7 @@ export default class Popover extends Component { this.showTimeout = null; this.element.style.display = 'none'; this.document.body.removeChild(this.element); + this.emit('close'); }, 250); this.document.removeEventListener('keydown', this.docKeyDownHandler); @@ -118,7 +119,7 @@ export default class Popover extends Component { this.bgMouseDownHandler = null; if (this.deregisterCallback) this.deregisterCallback(); - this.emit('close'); + this.emit('closeStart'); } /** diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js index 9384b712b..b2275af0d 100644 --- a/front/core/components/searchbar/searchbar.js +++ b/front/core/components/searchbar/searchbar.js @@ -69,7 +69,7 @@ export default class Controller extends Component { this.$panelScope = this.$.$new(); this.$panel = this.$compile(`<${this.panel}/>`)(this.$panelScope); - let panel = this.$panel.isolateScope().$ctrl; + let panel = this.$panel[0].$ctrl; if (this.shownFilter) panel.filter = JSON.parse(JSON.stringify(this.shownFilter)); panel.onSubmit = filter => this.onPanelSubmit(filter); diff --git a/front/core/directives/focus.js b/front/core/directives/focus.js index b57241078..55e7d3496 100644 --- a/front/core/directives/focus.js +++ b/front/core/directives/focus.js @@ -1,6 +1,11 @@ import ngModule from '../module'; +const regex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i; +export const isMobile = regex.test(navigator.userAgent); + export function focus(input) { + if (isMobile) return; + const element = input; let selector = 'input, textarea, button, submit'; @@ -14,7 +19,6 @@ export function focus(input) { view: window }); element.dispatchEvent(focusEvent); - return; } diff --git a/front/core/vendor.js b/front/core/vendor.js index ac4364feb..bd368dac2 100644 --- a/front/core/vendor.js +++ b/front/core/vendor.js @@ -22,10 +22,3 @@ import 'material-design-lite/dist/material.orange-deep_orange.min.css'; import * as validator from 'validator'; export {validator}; - -import Flatpickr from 'flatpickr'; -import 'flatpickr/dist/flatpickr.css'; -import 'flatpickr/dist/themes/material_orange.css'; -import l10ns from 'flatpickr/dist/l10n'; -Flatpickr.l10ns = l10ns; -export {Flatpickr}; diff --git a/front/package-lock.json b/front/package-lock.json index 15ac9e49c..31fc844b9 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -88,21 +88,6 @@ "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.2.tgz", "integrity": "sha512-jDy4QYGpmiy7+Qk8QvKJ4spjDdxcx9cxMydmq1x427HkKWBw0qizLYeYM2F6tMcvvqGjU5VpJS55j4LnsaBblA==" }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "graceful-fs": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz", - "integrity": "sha1-8tcgwiCS90Mih3XHXjYSYyUB8TE=" - }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", @@ -112,14 +97,6 @@ "esprima": "^4.0.0" } }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, "material-design-lite": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz", @@ -3229,11 +3206,6 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" - }, "validator": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/validator/-/validator-6.3.0.tgz", diff --git a/front/package.json b/front/package.json index bfd8edfc4..82798b28c 100644 --- a/front/package.json +++ b/front/package.json @@ -18,7 +18,6 @@ "angular-translate": "^2.18.1", "angular-translate-loader-partial": "^2.18.1", "flatpickr": "^4.5.2", - "fs-extra": "^5.0.0", "js-yaml": "^3.13.1", "material-design-lite": "^1.3.0", "mg-crud": "^1.1.2", diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index 953441581..289f8f197 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -8,23 +8,18 @@
- - - + + - + field="::$ctrl.claim.created | dateTime:'yyyy-MM-dd hh:mm'" + readonly="true"> + { + it('should return the expected message and status code', async() => { + const code = 200; + const smsConfig = await app.models.SmsConfig.findOne(); + const soapClient = await soap.createClientAsync(smsConfig.uri); + spyOn(soap, 'createClientAsync').and.returnValue(soapClient); + spyOn(soapClient, 'sendSMSAsync').and.returnValue([{ + result: { + $value: + ` + + + ${code} + + + Envio en procesamiento + + + 1 + + + + 444328681 + + ` + } + }]); + let ctx = {req: {accessToken: {userId: 1}}}; + let result = await app.models.Sms.send(ctx, 105, 'destination', 'My SMS Body'); + + expect(result.statusCode).toEqual(200); + expect(result.status).toContain('Envio en procesamiento'); + }); + + it(`should throw if the response code isn't 200`, async() => { + let error; + const code = 400; + const smsConfig = await app.models.SmsConfig.findOne(); + const soapClient = await soap.createClientAsync(smsConfig.uri); + spyOn(soap, 'createClientAsync').and.returnValue(soapClient); + spyOn(soapClient, 'sendSMSAsync').and.returnValue([{ + result: { + $value: + ` + + + ${code} + + + Envio en procesamiento + + + 1 + + + + 444328681 + + ` + } + }]); + let ctx = {req: {accessToken: {userId: 1}}}; + try { + await app.models.Sms.send(ctx, 105, 'destination', 'My SMS Body'); + } catch (err) { + error = err; + } + + expect(error.message).toEqual(`We weren't able to send this SMS`); + }); +}); diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html index 2c502e9d9..ccfc253e7 100644 --- a/modules/client/front/fiscal-data/index.html +++ b/modules/client/front/fiscal-data/index.html @@ -32,21 +32,26 @@ - + label="Country" + rule> - + label="Province" + rule> diff --git a/modules/order/front/filter/index.js b/modules/order/front/filter/index.js index 4305f2506..780bf798b 100644 --- a/modules/order/front/filter/index.js +++ b/modules/order/front/filter/index.js @@ -151,7 +151,7 @@ class Controller { this.$panelScope = this.$scope.$new(); this.$panel = this.$compile(``)(this.$panelScope); - const panel = this.$panel.isolateScope().$ctrl; + const panel = this.$panel[0].$ctrl; panel.filter = this.filter; panel.onSubmit = filter => this.onPanelSubmit(filter); diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html index f545e7131..95cbcccf6 100644 --- a/modules/ticket/front/basic-data/step-one/index.html +++ b/modules/ticket/front/basic-data/step-one/index.html @@ -26,9 +26,12 @@ value-field="id" ng-model="$ctrl.addressId" order="isActive DESC"> - - {{::isActive ? '' : 'INACTIVE'}} {{::nickname}} - - {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}} + + {{::!isActive ? '(Inactive)' : ''}} + {{::nickname}} + + , {{::street}}, {{::city}}, {{::province.name}} - {{::agencyMode.name}} + + ng-model="$ctrl.shipped"> + + - + + - - - - .inactive { - text-transform: uppercase; - } } diff --git a/webpack.config.js b/webpack.config.js index 74cf8d5c1..1efcf5f01 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -107,8 +107,8 @@ let baseConfig = { ], devtool: 'source-map', stats: { - modules: false, assets: false, + modules: false, children: false, entrypoints: false, colors: true