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

hotfix_ticketNegative #1590

Open
jsegarra wants to merge 15 commits from hotfix_ticketNegative into master
pull from: hotfix_ticketNegative
merge into: verdnatura:master
Conversation 0 Commits 15 Files Changed 32 +66 -33
10 changed files with 66 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57abfd5b4e - Show all commits

2
cypress.config.js
View File

@ -30,7 +30,7 @@ export default defineConfig({
trashAssetsBeforeRuns: false,
requestTimeout: 10000,
responseTimeout: 30000,
pageLoadTimeout: 60000,
pageLoadTimeout: 120000,
defaultBrowser: 'chromium',
fixturesFolder: 'test/cypress/fixtures',
screenshotsFolder: 'test/cypress/screenshots',

4
docs/Dockerfile.dev
View File

@ -25,6 +25,8 @@ RUN apt-get update \
libnss3 \
libxss1 \
libxtst6 \
mesa-vulkan-drivers \
vulkan-tools \
xauth \
xvfb \
&& apt-get clean \
@ -39,7 +41,7 @@ ENV PNPM_HOME="/home/app/.local/share/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN pnpm setup \
&& pnpm install --global cypress@13.6.6 \
&& pnpm install --global cypress@14.1.0 \
&& cypress install
WORKDIR /app

2
package.json
View File

@ -47,7 +47,7 @@
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14",
"cypress": "^13.6.6",
"cypress": "^14.1.0",
"cypress-mochawesome-reporter": "^3.8.2",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",

16
pnpm-lock.yaml
View File

@ -71,11 +71,11 @@ devDependencies:
specifier: ^10.4.14
version: 10.4.20(postcss@8.5.1)
cypress:
specifier: ^13.6.6
version: 13.17.0
specifier: ^14.1.0
version: 14.1.0
cypress-mochawesome-reporter:
specifier: ^3.8.2
version: 3.8.2(cypress@13.17.0)(mocha@11.0.1)
version: 3.8.2(cypress@14.1.0)(mocha@11.0.1)
eslint:
specifier: ^9.18.0
version: 9.18.0
@ -3321,7 +3321,7 @@ packages:
/csstype@3.1.3:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
/cypress-mochawesome-reporter@3.8.2(cypress@13.17.0)(mocha@11.0.1):
/cypress-mochawesome-reporter@3.8.2(cypress@14.1.0)(mocha@11.0.1):
resolution: {integrity: sha512-oJZkNzhNmN9ZD+LmZyFuPb8aWaIijyHyqYh52YOBvR6B6ckfJNCHP3A98a+/nG0H4t46CKTNwo+wNpMa4d2kjA==}
engines: {node: '>=14'}
hasBin: true
@ -3329,7 +3329,7 @@ packages:
cypress: '>=6.2.0'
dependencies:
commander: 10.0.1
cypress: 13.17.0
cypress: 14.1.0
fs-extra: 10.1.0
mochawesome: 7.1.3(mocha@11.0.1)
mochawesome-merge: 4.3.0
@ -3338,9 +3338,9 @@ packages:
- mocha
dev: true
/cypress@13.17.0:
resolution: {integrity: sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==}
engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
/cypress@14.1.0:
resolution: {integrity: sha512-pPPj8Uu9NwjaaiXAEcjYZZmgsq6v9Zs1Nw6a+zRF+ANgYSNhH4S32SjFRsvMcuOHR/8dp4GBJhBPqIPSs+TxaA==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
hasBin: true
requiresBuild: true
dependencies:

11
src/components/TicketProblems.vue
View File

@ -28,6 +28,17 @@ defineProps({ row: { type: Object, required: true } });
{{ t('ticketSale.reserved') }}
</QTooltip>
</QIcon>
<QIcon
v-if="row?.isDeleted"
color="primary"
name="vn:deletedTicket"
size="xs"
data-cy="ticketDeletedIcon"
>
<QTooltip>
{{ t('Ticket deleted') }}
</QTooltip>
</QIcon>
<QIcon
v-if="row?.hasRisk"
name="vn:risk"

2
src/pages/Ticket/Card/TicketDescriptor.vue
View File

@ -96,7 +96,7 @@ function ticketFilter(ticket) {
</template>
<template #icons="{ entity }">
<QCardActions class="q-gutter-x-xs">
<TicketProblems :row="{ ...entity?.client, ...problems }" />
<TicketProblems :row="{ ...entity?.client, ...problems, ...entity }" />
</QCardActions>
</template>
<template #actions="{ entity }">

42
src/pages/Ticket/Card/TicketSale.vue
View File

@ -174,22 +174,28 @@ const getSaleTotal = (sale) => {
return price - discount;
};
const getRowUpdateInputEvents = (sale) => ({
'keyup.enter': () => {
changeQuantity(sale);
},
blur: () => {
changeQuantity(sale);
},
});
const getRowUpdateInputEvents = (sale) => {
return {
'keyup.enter': (evt) => {
console.error(evt);
changeQuantity(sale);
},
blur: (evt) => {
console.error(evt);
changeQuantity(sale);
},
};
};
const resetChanges = async () => {
arrayData.fetch({ append: false });
tableRef.value.reload();
selectedRows.value = [];
};
const changeQuantity = async (sale) => {
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
return;
else sale.originalQuantity = sale.quantity;
if (!sale.id) return addSale(sale);
if (await isSalePrepared(sale)) {
@ -235,7 +241,7 @@ const addSale = async (sale) => {
notify('globals.dataSaved', 'positive');
sale.isNew = false;
arrayData.fetch({});
resetChanges();
};
const changeConcept = async (sale) => {
if (await isSalePrepared(sale)) {
@ -310,7 +316,7 @@ const changeDiscount = async (sale) => {
}
};
const updateDiscounts = async (sales, newDiscount = null) => {
const updateDiscounts = async (sales, newDiscount) => {
const salesTracking = await fetchSalesTracking();
const someSaleIsPrepared = salesTracking.some((sale) =>
@ -320,12 +326,11 @@ const updateDiscounts = async (sales, newDiscount = null) => {
else updateDiscount(sales, newDiscount);
};
const updateDiscount = async (sales, newDiscount = null) => {
const saleIds = sales.map((sale) => sale.id);
const _newDiscount = newDiscount || edit.value.discount;
const updateDiscount = async (sales, newDiscount = 0) => {
const salesIds = sales.map(({ id }) => id);
const params = {
salesIds: saleIds,
newDiscount: _newDiscount,
salesIds,
newDiscount,
manaCode: manaCode.value,
};
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
@ -474,7 +479,7 @@ const endNewRow = (row) => {
};
async function confirmUpdate(cb) {
await quasar
quasar
.dialog({
component: VnConfirm,
componentProps: {
@ -664,6 +669,7 @@ watch(
selection: 'multiple',
}"
:right-search="false"
:search-url="false"
:column-search="false"
:disable-option="{ card: true }"
auto-load
@ -692,7 +698,7 @@ watch(
</template>
<template #column-image="{ row }">
<div class="image-wrapper">
<VnImg :id="parseInt(row?.item?.id)" class="rounded" />
<VnImg v-if="row.item" :id="parseInt(row?.item?.id)" class="rounded" />
</div>
</template>
<template #column-visible="{ row }">
@ -740,7 +746,7 @@ watch(
{{ row?.item?.subName.toUpperCase() }}
</div>
</div>
<FetchedTags :item="row.item" :max-length="6" />
<FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
<QPopupProxy v-if="row.id && isTicketEditable">
<VnInput
v-model="row.concept"

6
src/pages/Zone/Card/ZoneLocationsTree.vue
View File

@ -72,6 +72,7 @@ const onNodeExpanded = async (nodeKeysArray) => {
const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
params,
});
response.data = JSON.parse(response.data);
if (response.data) {
node.childs = response.data.map((n) => {
if (n.sons > 0) n.childs = [{}];
@ -125,14 +126,17 @@ watch(
async (val) => {
if (!val) return;
// // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
val = JSON.parse(val);
if (!nodes.value[0]) nodes.value = [defaultNode];
nodes.value[0].childs = [...val];
const fetchedNodeKeys = val.flatMap(getNodeIds);
state.set('Tree', [...fetchedNodeKeys]);
expanded.value = [null, ...fetchedNodeKeys];
const fetchs = [];
for (let n of state.get('Tree')) {
await fetchNodeLeaves(n);
fetchs.push(fetchNodeLeaves(n));
}
await Promise.all(fetchs);
previousExpandedNodes.value = new Set(expanded.value);
},
{ immediate: true }

4
test/cypress/integration/client/clientBalance.spec.js
View File

@ -1,14 +1,14 @@
/// <reference types="cypress" />
describe('Client balance', () => {
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('developer');
cy.visit('#/customer/1101/balance');
});
it('Should create a mandate', () => {
cy.waitSpinner();
cy.get('.q-page-sticky > div > .q-btn').click();
cy.selectOption('[data-cy="paymentBank"]', 2);
cy.dataCy('paymentAmount_input').type('100');
cy.dataCy('paymentAmount_input').clear().type('100');
cy.saveCard();
});
});

10
test/cypress/support/commands.js
View File

@ -92,6 +92,14 @@ Cypress.Commands.add('getValue', (selector) => {
});
});
Cypress.Commands.add('waitSpinner', () => {
cy.get('body').then(($body) => {
if ($body.find('[data-cy="loading-spinner"]').length) {
cy.get('[data-cy="loading-spinner"]').should('not.be.visible');
}
});
});
// Fill Inputs
Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
cy.waitForElement(selector, timeout);
@ -109,6 +117,7 @@ Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
function selectItem(selector, option, ariaControl, hasWrite = true) {
if (!hasWrite) cy.wait(100);
cy.waitSpinner();
getItems(ariaControl).then((items) => {
const matchingItem = items
@ -128,6 +137,7 @@ function getItems(ariaControl, startTime = Cypress._.now(), timeout = 2500) {
.should('exist')
.find('.q-item')
.should('exist')
.should('be.visible')
.then(($items) => {
if (!$items?.length || $items.first().text().trim() === '') {
if (Cypress._.now() - startTime > timeout) {