verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 69 Releases Wiki Activity

#7553 modified TicketExpedition & changes in ticket section #571

Merged
jon merged 79 commits from 7553_FixTicketExpedition into dev 2024-09-25 05:51:16 +00:00
Conversation 0 Commits 79 Files Changed 37 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ffa6ef57fe - Show all commits

8
src/pages/Ticket/Card/TicketDescriptorMenu.vue
View File

@ -13,6 +13,7 @@ import FormPopup from 'components/FormPopup.vue';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnInputTime from 'src/components/common/VnInputTime.vue'; import VnInputTime from 'src/components/common/VnInputTime.vue';
import { useAcl } from 'src/composables/useAcl';
const props = defineProps({ const props = defineProps({
ticket: { ticket: {
@ -34,7 +35,7 @@ const showTurnDialog = ref(false);
const showChangeTimeDialog = ref(false); const showChangeTimeDialog = ref(false);
const dialogRef = ref(); const dialogRef = ref();
const isEditable = ref(); const isEditable = ref();
const hasInvoicing = ref(); const hasInvoicing = useAcl('invoicing');
const hasPdf = ref(); const hasPdf = ref();
const actions = { const actions = {
clone: async () => { clone: async () => {
@ -529,18 +530,17 @@ async function handleInvoiceOutData() {
</QItemSection> </QItemSection>
<QItemSection>{{ t('Make invoice') }}</QItemSection> <QItemSection>{{ t('Make invoice') }}</QItemSection>
</QItem> </QItem>
<!--TODO: acabar esta parte, falta el campo hasInvoicing-->
<QItem <QItem
@click="generatePdfDialog()" @click="generatePdfDialog()"
v-ripple v-ripple
clickable clickable
v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)" v-if="ticket.refFk !== null && (hasInvoicing || hasPdf)"
> >
<QItemSection avatar> <QItemSection avatar>
<QIcon name="picture_as_pdf" /> <QIcon name="picture_as_pdf" />
</QItemSection> </QItemSection>
<QItemSection>{{ <QItemSection>{{
hasPdf.value ? t('Regenerate PDF invoice') : t('Generate PDF invoice') hasPdf ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
}}</QItemSection> }}</QItemSection>
</QItem> </QItem>
<QItem @click="openConfirmDialog('clone')" v-ripple clickable> <QItem @click="openConfirmDialog('clone')" v-ripple clickable>