refs #5639 smart-table country

modules/client/back/models/defaulter.json

@@ -29,6 +29,16 @@
       "type": "belongsTo",
       "model": "Client",
       "foreignKey": "clientFk"
+    },
+    "country": {
+      "type": "belongsTo",
+      "model": "Country",
+      "foreignKey": "countryFk"
+    },
+    "payMethod": {
+      "type": "belongsTo",
+      "model": "PayMethod",
+      "foreignKey": "payMethodFk"
     }
   }
 }

modules/client/front/defaulter/index.html

@@ -60,7 +60,8 @@
                         <th field="countryFk">
                             <span translate>Country</span>
                         </th>
-                        <th field="payMethodFk">
+                        <th field="payMethodFk"
+                            vn-tooltip="Pay Method">
                             <span translate>P.Method</span>
                         </th>
                         <th
@@ -117,6 +118,12 @@
                                 {{::defaulter.salesPersonName | dashIfEmpty}}
                             </span>
                         </td>
+                        <td>
+                            {{::defaulter.countryFk}}
+                        </td>
+                        <!-- <td>
+                            {{:defaulter.payMethod}}
+                        </td> -->
                         <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                         <td>
                             <span

modules/client/front/defaulter/index.js

@@ -20,8 +20,7 @@ export default class Controller extends Section {
                         showField: 'name',
                         valueField: 'id'
                     }
-                },
-                {
+                }, {
                     field: 'salesPersonFk',
                     autocomplete: {
                         url: 'Workers/activeWithInheritedRole',
@@ -30,6 +29,12 @@ export default class Controller extends Section {
                         showField: 'name',
                         valueField: 'id',
                     }
+                }, {
+                    field: 'countryFk',
+                    autocomplete: {
+                        showField: 'country',
+                        valueField: 'id'
+                    }
                 },
                 {
                     field: 'workerFk',
@@ -132,7 +137,8 @@ export default class Controller extends Section {
     sendMail() {
         const params = {
             defaulters: this.checked,
-            observation: this.defaulter.observation
+            observation: this.defaulter.observation,
+            country: this.defaulter.countryFk
         };
         this.$http.post(`Defaulters/observationEmail`, params);
     }
@@ -143,6 +149,8 @@ export default class Controller extends Section {
         case 'amount':
         case 'clientFk':
         case 'workerFk':
+        case 'countryFk':
+        case 'payMethod':
         case 'salesPersonFk':
             return {[`d.${param}`]: value};
         case 'created':

modules/client/front/defaulter/locale/es.yml

@@ -9,3 +9,6 @@ Search client: Buscar clientes
 Worker who made the last observation: Trabajador que ha realizado la última observación
 Email sended!: Email enviado!
 Observation saved!: Observación añadida!
+P.Method: F.Pago
+Pay Method: Forma de Pago
+Country: Pais