Merge pull request '5836-clientDefaulterisWorker' (!1639) from 5836-clientDefaulterisWorker into dev

Reviewed-on: #1639
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

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',
+        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(8) > vn-textarea[ng-model="defaulter.observation"]',
+        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"]',

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,
                         u.name salesPersonName,
                         d.amount,
                         co.created,

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">
 </vn-crud-model>
@@ -34,7 +34,7 @@
             </div>
             <div class="vn-pa-md">
                 <vn-button
-                    ng-show="$ctrl.checked.length > 0"
+                    disabled="$ctrl.checked.length == 0"
                     ng-click="notesDialog.show()"
                     name="notesDialog"
                     vn-tooltip="Add observation"
@@ -54,6 +54,9 @@
                         <th field="clientFk">
                             <span translate>Client</span>
                         </th>
+                        <th>
+                            <span translate>Es trabajador</span>
+                        </th>
                         <th field="salesPersonFk">
                             <span translate>Comercial</span>
                         </th>
@@ -94,7 +97,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="defaulter in defaulters">
+                    <tr ng-repeat="defaulter in $ctrl.defaulters">
                         <td shrink>
                             <vn-check
                                 ng-model="defaulter.checked"
@@ -110,6 +113,12 @@
                                 {{::defaulter.clientName}}
                             </span>
                         </td>
+                        <td>
+                            <vn-check
+                                ng-model="defaulter.isWorker"
+                                disabled="true">
+                            </vn-check>
+                        </td>
                         <td>
                             <span
                                 title="{{::defaulter.salesPersonName}}"

modules/client/front/defaulter/index.js

@@ -6,6 +6,7 @@ export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.defaulter = {};
+        this.defaulters = [];
         this.checkedDefaulers = [];
 
         this.smartTableOptions = {
@@ -69,6 +70,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.businessTypeFk === 'worker';
+
+        this._defaulters = value;
+    }
+
+    get defaulters() {
+        return this._defaulters;
+    }
+
     get checked() {
         const clients = this.$.model.data || [];
         const checkedLines = [];