Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro

modules/claim/back/methods/claim-state/isEditable.js

@@ -26,13 +26,13 @@ module.exports = Self => {
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
-    
-            const state = await models.ClaimState.findById(id, {
-                include: {
-                    relation: 'writeRole'
-                }
-            }, myOptions);
-            const roleWithGrants = state && state.writeRole().name;
-            return await models.Account.hasRole(userId, roleWithGrants, myOptions);
+
+        const state = await models.ClaimState.findById(id, {
+            include: {
+                relation: 'writeRole'
+            }
+        }, myOptions);
+        const roleWithGrants = state && state.writeRole().name;
+        return await models.Account.hasRole(userId, roleWithGrants, myOptions);
     };
 };

modules/claim/front/detail/index.js

@@ -151,7 +151,7 @@ class Controller extends Section {
     isClaimEditable() {
         if (!this.claim) return;
 
-        this.$http.get(`ClaimStates/${this.claim.id}/isEditable`).then(res => {
+        this.$http.get(`ClaimStates/${this.claim.claimStateFk}/isEditable`).then(res => {
             this.isRewritable = res.data;
         });
     }

print/templates/reports/delivery-note/delivery-note.html

@@ -33,7 +33,7 @@
                 <div class="size50">
                     <div class="panel">
                         <div class="header">{{$t('deliveryAddress')}}</div>
-                        <div class="body">
+                        <div class="body" v-if="address">
                             <h3 class="uppercase">{{address.nickname}}</h3>
                             <div>{{address.street}}</div>
                             <div>{{address.postalCode}}, {{address.city}} ({{address.province}})</div>
@@ -245,13 +245,8 @@
         </div>
     </div>
     <template v-slot:footer>
-        <report-footer
-            id="pageFooter"
-            v-bind:company-code="ticket.companyCode"
-            v-bind:left-text="footerType"
-            v-bind:center-text="client.socialName"
-            v-bind="$props"
-        >
+        <report-footer id="pageFooter" v-bind:company-code="ticket.companyCode" v-bind:left-text="footerType"
+            v-bind:center-text="client.socialName" v-bind="$props">
         </report-footer>
     </template>
-</report-body>
+</report-body>