Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2240-salix-version-refresh

e2e/paths/02-client/21_defaulter.spec.js

@@ -28,12 +28,12 @@ describe('Client defaulter path', () => {
         const salesPersonName =
             await page.waitToGetProperty(selectors.clientDefaulter.firstSalesPersonName, 'innerText');
 
-        expect(clientName).toEqual('Ororo Munroe');
+        expect(clientName).toEqual('Bruce Banner');
-        expect(salesPersonName).toEqual('salesPersonNick');
+        expect(salesPersonName).toEqual('developer');
     });
 
     it('should first observation not changed', async() => {
-        const expectedObservation = 'Madness, as you know, is like gravity, all it takes is a little push';
+        const expectedObservation = 'Meeting with Black Widow 21st 9am';
         const result = await page.waitToGetProperty(selectors.clientDefaulter.firstObservation, 'value');
 
         expect(result).toContain(expectedObservation);

front/core/filters/currency.js

@@ -15,8 +15,9 @@ export default function currency($translate) {
             maximumFractionDigits: fractionSize
         };
 
+        const lang = $translate.use() == 'es' ? 'de' : $translate.use();
         if (typeof input == 'number') {
-            return new Intl.NumberFormat($translate.use(), options)
+            return new Intl.NumberFormat(lang, options)
                 .format(input);
         }
 

modules/client/back/methods/defaulter/filter.js

@@ -58,12 +58,12 @@ module.exports = Self => {
                         DISTINCT c.id clientFk,
                         c.name clientName,
                         c.salesPersonFk,
-                        u.nickname salesPersonName,
+                        u.name salesPersonName,
                         d.amount,
                         co.created,
                         co.text observation,
                         uw.id workerFk,
-                        uw.nickname workerName, 
+                        uw.name workerName, 
                         c.creditInsurance,
                         d.defaulterSinced
                     FROM vn.defaulter d

modules/client/front/defaulter/index.html

@@ -3,6 +3,7 @@
     url="Defaulters/filter"
     filter="::$ctrl.filter"
     limit="20"
+    order="amount DESC"
     data="defaulters"
     auto-load="true">
 </vn-crud-model>
@@ -70,13 +71,13 @@
                         </th>
                         <th 
                             vn-tooltip="Last observation date"
-                            field="created" 
+                            field="created">
-                            shrink-datetime>
+                            <span translate>L. O. Date</span>
-                            <span translate>Last observation D.</span>
                         </th>
                         <th 
                             vn-tooltip="Credit insurance"
-                            field="creditInsurance" >
+                            field="creditInsurance"
+                            shrink>
                             <span translate>Credit I.</span>
                         </th>
                         <th field="defaulterSinced">
@@ -124,13 +125,13 @@
                                 ng-model="defaulter.observation">
                             </vn-textarea>
                         </td>
-                        <td shrink-datetime>
+                        <td shrink-date>
                             <span class="chip {{::$ctrl.chipColor(defaulter.created)}}">
                                 {{::defaulter.created | date: 'dd/MM/yyyy'}}
                             </span>
                         </td>
-                        <td>{{::defaulter.creditInsurance | currency: 'EUR': 2}}</td>
+                        <td shrink>{{::defaulter.creditInsurance | currency: 'EUR': 2}}</td>
-                        <td>{{::defaulter.defaulterSinced | date: 'dd/MM/yyyy'}}</td>
+                        <td shrink-date>{{::defaulter.defaulterSinced | date: 'dd/MM/yyyy'}}</td>
                     </tr>
                 </tbody>
             </table>

modules/client/front/defaulter/index.js

@@ -26,7 +26,7 @@ export default class Controller extends Section {
                         url: 'Workers/activeWithInheritedRole',
                         where: `{role: 'salesPerson'}`,
                         searchFunction: '{firstName: $search}',
-                        showField: 'nickname',
+                        showField: 'name',
                         valueField: 'id',
                     }
                 },
@@ -35,7 +35,7 @@ export default class Controller extends Section {
                     autocomplete: {
                         url: 'Workers/activeWithInheritedRole',
                         searchFunction: '{firstName: $search}',
-                        showField: 'nickname',
+                        showField: 'name',
                         valueField: 'id',
                     }
                 },
@@ -53,16 +53,8 @@ export default class Controller extends Section {
                 }
             ]
         };
-    }
 
-    get balanceDueTotal() {
+        this.getBalanceDueTotal();
-        let balanceDueTotal = 0;
-        const defaulters = this.$.model.data || [];
-
-        for (let defaulter of defaulters)
-            balanceDueTotal += defaulter.amount;
-
-        return balanceDueTotal;
     }
 
     get checked() {
@@ -76,6 +68,18 @@ export default class Controller extends Section {
         return checkedLines;
     }
 
+    getBalanceDueTotal() {
+        this.$http.get('Defaulters/filter')
+            .then(res => {
+                if (!res.data) return 0;
+
+                this.balanceDueTotal = res.data.reduce(
+                    (accumulator, currentValue) => {
+                        return accumulator + (currentValue['amount'] || 0);
+                    }, 0);
+            });
+    }
+
     chipColor(date) {
         const day = 24 * 60 * 60 * 1000;
         const today = new Date();

modules/client/front/defaulter/index.spec.js

@@ -36,17 +36,6 @@ describe('client defaulter', () => {
             });
         });
 
-        describe('balanceDueTotal() getter', () => {
-            it('should return balance due total', () => {
-                const data = controller.$.model.data;
-                const expectedAmount = data[0].amount + data[1].amount + data[2].amount;
-
-                const result = controller.balanceDueTotal;
-
-                expect(result).toEqual(expectedAmount);
-            });
-        });
-
         describe('chipColor()', () => {
             it('should return undefined when the date is the present', () => {
                 let today = new Date();
@@ -93,6 +82,7 @@ describe('client defaulter', () => {
                 const params = [{text: controller.defaulter.observation, clientFk: data[1].clientFk}];
 
                 jest.spyOn(controller.vnApp, 'showMessage');
+                $httpBackend.expect('GET', `Defaulters/filter`).respond(200);
                 $httpBackend.expect('POST', `ClientObservations`, params).respond(200, params);
 
                 controller.onResponse();
@@ -115,5 +105,17 @@ describe('client defaulter', () => {
                 expect(expr).toEqual({'d.clientFk': '5'});
             });
         });
+
+        describe('getBalanceDueTotal()', () => {
+            it('should return balance due total', () => {
+                const defaulters = controller.$.model.data;
+                $httpBackend.when('GET', `Defaulters/filter`).respond(defaulters);
+
+                controller.getBalanceDueTotal();
+                $httpBackend.flush();
+
+                expect(controller.balanceDueTotal).toEqual(875);
+            });
+        });
     });
 });

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

@@ -3,7 +3,7 @@ Add observation to all selected clients: Añadir observación a {{total}} client
 Balance D.: Saldo V.
 Credit I.: Crédito A.
 Last observation: Última observación
-Last observation D.: Fecha última O.
+L. O. Date: Fecha Ú. O.
 Last observation date: Fecha última observación
 Search client: Buscar clientes
 Worker who made the last observation: Trabajador que ha realizado la última observación