verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Vicent Llopis 2023-03-24 07:51:31 +01:00
parent afdfe5e3f3 ea50da8a19
commit 0f6092483c
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/claim/back/methods/claim-state/isEditable.js
View File

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

2
modules/claim/front/detail/index.js
View File

@ -151,7 +151,7 @@ class Controller extends Section {
isClaimEditable() { isClaimEditable() {
if (!this.claim) return; 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; this.isRewritable = res.data;
}); });
} }

11
print/templates/reports/delivery-note/delivery-note.html
View File

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