From 11bd861224e8aaaef3d708046f91d5259376692a Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Fri, 6 Mar 2020 09:57:05 +0100 Subject: [PATCH 01/13] section bases --- modules/entry/front/buy/index.html | 68 +++++++++++++++++++++++++++ modules/entry/front/buy/index.js | 35 ++++++++++++++ modules/entry/front/buy/locale/es.yml | 1 + modules/entry/front/index.js | 1 + modules/entry/front/routes.json | 11 ++++- 5 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 modules/entry/front/buy/index.html create mode 100644 modules/entry/front/buy/index.js create mode 100644 modules/entry/front/buy/locale/es.yml diff --git a/modules/entry/front/buy/index.html b/modules/entry/front/buy/index.html new file mode 100644 index 000000000..af9eae30c --- /dev/null +++ b/modules/entry/front/buy/index.html @@ -0,0 +1,68 @@ + +
Entry #{{$ctrl.entryData.id}} - {{$ctrl.entryData.supplier.nickname}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/entry/front/buy/index.js b/modules/entry/front/buy/index.js new file mode 100644 index 000000000..36e353229 --- /dev/null +++ b/modules/entry/front/buy/index.js @@ -0,0 +1,35 @@ +import ngModule from '../module'; +import Component from 'core/lib/component'; + +class Controller extends Component { + constructor($element, $) { + super($element, $); + } + + get entry() { + return this._entry; + } + + set entry(value) { + this._entry = value; + + if (value && value.id) + this.getEntryData(); + } + + getEntryData() { + return this.$http.get(`/api/Entries/${this.entry.id}/getEntry`).then(response => { + this.entryData = response.data; + }); + } +} + +Controller.$inject = ['$element', '$scope']; + +ngModule.component('vnEntryBuy', { + template: require('./index.html'), + controller: Controller, + bindings: { + entry: '<' + } +}); diff --git a/modules/entry/front/buy/locale/es.yml b/modules/entry/front/buy/locale/es.yml new file mode 100644 index 000000000..8f2be1e44 --- /dev/null +++ b/modules/entry/front/buy/locale/es.yml @@ -0,0 +1 @@ +Buy: Lineas de entrada \ No newline at end of file diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js index 0679b946b..f0c845b14 100644 --- a/modules/entry/front/index.js +++ b/modules/entry/front/index.js @@ -7,3 +7,4 @@ import './descriptor'; import './card'; import './summary'; import './log'; +import './buy'; diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json index 92d893044..3dff61641 100644 --- a/modules/entry/front/routes.json +++ b/modules/entry/front/routes.json @@ -9,7 +9,8 @@ {"state": "entry.index", "icon": "icon-entry"} ], "card": [ - {"state": "entry.card.log", "icon": "history"} + {"state": "entry.card.log", "icon": "history"}, + {"state": "entry.card.buy", "icon": "icon-lines"} ] }, "routes": [ @@ -42,6 +43,14 @@ "state": "entry.card.log", "component": "vn-entry-log", "description": "Log" + }, { + "url" : "/buy", + "state": "entry.card.buy", + "component": "vn-entry-buy", + "description": "Buy", + "params": { + "entry": "$ctrl.entry" + } } ] } \ No newline at end of file From 5f0ace8f29a8565e86d6324aa4a8790ef394900f Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Fri, 6 Mar 2020 10:21:42 +0100 Subject: [PATCH 02/13] removed unused code --- modules/entry/front/buy/index.html | 69 +----------------------------- modules/entry/front/buy/index.js | 17 -------- modules/entry/front/routes.json | 4 +- 3 files changed, 3 insertions(+), 87 deletions(-) diff --git a/modules/entry/front/buy/index.html b/modules/entry/front/buy/index.html index af9eae30c..8b1378917 100644 --- a/modules/entry/front/buy/index.html +++ b/modules/entry/front/buy/index.html @@ -1,68 +1 @@ - -
Entry #{{$ctrl.entryData.id}} - {{$ctrl.entryData.supplier.nickname}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/modules/entry/front/buy/index.js b/modules/entry/front/buy/index.js index 36e353229..bc8788239 100644 --- a/modules/entry/front/buy/index.js +++ b/modules/entry/front/buy/index.js @@ -5,23 +5,6 @@ class Controller extends Component { constructor($element, $) { super($element, $); } - - get entry() { - return this._entry; - } - - set entry(value) { - this._entry = value; - - if (value && value.id) - this.getEntryData(); - } - - getEntryData() { - return this.$http.get(`/api/Entries/${this.entry.id}/getEntry`).then(response => { - this.entryData = response.data; - }); - } } Controller.$inject = ['$element', '$scope']; diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json index 3dff61641..084ff7bb2 100644 --- a/modules/entry/front/routes.json +++ b/modules/entry/front/routes.json @@ -9,8 +9,8 @@ {"state": "entry.index", "icon": "icon-entry"} ], "card": [ - {"state": "entry.card.log", "icon": "history"}, - {"state": "entry.card.buy", "icon": "icon-lines"} + {"state": "entry.card.buy", "icon": "icon-lines"}, + {"state": "entry.card.log", "icon": "history"} ] }, "routes": [ From ec97ab3e21a831eb97c0b1c638c1c997882bb43b Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Mon, 9 Mar 2020 16:47:02 +0100 Subject: [PATCH 03/13] log with narrow and wide widths --- e2e/helpers/selectors.js | 1 + e2e/paths/02-client/14_balance.spec.js | 3 +- e2e/paths/05-ticket/17_log.spec.js | 65 ++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 e2e/paths/05-ticket/17_log.spec.js diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 284945241..2131704ab 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -525,6 +525,7 @@ export default { }, ticketLog: { + firstTD: 'vn-ticket-log vn-table vn-td:nth-child(1)', logButton: 'vn-left-menu a[ui-sref="ticket.card.log"]', changedBy: 'vn-ticket-log > vn-log vn-tr:nth-child(1) > vn-td:nth-child(2) > span', actionTaken: 'vn-ticket-log > vn-log vn-td:nth-child(1) > div > div:nth-child(3) > span.value', diff --git a/e2e/paths/02-client/14_balance.spec.js b/e2e/paths/02-client/14_balance.spec.js index f45937deb..0d020831e 100644 --- a/e2e/paths/02-client/14_balance.spec.js +++ b/e2e/paths/02-client/14_balance.spec.js @@ -35,7 +35,7 @@ describe('Client balance path', () => { await page.clearInput(selectors.globalItems.userConfigThirdAutocomplete); let result = await page.waitForLastSnackbar(); - expect(result).toEqual('Data saved!'); + expect(result).toContain('Data saved!'); }); it('should click the new payment button', async() => { @@ -63,7 +63,6 @@ describe('Client balance path', () => { let firstBalanceLine = await page .waitToGetProperty(selectors.clientBalance.firstBalanceLine, 'innerText'); - expect(company).toEqual('VNL'); expect(firstBalanceLine).toContain('0.00'); }); diff --git a/e2e/paths/05-ticket/17_log.spec.js b/e2e/paths/05-ticket/17_log.spec.js new file mode 100644 index 000000000..2008d022e --- /dev/null +++ b/e2e/paths/05-ticket/17_log.spec.js @@ -0,0 +1,65 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Ticket log path', () => { + let browser; + let page; + const ticketId = '5'; + + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + }); + + afterAll(async() => { + await browser.close(); + }); + + it('should navigate to the target ticket notes section', async() => { + await page.loginAndModule('employee', 'ticket'); + await page.accessToSearchResult(ticketId); + await page.accessToSection('ticket.card.observation'); + let url = await page.expectURL('/observation'); + + expect(url).toBe(true); + }); + + it('should create a new note for the test', async() => { + await page.waitToClick(selectors.ticketNotes.addNoteButton); + await page.autocompleteSearch(selectors.ticketNotes.firstNoteType, 'observation one'); + await page.write(selectors.ticketNotes.firstDescription, 'description'); + await page.waitToClick(selectors.ticketNotes.submitNotesButton); + const result = await page.waitForLastSnackbar(); + + expect(result).toEqual('Data saved!'); + }); + + it('should navigate to the log section', async() => { + await page.accessToSection('ticket.card.log'); + let url = await page.expectURL('/log'); + + expect(url).toBe(true); + }); + + it('should set the viewport width to 1920 to see the table full width', async() => { + await page.setViewport({ + width: 1920, + height: 0, + }); + + const result = await page.waitToGetProperty(selectors.ticketLog.firstTD, 'innerText'); + + expect(result.length).not.toBeGreaterThan('20'); + }); + + it('should set the viewport width to 800 to see the table shrink and move data to the 1st column', async() => { + await page.setViewport({ + width: 800, + height: 0, + }); + + const result = await page.waitToGetProperty(selectors.ticketLog.firstTD, 'innerText'); + + expect(result.length).toBeGreaterThan('20'); + }); +}); From 8688ecc81003e7cd199b8cd00b239d179a8b08ac Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Tue, 10 Mar 2020 07:38:21 +0100 Subject: [PATCH 04/13] eliminado el campo id en advanced search --- e2e/helpers/selectors.js | 2 +- modules/claim/front/search-panel/index.html | 17 +++++------------ modules/client/front/search-panel/index.html | 17 +++++------------ modules/order/front/search-panel/index.html | 5 ----- modules/order/front/search-panel/locale/es.yml | 2 +- modules/ticket/front/search-panel/index.html | 5 ----- modules/ticket/front/search-panel/locale/es.yml | 2 +- 7 files changed, 13 insertions(+), 37 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 284945241..93dd6c65d 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -366,7 +366,7 @@ export default { ticketsIndex: { openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]', advancedSearchInvoiceOut: 'vn-ticket-search-panel vn-textfield[ng-model="filter.refFk"]', - newTicketButton: 'vn-ticket-index > a', + newTicketButton: 'vn-ticket-index a', searchResult: 'vn-ticket-index vn-card > vn-table > div > vn-tbody > a.vn-tr', searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr', searchResultDate: 'vn-ticket-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(5)', diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html index 93d3db455..f50af1e5a 100644 --- a/modules/claim/front/search-panel/index.html +++ b/modules/claim/front/search-panel/index.html @@ -10,24 +10,17 @@ + + - - - - - - - - - - - - + + - - - - Date: Tue, 10 Mar 2020 11:36:49 +0100 Subject: [PATCH 05/13] Removed autocomplete completion for chrome --- front/core/components/autocomplete/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js index 38c85db57..1d3c6e243 100755 --- a/front/core/components/autocomplete/index.js +++ b/front/core/components/autocomplete/index.js @@ -23,6 +23,7 @@ export default class Autocomplete extends Field { this._selection = null; this.input = this.element.querySelector('input'); + this.input.setAttribute('autocomplete', 'off'); } $postLink() { From 6d437d0e2ef56e958815bc022309130abeee4f18 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 10 Mar 2020 11:46:58 +0100 Subject: [PATCH 06/13] Allow empty agency on ticket creation --- modules/ticket/back/methods/ticket/new.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js index db5310f7c..7c4b3adb4 100644 --- a/modules/ticket/back/methods/ticket/new.js +++ b/modules/ticket/back/methods/ticket/new.js @@ -6,7 +6,7 @@ module.exports = Self => { accessType: 'WRITE', accepts: [{ arg: 'clientId', - type: 'Number', + type: 'number', description: `The client id filter`, required: true }, @@ -22,29 +22,29 @@ module.exports = Self => { }, { arg: 'warehouseId', - type: 'Number', + type: 'number', description: `The warehouse id filter`, required: true }, { arg: 'companyId', - type: 'Number', + type: 'number', description: `The company id filter` }, { arg: 'addressId', - type: 'Number', + type: 'number', description: `The address id filter`, required: true }, { arg: 'agencyModeId', - type: 'Number', + type: 'any', description: `The agencyMode id filter` }, { arg: 'routeId', - type: 'Number', + type: 'number', description: `The route id filter` }], returns: { From 0cd4e2ad9ed2c82071942b2b1c6c748f4c62476e Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 10 Mar 2020 14:28:50 +0100 Subject: [PATCH 07/13] Added autocomplete property --- front/core/components/autocomplete/index.js | 1 - front/core/components/drop-down/index.html | 3 ++- front/core/components/field/index.js | 12 ++++++++++++ modules/ticket/front/index/index.html | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js index 1d3c6e243..38c85db57 100755 --- a/front/core/components/autocomplete/index.js +++ b/front/core/components/autocomplete/index.js @@ -23,7 +23,6 @@ export default class Autocomplete extends Field { this._selection = null; this.input = this.element.querySelector('input'); - this.input.setAttribute('autocomplete', 'off'); } $postLink() { diff --git a/front/core/components/drop-down/index.html b/front/core/components/drop-down/index.html index 5366d9d90..52ceeeaae 100644 --- a/front/core/components/drop-down/index.html +++ b/front/core/components/drop-down/index.html @@ -3,7 +3,8 @@ ng-model="$ctrl.search" class="dense search" ng-blur="$ctrl.onFocusOut()" - placeholder="{{::'Search' | translate}}"> + placeholder="{{::'Search' | translate}}" + autocomplete="off">
diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index 481ccce91..18286175b 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -132,6 +132,17 @@ export default class Field extends FormInput { return this.error || this.inputError || null; } + get autocomplete() { + return this._autocomplete; + } + + set autocomplete(value) { + this._autocomplete = value; + console.log(value); + if (value === 'off') + this.input.setAttribute('autocomplete', 'off'); + } + refreshHint() { let error = this.shownError; let hint = error || this.hint; @@ -206,6 +217,7 @@ ngModule.vnComponent('vnField', { controller: Field, bindings: { type: '@?', + autocomplete: '@?', placeholder: '@?', value: '=?', info: '@?', diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index ee218df56..6a0b051ec 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -129,7 +129,7 @@
- Date: Tue, 10 Mar 2020 11:46:58 +0100 Subject: [PATCH 08/13] Allow empty agency on ticket creation --- modules/ticket/back/methods/ticket/new.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js index db5310f7c..7c4b3adb4 100644 --- a/modules/ticket/back/methods/ticket/new.js +++ b/modules/ticket/back/methods/ticket/new.js @@ -6,7 +6,7 @@ module.exports = Self => { accessType: 'WRITE', accepts: [{ arg: 'clientId', - type: 'Number', + type: 'number', description: `The client id filter`, required: true }, @@ -22,29 +22,29 @@ module.exports = Self => { }, { arg: 'warehouseId', - type: 'Number', + type: 'number', description: `The warehouse id filter`, required: true }, { arg: 'companyId', - type: 'Number', + type: 'number', description: `The company id filter` }, { arg: 'addressId', - type: 'Number', + type: 'number', description: `The address id filter`, required: true }, { arg: 'agencyModeId', - type: 'Number', + type: 'any', description: `The agencyMode id filter` }, { arg: 'routeId', - type: 'Number', + type: 'number', description: `The route id filter` }], returns: { From b214de25ce5a2813882879d1781d54882d886a3b Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 10 Mar 2020 11:36:49 +0100 Subject: [PATCH 09/13] Removed autocomplete completion for chrome --- front/core/components/autocomplete/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js index 38c85db57..1d3c6e243 100755 --- a/front/core/components/autocomplete/index.js +++ b/front/core/components/autocomplete/index.js @@ -23,6 +23,7 @@ export default class Autocomplete extends Field { this._selection = null; this.input = this.element.querySelector('input'); + this.input.setAttribute('autocomplete', 'off'); } $postLink() { From 3c88a25c2a1a2f05ca8886b582dc0d46146a857d Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 10 Mar 2020 14:28:50 +0100 Subject: [PATCH 10/13] Added autocomplete property --- front/core/components/autocomplete/index.js | 1 - front/core/components/drop-down/index.html | 3 ++- front/core/components/field/index.js | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js index 1d3c6e243..38c85db57 100755 --- a/front/core/components/autocomplete/index.js +++ b/front/core/components/autocomplete/index.js @@ -23,7 +23,6 @@ export default class Autocomplete extends Field { this._selection = null; this.input = this.element.querySelector('input'); - this.input.setAttribute('autocomplete', 'off'); } $postLink() { diff --git a/front/core/components/drop-down/index.html b/front/core/components/drop-down/index.html index 5366d9d90..52ceeeaae 100644 --- a/front/core/components/drop-down/index.html +++ b/front/core/components/drop-down/index.html @@ -3,7 +3,8 @@ ng-model="$ctrl.search" class="dense search" ng-blur="$ctrl.onFocusOut()" - placeholder="{{::'Search' | translate}}"> + placeholder="{{::'Search' | translate}}" + autocomplete="off">
diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index 481ccce91..18286175b 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -132,6 +132,17 @@ export default class Field extends FormInput { return this.error || this.inputError || null; } + get autocomplete() { + return this._autocomplete; + } + + set autocomplete(value) { + this._autocomplete = value; + console.log(value); + if (value === 'off') + this.input.setAttribute('autocomplete', 'off'); + } + refreshHint() { let error = this.shownError; let hint = error || this.hint; @@ -206,6 +217,7 @@ ngModule.vnComponent('vnField', { controller: Field, bindings: { type: '@?', + autocomplete: '@?', placeholder: '@?', value: '=?', info: '@?', From 509f2233fca9ea353baefd52f44aafaf400dbed0 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 10 Mar 2020 14:28:50 +0100 Subject: [PATCH 11/13] Added autocomplete property --- front/core/components/field/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index 18286175b..62adf3233 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -138,7 +138,7 @@ export default class Field extends FormInput { set autocomplete(value) { this._autocomplete = value; - console.log(value); + if (value === 'off') this.input.setAttribute('autocomplete', 'off'); } From 7496bc923eb124319837d74d54a2f1cddd0746ba Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 11 Mar 2020 08:02:58 +0100 Subject: [PATCH 12/13] Updated fonts & changed icons --- front/core/components/input-file/index.html | 2 +- front/core/styles/icons/salixfont.css | 17 +++++++++++- front/core/styles/icons/salixfont.svg | 5 ++++ front/core/styles/icons/salixfont.ttf | Bin 29868 -> 32980 bytes front/core/styles/icons/salixfont.woff | Bin 29944 -> 33056 bytes modules/entry/back/methods/entry/filter.js | 1 - modules/entry/back/models/entry.json | 27 ++++++++++--------- modules/entry/front/descriptor/index.html | 12 +++++++++ modules/entry/front/descriptor/locale/es.yml | 4 ++- modules/entry/front/index/index.html | 2 +- modules/zone/front/routes.json | 2 +- 11 files changed, 54 insertions(+), 18 deletions(-) diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html index be4c15248..ad71b744d 100644 --- a/front/core/components/input-file/index.html +++ b/front/core/components/input-file/index.html @@ -30,7 +30,7 @@ ng-click="$ctrl.onClear($event)"> diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index 505fb8520..8805815e8 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -23,6 +23,21 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zone:before { + content: "\e95d"; +} +.icon-inventory:before { + content: "\e95e"; +} +.icon-wiki:before { + content: "\e968"; +} +.icon-attach:before { + content: "\e96c"; +} +.icon-zone2:before { + content: "\e96d"; +} .icon-net:before { content: "\e95b"; } @@ -301,4 +316,4 @@ } .icon-worker:before { content: "\e943"; -} +} \ No newline at end of file diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg index 7cd1af528..9ca57000d 100644 --- a/front/core/styles/icons/salixfont.svg +++ b/front/core/styles/icons/salixfont.svg @@ -100,4 +100,9 @@ + + + + + \ No newline at end of file diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf index 08a36a48ba00ae23f523cc473aff246dd4a0c945..ab5de35ff5704093f92f0a42ab96502a9010e385 100644 GIT binary patch delta 3467 zcma)9U2Ggj9iQ2mow?n+wQs$5d%jKXvc7e8lk-RJZtc6+aoPqYG>PIihBi#EaPk@Nvj|=h1}&+xFk{?&zz8JU&!2V1PmBod_N3c=+j-F9;!q~q~p1YGCdWmk?vJ;pdk|7!qIFx^B_R_&ihgOzW zRun&A0{GDsrYnCbarYzlpU|a_Pu`fLZ$6gfR<06*6ZQyMLpG4zWFI*|7Rhtu+vI!X zH2DenB_YlzjndY+gLc|(sY+!}+G;{NHBl_MajQK(76wk#i5g)LH56UQwvq}X*$~Bb zR7Osx#B^Ywq~(@+XsH$kV@Z3w<;H7iv9n64(jsJU0AO1mbxNsL=vk*prDgqfUXX9{ zUK0$aC{!x_w{X306b!GCw@e|2f|0K8^$Jim^>`Lxk*FpXISlWFr-zsb##IR$xz(2aui029n`OeUFhw4thH z1)6y84;fZlD~)Nwk#Ux_vGQn8p>J~LOO zwON*BBFBUjR*4Hs>cSEknUM--hy=4Sz(BGr`sd58aW>O8E5&P;z5MpPOFa$+X0M^t z^qJEvCuB~_EL4dqqfkgOod6^=BJBw=iMMi|{f)gwELhb>vYC9E+(#ZDv!qMr2wC51 zZ>4cD7>|pE#EoG*H^7fURT?v}DC@e$5PS^$I3x#(1LG{PW4kjxP%L3WZ6>-Gx+c4F zW7H2^=;GoZ=?ca$=kF)!tb6{-wK2nTSI@Zhy36+5Rj6Gb!Z9r&4rZx=jlJLx4J86@N6Gh~4rCqE*;CVx$+q-!Vw2W_;P zonk@AMy)Bw$J!E3QlYXIZlw{N4pR}1ms*YBCKDVf0(S^ElOm{v(OA3FXqRC8sTT#s z+Y)QyIuYythv-e}eED9-m(8=zG@qk&zG0{IlDg{vA$f z6JuM77T?VKtc&_^voW*A)8KiU+*}VIiJ1ofx`|G1ga3cfC*k{y^LW0#u?=%FnCHzj zo0||KZcCsi3^u=O@9~Mr<9nwMFsqz+^exMG9N(g6-TZRcQ?2f8Y-)u&D*4Y(?mpVK z=~@5ourWG%Po>gh$493p_Bq-`Yseeoxw^OE>$+{Z+_sAI88%RkRJW5?ovJXZ?m9W; zXS15FBP>alskW6M%9oDF-0(V<{)sQckvtd%@4$kj}DHT7Q8uum@$s z#DSqCoAnuc0S6X5=+6KtbRcs+=k)SjyxM9sT2(&9`mCjw&1}}x=BysJ^t#Aqi!zfl zwEIO;7#Uf9+5VMfWioEo)UVidc4XKQOQ%(eLY`W=$o|e=MN%R(H5o|}*$c|VmBr9I zC=w6sMVS;$a}g*C4Z~D!-~!zPs^WoH-9mw@fs!D;l-yQ_DtktGg7j zm0fRp7;GgBZxAeNVGxR6iO0ur(X*H)^_L`1U=!beKLa>qm=@8va zx6>K=Mfw%`1R*NHrY%9xh!IE{t++~6Iz_`ZVqS35UU_PyuCnBoz=t+T6)OZ*b)?rH zwZn0Mr~%;JN?lvU25_b#iXYE`P=N^=RD%utwJ=c+hcz2D1=neSIpWEBB=K9-Lk;Bc zgsY1v(Nqk!u&NS00?Fzeb^-pdy}E3ys)e*E?5*X?m}uI`_4=iw>X%fDI`AD-j$N-z zU|hG>BT{WQWx5xkq&&BXwjiXu+5+TN*qQ}&PRkh%dI?t6&C>ra=@I%5THvM1| zkAp7PP}dk~|13v^gX-xlOHc)&wn+QSI2Q0QexsmKps}V}PUCNZ0jEL1;w=9eb7AA- zvgdcJ5?0Z6Tkh^}?GE;YT+gqwRC!~o3P)%Dwm}t;GbnGcYZgY)y%BPiA)GLeV0)avCz)l$-7zP0D07n$SFOkRM^;%$l;TPlTlqd8 z4(_)r{*(%(v!j8!M!&f{gxBIG$N5-x7`x=cG^G}=z9H5!ExaWj5~Y|SguDzEV6ktR zV?~8Zi$0Otqc&<|cd!@xiBypx__dI$!tOKHhkyK1@6 z8M!4Dm2KRaKz<8QPfJdIvSZ@BlwC;-3`HD31xIodD+(CunaY6tGeEvVUSe))T=-3Q zApZ?e!@Pq0;u4@kfuN)ZB+tOi{Bz;~d&ZbajMmx~KoKqm4hAM5WMoiy8T0?||NkJh zKsE!I&G`SZI15le<#w~9sggBT!sa!8FiW8&tX Wnij^%Ds@NLK|K-O>!J;wfZ%Az~y;ZytQwrzXB z>BICjBCz`4{M`9N=MS$et*j^|&;;~-8BJIIQs&;r-baK1iQlU~rf=MzS}T``!3n#U ztRvTvz2pvZkQ^b$$al#1$xGxXHg5?)9|W@yazS`?9Alq+1uIqL;Kg6XQ|n z#@)CXg>h5Kh3qJ;D3(o8+CXLOcFRl$2S(anxsR6XQ8=DQhqRF%cd(h-&*_?*H zV(3QEzLN=NxF(ZKy4rBfwnI(4|N9)Pc~1Atg=G0*Cb-#$#*6_u1DNTWsSr>(VHR!M zx0rSpSX?Lp7xZKpA~FiPVfYk1y}87(X?*>u!(Z z>!|B?gP@vd;=83%ZuzzO60Og%JQEfZQrKlKY^e)dj-7d+~77%=+{WoE#fVV01VlzEsEHAZ2OqB{vn=0x@;#3cU88TL2!GO^)R zo5@ykBe{*-N#;n8Ai6fSJKJee3MZ0MG4&ES&lU0$RE;JK5anHKfbbLKCn-5p8k%6C zlQ`Xpp;8$g>M+qe+cVk4D_{NK*&a6j-kx9#ef~k3^?GM6u6=XNy7ZdYXn1Vj&PL;X zo!@@$+^mqF{%XUsOb9j$;itYI#PQP4*t?gG=Hhsky^A=r(QZbB?IQieN4A(CpC^mt z8S*3YEArQrO1h3V5%JA-t6M4x*{rwZ#CS&{NUBuUqwO?C(4i}$iE_IcUIihLVxS|0 znG|6?ipM+MW~U72&!Q+SeWtK3E(&-_jz&@vsw3@T)d<~JO$*qm(-h^q0udD3zGx+}x z`y^tYah@zRHh17o2J`*dR%;7V#AgcV34<-%y#JZWsb}`j9AtJS_34{-;JSfLPkV*s zsIOMr-`vuUc2^5uoZ5T5sBm|G41x+iqU_PAr0 z7IJK;606r9UUO^0sCgUYbdb+$x{kCYnZ*Y~tenxOgSr_s%s<&HAqtAm$KLH zQsvLMtk~N z^u9Y*t+a|Re%g$`BMf)=72mHcFLGVyq9p0bA;+PGLcn?feoL?Td!k^{tEL+&zE*cT z6~E=W#X*>tLge5-uy5M~1zZg7W*g@5E4CC$yIC1t9b$P=W#t@F5ItGn+_N>@PZA8E5Wp5R! zvD(VAR|XEx6je|ttlG%7Kkh^mAW;J#x|O+($_+qfDhiL|K&n6o4@?6Fd_79l!C}m1 zUC|91qK|yC377b_=3xeUIKtIIlxn61UsyGXHxkKeAASLR)L9)iQPo2BDDJi8%eZJc z>E-&RtLm4`idyjXRE}S+OyFGC)+16)H-lhGo381jSXdKG)aY8FlNs!SkM(ACNe>5x zYaL|(Wx>vXrX0~(2nv>OtIJfV+ZpbKQY`njB1YHnlj3*zX?dBAC--xV9z6 zZ`$mJL2i#SStv(@FeVU4Rwu?y&vPKa8Ny+W+|#5)E3$M0+t0noZl#F6l{#C zhST_)0AMvJSls15qAwgYF8khE)v!yB*Y@^)dvCZe;(B3&t;!omRX92eZrG?2at`GU zX3e5FzBR^OWe7JaU|A_PKA9iKiq)zLGMbGz3L0qY<(8)g5lEJ-d3ST>d;3-Olx+}$ z3?}@f!u8+4s^9g)&xI0+6xE;PYK{FyxF^DqPq&MzHE@fUi z>Z$P<|Jbf5jdD_r61y-EAi#r8HJDbZbZ#tE+ZeQ#hjCimE0=)q6-u>J`@jC{fvv|U#ncPirncV(j{2`L K|7z{%S^95b%=v== delta 359 zcmZ3`#Ps7Oqe!{Gn;Qco0}zz_VBiMRYbJ_l*ViZKCKfO-FlGRSLO@tN?9$`(#A1-x z9w46siUrbhD${^sM;I9LHh}Q?zpA%0QWH}c7z#>&YRo`bf;InR22cY=1hN!pD8rF?DZ7$#6Dxog7fS&73SeB%RF;>R zn+g=O0BW2E!g1j@-3#)IftHrsfU9E$vY45FPUc~>XN;Nb!)UDyRL{T#bUqUhGBPN< zjQRif|9_wu(Bzj4U^e6b$Kosu%nXd14>2CjQw9YN5Uco9-jC^g>iC0-4QmBdWOW!ZuPeq0e%@=f&c&j diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js index ba9b021f5..c915569de 100644 --- a/modules/entry/back/methods/entry/filter.js +++ b/modules/entry/back/methods/entry/filter.js @@ -150,7 +150,6 @@ module.exports = Self => { JOIN vn.currency cu ON cu.id = e.currencyFk` ); - stmt.merge(conn.makeSuffix(filter)); let itemsIndex = stmts.push(stmt) - 1; diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json index 6d38dbba1..d3f149680 100644 --- a/modules/entry/back/models/entry.json +++ b/modules/entry/back/models/entry.json @@ -11,7 +11,7 @@ }, "properties": { "id": { - "type": "Number", + "type": "number", "id": true, "description": "Identifier" }, @@ -19,46 +19,49 @@ "type": "date" }, "ref": { - "type": "String" + "type": "string" }, "isBooked": { - "type": "Boolean" + "type": "boolean" }, "isInventory": { - "type": "Boolean" + "type": "boolean" }, "notes": { - "type": "Number" + "type": "number" }, "isConfirmed": { - "type": "Boolean" + "type": "boolean" }, "isVirtual": { - "type": "Boolean", + "type": "boolean", "mysql": { "columnName": "isRaid" } }, + "isRaid": { + "type": "boolean" + }, "commission": { - "type": "Number" + "type": "number" }, "isOrdered": { - "type": "Boolean" + "type": "boolean" }, "created": { "type": "date" }, "observation": { - "type": "String", + "type": "string", "mysql": { "columnName": "evaNotes" } }, "isBlocked": { - "type": "Boolean" + "type": "boolean" }, "loadPriority": { - "type": "Number" + "type": "number" } }, "relations": { diff --git a/modules/entry/front/descriptor/index.html b/modules/entry/front/descriptor/index.html index cd4057c43..917c5d721 100644 --- a/modules/entry/front/descriptor/index.html +++ b/modules/entry/front/descriptor/index.html @@ -35,6 +35,18 @@ value="{{$ctrl.entry.travel.warehouseOut.name}}">
+
+ + + + +
diff --git a/modules/entry/front/descriptor/locale/es.yml b/modules/entry/front/descriptor/locale/es.yml index 5e1eb25c2..47fabb8f0 100644 --- a/modules/entry/front/descriptor/locale/es.yml +++ b/modules/entry/front/descriptor/locale/es.yml @@ -1,4 +1,6 @@ Reference: Referencia All travels with current agency: Todos los envios con la agencia actual All entries with current supplier: Todas las entradas con el proveedor actual -Show entry report: Ver informe del pedido \ No newline at end of file +Show entry report: Ver informe del pedido +Is inventory entry: Es una entrada de inventario +Is virtual entry: Es una redada \ No newline at end of file diff --git a/modules/entry/front/index/index.html b/modules/entry/front/index/index.html index 60bbe46d5..cb44aa630 100644 --- a/modules/entry/front/index/index.html +++ b/modules/entry/front/index/index.html @@ -38,7 +38,7 @@ ng-show="entry.isInventory" class="bright" vn-tooltip="Inventory entry" - icon="icon-anonymous"> + icon="icon-inventory"> Date: Wed, 11 Mar 2020 08:05:38 +0100 Subject: [PATCH 13/13] Changed icon --- modules/zone/front/routes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/zone/front/routes.json b/modules/zone/front/routes.json index be96d3d6b..b5f0e76ab 100644 --- a/modules/zone/front/routes.json +++ b/modules/zone/front/routes.json @@ -6,7 +6,7 @@ "dependencies": ["worker"], "menus": { "main": [ - {"state": "zone.index", "icon": "location_on"}, + {"state": "zone.index", "icon": "icon-zone"}, {"state": "zone.deliveryDays", "icon": "today"} ], "card": [