diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index def8f3b51..0c37c1f50 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -557,6 +557,7 @@ ticket: tracking: Tracking components: Components pictures: Pictures + packages: Packages list: nickname: Nickname state: State diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 58f688a7c..8a38e05cc 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -239,6 +239,13 @@ globals: mailForwarding: Reenvío de correo mailAlias: Alias de correo privileges: Privilegios + observation: Notas + expedition: Expedición + services: Servicios + tracking: Estados + components: Componentes + pictures: Fotos + packages: Bultos created: Fecha creación worker: Trabajador now: Ahora @@ -555,6 +562,7 @@ ticket: tracking: Estados components: Componentes pictures: Fotos + packages: Bultos list: nickname: Alias state: Estado diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue new file mode 100644 index 000000000..a76fce2b6 --- /dev/null +++ b/src/pages/Ticket/Card/TicketPackage.vue @@ -0,0 +1,132 @@ + + + diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index b78b20fa2..ede5480ff 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -201,3 +201,9 @@ tracking: worker: Worker created: Created addState: Add state +package: + package: Package + quantity: Quantity + added: Added + addPackage: Add package + removePackage: Remove package diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml index 610a490c9..1b97cd66f 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -201,6 +201,12 @@ expedition: removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición? worker: Trabajador move: Mover +package: + package: Embalaje + quantity: Cantidad + added: Añadido + addPackage: Añadir embalaje + removePackage: Quitar embalaje Search ticket: Buscar tickets You can search by ticket id or alias: Puedes buscar por id o alias del ticket Select lines to see the options: Selecciona líneas para ver las opciones diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 332bf917a..c70d354ab 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -26,6 +26,7 @@ export default { 'TicketSms', 'TicketPicture', 'TicketComponents', + 'TicketPackage', ], }, children: [ @@ -145,24 +146,6 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketLog.vue'), }, - { - path: 'picture', - name: 'TicketPicture', - meta: { - title: 'pictures', - icon: 'vn:photo', - }, - component: () => import('src/pages/Ticket/Card/TicketPicture.vue'), - }, - { - path: 'picture', - name: 'TicketPicture', - meta: { - title: 'pictures', - icon: 'vn:photo', - }, - component: () => import('src/pages/Ticket/Card/TicketPicture.vue'), - }, { path: 'observation', name: 'TicketNotes', @@ -172,6 +155,15 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketNotes.vue'), }, + { + path: 'picture', + name: 'TicketPicture', + meta: { + title: 'pictures', + icon: 'vn:photo', + }, + component: () => import('src/pages/Ticket/Card/TicketPicture.vue'), + }, { path: 'volume', name: 'TicketVolume', @@ -181,15 +173,7 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketVolume.vue'), }, - { - path: 'components', - name: 'TicketComponents', - meta: { - title: 'components', - icon: 'vn:components', - }, - component: () => import('src/pages/Ticket/Card/TicketComponents.vue'), - }, + { path: 'expedition', name: 'TicketExpedition', @@ -208,6 +192,24 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketService.vue'), }, + { + path: 'package', + name: 'TicketPackage', + meta: { + title: 'packages', + icon: 'vn:bucket', + }, + component: () => import('src/pages/Ticket/Card/TicketPackage.vue'), + }, + { + path: 'components', + name: 'TicketComponents', + meta: { + title: 'components', + icon: 'vn:components', + }, + component: () => import('src/pages/Ticket/Card/TicketComponents.vue'), + }, { path: 'boxing', name: 'TicketBoxing', diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js index fc80c93f8..bd0e55c37 100644 --- a/test/cypress/integration/entry/myEntry.spec.js +++ b/test/cypress/integration/entry/myEntry.spec.js @@ -1,20 +1,20 @@ -// describe('WagonTypeCreate', () => { -// beforeEach(() => { -// cy.viewport(1920, 1080); -// cy.login('customer'); -// cy.visit(`/#/entry/my`, { -// onBeforeLoad(win) { -// cy.stub(win, 'open'); -// }, -// }); -// cy.waitForElement('.q-page', 6000); -// }); +describe('My entry when is supplier', () => { + beforeEach(() => { + cy.viewport(1920, 1080); + cy.login('supplier'); + cy.visit(`/#/entry/my`, { + onBeforeLoad(win) { + cy.stub(win, 'open'); + }, + }); + cy.waitForElement('.q-page', 6000); + }); -// it('should create edit and remove new dms', () => { -// cy.get( -// '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' -// ).click(); -// cy.get('.q-card__actions > .q-btn').click(); -// cy.window().its('open').should('be.called'); -// }); -// }); + it('should open buyLabel when is supplier', () => { + cy.get( + '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' + ).click(); + cy.get('.q-card__actions > .q-btn').click(); + cy.window().its('open').should('be.called'); + }); +});