refs #5639 select country, paymethod

2023-05-23 12:31:02 +02:00 · 2023-05-23 12:31:02 +02:00 · e2bea16e68
parent db7d3b6868
commit e2bea16e68
2 changed files with 7 additions and 3 deletions
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@ -67,9 +67,13 @@ module.exports = Self => {
                        uw.id workerFk,
                        uw.name workerName,
                        c.creditInsurance,
-                        d.defaulterSinced
+                        d.defaulterSinced,
+                        cn.country,
+                        pm.name payMethod
                    FROM vn.defaulter d
                        JOIN vn.client c ON c.id = d.clientFk
+                        JOIN vn.country cn ON cn.id = c.countryFk
+                        JOIN vn.payMethod pm ON pm.id = c.payMethodFk 
                        LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
                        LEFT JOIN account.user u ON u.id = c.salesPersonFk
                        LEFT JOIN account.user uw ON uw.id = co.workerFk
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@ -119,10 +119,10 @@
                            </span>
                        </td>
                        <td>
-                            {{::defaulter.countryFk}}
+                            {{::defaulter.country}}
                        </td>
                        <td>
-                            {{::defaulter.payMethodFk}}
+                            {{::defaulter.payMethod}}
                        </td> 
                        <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                        <td>