{
-
+
{{ value }}
{{ t('Open buscaman') }}
@@ -349,7 +349,7 @@ const openSmsDialog = async () => {
-
+
{{ value }}
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 63e45c8abea..f7389b59220 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -32,7 +32,7 @@ onMounted(() => {
watch(
() => props.ticket,
- () => restoreTicket
+ () => restoreTicket,
);
const { push, currentRoute } = useRouter();
@@ -58,7 +58,7 @@ const hasDocuwareFile = ref();
const quasar = useQuasar();
const canRestoreTicket = ref(false);
-const onClientSelected = async(clientId) =>{
+const onClientSelected = async (clientId) => {
client.value = clientId;
await fetchClient();
await fetchAddresses();
@@ -66,10 +66,10 @@ const onClientSelected = async(clientId) =>{
const onAddressSelected = (addressId) => {
address.value = addressId;
-}
+};
const fetchClient = async () => {
- const response = await getClient(client.value)
+ const response = await getClient(client.value);
if (!response) return;
const [retrievedClient] = response.data;
selectedClient.value = retrievedClient;
@@ -151,7 +151,7 @@ function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
recipientId: ticket.value.clientFk,
type: type,
},
- '_blank'
+ '_blank',
);
}
@@ -297,8 +297,8 @@ async function transferClient() {
clientFk: client.value,
addressFk: address.value,
};
-
- await axios.patch( `Tickets/${ticketId.value}/transferClient`, params );
+
+ await axios.patch(`Tickets/${ticketId.value}/transferClient`, params);
window.location.reload();
}
@@ -339,7 +339,7 @@ async function changeShippedHour(time) {
const { data } = await axios.post(
`Tickets/${ticketId.value}/updateEditableTicket`,
- params
+ params,
);
if (data) window.location.reload();
@@ -405,8 +405,7 @@ async function uploadDocuware(force) {
uploadDocuware(true);
});
- const { data } = await axios.post(`Docuwares/upload`, {
- fileCabinet: 'deliveryNote',
+ const { data } = await axios.post(`Docuwares/upload-delivery-note`, {
ticketIds: [parseInt(ticketId.value)],
});
@@ -500,7 +499,7 @@ async function ticketToRestore() {
- item.id);
+async function sendDocuware(tickets) {
+ let ticketIds = tickets.map((item) => item.id);
- const { data } = await axios.post(`Docuwares/upload`, {
- fileCabinet: 'deliveryNote',
- ticketIds,
- });
+ const { data } = await axios.post(`Docuwares/upload-delivery-note`, {
+ ticketIds,
+ });
- for (let ticket of ticketIds) {
- ticket.stateFk = data.id;
- ticket.state = data.name;
- ticket.alertLevel = data.alertLevel;
- ticket.alertLevelCode = data.code;
- }
- notify('globals.dataSaved', 'positive');
- } catch (err) {
- console.err('err: ', err);
+ for (let ticket of tickets) {
+ ticket.stateFk = data.id;
+ ticket.state = data.name;
+ ticket.alertLevel = data.alertLevel;
+ ticket.alertLevelCode = data.code;
}
+ notify('globals.dataSaved', 'positive');
}
function openBalanceDialog(ticket) {
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index b5656dc5ffb..02eea8c6caa 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -81,7 +81,7 @@ export default {
keyBinding: 'e',
menu: [
'EntryList',
- 'MyEntries',
+ 'EntrySupplier',
'EntryLatestBuys',
'EntryStockBought',
'EntryWasteRecalc',
@@ -125,21 +125,12 @@ export default {
},
{
path: 'my',
- name: 'MyEntries',
+ name: 'EntrySupplier',
meta: {
title: 'labeler',
icon: 'sell',
},
- component: () => import('src/pages/Entry/MyEntries.vue'),
- },
- {
- path: 'latest-buys',
- name: 'EntryLatestBuys',
- meta: {
- title: 'latestBuys',
- icon: 'contact_support',
- },
- component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
+ component: () => import('src/pages/Entry/EntrySupplier.vue'),
},
{
path: 'stock-Bought',
diff --git a/src/stores/__tests__/useDescriptorStore.spec.js b/src/stores/__tests__/useDescriptorStore.spec.js
new file mode 100644
index 00000000000..61aab8d142f
--- /dev/null
+++ b/src/stores/__tests__/useDescriptorStore.spec.js
@@ -0,0 +1,28 @@
+import { describe, expect, it, beforeEach } from 'vitest';
+import 'app/test/vitest/helper';
+
+import { useDescriptorStore } from 'src/stores/useDescriptorStore';
+import { useStateStore } from 'stores/useStateStore';
+
+describe('useDescriptorStore', () => {
+ const { get, has } = useDescriptorStore();
+ const stateStore = useStateStore();
+
+ beforeEach(() => {
+ stateStore.setDescriptors({});
+ });
+
+ function getDescriptors() {
+ return stateStore.descriptors;
+ }
+
+ it('should get descriptors in stateStore', async () => {
+ expect(Object.keys(getDescriptors()).length).toBe(0);
+ get();
+ expect(Object.keys(getDescriptors()).length).toBeGreaterThan(0);
+ });
+
+ it('should find ticketDescriptor if search ticketFk', async () => {
+ expect(has('ticketFk')).toBeDefined();
+ });
+});
diff --git a/src/stores/useDescriptorStore.js b/src/stores/useDescriptorStore.js
new file mode 100644
index 00000000000..89189f32ee1
--- /dev/null
+++ b/src/stores/useDescriptorStore.js
@@ -0,0 +1,35 @@
+import { defineAsyncComponent } from 'vue';
+import { defineStore } from 'pinia';
+import { useStateStore } from 'stores/useStateStore';
+
+export const useDescriptorStore = defineStore('descriptorStore', () => {
+ const { descriptors, setDescriptors } = useStateStore();
+ function get() {
+ if (Object.keys(descriptors).length) return descriptors;
+
+ const currentDescriptors = {};
+ const files = import.meta.glob(`/src/**/*DescriptorProxy.vue`);
+ const moduleParser = {
+ account: 'user',
+ client: 'customer',
+ };
+ for (const file in files) {
+ const name = file.split('/').at(-1).slice(0, -19).toLowerCase();
+ const descriptor = moduleParser[name] ?? name;
+ currentDescriptors[descriptor + 'Fk'] = defineAsyncComponent(
+ () => import(/* @vite-ignore */ file),
+ );
+ }
+ setDescriptors(currentDescriptors);
+ return currentDescriptors;
+ }
+
+ function has(name) {
+ return get()[name];
+ }
+
+ return {
+ has,
+ get,
+ };
+});
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index ca447bc1184..44fa133d03d 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -8,6 +8,7 @@ export const useStateStore = defineStore('stateStore', () => {
const rightAdvancedDrawer = ref(false);
const subToolbar = ref(false);
const cardDescriptor = ref(null);
+ const descriptors = ref({});
function cardDescriptorChangeValue(descriptor) {
cardDescriptor.value = descriptor;
@@ -52,6 +53,10 @@ export const useStateStore = defineStore('stateStore', () => {
return subToolbar.value;
}
+ function setDescriptors(value) {
+ descriptors.value = value;
+ }
+
return {
cardDescriptor,
cardDescriptorChangeValue,
@@ -68,5 +73,7 @@ export const useStateStore = defineStore('stateStore', () => {
isSubToolbarShown,
toggleSubToolbar,
rightDrawerChangeValue,
+ descriptors,
+ setDescriptors,
};
});
diff --git a/test/cypress/integration/Order/orderCatalog.spec.js b/test/cypress/integration/Order/orderCatalog.spec.js
index a106d0e8ad0..386e3b2aae1 100644
--- a/test/cypress/integration/Order/orderCatalog.spec.js
+++ b/test/cypress/integration/Order/orderCatalog.spec.js
@@ -34,7 +34,7 @@ describe('OrderCatalog', () => {
searchByCustomTagInput('Silver');
});
- it('filters by custom value dialog', () => {
+ it.skip('filters by custom value dialog', () => {
Cypress.on('uncaught:exception', (err) => {
if (err.message.includes('canceled')) {
return false;
diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 05ee7f0b84c..097d870dffa 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -1,5 +1,5 @@
///
-describe('ClaimDevelopment', () => {
+describe.skip('ClaimDevelopment', () => {
const claimId = 1;
const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
const thirdRow = 'tbody > :nth-child(3)';
@@ -19,11 +19,10 @@ describe('ClaimDevelopment', () => {
cy.getValue(firstLineReason).should('equal', lastReason);
});
- it('should edit line', () => {
+ it.skip('should edit line', () => {
cy.selectOption(firstLineReason, newReason);
cy.saveCard();
- cy.login('developer');
cy.visit(`/#/claim/${claimId}/development`);
cy.getValue(firstLineReason).should('equal', newReason);
@@ -49,12 +48,9 @@ describe('ClaimDevelopment', () => {
cy.fillRow(thirdRow, rowData);
cy.saveCard();
- cy.login('developer');
- cy.visit(`/#/claim/${claimId}/development`);
-
cy.validateRow(thirdRow, rowData);
- cy.reload();
+ cy.visit(`/#/claim/${claimId}/development`);
cy.validateRow(thirdRow, rowData);
//remove row
@@ -63,7 +59,7 @@ describe('ClaimDevelopment', () => {
cy.clickConfirm();
cy.get(thirdRow).should('not.exist');
- cy.reload();
+ cy.visit(`/#/claim/${claimId}/development`);
cy.get(thirdRow).should('not.exist');
});
});
diff --git a/test/cypress/integration/entry/commands.js b/test/cypress/integration/entry/commands.js
new file mode 100644
index 00000000000..7c96a5440ea
--- /dev/null
+++ b/test/cypress/integration/entry/commands.js
@@ -0,0 +1,21 @@
+Cypress.Commands.add('selectTravel', (warehouse = '1') => {
+ cy.get('i[data-cy="Travel_icon"]').click();
+ cy.get('input[data-cy="Warehouse Out_select"]').type(warehouse);
+ cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
+ cy.get('button[data-cy="save-filter-travel-form"]').click();
+ cy.get('tr').eq(1).click();
+});
+
+Cypress.Commands.add('deleteEntry', () => {
+ cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
+ cy.waitForElement('div[data-cy="delete-entry"]').click();
+ cy.url().should('include', 'list');
+});
+
+Cypress.Commands.add('createEntry', () => {
+ cy.get('button[data-cy="vnTableCreateBtn"]').click();
+ cy.selectTravel('one');
+ cy.get('button[data-cy="FormModelPopup_save"]').click();
+ cy.url().should('include', 'summary');
+ cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
+});
diff --git a/test/cypress/integration/entry/entryCard/entryBasicData.spec.js b/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
new file mode 100644
index 00000000000..ba689b8c7d2
--- /dev/null
+++ b/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
@@ -0,0 +1,19 @@
+import '../commands.js';
+
+describe('EntryBasicData', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/list`);
+ });
+
+ it('Change Travel', () => {
+ cy.createEntry();
+ cy.waitForElement('[data-cy="entry-buys"]');
+ cy.get('a[data-cy="EntryBasicData-menu-item"]').click();
+ cy.selectTravel('two');
+ cy.saveCard();
+ cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
+ cy.deleteEntry();
+ });
+});
diff --git a/test/cypress/integration/entry/entryCard/entryBuys.spec.js b/test/cypress/integration/entry/entryCard/entryBuys.spec.js
new file mode 100644
index 00000000000..f8f5e6b80da
--- /dev/null
+++ b/test/cypress/integration/entry/entryCard/entryBuys.spec.js
@@ -0,0 +1,96 @@
+import '../commands.js';
+describe('EntryBuys', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/list`);
+ });
+
+ it('Edit buys and use toolbar actions', () => {
+ const COLORS = {
+ negative: 'rgb(251, 82, 82)',
+ positive: 'rgb(200, 228, 132)',
+ enabled: 'rgb(255, 255, 255)',
+ disable: 'rgb(168, 168, 168)',
+ };
+
+ const selectCell = (field, row = 0) =>
+ cy.get(`td[data-col-field="${field}"][data-row-index="${row}"]`);
+ const selectSpan = (field, row = 0) => selectCell(field, row).find('div > span');
+ const selectButton = (cySelector) => cy.get(`button[data-cy="${cySelector}"]`);
+ const clickAndType = (field, value, row = 0) => {
+ selectCell(field, row).click().type(`${value}{esc}`);
+ };
+ const checkText = (field, expectedText, row = 0) =>
+ selectCell(field, row).should('have.text', expectedText);
+ const checkColor = (field, expectedColor, row = 0) =>
+ selectSpan(field, row).should('have.css', 'color', expectedColor);
+
+ cy.createEntry();
+ createBuy();
+
+ selectCell('isIgnored').click().click().type('{esc}');
+ checkText('isIgnored', 'close');
+
+ clickAndType('stickers', '1');
+ checkText('stickers', '0/01');
+ checkText('quantity', '1');
+ checkText('amount', '50.00');
+ clickAndType('packing', '2');
+ checkText('packing', '12');
+ checkText('weight', '12.0');
+ checkText('quantity', '12');
+ checkText('amount', '600.00');
+ checkColor('packing', COLORS.enabled);
+
+ selectCell('groupingMode').click().click().click();
+ checkColor('packing', COLORS.disable);
+ checkColor('grouping', COLORS.enabled);
+
+ selectCell('buyingValue').click().clear().type('{backspace}{backspace}1');
+ checkText('amount', '12.00');
+ checkColor('minPrice', COLORS.disable);
+
+ selectCell('hasMinPrice').click().click();
+ checkColor('minPrice', COLORS.enabled);
+ selectCell('hasMinPrice').click();
+
+ cy.saveCard();
+ cy.get('span[data-cy="footer-stickers"]').should('have.text', '1');
+ cy.get('.q-notification__message').contains('Data saved');
+
+ selectButton('change-quantity-sign').should('be.disabled');
+ selectButton('check-buy-amount').should('be.disabled');
+ cy.get('tr.cursor-pointer > .q-table--col-auto-width > .q-checkbox').click();
+ selectButton('change-quantity-sign').should('be.enabled');
+ selectButton('check-buy-amount').should('be.enabled');
+
+ selectButton('change-quantity-sign').click();
+ selectButton('set-negative-quantity').click();
+ checkText('quantity', '-12');
+ selectButton('set-positive-quantity').click();
+ checkText('quantity', '12');
+ checkColor('amount', COLORS.disable);
+
+ selectButton('check-buy-amount').click();
+ selectButton('uncheck-amount').click();
+ checkColor('amount', COLORS.disable);
+
+ selectButton('check-amount').click();
+ checkColor('amount', COLORS.positive);
+ cy.saveCard();
+
+ cy.deleteEntry();
+ });
+
+ function createBuy() {
+ cy.waitForElement('[data-cy="entry-buys"]');
+ cy.get('a[data-cy="EntryBuys-menu-item"]').click();
+ cy.get('button[data-cy="vnTableCreateBtn"]').click();
+
+ cy.get('input[data-cy="itemFk-create-popup"]').type('1');
+ cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
+ cy.get('input[data-cy="Grouping mode_select"]').should('have.value', 'packing');
+ cy.get('button[data-cy="FormModelPopup_save"]').click();
+ }
+});
diff --git a/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js b/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
new file mode 100644
index 00000000000..55447100831
--- /dev/null
+++ b/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
@@ -0,0 +1,44 @@
+import '../commands.js';
+describe('EntryDescriptor', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/list`);
+ });
+
+ it('Clone entry and recalculate rates', () => {
+ cy.createEntry();
+
+ cy.waitForElement('[data-cy="entry-buys"]');
+
+ cy.url().then((previousUrl) => {
+ cy.get('[data-cy="descriptor-more-opts"]').click();
+ cy.get('div[data-cy="clone-entry"]').should('be.visible').click();
+
+ cy.get('.q-notification__message').eq(1).should('have.text', 'Entry cloned');
+
+ cy.url()
+ .should('not.eq', previousUrl)
+ .then(() => {
+ cy.waitForElement('[data-cy="entry-buys"]');
+
+ cy.get('[data-cy="descriptor-more-opts"]').click();
+ cy.get('div[data-cy="recalculate-rates"]').click();
+
+ cy.get('.q-notification__message')
+ .eq(2)
+ .should('have.text', 'Entry prices recalculated');
+
+ cy.get('[data-cy="descriptor-more-opts"]').click();
+ cy.deleteEntry();
+
+ cy.log(previousUrl);
+
+ cy.visit(previousUrl);
+
+ cy.waitForElement('[data-cy="entry-buys"]');
+ cy.deleteEntry();
+ });
+ });
+ });
+});
diff --git a/test/cypress/integration/entry/entryCard/entryDms.spec.js b/test/cypress/integration/entry/entryCard/entryDms.spec.js
new file mode 100644
index 00000000000..f3f0ef20b36
--- /dev/null
+++ b/test/cypress/integration/entry/entryCard/entryDms.spec.js
@@ -0,0 +1,22 @@
+import '../commands.js';
+describe('EntryDms', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/list`);
+ });
+
+ it('should create edit and remove new dms', () => {
+ cy.createEntry();
+ cy.waitForElement('[data-cy="entry-buys"]');
+ cy.dataCy('EntryDms-menu-item').click();
+ cy.dataCy('addButton').click();
+ cy.dataCy('attachFile').click();
+ cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
+ force: true,
+ });
+ cy.dataCy('FormModelPopup_save').click();
+ cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
+ cy.deleteEntry();
+ });
+});
diff --git a/test/cypress/integration/entry/entryCard/entryLock.spec.js b/test/cypress/integration/entry/entryCard/entryLock.spec.js
new file mode 100644
index 00000000000..6ba4392ae90
--- /dev/null
+++ b/test/cypress/integration/entry/entryCard/entryLock.spec.js
@@ -0,0 +1,44 @@
+import '../commands.js';
+describe('EntryLock', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/list`);
+ });
+
+ it('Should notify when entry is lock by another user', () => {
+ const checkLockMessage = () => {
+ cy.get('[role="dialog"]').should('be.visible');
+ cy.get('[data-cy="VnConfirm_message"] > span').should(
+ 'contain.text',
+ 'This entry has been locked by buyerNick',
+ );
+ };
+
+ cy.createEntry();
+ goToEntryBuys();
+ cy.get('.q-notification__message')
+ .eq(1)
+ .should('have.text', 'The entry has been locked successfully');
+
+ cy.login('logistic');
+ cy.reload();
+ checkLockMessage();
+ cy.get('[data-cy="VnConfirm_cancel"]').click();
+ cy.url().should('include', 'summary');
+
+ goToEntryBuys();
+ checkLockMessage();
+ cy.get('[data-cy="VnConfirm_confirm"]').click();
+ cy.url().should('include', 'buys');
+
+ cy.deleteEntry();
+
+ function goToEntryBuys() {
+ const entryBuySelector = 'a[data-cy="EntryBuys-menu-item"]';
+ cy.get(entryBuySelector).should('be.visible');
+ cy.waitForElement('[data-cy="entry-buys"]');
+ cy.get(entryBuySelector).click();
+ }
+ });
+});
diff --git a/test/cypress/integration/entry/entryCard/entryNotes.spec.js b/test/cypress/integration/entry/entryCard/entryNotes.spec.js
new file mode 100644
index 00000000000..544ac23b0b5
--- /dev/null
+++ b/test/cypress/integration/entry/entryCard/entryNotes.spec.js
@@ -0,0 +1,50 @@
+import '../commands.js';
+
+describe('EntryNotes', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/list`);
+ });
+
+ const createObservation = (type, description) => {
+ cy.dataCy('vnTableCreateBtn').click();
+ cy.dataCy('Observation type_select').eq(1).should('be.visible').type(type);
+ cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
+ cy.dataCy('Description_input').should('be.visible').type(description);
+ cy.dataCy('FormModelPopup_save').should('be.enabled').click();
+ };
+
+ const editObservation = (rowIndex, type, description) => {
+ cy.get(`td[data-col-field="description"][data-row-index="${rowIndex}"]`)
+ .click()
+ .clear()
+ .type(description);
+ cy.get(`td[data-col-field="observationTypeFk"][data-row-index="${rowIndex}"]`)
+ .click()
+ .clear()
+ .type(type);
+ cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
+ cy.saveCard();
+ };
+
+ it('Create, delete, and edit observations', () => {
+ cy.createEntry();
+ cy.waitForElement('[data-cy="entry-buys"]');
+
+ cy.dataCy('EntryNotes-menu-item').click();
+
+ createObservation('Packager', 'test');
+ cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
+
+ editObservation(0, 'Administrative', 'test2');
+
+ createObservation('Administrative', 'test');
+ cy.get('.q-notification__message')
+ .eq(2)
+ .should('have.text', "The observation type can't be repeated");
+ cy.dataCy('FormModelPopup_cancel').click();
+
+ cy.deleteEntry();
+ });
+});
diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
deleted file mode 100644
index 06f05725866..00000000000
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-describe.skip('EntryDms', () => {
- const entryId = 1;
-
- beforeEach(() => {
- cy.viewport(1920, 1080);
- cy.login('developer');
- cy.visit(`/#/entry/${entryId}/dms`);
- });
-
- it('should create edit and remove new dms', () => {
- cy.addRow();
- cy.get('.icon-attach').click();
- cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
- force: true,
- });
-
- cy.get('tbody > tr').then((value) => {
- const u = undefined;
-
- //Create and check if exist new row
- let newFileTd = Cypress.$(value).length;
- cy.get('.q-btn--standard > .q-btn__content > .block').click();
- expect(value).to.have.length(newFileTd++);
- const newRowSelector = `tbody > :nth-child(${newFileTd})`;
- cy.waitForElement(newRowSelector);
- cy.validateRow(newRowSelector, [u, u, u, u, u, 'ENTRADA ID 1']);
-
- //Edit new dms
- const newDescription = 'entry id 1 modified';
- const textAreaSelector =
- '.q-textarea > .q-field__inner > .q-field__control > .q-field__control-container';
- cy.get(
- `tbody :nth-child(${newFileTd}) > .text-right > .no-wrap > :nth-child(2) > .q-btn > .q-btn__content > .q-icon`,
- ).click();
-
- cy.get(textAreaSelector).clear();
- cy.get(textAreaSelector).type(newDescription);
- cy.saveCard();
- cy.reload();
-
- cy.validateRow(newRowSelector, [u, u, u, u, u, newDescription]);
- });
- });
-});
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index bdaa66f7948..990f74261a4 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -1,223 +1,54 @@
-describe.skip('Entry', () => {
+import './commands';
+
+describe('EntryList', () => {
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('buyer');
cy.visit(`/#/entry/list`);
});
- it('Filter deleted entries and other fields', () => {
- createEntry();
+ it('View popup summary', () => {
+ cy.createEntry();
cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
cy.waitForElement('[data-cy="entry-buys"]');
- deleteEntry();
+ cy.deleteEntry();
cy.typeSearchbar('{enter}');
- cy.get('span[title="Date"]').click().click();
- cy.typeSearchbar('{enter}');
- cy.url().should('include', 'order');
- cy.get('td[data-row-index="0"][data-col-field="landed"]').should(
- 'have.text',
- '-',
- );
+ cy.get('button[title="Summary"]').eq(1).should('be.visible').click();
+ cy.dataCy('entry-summary').should('be.visible');
});
- it('Create entry, modify travel and add buys', () => {
- createEntryAndBuy();
- cy.get('a[data-cy="EntryBasicData-menu-item"]').click();
- selectTravel('two');
- cy.saveCard();
- cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
- deleteEntry();
+ it('Show supplierDescriptor on click on supplierDescriptor', () => {
+ cy.typeSearchbar('{enter}');
+ cy.get('td[data-col-field="supplierFk"] > div > span').eq(0).click();
+ cy.get('div[role="menu"] > div[class="descriptor"]').should('be.visible');
});
- it('Clone entry and recalculate rates', () => {
- createEntry();
+ it('Landed badge should display the right color', () => {
+ cy.typeSearchbar('{enter}');
- cy.waitForElement('[data-cy="entry-buys"]');
-
- cy.url().then((previousUrl) => {
- cy.get('[data-cy="descriptor-more-opts"]').click();
- cy.get('div[data-cy="clone-entry"]').should('be.visible').click();
-
- cy.get('.q-notification__message').eq(1).should('have.text', 'Entry cloned');
-
- cy.url()
- .should('not.eq', previousUrl)
- .then(() => {
- cy.waitForElement('[data-cy="entry-buys"]');
-
- cy.get('[data-cy="descriptor-more-opts"]').click();
- cy.get('div[data-cy="recalculate-rates"]').click();
-
- cy.get('.q-notification__message')
- .eq(2)
- .should('have.text', 'Entry prices recalculated');
-
- cy.get('[data-cy="descriptor-more-opts"]').click();
- deleteEntry();
-
- cy.log(previousUrl);
-
- cy.visit(previousUrl);
-
- cy.waitForElement('[data-cy="entry-buys"]');
- deleteEntry();
+ const checkBadgeDate = (selector, comparisonFn) => {
+ cy.get(selector)
+ .should('exist')
+ .each(($badge) => {
+ const badgeText = $badge.text().trim();
+ const badgeDate = new Date(badgeText);
+ const compareDate = new Date('01/01/2001');
+ comparisonFn(badgeDate, compareDate);
});
- });
- });
-
- it('Should notify when entry is lock by another user', () => {
- const checkLockMessage = () => {
- cy.get('[role="dialog"]').should('be.visible');
- cy.get('[data-cy="VnConfirm_message"] > span').should(
- 'contain.text',
- 'This entry has been locked by buyerNick',
- );
};
- createEntry();
- goToEntryBuys();
- cy.get('.q-notification__message')
- .eq(1)
- .should('have.text', 'The entry has been locked successfully');
-
- cy.login('logistic');
- cy.reload();
- checkLockMessage();
- cy.get('[data-cy="VnConfirm_cancel"]').click();
- cy.url().should('include', 'summary');
-
- goToEntryBuys();
- checkLockMessage();
- cy.get('[data-cy="VnConfirm_confirm"]').click();
- cy.url().should('include', 'buys');
-
- deleteEntry();
- });
-
- it('Edit buys and use toolbar actions', () => {
- const COLORS = {
- negative: 'rgb(251, 82, 82)',
- positive: 'rgb(200, 228, 132)',
- enabled: 'rgb(255, 255, 255)',
- disable: 'rgb(168, 168, 168)',
- };
-
- const selectCell = (field, row = 0) =>
- cy.get(`td[data-col-field="${field}"][data-row-index="${row}"]`);
- const selectSpan = (field, row = 0) => selectCell(field, row).find('div > span');
- const selectButton = (cySelector) => cy.get(`button[data-cy="${cySelector}"]`);
- const clickAndType = (field, value, row = 0) => {
- selectCell(field, row).click().type(`${value}{esc}`);
- };
- const checkText = (field, expectedText, row = 0) =>
- selectCell(field, row).should('have.text', expectedText);
- const checkColor = (field, expectedColor, row = 0) =>
- selectSpan(field, row).should('have.css', 'color', expectedColor);
-
- createEntryAndBuy();
-
- selectCell('isIgnored').click().click().type('{esc}');
- checkText('isIgnored', 'close');
-
- clickAndType('stickers', '1');
- checkText('stickers', '0/01');
- checkText('quantity', '1');
- checkText('amount', '50.00');
- clickAndType('packing', '2');
- checkText('packing', '12');
- checkText('weight', '12.0');
- checkText('quantity', '12');
- checkText('amount', '600.00');
- checkColor('packing', COLORS.enabled);
-
- selectCell('groupingMode').click().click().click();
- checkColor('packing', COLORS.disable);
- checkColor('grouping', COLORS.enabled);
-
- selectCell('buyingValue').click().clear().type('{backspace}{backspace}1');
- checkText('amount', '12.00');
- checkColor('minPrice', COLORS.disable);
-
- selectCell('hasMinPrice').click().click();
- checkColor('minPrice', COLORS.enabled);
- selectCell('hasMinPrice').click();
-
- cy.saveCard();
- cy.get('span[data-cy="footer-stickers"]').should('have.text', '1');
- cy.get('.q-notification__message').contains('Data saved');
-
- selectButton('change-quantity-sign').should('be.disabled');
- selectButton('check-buy-amount').should('be.disabled');
- cy.get('tr.cursor-pointer > .q-table--col-auto-width > .q-checkbox').click();
- selectButton('change-quantity-sign').should('be.enabled');
- selectButton('check-buy-amount').should('be.enabled');
-
- selectButton('change-quantity-sign').click();
- selectButton('set-negative-quantity').click();
- checkText('quantity', '-12');
- selectButton('set-positive-quantity').click();
- checkText('quantity', '12');
- checkColor('amount', COLORS.disable);
-
- selectButton('check-buy-amount').click();
- selectButton('uncheck-amount').click();
- checkColor('amount', COLORS.disable);
-
- selectButton('check-amount').click();
- checkColor('amount', COLORS.positive);
- cy.saveCard();
-
- cy.get('span[data-cy="footer-amount"]').should(
- 'have.css',
- 'color',
- COLORS.positive,
+ checkBadgeDate(
+ 'td[data-col-field="landed"] > div .bg-warning',
+ (badgeDate, compareDate) => {
+ expect(badgeDate.getTime()).to.be.greaterThan(compareDate.getTime());
+ },
);
- deleteEntry();
+ checkBadgeDate(
+ 'td[data-col-field="landed"] > div .bg-info',
+ (badgeDate, compareDate) => {
+ expect(badgeDate.getTime()).to.be.lessThan(compareDate.getTime());
+ },
+ );
});
-
- function goToEntryBuys() {
- const entryBuySelector = 'a[data-cy="EntryBuys-menu-item"]';
- cy.get(entryBuySelector).should('be.visible');
- cy.waitForElement('[data-cy="entry-buys"]');
- cy.get(entryBuySelector).click();
- }
-
- function deleteEntry() {
- cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
- cy.waitForElement('div[data-cy="delete-entry"]').click();
- cy.url().should('include', 'list');
- }
-
- function createEntryAndBuy() {
- createEntry();
- createBuy();
- }
-
- function createEntry() {
- cy.get('button[data-cy="vnTableCreateBtn"]').click();
- selectTravel('one');
- cy.get('button[data-cy="FormModelPopup_save"]').click();
- cy.url().should('include', 'summary');
- cy.get('.q-notification__message').eq(0).should('have.text', 'Data created');
- }
-
- function selectTravel(warehouse) {
- cy.get('i[data-cy="Travel_icon"]').click();
- cy.get('input[data-cy="Warehouse Out_select"]').type(warehouse);
- cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
- cy.get('button[data-cy="save-filter-travel-form"]').click();
- cy.get('tr').eq(1).click();
- }
-
- function createBuy() {
- cy.get('a[data-cy="EntryBuys-menu-item"]').click();
- cy.get('a[data-cy="EntryBuys-menu-item"]').click();
- cy.get('button[data-cy="vnTableCreateBtn"]').click();
-
- cy.get('input[data-cy="itemFk-create-popup"]').type('1');
- cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
- cy.get('input[data-cy="Grouping mode_select"]').should('have.value', 'packing');
- cy.get('button[data-cy="FormModelPopup_save"]').click();
- }
});
diff --git a/test/cypress/integration/entry/entryStockBought.spec.js b/test/cypress/integration/entry/entryStockBought.spec.js
new file mode 100644
index 00000000000..3fad44d9178
--- /dev/null
+++ b/test/cypress/integration/entry/entryStockBought.spec.js
@@ -0,0 +1,23 @@
+describe('EntryStockBought', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyer');
+ cy.visit(`/#/entry/stock-Bought`);
+ });
+
+ it('Should edit the reserved space adjust the purchased spaces and check detail', () => {
+ cy.get('[data-cy="edit-travel"]').should('be.visible').click();
+ cy.get('input[aria-label="m3"]').clear().type('60');
+ cy.get('[data-cy="FormModelPopup_save"]').click();
+ cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
+
+ cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
+ cy.get('[data-col-field="reserve"][data-row-index="0"]').click();
+ cy.get('input[name="reserve"]').type('10{enter}');
+ cy.get('button[title="Save"]').click();
+ cy.checkNotification('Data saved');
+
+ cy.get('[data-cy="searchBtn"]').eq(0).click();
+ cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
+ });
+});
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/entrySupplier.spec.js
similarity index 71%
rename from test/cypress/integration/entry/myEntry.spec.js
rename to test/cypress/integration/entry/entrySupplier.spec.js
index ed469d9e2e5..83deecea5b5 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/entrySupplier.spec.js
@@ -1,4 +1,4 @@
-describe('EntryMy when is supplier', () => {
+describe('EntrySupplier when is supplier', () => {
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('supplier');
@@ -13,5 +13,7 @@ describe('EntryMy when is supplier', () => {
cy.dataCy('cardBtn').eq(2).click();
cy.dataCy('printLabelsBtn').click();
cy.window().its('open').should('be.called');
+ cy.dataCy('seeLabelBtn').eq(0).should('be.visible').click();
+ cy.window().its('open').should('be.called');
});
});
diff --git a/test/cypress/integration/entry/entryWasteRecalc.spec.js b/test/cypress/integration/entry/entryWasteRecalc.spec.js
new file mode 100644
index 00000000000..1b358676c76
--- /dev/null
+++ b/test/cypress/integration/entry/entryWasteRecalc.spec.js
@@ -0,0 +1,22 @@
+import './commands';
+describe('EntryDms', () => {
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('buyerBoss');
+ cy.visit(`/#/entry/waste-recalc`);
+ });
+
+ it('should recalc waste for today', () => {
+ cy.waitForElement('[data-cy="wasteRecalc"]');
+ cy.dataCy('recalc').should('be.disabled');
+
+ cy.dataCy('dateFrom').should('be.visible').click().type('01-01-2001');
+ cy.dataCy('dateTo').should('be.visible').click().type('01-01-2001');
+
+ cy.dataCy('recalc').should('be.enabled').click();
+ cy.get('.q-notification__message').should(
+ 'have.text',
+ 'The wastes were successfully recalculated',
+ );
+ });
+});
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 2a8431cf0e5..00000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,50 +0,0 @@
-describe.skip('EntryStockBought', () => {
- beforeEach(() => {
- cy.viewport(1920, 1080);
- cy.login('buyer');
- cy.visit(`/#/entry/stock-Bought`);
- });
- it('Should edit the reserved space', () => {
- cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
- cy.get('[data-col-field="reserve"][data-row-index="0"]').click();
- cy.get('input[name="reserve"]').type('10{enter}');
- cy.get('button[title="Save"]').click();
- cy.checkNotification('Data saved');
- });
- it('Should add a new reserved space for buyerBoss', () => {
- cy.addBtnClick();
- cy.get('input[aria-label="Reserve"]').type('1');
- cy.get('input[aria-label="Date"]').eq(1).clear();
- cy.get('input[aria-label="Date"]').eq(1).type('01-01');
- cy.get('input[aria-label="Buyer"]').type('itNick');
- cy.get('div[role="listbox"] > div > div[role="option"]')
- .eq(1)
- .should('be.visible')
- .click();
-
- cy.get('[data-cy="FormModelPopup_save"]').click();
- cy.get('.q-notification__message').should('have.text', 'Data created');
-
- cy.get('[data-col-field="reserve"][data-row-index="1"]').click().clear();
- cy.get('[data-cy="searchBtn"]').eq(1).click();
- cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata')
- .should('have.text', 'warningNo data available')
- .type('{esc}');
- cy.get('[data-col-field="reserve"][data-row-index="1"]')
- .click()
- .type('{backspace}{enter}');
- cy.get('[data-cy="crudModelDefaultSaveBtn"]').should('be.enabled').click();
- cy.get('.q-notification__message').eq(1).should('have.text', 'Data saved');
- });
- it('Should check detail for the buyer', () => {
- cy.get('[data-cy="searchBtn"]').eq(0).click();
- cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
- });
-
- it('Should edit travel m3 and refresh', () => {
- cy.get('[data-cy="edit-travel"]').should('be.visible').click();
- cy.get('input[aria-label="m3"]').clear().type('60');
- cy.get('[data-cy="FormModelPopup_save"]').click();
- cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
- });
-});
diff --git a/test/cypress/integration/order/orderList.spec.js b/test/cypress/integration/order/orderList.spec.js
index c48b317a8ea..34cd2bffcf8 100644
--- a/test/cypress/integration/order/orderList.spec.js
+++ b/test/cypress/integration/order/orderList.spec.js
@@ -30,7 +30,7 @@ describe('OrderList', () => {
cy.url().should('include', `/order`);
});
- it('filter list and create order', () => {
+ it.skip('filter list and create order', () => {
cy.dataCy('Customer ID_input').type('1101{enter}');
cy.dataCy('vnTableCreateBtn').click();
cy.dataCy('landedDate').find('input').type('06/01/2001');
diff --git a/test/cypress/integration/outLogin/logout.spec.js b/test/cypress/integration/outLogin/logout.spec.js
index b17e4279438..9f022617d1d 100644
--- a/test/cypress/integration/outLogin/logout.spec.js
+++ b/test/cypress/integration/outLogin/logout.spec.js
@@ -1,5 +1,5 @@
///
-describe('Logout', () => {
+describe.skip('Logout', () => {
beforeEach(() => {
cy.login('developer');
cy.visit(`/#/dashboard`);
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 2409dd14911..a3d8fe90840 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -35,7 +35,7 @@ describe('TicketList', () => {
cy.get('.summaryBody').should('exist');
});
- it('filter client and create ticket', () => {
+ it.skip('filter client and create ticket', () => {
cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
searchResults();
cy.wait('@ticketSearchbar');
diff --git a/test/cypress/integration/vnComponent/VnLog.spec.js b/test/cypress/integration/vnComponent/VnLog.spec.js
index 80b9d07dfd0..afe641549d7 100644
--- a/test/cypress/integration/vnComponent/VnLog.spec.js
+++ b/test/cypress/integration/vnComponent/VnLog.spec.js
@@ -22,4 +22,10 @@ describe('VnLog', () => {
cy.get('.q-page').click();
cy.validateContent(chips[0], 'Claim');
});
+
+ it('should show claimDescriptor', () => {
+ cy.dataCy('iconLaunch-claimFk').first().click();
+ cy.dataCy('descriptor_id').contains('1');
+ cy.dataCy('iconLaunch-claimFk').first().click();
+ });
});
diff --git a/test/cypress/integration/zone/zoneWarehouse.spec.js b/test/cypress/integration/zone/zoneWarehouse.spec.js
index bca5ced22d5..d7a9854bb87 100644
--- a/test/cypress/integration/zone/zoneWarehouse.spec.js
+++ b/test/cypress/integration/zone/zoneWarehouse.spec.js
@@ -18,7 +18,7 @@ describe('ZoneWarehouse', () => {
cy.checkNotification(dataError);
});
- it('should create & remove a warehouse', () => {
+ it.skip('should create & remove a warehouse', () => {
cy.addBtnClick();
cy.fillInForm(data);
cy.get(saveBtn).click();
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 1ca2b23923e..45e17654e06 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -395,6 +395,7 @@ Cypress.Commands.add('clickButtonWith', (type, value) => {
break;
}
});
+
Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
cy.waitForElement('[data-cy="descriptor_actions"]');
cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should('not.be.visible');