refs #6905 add rows #235
|
@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
- (Tickets) => Se añade la opción de clonar ticket. #6951
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
|
@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
|
||||||
// app boot file (/src/boot)
|
// app boot file (/src/boot)
|
||||||
// --> boot files are part of "main.js"
|
// --> boot files are part of "main.js"
|
||||||
// https://v2.quasar.dev/quasar-cli/boot-files
|
// https://v2.quasar.dev/quasar-cli/boot-files
|
||||||
boot: ['i18n', 'axios', 'vnDate', 'validations'],
|
boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar'],
|
||||||
|
|
||||||
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
|
||||||
css: ['app.scss'],
|
css: ['app.scss'],
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
import { getCurrentInstance } from 'vue';
|
||||||
|
|
||||||
|
const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
|
||||||
|
const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
mounted: function () {
|
||||||
|
const vm = getCurrentInstance();
|
||||||
|
if (vm.type.name === 'QForm')
|
||||||
|
if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
|
||||||
|
// AUTOFOCUS
|
||||||
|
const elementsArray = Array.from(this.$el.elements);
|
||||||
|
const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
|
||||||
|
|
||||||
|
if (firstInputElement) {
|
||||||
|
firstInputElement.focus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
|
@ -0,0 +1,6 @@
|
||||||
|
import { boot } from 'quasar/wrappers';
|
||||||
|
import qFormMixin from './qformMixin';
|
||||||
|
|
||||||
|
export default boot(({ app }) => {
|
||||||
|
app.mixin(qFormMixin);
|
||||||
|
});
|
|
@ -164,7 +164,7 @@ function formatValue(value) {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QForm @submit="search">
|
<QForm @submit="search" id="filterPanelForm">
|
||||||
<QList dense>
|
<QList dense>
|
||||||
<QItem class="q-mt-xs">
|
<QItem class="q-mt-xs">
|
||||||
<QItemSection top>
|
<QItemSection top>
|
||||||
|
|
|
@ -108,7 +108,7 @@ async function search() {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QForm @submit="search">
|
<QForm @submit="search" id="searchbarForm">
|
||||||
<VnInput
|
<VnInput
|
||||||
id="searchbar"
|
id="searchbar"
|
||||||
v-model="searchText"
|
v-model="searchText"
|
||||||
|
|
|
@ -3,7 +3,7 @@ import axios from 'axios';
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRouter, useRoute } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import { usePrintService } from 'composables/usePrintService';
|
import { usePrintService } from 'composables/usePrintService';
|
||||||
import SendEmailDialog from 'components/common/SendEmailDialog.vue';
|
import SendEmailDialog from 'components/common/SendEmailDialog.vue';
|
||||||
import VnConfirm from 'components/ui/VnConfirm.vue';
|
import VnConfirm from 'components/ui/VnConfirm.vue';
|
||||||
|
@ -17,13 +17,49 @@ const props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const router = useRouter();
|
const { push, currentRoute } = useRouter();
|
||||||
const route = useRoute();
|
const { dialog, notify } = useQuasar();
|
||||||
const quasar = useQuasar();
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { openReport, sendEmail } = usePrintService();
|
const { openReport, sendEmail } = usePrintService();
|
||||||
|
|
||||||
const ticket = ref(props.ticket);
|
const ticket = ref(props.ticket);
|
||||||
|
const ticketId = currentRoute.value.params.id;
|
||||||
|
const actions = {
|
||||||
|
clone: async () => {
|
||||||
|
const opts = { message: t('Ticket cloned'), type: 'positive' };
|
||||||
|
let clonedTicketId;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const { data } = await axios.post(`Tickets/${ticketId}/clone`, {
|
||||||
|
shipped: ticket.value.shipped,
|
||||||
|
});
|
||||||
|
clonedTicketId = data;
|
||||||
|
} catch (e) {
|
||||||
|
opts.message = t('It was not able to clone the ticket');
|
||||||
|
opts.type = 'negative';
|
||||||
|
} finally {
|
||||||
|
notify(opts);
|
||||||
|
|
||||||
|
if (clonedTicketId)
|
||||||
|
push({ name: 'TicketSummary', params: { id: clonedTicketId } });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
remove: async () => {
|
||||||
|
try {
|
||||||
|
await axios.post(`Tickets/${ticketId}/setDeleted`);
|
||||||
|
|
||||||
|
notify({ message: t('Ticket deleted'), type: 'positive' });
|
||||||
|
notify({
|
||||||
|
message: t('You can undo this action within the first hour'),
|
||||||
|
icon: 'info',
|
||||||
|
});
|
||||||
|
|
||||||
|
push({ name: 'TicketList' });
|
||||||
|
} catch (e) {
|
||||||
|
notify({ message: e.message, type: 'negative' });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
|
function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
|
||||||
const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
|
const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
|
||||||
|
@ -35,7 +71,7 @@ function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
|
||||||
|
|
||||||
function sendDeliveryNoteConfirmation(type = 'deliveryNote', documentType = 'pdf') {
|
function sendDeliveryNoteConfirmation(type = 'deliveryNote', documentType = 'pdf') {
|
||||||
const customer = ticket.value.client;
|
const customer = ticket.value.client;
|
||||||
quasar.dialog({
|
dialog({
|
||||||
component: SendEmailDialog,
|
component: SendEmailDialog,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
data: {
|
data: {
|
||||||
|
@ -67,7 +103,7 @@ function showSmsDialog(template, customData) {
|
||||||
const address = ticket.value.address;
|
const address = ticket.value.address;
|
||||||
const client = ticket.value.client;
|
const client = ticket.value.client;
|
||||||
const phone =
|
const phone =
|
||||||
route.params.phone ||
|
currentRoute.value.params.phone ||
|
||||||
address.mobile ||
|
address.mobile ||
|
||||||
address.phone ||
|
address.phone ||
|
||||||
client.mobile ||
|
client.mobile ||
|
||||||
|
@ -82,7 +118,7 @@ function showSmsDialog(template, customData) {
|
||||||
Object.assign(data, customData);
|
Object.assign(data, customData);
|
||||||
}
|
}
|
||||||
|
|
||||||
quasar.dialog({
|
dialog({
|
||||||
component: VnSmsDialog,
|
component: VnSmsDialog,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
phone: phone,
|
phone: phone,
|
||||||
|
@ -95,42 +131,26 @@ function showSmsDialog(template, customData) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function showSmsDialogWithChanges() {
|
async function showSmsDialogWithChanges() {
|
||||||
const query = `TicketLogs/${route.params.id}/getChanges`;
|
const query = `TicketLogs/${ticketId}/getChanges`;
|
||||||
const response = await axios.get(query);
|
const response = await axios.get(query);
|
||||||
|
|
||||||
showSmsDialog('orderChanges', { changes: response.data });
|
showSmsDialog('orderChanges', { changes: response.data });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function sendSms(body) {
|
async function sendSms(body) {
|
||||||
await axios.post(`Tickets/${route.params.id}/sendSms`, body);
|
await axios.post(`Tickets/${ticketId}/sendSms`, body);
|
||||||
quasar.notify({
|
notify({
|
||||||
message: 'Notification sent',
|
message: 'Notification sent',
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmDelete() {
|
function openConfirmDialog(callback) {
|
||||||
quasar
|
dialog({
|
||||||
.dialog({
|
|
||||||
component: VnConfirm,
|
component: VnConfirm,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
promise: remove,
|
promise: actions[callback],
|
||||||
},
|
},
|
||||||
})
|
|
||||||
.onOk(async () => await router.push({ name: 'TicketList' }));
|
|
||||||
}
|
|
||||||
|
|
||||||
async function remove() {
|
|
||||||
const id = route.params.id;
|
|
||||||
await axios.post(`Tickets/${id}/setDeleted`);
|
|
||||||
|
|
||||||
quasar.notify({
|
|
||||||
message: t('Ticket deleted'),
|
|
||||||
type: 'positive',
|
|
||||||
});
|
|
||||||
quasar.notify({
|
|
||||||
message: t('You can undo this action within the first hour'),
|
|
||||||
icon: 'info',
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -227,9 +247,15 @@ async function remove() {
|
||||||
</QList>
|
</QList>
|
||||||
</QMenu>
|
</QMenu>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
<QItem @click="openConfirmDialog('clone')" v-ripple clickable>
|
||||||
|
<QItemSection avatar>
|
||||||
|
<QIcon name="content_copy" />
|
||||||
|
</QItemSection>
|
||||||
|
<QItemSection>{{ t('To clone ticket') }}</QItemSection>
|
||||||
|
</QItem>
|
||||||
<template v-if="!ticket.isDeleted">
|
<template v-if="!ticket.isDeleted">
|
||||||
<QSeparator />
|
<QSeparator />
|
||||||
<QItem @click="confirmDelete()" v-ripple clickable>
|
<QItem @click="openConfirmDialog('remove')" v-ripple clickable>
|
||||||
<QItemSection avatar>
|
<QItemSection avatar>
|
||||||
<QIcon name="delete" />
|
<QIcon name="delete" />
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
@ -253,4 +279,7 @@ es:
|
||||||
Order changes: Cambios del pedido
|
Order changes: Cambios del pedido
|
||||||
Ticket deleted: Ticket eliminado
|
Ticket deleted: Ticket eliminado
|
||||||
You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
|
You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
|
||||||
|
To clone ticket: Clonar ticket
|
||||||
|
Ticket cloned: Ticked clonado
|
||||||
|
It was not able to clone the ticket: No se pudo clonar el ticket
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
/// <reference types="cypress" />
|
||||||
|
describe('Ticket descriptor', () => {
|
||||||
|
const toCloneOpt = '.q-list > :nth-child(5)';
|
||||||
|
const warehouseValue = '.summaryBody > :nth-child(2) > :nth-child(6) > .value > span';
|
||||||
|
const summaryHeader = '.summaryHeader > div';
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
const ticketId = 1;
|
||||||
|
|
||||||
|
cy.login('developer');
|
||||||
|
cy.visit(`/#/ticket/${ticketId}/summary`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should clone the ticket without warehouse', () => {
|
||||||
|
cy.openLeftMenu();
|
||||||
|
cy.openActionsDescriptor();
|
||||||
|
cy.get(toCloneOpt).click();
|
||||||
|
cy.clickConfirm();
|
||||||
|
cy.get(warehouseValue).contains('-');
|
||||||
|
cy.get(summaryHeader)
|
||||||
|
.invoke('text')
|
||||||
|
.then((text) => {
|
||||||
|
const [, owner] = text.split('-');
|
||||||
|
cy.wrap(owner.trim()).should('eq', 'Bruce Wayne (1101)');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in New Issue