From b81b8e18ed1aa92e020644cfde5619780c4c0209 Mon Sep 17 00:00:00 2001 From: jgallego Date: Fri, 15 Feb 2019 14:29:47 +0100 Subject: [PATCH 1/9] $color-font-link --- front/salix/styles/variables.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/front/salix/styles/variables.scss b/front/salix/styles/variables.scss index b794d56109..36a1a14db4 100644 --- a/front/salix/styles/variables.scss +++ b/front/salix/styles/variables.scss @@ -32,6 +32,7 @@ $color-font: #222222; $color-font-secondary: #9b9b9b; $color-font-dark: white; $color-font-bg: rgba(0, 0, 0, .7); +$color-font-link: #005a9a; $color-active: #3d3d3d; $color-active-font: white; $color-bg-panel: white; @@ -40,6 +41,7 @@ $color-secondary: #ccc; $color-success: #a3d131; $color-notice: #32b1ce; $color-alert: #f42121; + $color-spacer: rgba(0, 0, 0, .3); $color-spacer-light: rgba(0, 0, 0, .12); $color-input-underline: rgba(0, 0, 0, .12); @@ -49,7 +51,6 @@ $color-hover-cd: rgba(0, 0, 0, .1); $color-hover-dc: .7; $color-disabled: .6; -$color-font-link: darken($color-main, 10%); $color-main-medium: lighten($color-main, 20%); $color-main-light: lighten($color-main, 35%); $color-success-medium: lighten($color-success, 20%); @@ -68,6 +69,7 @@ $color-font: white; $color-font-secondary: #777; $color-font-dark: white; $color-font-bg: rgba(0, 0, 0, .8); +$color-font-link: #005a9a; $color-active: #666; $color-active-font: white; $color-bg-panel: #3c3b3b; From 2b4f5984ccbae6c2e44b5a6f35db6e7c2e8cae4e Mon Sep 17 00:00:00 2001 From: jgallego Date: Fri, 15 Feb 2019 16:04:24 +0100 Subject: [PATCH 2/9] principio 1146 --- modules/item/back/methods/item/getCard.js | 6 +++--- modules/item/back/methods/item/regularize.js | 2 +- modules/item/front/descriptor/index.js | 16 +++++++++++++++- modules/item/front/diary/index.html | 4 ++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/modules/item/back/methods/item/getCard.js b/modules/item/back/methods/item/getCard.js index b9be274e1e..eb479607b9 100644 --- a/modules/item/back/methods/item/getCard.js +++ b/modules/item/back/methods/item/getCard.js @@ -60,15 +60,15 @@ module.exports = Self => { }; [item] = await Self.app.models.Item.find(filter); - // Visible Avaible + // Visible Available let query = ` CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; let options = [item.id, item.itemType().warehouseFk, false]; let [res] = await Self.rawSql(query, options); - item.available = res[0].available ? res[0].available : '-'; - item.visible = res[0].visible ? res[0].visible : '-'; + item.available = res[0].available; + item.visible = res[0].visible; return item; }; diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js index 12c28144ca..a9644cc1dc 100644 --- a/modules/item/back/methods/item/regularize.js +++ b/modules/item/back/methods/item/regularize.js @@ -28,7 +28,7 @@ module.exports = Self => { } }); - Self.regularize = async (ctx, itemFk, quantity, warehouseFk) => { + Self.regularize = async(ctx, itemFk, quantity, warehouseFk) => { const userId = ctx.req.accessToken.userId; const models = Self.app.models; diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index 79e669b870..4a3421f332 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -25,7 +25,6 @@ class Controller { if (value) this._warehouseFk = value; } - get warehouseFk() { if (!this._warehouseFk) this._warehouseFk = parseInt(window.localStorage.defaultWarehouseFk); @@ -33,6 +32,20 @@ class Controller { return this._warehouseFk; } + set item(value) { + this._item = value + this.avai = null + visible null + if (!this.item) + this._warehouseFk = parseInt(window.localStorage.defaultWarehouseFk); + llamar availabe + return this._warehouseFk; + } + + get item(){ + return this._item; + } + onMoreChange(callback) { callback.call(this); } @@ -57,6 +70,7 @@ class Controller { warehouseFk: this.warehouseFk }).then(res => { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + this.card.reload(); }); } } diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html index 94878c8c55..4459e4a703 100644 --- a/modules/item/front/diary/index.html +++ b/modules/item/front/diary/index.html @@ -35,14 +35,14 @@ - + {{::sale.date | date:'dd/MM/yyyy' }} From 58706b8694f0d9aaf797475f8fbb5f92c662fda0 Mon Sep 17 00:00:00 2001 From: "LaptopVerdnatura\\Javi" Date: Mon, 18 Feb 2019 07:57:15 +0100 Subject: [PATCH 3/9] backPreparado --- .../back/methods/item/getVisibleAvailable.js | 38 +++++++++++++++++++ modules/item/back/models/item.js | 1 + modules/item/front/descriptor/index.html | 7 ++++ modules/item/front/descriptor/index.js | 21 ++++++---- package-lock.json | 20 +++++----- 5 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 modules/item/back/methods/item/getVisibleAvailable.js diff --git a/modules/item/back/methods/item/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js new file mode 100644 index 0000000000..6e9f2b531d --- /dev/null +++ b/modules/item/back/methods/item/getVisibleAvailable.js @@ -0,0 +1,38 @@ +module.exports = Self => { + Self.remoteMethod('getVisibleAvailable', { + description: 'Returns visible and available for params', + accessType: '', + accepts: [ + { + arg: 'itemFk', + type: 'Number', + required: true, + }, + { + arg: 'warehouseFk', + type: 'Number', + required: true, + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/getVisibleAvailable`, + verb: 'GET' + } + }); + + Self.getVisibleAvailable = async(itemFk, warehouseFk) => { + let item = {}; + let query = ` + CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; + + let options = [itemFk, warehouseFk, false]; + [res] = await Self.rawSql(query, options); + + item.available = res[0].available; + item.visible = res[0].visible; + return item; + }; +}; diff --git a/modules/item/back/models/item.js b/modules/item/back/models/item.js index e34b2eec58..628bd5a030 100644 --- a/modules/item/back/models/item.js +++ b/modules/item/back/models/item.js @@ -9,6 +9,7 @@ module.exports = Self => { require('../methods/item/getSummary')(Self); require('../methods/item/getCard')(Self); require('../methods/item/regularize')(Self); + require('../methods/item/getVisibleAvailable')(Self); require('../methods/item/new')(Self); Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'}); diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 02e1267dca..22769d5a70 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -1,3 +1,10 @@ + +
diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index 4a3421f332..268fbfb8a8 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -33,16 +33,21 @@ class Controller { } set item(value) { - this._item = value - this.avai = null - visible null - if (!this.item) - this._warehouseFk = parseInt(window.localStorage.defaultWarehouseFk); - llamar availabe - return this._warehouseFk; + this._item = value; + this.available = null; + this.visible = null; + if (!this.item) { + this.params = { + params: { + itemFk: this.item, + warehouseFk: this._warehouseFk + } + }; + } + return this._item; } - get item(){ + get item() { return this._item; } diff --git a/package-lock.json b/package-lock.json index d3dc2c650e..3bc805f329 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7575,7 +7575,7 @@ "jasmine-spec-reporter": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", - "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=", + "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", "dev": true, "requires": { "colors": "1.1.2" @@ -7863,7 +7863,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", + "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { "fs-access": "^1.0.0", @@ -9671,7 +9671,7 @@ "dependencies": { "commander": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz", + "resolved": "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz", "integrity": "sha1-Xt6xruI8T7VBprcNaSq+8ZZpotM=", "dev": true, "requires": { @@ -11650,7 +11650,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, @@ -12119,7 +12119,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -12901,7 +12901,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -13367,7 +13367,7 @@ "split2": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=", "dev": true, "requires": { "through2": "^2.0.2" @@ -14855,7 +14855,7 @@ "useragent": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { "lru-cache": "4.1.x", @@ -15571,7 +15571,7 @@ }, "globby": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { @@ -15584,7 +15584,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } From a3e69d604a642e7aa06ce5dce415cd3fb5b63f24 Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 18 Feb 2019 13:31:57 +0100 Subject: [PATCH 4/9] getAvailable aislado --- modules/item/back/methods/item/getCard.js | 10 ------ .../back/methods/item/getVisibleAvailable.js | 11 +++---- modules/item/front/descriptor/index.html | 11 ++----- modules/item/front/descriptor/index.js | 31 ++++++++++++------- 4 files changed, 26 insertions(+), 37 deletions(-) diff --git a/modules/item/back/methods/item/getCard.js b/modules/item/back/methods/item/getCard.js index eb479607b9..9780c5601e 100644 --- a/modules/item/back/methods/item/getCard.js +++ b/modules/item/back/methods/item/getCard.js @@ -60,16 +60,6 @@ module.exports = Self => { }; [item] = await Self.app.models.Item.find(filter); - // Visible Available - let query = ` - CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; - - let options = [item.id, item.itemType().warehouseFk, false]; - let [res] = await Self.rawSql(query, options); - - item.available = res[0].available; - item.visible = res[0].visible; - return item; }; }; diff --git a/modules/item/back/methods/item/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js index 6e9f2b531d..fecdb736ba 100644 --- a/modules/item/back/methods/item/getVisibleAvailable.js +++ b/modules/item/back/methods/item/getVisibleAvailable.js @@ -4,7 +4,7 @@ module.exports = Self => { accessType: '', accepts: [ { - arg: 'itemFk', + arg: 'id', type: 'Number', required: true, }, @@ -18,21 +18,20 @@ module.exports = Self => { root: true }, http: { - path: `/getVisibleAvailable`, + path: `/:id/getVisibleAvailable`, verb: 'GET' } }); Self.getVisibleAvailable = async(itemFk, warehouseFk) => { - let item = {}; let query = ` CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`; let options = [itemFk, warehouseFk, false]; [res] = await Self.rawSql(query, options); - item.available = res[0].available; - item.visible = res[0].visible; - return item; + return { + available: res[0].available, + visible: res[0].visible}; }; }; diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 22769d5a70..a0d6404f54 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -1,10 +1,3 @@ - -
@@ -41,11 +34,11 @@

Visible

-

{{$ctrl.item.visible}}

+

{{$ctrl.visible | dashIfEmpty}}

Available

-

{{$ctrl.item.available}}

+

{{$ctrl.available | dashIfEmpty}}
diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index 268fbfb8a8..edf6d64445 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -1,5 +1,6 @@ import ngModule from '../module'; import './style.scss'; +import {runInThisContext} from 'vm'; class Controller { constructor($state, $scope, $http, vnApp, $translate) { @@ -34,23 +35,29 @@ class Controller { set item(value) { this._item = value; - this.available = null; - this.visible = null; - if (!this.item) { - this.params = { - params: { - itemFk: this.item, - warehouseFk: this._warehouseFk - } - }; - } - return this._item; + this.updateStock(); } get item() { return this._item; } + updateStock() { + this.available = null; + this.visible = null; + if (this._item && this._item.id) { + let options = { + params: { + warehouseFk: this._warehouseFk + } + }; + this.$http.get(`/item/api/Items/${this._item.id}/getVisibleAvailable`, options).then(response => { + this.available = response.data.available; + this.visible = response.data.visible; + }); + } + } + onMoreChange(callback) { callback.call(this); } @@ -75,7 +82,7 @@ class Controller { warehouseFk: this.warehouseFk }).then(res => { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); - this.card.reload(); + this.updateStock(); }); } } From a0cf617cca43a3a4b444937f858ddc35f5123f79 Mon Sep 17 00:00:00 2001 From: jgallego Date: Tue, 19 Feb 2019 08:42:36 +0100 Subject: [PATCH 5/9] #498 e2e arreglado --- e2e/helpers/selectors.js | 3 ++- e2e/paths/order-module/01_edit_basic_data.spec.js | 6 ++++-- loopback/locale/en.json | 3 ++- modules/item/front/descriptor/index.js | 1 - modules/order/front/basic-data/index.html | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 77ecc38673..030b80f8dc 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -484,7 +484,8 @@ export default { orderByAutocomplete: `vn-autocomplete[label="Order by"]`, }, orderBasicData: { - clientAutocomplete: `vn-autocomplete[label=Client]`, + clientAutocomplete: `vn-autocomplete[label="Client"]`, + addressAutocomplete: `vn-autocomplete[label="Address"]`, observationInput: `vn-textarea[label="Observation"] textarea`, saveButton: `${components.vnSubmit}` }, diff --git a/e2e/paths/order-module/01_edit_basic_data.spec.js b/e2e/paths/order-module/01_edit_basic_data.spec.js index 2f24cf94a5..014941c099 100644 --- a/e2e/paths/order-module/01_edit_basic_data.spec.js +++ b/e2e/paths/order-module/01_edit_basic_data.spec.js @@ -2,7 +2,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; // Bug #808 order.basic-data -xdescribe('Order edit basic data path', () => { +fdescribe('Order edit basic data path', () => { const nightmare = createNightmare(); describe('when confirmed order', () => { beforeAll(() => { @@ -15,11 +15,13 @@ xdescribe('Order edit basic data path', () => { it('should not be able to change the client', async() => { const result = await nightmare .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') + .autocompleteSearch(selectors.orderBasicData.addressAutocomplete, 'Tony Stark') + .wait(1999) .waitToClick(selectors.orderBasicData.saveButton) .waitForLastSnackbar(); expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`); - }); + }, 15000); }); describe('when order with rows', () => { diff --git a/loopback/locale/en.json b/loopback/locale/en.json index b56b03a38b..ac9e6b1324 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -36,5 +36,6 @@ "The warehouse can't be repeated": "The warehouse can't be repeated", "Barcode must be unique": "Barcode must be unique", "You don't have enough privileges to do that": "You don't have enough privileges to do that", - "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client" + "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client", + "can't be blank": "can't be blank" } \ No newline at end of file diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js index edf6d64445..922ca48146 100644 --- a/modules/item/front/descriptor/index.js +++ b/modules/item/front/descriptor/index.js @@ -1,6 +1,5 @@ import ngModule from '../module'; import './style.scss'; -import {runInThisContext} from 'vm'; class Controller { constructor($state, $scope, $http, vnApp, $translate) { diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html index 50e8c99019..672ae92fa3 100644 --- a/modules/order/front/basic-data/index.html +++ b/modules/order/front/basic-data/index.html @@ -29,9 +29,10 @@ From 9d39840449b7bc434574f6d045c466883718dc9a Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 19 Feb 2019 15:54:01 +0100 Subject: [PATCH 6/9] performance problems with the component fetched tags fixed --- front/core/components/fetched-tags/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/core/components/fetched-tags/index.html b/front/core/components/fetched-tags/index.html index 3b1dc54f6d..546e5d67d3 100644 --- a/front/core/components/fetched-tags/index.html +++ b/front/core/components/fetched-tags/index.html @@ -4,8 +4,8 @@
+ ng-repeat="fetchedTag in $ctrl.tags track by $index" + title="{{::fetchedTag.name}}: {{::fetchedTag.value}}"> {{::fetchedTag.value}}
From e041cef586b78e9c2ce217d977990748a82f776b Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 19 Feb 2019 16:11:57 +0100 Subject: [PATCH 7/9] vn-empty-rows deleted as its not longer needed --- front/core/components/log/index.html | 3 --- modules/claim/front/index/index.html | 6 ------ modules/client/front/credit/index/index.html | 3 --- modules/client/front/index/index.html | 8 -------- modules/client/front/mandate/index.html | 3 --- modules/client/front/recovery/index/index.html | 3 --- modules/order/front/index/index.html | 3 --- modules/ticket/front/descriptor/addStowaway.html | 3 --- modules/ticket/front/descriptor/removeStowaway.html | 3 --- modules/ticket/front/sale/index.html | 3 --- modules/travel/front/index/index.html | 3 --- modules/worker/front/index/index.html | 4 ---- 12 files changed, 45 deletions(-) diff --git a/front/core/components/log/index.html b/front/core/components/log/index.html index eb065c6cb4..8211a8e085 100644 --- a/front/core/components/log/index.html +++ b/front/core/components/log/index.html @@ -77,9 +77,6 @@ - - No results - diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html index 69b191ad0f..38bd8b4e74 100644 --- a/modules/claim/front/index/index.html +++ b/modules/claim/front/index/index.html @@ -57,12 +57,6 @@ - - No results - - - Enter a new search - diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html index a68e31d2ff..3a9244f862 100644 --- a/modules/client/front/credit/index/index.html +++ b/modules/client/front/credit/index/index.html @@ -24,9 +24,6 @@ {{::credit.worker.user.nickname}} - - No results - diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html index 32f01c7e4e..5a964cfe5c 100644 --- a/modules/client/front/index/index.html +++ b/modules/client/front/index/index.html @@ -22,14 +22,6 @@ ng-repeat="client in clients track by client.id" client="::client"> - - No results - - - Enter a new search -
diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index 69beeaa02f..4b290d2057 100644 --- a/modules/client/front/mandate/index.html +++ b/modules/client/front/mandate/index.html @@ -28,9 +28,6 @@ {{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}} - - No results - diff --git a/modules/client/front/recovery/index/index.html b/modules/client/front/recovery/index/index.html index b130d73c2a..1e80094292 100644 --- a/modules/client/front/recovery/index/index.html +++ b/modules/client/front/recovery/index/index.html @@ -36,9 +36,6 @@ {{::recovery.period}} - - No results - diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 3040801d6a..eeddf25217 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -60,9 +60,6 @@ - - Enter a new search - diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html index 64bb65554c..349ae137ee 100644 --- a/modules/ticket/front/descriptor/addStowaway.html +++ b/modules/ticket/front/descriptor/addStowaway.html @@ -26,9 +26,6 @@ {{ticket.state.state.name}} - - No results - diff --git a/modules/ticket/front/descriptor/removeStowaway.html b/modules/ticket/front/descriptor/removeStowaway.html index 7653d25b78..515d6b2cc1 100644 --- a/modules/ticket/front/descriptor/removeStowaway.html +++ b/modules/ticket/front/descriptor/removeStowaway.html @@ -25,9 +25,6 @@ {{stowaway.ticket.state.state.name}} - - No results - diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index 427ea19586..62dc102941 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -144,9 +144,6 @@ - - No results - diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html index 21750fa8b7..744b0680df 100644 --- a/modules/travel/front/index/index.html +++ b/modules/travel/front/index/index.html @@ -47,9 +47,6 @@ - - Enter a new search - diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html index a4c2a6f254..53d16ccea3 100644 --- a/modules/worker/front/index/index.html +++ b/modules/worker/front/index/index.html @@ -48,10 +48,6 @@ - - Enter a new search -
From de5a15778ea020755b404784ab5e321e7d729823 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 19 Feb 2019 16:37:17 +0100 Subject: [PATCH 8/9] e2e fixed --- e2e/helpers/selectors.js | 2 +- e2e/paths/order-module/01_edit_basic_data.spec.js | 5 ++--- e2e/paths/ticket-module/11_ticket_diary.spec.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 030b80f8dc..3c11a5fbb8 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -262,7 +262,7 @@ export default { itemDiary: { thirdTicketId: 'vn-item-diary vn-tbody > vn-tr:nth-child(3) > vn-td:nth-child(2) > span', firstBalance: 'vn-item-diary vn-tbody > vn-tr:nth-child(1) > vn-td.balance', - fifthBalance: 'vn-item-diary vn-tbody > vn-tr.ng-scope.isToday.isIn > vn-td.balance > span', + fifthBalance: 'vn-item-diary vn-tbody > vn-tr:nth-child(5) > vn-td.balance', warehouseAutocomplete: 'vn-item-diary vn-autocomplete[field="$ctrl.warehouseFk"]', }, ticketSummary: { diff --git a/e2e/paths/order-module/01_edit_basic_data.spec.js b/e2e/paths/order-module/01_edit_basic_data.spec.js index 014941c099..0efcc4f8c6 100644 --- a/e2e/paths/order-module/01_edit_basic_data.spec.js +++ b/e2e/paths/order-module/01_edit_basic_data.spec.js @@ -1,8 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -// Bug #808 order.basic-data -fdescribe('Order edit basic data path', () => { +describe('Order edit basic data path', () => { const nightmare = createNightmare(); describe('when confirmed order', () => { beforeAll(() => { @@ -16,7 +15,6 @@ fdescribe('Order edit basic data path', () => { const result = await nightmare .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') .autocompleteSearch(selectors.orderBasicData.addressAutocomplete, 'Tony Stark') - .wait(1999) .waitToClick(selectors.orderBasicData.saveButton) .waitForLastSnackbar(); @@ -65,6 +63,7 @@ fdescribe('Order edit basic data path', () => { it('should be able to modify all the properties', async() => { const result = await nightmare .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark') + .autocompleteSearch(selectors.orderBasicData.addressAutocomplete, 'Tony Stark') .clearInput(selectors.orderBasicData.observationInput) .write(selectors.orderBasicData.observationInput, 'Observation modified') .waitToClick(selectors.orderBasicData.saveButton) diff --git a/e2e/paths/ticket-module/11_ticket_diary.spec.js b/e2e/paths/ticket-module/11_ticket_diary.spec.js index f5bb6fbc7e..933628e5d4 100644 --- a/e2e/paths/ticket-module/11_ticket_diary.spec.js +++ b/e2e/paths/ticket-module/11_ticket_diary.spec.js @@ -50,7 +50,7 @@ describe('Ticket diary path', () => { it(`should check the fifth line balance is marked as counter`, async() => { const result = await nightmare - .waitToGetProperty(selectors.itemDiary.fifthBalance, 'className'); + .waitToGetProperty(`${selectors.itemDiary.fifthBalance} > span`, 'className'); expect(result).toContain('counter'); }); From 7d2bc25c9567994d9be8cc40c14aecdbeadb0172 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Tue, 19 Feb 2019 17:55:19 +0100 Subject: [PATCH 9/9] #1142 order.line total --- e2e/helpers/selectors.js | 2 +- modules/order/front/line/index.html | 17 ++++++----------- modules/order/front/line/style.scss | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 77ecc38673..38cc5a2e74 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -489,7 +489,7 @@ export default { saveButton: `${components.vnSubmit}` }, orderLine: { - orderSubtotal: 'vn-order-line > vn-vertical > vn-card > div > vn-vertical > vn-horizontal > div > span', + orderSubtotal: 'vn-order-line vn-horizontal.header p:nth-child(1)', firstLineDeleteButton: 'vn-order-line vn-tbody > vn-tr:nth-child(1) vn-icon[icon="delete"]', confirmOrder: 'vn-order-line > vn-vertical > vn-button-bar > vn-button > button', confirmButton: 'vn-order-line > vn-confirm button[response="ACCEPT"]', diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index c59154e45b..d8b27efe33 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -5,17 +5,12 @@ - -
- Subtotal - {{$ctrl.subtotal | currency: 'EUR':2}} -

- VAT - {{$ctrl.VAT | currency: 'EUR':2}} -

- Total - {{$ctrl.order.total | currency: 'EUR':2}} -
+ + +

Subtotal {{$ctrl.subtotal | currency: 'EUR':2}}

+

VAT {{$ctrl.VAT | currency: 'EUR':2}}

+

Total {{$ctrl.order.total | currency: 'EUR':2}}

+ diff --git a/modules/order/front/line/style.scss b/modules/order/front/line/style.scss index 31a13d5920..6f06532e04 100644 --- a/modules/order/front/line/style.scss +++ b/modules/order/front/line/style.scss @@ -6,4 +6,20 @@ vn-order-line{ height: 50px; } } + .taxes { + max-width: 10em; + border: .1em solid #CCC; + text-align: right; + padding: .5em !important; + + + & > p { + font-size: 1.2em; + margin: .2em; + } + } + vn-horizontal.header { + justify-content: flex-end; + margin-bottom: 0.5em; + } } \ No newline at end of file