Compare commits
1 Commits
dev
...
ticketSale
Author | SHA1 | Date |
---|---|---|
|
b915436cae |
|
@ -197,12 +197,7 @@ const changeQuantity = async (sale) => {
|
||||||
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
||||||
return;
|
return;
|
||||||
else sale.originalQuantity = sale.quantity;
|
else sale.originalQuantity = sale.quantity;
|
||||||
try {
|
|
||||||
if (!sale.id) await addSale(sale);
|
if (!sale.id) await addSale(sale);
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (await isSalePrepared(sale)) {
|
if (await isSalePrepared(sale)) {
|
||||||
await confirmUpdate(() => updateQuantity(sale));
|
await confirmUpdate(() => updateQuantity(sale));
|
||||||
|
@ -229,7 +224,6 @@ const addSale = async (sale) => {
|
||||||
barcode: sale.itemFk,
|
barcode: sale.itemFk,
|
||||||
quantity: sale.quantity,
|
quantity: sale.quantity,
|
||||||
};
|
};
|
||||||
try {
|
|
||||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||||
|
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
|
@ -247,9 +241,6 @@ const addSale = async (sale) => {
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
sale.isNew = false;
|
sale.isNew = false;
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
const changeConcept = async (sale) => {
|
const changeConcept = async (sale) => {
|
||||||
if (await isSalePrepared(sale)) {
|
if (await isSalePrepared(sale)) {
|
||||||
|
@ -258,14 +249,10 @@ const changeConcept = async (sale) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateConcept = async (sale) => {
|
const updateConcept = async (sale) => {
|
||||||
try {
|
|
||||||
const data = { newConcept: sale.concept };
|
const data = { newConcept: sale.concept };
|
||||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const DEFAULT_EDIT = {
|
const DEFAULT_EDIT = {
|
||||||
|
@ -343,7 +330,6 @@ const updateDiscounts = async (sales, newDiscount) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateDiscount = async (sales, newDiscount = 0) => {
|
const updateDiscount = async (sales, newDiscount = 0) => {
|
||||||
try {
|
|
||||||
const salesIds = sales.map(({ id }) => id);
|
const salesIds = sales.map(({ id }) => id);
|
||||||
const params = {
|
const params = {
|
||||||
salesIds,
|
salesIds,
|
||||||
|
@ -353,10 +339,6 @@ const updateDiscount = async (sales, newDiscount = 0) => {
|
||||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const getNewPrice = computed(() => {
|
const getNewPrice = computed(() => {
|
||||||
|
@ -378,15 +360,11 @@ const getNewPrice = computed(() => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const newOrderFromTicket = async () => {
|
const newOrderFromTicket = async () => {
|
||||||
try {
|
|
||||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||||
ticketFk: Number(route.params.id),
|
ticketFk: Number(route.params.id),
|
||||||
});
|
});
|
||||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||||
window.open(routeData.href, '_blank');
|
window.open(routeData.href, '_blank');
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const goToLog = (saleId) => {
|
const goToLog = (saleId) => {
|
||||||
|
@ -403,15 +381,11 @@ const goToLog = (saleId) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeTicketState = async (val) => {
|
const changeTicketState = async (val) => {
|
||||||
try {
|
|
||||||
stateBtnDropdownRef.value.hide();
|
stateBtnDropdownRef.value.hide();
|
||||||
const params = { ticketFk: route.params.id, code: val };
|
const params = { ticketFk: route.params.id, code: val };
|
||||||
await axios.post('Tickets/state', params);
|
await axios.post('Tickets/state', params);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const removeSelectedSales = () => {
|
const removeSelectedSales = () => {
|
||||||
|
@ -431,14 +405,10 @@ const removeSales = async () => {
|
||||||
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
||||||
|
|
||||||
if (params.sales.length == 0) return;
|
if (params.sales.length == 0) return;
|
||||||
try {
|
|
||||||
await axios.post('Sales/deleteSales', params);
|
await axios.post('Sales/deleteSales', params);
|
||||||
removeSelectedSales();
|
removeSelectedSales();
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
} catch (e) {
|
|
||||||
app.config.errorHandler(e);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const setTransferParams = async () => {
|
const setTransferParams = async () => {
|
||||||
|
|
|
@ -4,20 +4,29 @@ const firstRow = 'tbody > :nth-child(1)';
|
||||||
describe('TicketSale', () => {
|
describe('TicketSale', () => {
|
||||||
describe('Ticket #23', () => {
|
describe('Ticket #23', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('salesperson');
|
||||||
cy.viewport(1920, 1080);
|
cy.viewport(1920, 1080);
|
||||||
cy.visit('/#/ticket/23/sale');
|
cy.visit('/#/ticket/23/sale');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('update price', () => {
|
it('error - update price', () => {
|
||||||
const price = Number((Math.random() * 99 + 1).toFixed(2));
|
|
||||||
cy.waitForElement(firstRow);
|
cy.waitForElement(firstRow);
|
||||||
cy.get('[data-col-field="price"]').find('.q-btn').click();
|
cy.get('[data-col-field="price"]').find('.q-btn').eq(1).click();
|
||||||
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
|
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
|
||||||
cy.dataCy('ticketEditManaProxy').should('exist');
|
cy.dataCy('ticketEditManaProxy').should('exist');
|
||||||
cy.waitForElement('[data-cy="Price_input"]');
|
cy.waitForElement('[data-cy="Price_input"]');
|
||||||
cy.dataCy('Price_input').clear();
|
cy.dataCy('Price_input').clear().type(-1);
|
||||||
cy.dataCy('Price_input').type(price);
|
cy.dataCy('saveManaBtn').click();
|
||||||
|
cy.checkNotification('Price must be greater than 0');
|
||||||
|
});
|
||||||
|
it('update price', () => {
|
||||||
|
const price = Number((Math.random() * 99 + 1).toFixed(2));
|
||||||
|
cy.waitForElement(firstRow);
|
||||||
|
cy.get('[data-col-field="price"]').find('.q-btn').eq(1).click();
|
||||||
|
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
|
||||||
|
cy.dataCy('ticketEditManaProxy').should('exist');
|
||||||
|
cy.waitForElement('[data-cy="Price_input"]');
|
||||||
|
cy.dataCy('Price_input').clear().type(price);
|
||||||
cy.dataCy('saveManaBtn').click();
|
cy.dataCy('saveManaBtn').click();
|
||||||
handleVnConfirm();
|
handleVnConfirm();
|
||||||
|
|
||||||
|
@ -25,15 +34,24 @@ describe('TicketSale', () => {
|
||||||
.find('.q-btn > .q-btn__content')
|
.find('.q-btn > .q-btn__content')
|
||||||
.should('contain.text', `€${price}`);
|
.should('contain.text', `€${price}`);
|
||||||
});
|
});
|
||||||
it('update discount', () => {
|
it('error - update discount', () => {
|
||||||
const discount = Math.floor(Math.random() * 100) + 1;
|
|
||||||
selectFirstRow();
|
selectFirstRow();
|
||||||
cy.get('[data-col-field="discount"]').find('.q-btn').click();
|
cy.get('[data-col-field="discount"]').find('.q-btn').eq(1).click();
|
||||||
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
|
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
|
||||||
cy.dataCy('ticketEditManaProxy').should('exist');
|
cy.dataCy('ticketEditManaProxy').should('exist');
|
||||||
cy.waitForElement('[data-cy="Disc_input"]');
|
cy.waitForElement('[data-cy="Disc_input"]');
|
||||||
cy.dataCy('Disc_input').clear();
|
cy.dataCy('Disc_input').clear().type(200);
|
||||||
cy.dataCy('Disc_input').type(discount);
|
cy.dataCy('saveManaBtn').click();
|
||||||
|
cy.checkNotification('Price must be greater than 0');
|
||||||
|
});
|
||||||
|
it('update discount', () => {
|
||||||
|
const discount = Math.floor(Math.random() * 100) + 1;
|
||||||
|
selectFirstRow();
|
||||||
|
cy.get('[data-col-field="discount"]').find('.q-btn').eq(1).click();
|
||||||
|
cy.waitForElement('[data-cy="ticketEditManaProxy"]');
|
||||||
|
cy.dataCy('ticketEditManaProxy').should('exist');
|
||||||
|
cy.waitForElement('[data-cy="Disc_input"]');
|
||||||
|
cy.dataCy('Disc_input').find('input').eq(1).clear().type(discount);
|
||||||
cy.dataCy('saveManaBtn').click();
|
cy.dataCy('saveManaBtn').click();
|
||||||
handleVnConfirm();
|
handleVnConfirm();
|
||||||
|
|
||||||
|
@ -54,10 +72,19 @@ describe('TicketSale', () => {
|
||||||
|
|
||||||
cy.get('[data-col-field="item"]').should('contain.text', `${concept}`);
|
cy.get('[data-col-field="item"]').should('contain.text', `${concept}`);
|
||||||
});
|
});
|
||||||
|
it('error - change quantity ', () => {
|
||||||
|
cy.waitForElement(firstRow);
|
||||||
|
cy.dataCy('ticketSaleQuantityInput').find('input').eq(1).clear();
|
||||||
|
cy.dataCy('ticketSaleQuantityInput')
|
||||||
|
.find('input')
|
||||||
|
.eq(1)
|
||||||
|
.type(9999999999)
|
||||||
|
.trigger('tab');
|
||||||
|
});
|
||||||
it('change quantity ', () => {
|
it('change quantity ', () => {
|
||||||
const quantity = Math.floor(Math.random() * 100) + 1;
|
const quantity = Math.floor(Math.random() * 100) + 1;
|
||||||
cy.waitForElement(firstRow);
|
cy.waitForElement(firstRow);
|
||||||
cy.dataCy('ticketSaleQuantityInput').find('input').clear();
|
cy.dataCy('ticketSaleQuantityInput').find('input').eq(1).clear();
|
||||||
cy.dataCy('ticketSaleQuantityInput')
|
cy.dataCy('ticketSaleQuantityInput')
|
||||||
.find('input')
|
.find('input')
|
||||||
.type(quantity)
|
.type(quantity)
|
||||||
|
|
Loading…
Reference in New Issue