From 7f9d8da7a7a264df2f16ab18eea36d20753cdfa6 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 22 Jun 2023 11:42:21 +0200 Subject: [PATCH 1/7] refs #5836 defaulter --- modules/client/front/defaulter/index.html | 10 ++++++++++ modules/client/front/defaulter/index.js | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html index 4f662b62bd..f61a9664f3 100644 --- a/modules/client/front/defaulter/index.html +++ b/modules/client/front/defaulter/index.html @@ -54,6 +54,9 @@ Client + + Es trabajador + Comercial @@ -110,6 +113,13 @@ {{::defaulter.clientName}} + + + + Date: Mon, 26 Jun 2023 13:55:39 +0200 Subject: [PATCH 2/7] refs #5836 isworker back --- modules/client/back/methods/defaulter/filter.js | 1 + modules/client/back/models/defaulter.json | 5 +++++ modules/client/front/defaulter/index.html | 4 ++-- modules/client/front/defaulter/index.js | 13 +++++++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js index 736c29f9ca..16d6929bd4 100644 --- a/modules/client/back/methods/defaulter/filter.js +++ b/modules/client/back/methods/defaulter/filter.js @@ -60,6 +60,7 @@ module.exports = Self => { DISTINCT c.id clientFk, c.name clientName, c.salesPersonFk, + c.businessTypeFk businessType, u.name salesPersonName, d.amount, co.created, diff --git a/modules/client/back/models/defaulter.json b/modules/client/back/models/defaulter.json index 03d68ea71a..baad79ec40 100644 --- a/modules/client/back/models/defaulter.json +++ b/modules/client/back/models/defaulter.json @@ -39,6 +39,11 @@ "type": "belongsTo", "model": "PayMethod", "foreignKey": "payMethod" + }, + "businessType": { + "type":"belongsTo", + "model": "businessType", + "foreignKey": "businessTypeFk" } } } \ No newline at end of file diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html index f61a9664f3..4832487b49 100644 --- a/modules/client/front/defaulter/index.html +++ b/modules/client/front/defaulter/index.html @@ -54,7 +54,7 @@ Client - + Es trabajador @@ -116,7 +116,7 @@ diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js index a358b64df5..6fb1f5b2c8 100644 --- a/modules/client/front/defaulter/index.js +++ b/modules/client/front/defaulter/index.js @@ -62,6 +62,14 @@ export default class Controller extends Section { { field: 'defaulterSinced', datepicker: true + }, + { + field: 'businessType', + autocomplete: { + url: 'Clients', + showField: 'businessTypeFk', + valueField: 'id' + } } ] }; @@ -152,6 +160,7 @@ export default class Controller extends Section { switch (param) { case 'creditInsurance': case 'amount': + case 'businessTypeFk': case 'clientFk': case 'workerFk': case 'country': @@ -178,8 +187,8 @@ export default class Controller extends Section { return [minHour, maxHour]; } - isWorker(){ - if (businessFk === 'worker') + isWorker() { + if (businessType === 'worker') return true; } } From 5216f12001c21d371d0d0384bb50ee4a5e67efbb Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 27 Jun 2023 10:27:39 +0200 Subject: [PATCH 3/7] refs #5836 check fix --- modules/client/back/models/defaulter.json | 5 ---- modules/client/front/defaulter/index.html | 9 ++++--- modules/client/front/defaulter/index.js | 29 +++++++++++------------ 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/modules/client/back/models/defaulter.json b/modules/client/back/models/defaulter.json index baad79ec40..03d68ea71a 100644 --- a/modules/client/back/models/defaulter.json +++ b/modules/client/back/models/defaulter.json @@ -39,11 +39,6 @@ "type": "belongsTo", "model": "PayMethod", "foreignKey": "payMethod" - }, - "businessType": { - "type":"belongsTo", - "model": "businessType", - "foreignKey": "businessTypeFk" } } } \ No newline at end of file diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html index 4832487b49..cf880e0f72 100644 --- a/modules/client/front/defaulter/index.html +++ b/modules/client/front/defaulter/index.html @@ -4,7 +4,7 @@ filter="::$ctrl.filter" limit="20" order="amount DESC" - data="defaulters" + data="$ctrl.defaulters" on-data-change="$ctrl.reCheck()" auto-load="true"> @@ -54,7 +54,7 @@ Client - + Es trabajador @@ -97,7 +97,7 @@ - + diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js index 6fb1f5b2c8..9202485473 100644 --- a/modules/client/front/defaulter/index.js +++ b/modules/client/front/defaulter/index.js @@ -5,7 +5,7 @@ import UserError from 'core/lib/user-error'; export default class Controller extends Section { constructor($element, $) { super($element, $); - this.defaulter = {}; + this.defaulters = []; this.checkedDefaulers = []; this.smartTableOptions = { @@ -62,14 +62,6 @@ export default class Controller extends Section { { field: 'defaulterSinced', datepicker: true - }, - { - field: 'businessType', - autocomplete: { - url: 'Clients', - showField: 'businessTypeFk', - valueField: 'id' - } } ] }; @@ -77,6 +69,18 @@ export default class Controller extends Section { this.getBalanceDueTotal(); } + set defaulters(value) { + if (!value || !value.length) return; + for (let defaulter of value) + defaulter.isWorker = defaulter.businessType === 'worker'; + + this._defaulters = value; + } + + get defaulters() { + return this._defaulters; + } + get checked() { const clients = this.$.model.data || []; const checkedLines = []; @@ -160,7 +164,7 @@ export default class Controller extends Section { switch (param) { case 'creditInsurance': case 'amount': - case 'businessTypeFk': + case 'businessType': case 'clientFk': case 'workerFk': case 'country': @@ -186,11 +190,6 @@ export default class Controller extends Section { return [minHour, maxHour]; } - - isWorker() { - if (businessType === 'worker') - return true; - } } ngModule.vnComponent('vnClientDefaulter', { From f0b238b62a61e0d2549869f924270f6b27977936 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 27 Jun 2023 12:31:58 +0200 Subject: [PATCH 4/7] refs #5836 fix e2e --- e2e/helpers/selectors.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index b8eaa99a1d..81278aa4de 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -312,8 +312,8 @@ export default { clientDefaulter: { anyClient: 'vn-client-defaulter tbody > tr', firstClientName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(2) > span', - firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(3) > span', - firstObservation: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]', + firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(4) > span', + firstObservation: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(9) > vn-textarea[ng-model="defaulter.observation"]', allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check', addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]', observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]', From af91630852089f150f59528a558df45b9ed8f875 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 29 Jun 2023 13:22:51 +0200 Subject: [PATCH 5/7] refs #5836 e2e fix --- modules/client/front/defaulter/index.html | 2 +- modules/client/front/defaulter/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html index cf880e0f72..3ea88088b8 100644 --- a/modules/client/front/defaulter/index.html +++ b/modules/client/front/defaulter/index.html @@ -34,7 +34,7 @@
Date: Fri, 30 Jun 2023 10:07:29 +0200 Subject: [PATCH 6/7] refs #5836 remove case --- modules/client/front/defaulter/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js index 292505c916..e8cf8def71 100644 --- a/modules/client/front/defaulter/index.js +++ b/modules/client/front/defaulter/index.js @@ -165,7 +165,6 @@ export default class Controller extends Section { switch (param) { case 'creditInsurance': case 'amount': - case 'businessType': case 'clientFk': case 'workerFk': case 'country': From c3ef6420170d22988cb2cf645db8a4819ecfe4bb Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 3 Jul 2023 11:45:05 +0200 Subject: [PATCH 7/7] refs #5836 fix fk --- modules/client/back/methods/defaulter/filter.js | 2 +- modules/client/front/defaulter/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js index 16d6929bd4..56afb64db4 100644 --- a/modules/client/back/methods/defaulter/filter.js +++ b/modules/client/back/methods/defaulter/filter.js @@ -60,7 +60,7 @@ module.exports = Self => { DISTINCT c.id clientFk, c.name clientName, c.salesPersonFk, - c.businessTypeFk businessType, + c.businessTypeFk, u.name salesPersonName, d.amount, co.created, diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js index e8cf8def71..47f385d4da 100644 --- a/modules/client/front/defaulter/index.js +++ b/modules/client/front/defaulter/index.js @@ -73,7 +73,7 @@ export default class Controller extends Section { set defaulters(value) { if (!value || !value.length) return; for (let defaulter of value) - defaulter.isWorker = defaulter.businessType === 'worker'; + defaulter.isWorker = defaulter.businessTypeFk === 'worker'; this._defaulters = value; }