+
useOpenURL(`#/order/${id}/summary`);
-
-
- {{ toDateFormat(row.date_send) }}
-
-
+
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 1cadd4cb4..1bc194a5c 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
import FetchData from 'src/components/FetchData.vue';
import { dateRange } from 'src/filters';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
defineProps({ dataKey: { type: String, required: true } });
const { t, te } = useI18n();
@@ -209,7 +210,7 @@ const getLocale = (label) => {
- {
- {
-
import { ref, computed, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
@@ -168,9 +167,11 @@ const columns = computed(() => [
component: 'select',
name: 'provinceFk',
attrs: {
- options: provinceOpts.value,
- 'option-value': 'id',
- 'option-label': 'name',
+ url: 'Provinces',
+ fields: ['id', 'name'],
+ sortBy: ['name ASC'],
+ optionValue: 'id',
+ optionLabel: 'name',
dense: true,
},
},
@@ -183,9 +184,11 @@ const columns = computed(() => [
component: 'select',
name: 'stateFk',
attrs: {
- options: stateOpts.value,
- 'option-value': 'id',
- 'option-label': 'name',
+ sortBy: ['name ASC'],
+ url: 'States',
+ fields: ['id', 'name'],
+ optionValue: 'id',
+ optionLabel: 'name',
dense: true,
},
},
@@ -212,9 +215,12 @@ const columns = computed(() => [
component: 'select',
name: 'zoneFk',
attrs: {
- options: zoneOpts.value,
- 'option-value': 'id',
- 'option-label': 'name',
+ url: 'Zones',
+ fields: ['id', 'name'],
+ sortBy: ['name ASC'],
+
+ optionValue: 'id',
+ optionLabel: 'name',
dense: true,
},
},
@@ -225,11 +231,12 @@ const columns = computed(() => [
align: 'left',
columnFilter: {
component: 'select',
- url: 'PayMethods',
attrs: {
- options: PayMethodOpts.value,
- optionValue: 'id',
+ url: 'PayMethods',
+ fields: ['id', 'name'],
+ sortBy: ['id ASC'],
optionLabel: 'name',
+ optionValue: 'id',
dense: true,
},
},
@@ -254,7 +261,9 @@ const columns = computed(() => [
columnFilter: {
component: 'select',
attrs: {
- options: DepartmentOpts.value,
+ url: 'Departments',
+ fields: ['id', 'name'],
+ sortBy: ['id ASC'],
dense: true,
},
},
@@ -265,11 +274,12 @@ const columns = computed(() => [
align: 'left',
columnFilter: {
component: 'select',
- url: 'ItemPackingTypes',
attrs: {
- options: ItemPackingTypeOpts.value,
- 'option-value': 'code',
- 'option-label': 'code',
+ url: 'ItemPackingTypes',
+ fields: ['code'],
+ sortBy: ['code ASC'],
+ optionValue: 'code',
+ optionCode: 'code',
dense: true,
},
},
@@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
-
-
-
-
-
-
diff --git a/src/pages/Ticket/Card/TicketDescriptorProxy.vue b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
index 583ba35e7..ba8367e81 100644
--- a/src/pages/Ticket/Card/TicketDescriptorProxy.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
@@ -10,7 +10,7 @@ const $props = defineProps({
});
-
+
diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
index c793e9319..de3b5d585 100644
--- a/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
+++ b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
@@ -11,7 +11,7 @@ const $props = defineProps({
-
+
{
it('should show/hide the section if it is a corrective invoice', () => {
cy.visit('/#/invoice-in/1/summary');
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('not.exist');
- cy.clicDescriptorAction(4);
+ cy.clickDescriptorAction(4);
cy.get('[data-cy="InvoiceInCorrective-menu-item"]').should('exist');
});
});
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index 9744486e0..641650436 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -64,17 +64,17 @@ describe('InvoiceInDescriptor', () => {
beforeEach(() => cy.visit('/#/invoice-in/1/summary'));
it('should navigate to the supplier summary', () => {
- cy.clicDescriptorAction(1);
+ cy.clickDescriptorAction(1);
cy.url().should('to.match', /supplier\/\d+\/summary/);
});
it('should navigate to the entry summary', () => {
- cy.clicDescriptorAction(2);
+ cy.clickDescriptorAction(2);
cy.url().should('to.match', /entry\/\d+\/summary/);
});
it('should navigate to the invoiceIn list', () => {
- cy.clicDescriptorAction(3);
+ cy.clickDescriptorAction(3);
cy.url().should('to.match', /invoice-in\/list\?table=\{.*supplierFk.+\}/);
});
});
@@ -93,7 +93,7 @@ describe('InvoiceInDescriptor', () => {
createCorrective();
redirect(originalId);
- cy.clicDescriptorAction(4);
+ cy.clickDescriptorAction(4);
cy.validateVnTableRows({
cols: [
{
@@ -141,7 +141,7 @@ function createCorrective() {
function redirect(subtitle) {
const regex = new RegExp(`InvoiceIns/${subtitle}\\?filter=.*`);
cy.intercept('GET', regex).as('getOriginal');
- cy.clicDescriptorAction(4);
+ cy.clickDescriptorAction(4);
cy.wait('@getOriginal');
cy.validateDescriptor({ subtitle });
}
diff --git a/test/cypress/integration/monitor/clientActions.spec.js b/test/cypress/integration/monitor/clientActions.spec.js
new file mode 100644
index 000000000..80f4de379
--- /dev/null
+++ b/test/cypress/integration/monitor/clientActions.spec.js
@@ -0,0 +1,47 @@
+///
+
+describe('Monitor Clients actions', () => {
+ beforeEach(() => {
+ cy.login('salesPerson');
+ cy.intercept('GET', '**/Departments**').as('departments');
+ cy.visit('/#/monitor/clients-actions');
+ cy.waitForElement('.q-page');
+ cy.wait('@departments').then((xhr) => {
+ cy.window().then((win) => {
+ const user = JSON.parse(win.sessionStorage.getItem('user'));
+ const { where } = JSON.parse(xhr.request.query.filter);
+ expect(where.id.like).to.include(user.departmentFk.toString());
+ });
+ });
+ cy.intercept('GET', '**/SalesMonitors/ordersFilter*').as('ordersFilter');
+ cy.intercept('GET', '**/SalesMonitors/clientsFilter*').as('clientsFilter');
+ });
+ it('Should filter by field', () => {
+ cy.get('.q-page').should('be.visible');
+ cy.dataCy('clientsOnWebsite')
+ .find('[data-cy="column-filter-departmentFk"] [data-cy="_select"]')
+ .click();
+ cy.dataCy('recentOrderActions').within(() => {
+ cy.getRowCol('clientFk').find('span').should('have.class', 'link').click();
+ });
+ cy.checkVisibleDescriptor('Customer');
+
+ cy.dataCy('recentOrderActions').within(() => {
+ cy.getRowCol('departmentFk', 2)
+ .find('span')
+ .should('have.class', 'link')
+ .click();
+ });
+
+ cy.checkVisibleDescriptor('Department');
+
+ cy.dataCy('clientsOnWebsite')
+ .find('.q-ml-md')
+ .should('have.text', 'Clients on website');
+ cy.dataCy('recentOrderActions')
+ .find('.q-ml-md')
+ .should('have.text', 'Recent order actions');
+ cy.dataCy('From_inputDate').should('have.value', '01/01/2001');
+ cy.dataCy('To_inputDate').should('have.value', '01/01/2001');
+ });
+});
diff --git a/test/cypress/integration/monitor/monitorTicket.spec.js b/test/cypress/integration/monitor/monitorTicket.spec.js
new file mode 100644
index 000000000..72c6bf936
--- /dev/null
+++ b/test/cypress/integration/monitor/monitorTicket.spec.js
@@ -0,0 +1,69 @@
+///
+describe('Monitor Tickets Table', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('salesPerson');
+ cy.visit('/#/monitor/tickets');
+ cy.waitForElement('.q-page');
+ cy.intercept('GET', '**/SalesMonitors/salesFilter*').as('filterRequest');
+ cy.openRightMenu();
+ });
+ it('should open new tab when ctrl+click on client link', () => {
+ cy.intercept('GET', '**/SalesMonitors/salesFilter*').as('filterRequest');
+
+ cy.window().then((win) => {
+ cy.stub(win, 'open').as('windowOpen');
+ });
+
+ cy.getRowCol('provinceFk').click({ ctrlKey: true });
+ cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
+ });
+ it('should open the descriptorProxy and SummaryPopup', () => {
+ cy.getRowCol('totalProblems');
+
+ cy.getRowCol('id').find('span').should('have.class', 'link').click();
+ cy.checkVisibleDescriptor('Ticket');
+
+ cy.getRowCol('zoneFk').find('span').should('have.class', 'link').click();
+ cy.checkVisibleDescriptor('Zone');
+
+ cy.getRowCol('clientFk').find('span').should('have.class', 'link').click();
+ cy.checkVisibleDescriptor('Customer');
+
+ cy.getRowCol('departmentFk').find('span').should('have.class', 'link').click();
+ cy.checkVisibleDescriptor('Department');
+
+ cy.getRowCol('shippedDate').find('.q-badge');
+ cy.tableActions().click({ ctrlKey: true });
+ cy.tableActions(1).click();
+ cy.get('.summaryHeader').should('exist');
+ });
+
+ it('clear scopeDays', () => {
+ cy.get('[data-cy="Days onward_input"]').clear().type('2');
+ cy.searchInFilterPanel();
+ cy.get('.q-chip__content > span').should('have.text', '"2"');
+ cy.waitSpinner();
+ checkScopeDays(2);
+ cy.get('[data-cy="Days onward_input"]').clear();
+ cy.searchInFilterPanel();
+ cy.get('.q-chip__content > span').should('have.text', '"0"');
+ cy.waitSpinner();
+ checkScopeDays(0);
+ });
+});
+
+function checkScopeDays(scopeDays) {
+ cy.url().then((url) => {
+ const urlParams = new URLSearchParams(url.split('?')[1]);
+ const saleMonitorTickets = JSON.parse(
+ decodeURIComponent(urlParams.get('saleMonitorTickets')),
+ );
+ expect(saleMonitorTickets.scopeDays).to.equal(scopeDays);
+ const fromDate = new Date(saleMonitorTickets.from);
+ const toDate = new Date(saleMonitorTickets.to);
+ expect(toDate.getDate() - fromDate.getDate()).to.equal(
+ saleMonitorTickets.scopeDays,
+ );
+ });
+}
diff --git a/test/cypress/integration/order/orderCatalog.spec.js b/test/cypress/integration/order/orderCatalog.spec.js
index 050dd396c..8ff6f4240 100644
--- a/test/cypress/integration/order/orderCatalog.spec.js
+++ b/test/cypress/integration/order/orderCatalog.spec.js
@@ -2,7 +2,7 @@
describe('OrderCatalog', () => {
beforeEach(() => {
cy.login('developer');
- cy.viewport(1920, 720);
+ cy.viewport(1920, 1080);
cy.visit('/#/order/8/catalog');
});
diff --git a/test/cypress/integration/shelving/parking/parkingBasicData.spec.js b/test/cypress/integration/shelving/parking/parkingBasicData.spec.js
index 81c158684..e3f454058 100644
--- a/test/cypress/integration/shelving/parking/parkingBasicData.spec.js
+++ b/test/cypress/integration/shelving/parking/parkingBasicData.spec.js
@@ -6,9 +6,7 @@ describe('ParkingBasicData', () => {
beforeEach(() => {
cy.login('developer');
cy.visit(`/#/shelving/parking/1/basic-data`);
- cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should(
- 'not.be.visible',
- );
+ cy.get('[data-cy="navBar-spinner"]', { timeout: 10000 }).should('not.be.visible');
});
it('should give an error if the code aldready exists', () => {
diff --git a/test/cypress/integration/vnComponent/VnDescriptor.commands.js b/test/cypress/integration/vnComponent/VnDescriptor.commands.js
new file mode 100644
index 000000000..f03db8244
--- /dev/null
+++ b/test/cypress/integration/vnComponent/VnDescriptor.commands.js
@@ -0,0 +1,6 @@
+Cypress.Commands.add('checkVisibleDescriptor', (alias) =>
+ cy
+ .get(`[data-cy="${alias}Descriptor"] [data-cy="vnDescriptor"] > .header`)
+ .should('exist')
+ .and('be.visible'),
+);
diff --git a/test/cypress/integration/vnComponent/vnTable.commands.js b/test/cypress/integration/vnComponent/vnTable.commands.js
index 6c7e71e13..316fc12f1 100644
--- a/test/cypress/integration/vnComponent/vnTable.commands.js
+++ b/test/cypress/integration/vnComponent/vnTable.commands.js
@@ -2,9 +2,7 @@ Cypress.Commands.add('getRow', (index = 1) =>
cy.get(`.vnTable .q-virtual-scroll__content tr:nth-child(${index})`),
);
Cypress.Commands.add('getRowCol', (field, index = 1) =>
- cy.get(
- `.vnTable .q-virtual-scroll__content > :nth-child(${index}) > [data-col-field="${field}"]`,
- ),
+ cy.getRow(index).find(`[data-col-field="${field}"]`),
);
Cypress.Commands.add('vnTableCreateBtn', () =>
@@ -14,3 +12,9 @@ Cypress.Commands.add('vnTableCreateBtn', () =>
Cypress.Commands.add('waitTableScrollLoad', () =>
cy.waitForElement('[data-q-vs-anchor]'),
);
+
+Cypress.Commands.add('tableActions', (n = 0, child = 1) =>
+ cy.get(
+ `:nth-child(${child}) > .q-table--col-auto-width > [data-cy="tableAction-${n}"] > .q-btn__content > .q-icon`,
+ ),
+);
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 41f91e855..ac84a5e60 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -78,20 +78,21 @@ Cypress.Commands.add('waitForElement', (element) => {
Cypress.Commands.add('getValue', (selector) => {
cy.get(selector).then(($el) => {
if ($el.find('.q-checkbox__inner').length > 0) {
- return cy.get(selector + '.q-checkbox__inner');
+ return cy.get(`${selector}.q-checkbox__inner`);
}
// Si es un QSelect
if ($el.find('.q-select__dropdown-icon').length) {
return cy
.get(
- selector +
- '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input',
+ `${
+ selector
+ }> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input`,
)
.invoke('val');
}
// Si es un QSelect
if ($el.find('span').length) {
- return cy.get(selector + ' span').then(($span) => {
+ return cy.get(`${selector} span`).then(($span) => {
return $span[0].innerText;
});
}
@@ -100,10 +101,15 @@ Cypress.Commands.add('getValue', (selector) => {
});
});
-Cypress.Commands.add('waitSpinner', () => {
+Cypress.Commands.add('waitSpinner', (_spinner = 'navBar') => {
+ const spinners = {
+ navBar: '[data-cy="navBar-spinner"]',
+ filterPanel: '[data-cy="filterPanel-spinner"]',
+ };
+ const spinner = spinners[_spinner];
cy.get('body').then(($body) => {
- if ($body.find('[data-cy="loading-spinner"]').length) {
- cy.get('[data-cy="loading-spinner"]').should('not.be.visible');
+ if ($body.find(spinner).length) {
+ cy.get(spinner).should('not.be.visible');
}
});
});
@@ -142,7 +148,7 @@ function selectItem(selector, option, ariaControl, hasWrite = true) {
function getItems(ariaControl, startTime = Cypress._.now(), timeout = 2500) {
// Se intenta obtener la lista de opciones del desplegable de manera recursiva
return cy
- .get('#' + ariaControl, { timeout })
+ .get(`#${ariaControl}`, { timeout })
.should('exist')
.find('.q-item')
.should('exist')
@@ -352,11 +358,21 @@ Cypress.Commands.add('openListSummary', (row) => {
cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(row).click();
});
-Cypress.Commands.add('openRightMenu', (element) => {
- if (element) cy.waitForElement(element);
- cy.get('[data-cy="toggle-right-drawer"]').click();
+Cypress.Commands.add('openRightMenu', (element = 'toggle-right-drawer') => {
+ if (element) cy.waitForElement(`[data-cy="${element}"]`);
+ cy.dataCy(element).click();
});
+Cypress.Commands.add('cleanFilterPanel', (element = 'clearFilters') => {
+ cy.get('#filterPanelForm').scrollIntoView();
+ if (element) cy.waitForElement(`[data-cy="${element}"]`);
+ cy.dataCy(element).click();
+});
+
+Cypress.Commands.add('searchInFilterPanel', (element = 'vnFilterPanel_search') => {
+ if (element) cy.waitForElement(`[data-cy="${element}"]`);
+ cy.dataCy(element).click();
+});
Cypress.Commands.add('openLeftMenu', (element) => {
if (element) cy.waitForElement(element);
cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
@@ -454,9 +470,9 @@ Cypress.Commands.add('clickButtonWith', (type, value) => {
Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
cy.waitForElement('[data-cy="descriptor_actions"]');
- cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should('not.be.visible');
+ cy.waitSpinner();
cy.get('.q-btn')
- .filter((index, el) => Cypress.$(el).find('.q-icon.' + iconClass).length > 0)
+ .filter((index, el) => Cypress.$(el).find(`.q-icon.${iconClass}`).length > 0)
.then(($btn) => {
cy.wrap($btn).click();
});
@@ -591,7 +607,7 @@ Cypress.Commands.add('validatePdfDownload', (match, trigger) => {
});
});
-Cypress.Commands.add('clicDescriptorAction', (index = 1) => {
+Cypress.Commands.add('clickDescriptorAction', (index = 1) => {
cy.get(`[data-cy="descriptor_actions"] .q-btn:nth-of-type(${index})`).click();
});
diff --git a/test/cypress/support/index.js b/test/cypress/support/index.js
index b0f0fb3b1..e9042c8fc 100644
--- a/test/cypress/support/index.js
+++ b/test/cypress/support/index.js
@@ -68,6 +68,7 @@ const waitForApiReady = (url, maxRetries = 20, delay = 1000) => {
};
before(() => {
+ cy.viewport(1920, 1080);
waitForApiReady('/api/Applications/status');
});