Compare commits

..

11 Commits

Author SHA1 Message Date
Javier Segarra 0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1241
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 17:30:10 +00:00
Javier Segarra c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 17:29:21 +00:00
Jorge Penadés 91f10bba79 Merge pull request 'feat: skip tests' (!1235) from skipTests into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1235
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 13:16:57 +00:00
Jorge Penadés 7d57b1ebe7 test: skip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:13:09 +01:00
Jorge Penadés 1d3feef1e7 chore: add task comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:39:59 +01:00
Jorge Penadés 18d4661bc3 chore: add task comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:37:28 +01:00
Jorge Penadés 3abd06db02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 11:00:55 +01:00
Jorge Penadés e636a37c33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:18:05 +01:00
Javier Segarra 7b42fac56c Merge branch 'dev' into warning_defaultValue_firstParam
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 07:05:01 +00:00
Javier Segarra 238817285d perf: remove warning default value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:35:14 +00:00
Jorge Penadés 21bcfdc997 feat: skip tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 16:20:02 +01:00
13 changed files with 34 additions and 39 deletions

View File

@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
const arrayDataStore = useArrayDataStore();
export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
export function useArrayData(key, userOptions) {
key ??= useRoute().meta.moduleName;
if (!key) throw new Error('ArrayData: A key is required to use this composable');
if (!arrayDataStore.get(key)) arrayDataStore.set(key);

View File

@ -89,12 +89,6 @@ const columns = computed(() => [
field: (row) => row.foreignValue,
align: 'left',
},
{
name: 'total',
label: t('Total'),
sortable: true,
align: 'left',
},
]);
const filter = {
@ -283,22 +277,19 @@ function autocompleteExpense(evt, row, col) {
<QTd>
{{
getTotal(rows, null, { cb: taxRate, currency: 'default' })
}}
</QTd>
<QTd />
}}</QTd
>
<QTd>
{{
getTotal(rows, null, {
cb: (row) =>
parseFloat(row.taxableBase || 0) +
parseFloat(taxRate(row) || 0),
currency: 'default',
})
}}
<template v-if="isNotEuro(invoiceIn.currency.code)">
{{
getTotal(rows, 'foreignValue', {
currency: invoiceIn.currency.code,
})
}}
</template>
</QTd>
</QTr>
</template>
<template #item="props">
<div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
<QCard bordered flat class="q-my-xs">

View File

@ -1,5 +1,6 @@
/// <reference types="cypress" />
describe('ClaimPhoto', () => {
// redmine.verdnatura.es/issues/8417
describe.skip('ClaimPhoto', () => {
beforeEach(() => {
const claimId = 1;
cy.login('developer');

View File

@ -8,8 +8,8 @@ describe('EntryMy when is supplier', () => {
},
});
});
it('should open buyLabel when is supplier', () => {
// https://redmine.verdnatura.es/issues/8418
it.skip('should open buyLabel when is supplier', () => {
cy.get(
'[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
).click();

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" />
describe('InvoiceInCorrective', () => {
// https://redmine.verdnatura.es/issues/8419
describe.skip('InvoiceInCorrective', () => {
const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';

View File

@ -21,8 +21,8 @@ describe('InvoiceInList', () => {
cy.url().should('include', `/invoice-in/${id}/summary`);
});
});
it('should open the details', () => {
// https://redmine.verdnatura.es/issues/8420
it.skip('should open the details', () => {
cy.get(firstDetailBtn).click();
cy.get(summaryHeaders).eq(1).contains('Basic data');
cy.get(summaryHeaders).eq(4).contains('Vat');

View File

@ -35,8 +35,8 @@ describe('InvoiceOut summary', () => {
cy.dataCy('VnConfirm_confirm').click();
cy.checkNotification('InvoiceOut deleted');
});
it('should transfer the invoice ', () => {
// https://redmine.verdnatura.es/issues/8415
it.skip('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click();
cy.get('.q-menu > .q-list > :nth-child(1)').click();

View File

@ -15,8 +15,8 @@ describe('Item list', () => {
cy.get('.q-menu .q-item').contains('Anthurium').click();
cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
});
it('should create an item', () => {
// https://redmine.verdnatura.es/issues/8421
it.skip('should create an item', () => {
const data = {
Description: { val: `Test item` },
Type: { val: `Crisantemo`, type: 'select' },

View File

@ -18,8 +18,8 @@ describe('Item tag', () => {
+cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification("The tag or priority can't be repeated for an item");
});
it('should add a new tag', () => {
// https://redmine.verdnatura.es/issues/8422
it.skip('should add a new tag', () => {
cy.get('.q-page').should('be.visible');
cy.get('.q-page-sticky > div').click();
cy.get('.q-page-sticky > div').click();

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" />
describe('Ticket expedtion', () => {
// https://redmine.verdnatura.es/issues/8423
describe.skip('Ticket expedtion', () => {
const tableContent = '.q-table .q-virtual-scroll__content';
const stateTd = 'td:nth-child(9)';

View File

@ -30,8 +30,8 @@ describe('TicketList', () => {
cy.get(firstRow).find('.q-btn:first').click();
cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
});
it('should open ticket summary', () => {
// https://redmine.verdnatura.es/issues/8424
it.skip('should open ticket summary', () => {
searchResults();
cy.get(firstRow).find('.q-btn:last').click();
cy.dataCy('ticketSummary').should('exist');

View File

@ -53,7 +53,8 @@ describe('VnLocation', () => {
cy.waitForElement('.q-card');
cy.get(inputLocation).click();
});
it('Show all options', function () {
// https://redmine.verdnatura.es/issues/8436
it.skip('Show all options', function () {
cy.get(locationOptions).should('have.length.at.least', 5);
});
it('input filter location as "al"', function () {

View File

@ -18,8 +18,8 @@ describe('ZoneWarehouse', () => {
cy.get(saveBtn).click();
cy.checkNotification(dataError);
});
it('should create & remove a warehouse', () => {
// https://redmine.verdnatura.es/issues/8425
it.skip('should create & remove a warehouse', () => {
cy.addBtnClick();
cy.fillInForm(data);
cy.get(saveBtn).click();