Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable

modules/claim/back/models/claim-beginning.js

@@ -22,9 +22,8 @@ module.exports = Self => {
     async function claimIsEditable(ctx) {
         const loopBackContext = LoopBackContext.getCurrentContext();
         const httpCtx = {req: loopBackContext.active};
-        console.log(ctx, 'ctx.where.id');
+        const claimBeginning = await Self.findById(ctx.where.id);
-        console.log(ctx.where, 'ctx.where.id');
+        const isEditable = await Self.app.models.Claim.isEditable(httpCtx, claimBeginning.claimFk);
-        const isEditable = await Self.app.models.Claim.isEditable(httpCtx, ctx.where.id);
 
         if (!isEditable)
             throw new UserError(`The current claim can't be modified`);

modules/claim/front/detail/index.js

@@ -22,16 +22,25 @@ class Controller extends Section {
         };
     }
 
-    set salesClaimed(value) {
+    get claim() {
-        this._salesClaimed = value;
+        return this._claim;
+    }
+
+    set claim(value) {
+        this._claim = value;
 
         if (value) {
-            this.calculateTotals();
             this.isClaimEditable();
             this.isTicketEditable();
         }
     }
 
+    set salesClaimed(value) {
+        this._salesClaimed = value;
+
+        if (value) this.calculateTotals();
+    }
+
     get salesClaimed() {
         return this._salesClaimed;
     }

modules/client/front/consumption/index.html

@@ -2,6 +2,7 @@
     url="Clients/consumption"
     link="{clientFk: $ctrl.$params.id}"
     filter="::$ctrl.filter"
+    limit="20"
     user-params="::$ctrl.filterParams"
     data="sales"
     order="itemTypeFk, itemName, itemSize">