diff --git a/package.json b/package.json
index ead0193c9..eaaa0b812 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-front",
- "version": "24.40.0",
+ "version": "24.42.0",
"description": "Salix frontend",
"productName": "Salix",
"author": "Verdnatura",
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 52cd3ed47..f53f3c645 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -731,6 +731,10 @@ es:
border-color: var(--vn-section-color);
}
+.q-table__container > div:first-child {
+ background-color: var(--vn-page-color);
+}
+
.grid-three {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f7be1ca99..41c62c704 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1075,7 +1075,7 @@ item:
producer: Producer
landed: Landed
fixedPrice:
- itemId: Item ID
+ itemFk: Item ID
groupingPrice: Grouping price
packingPrice: Packing price
hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 558f142ca..14c91aae9 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1060,7 +1060,7 @@ item:
producer: Productor
landed: F. entrega
fixedPrice:
- itemId: ID Artículo
+ itemFk: ID Artículo
groupingPrice: Precio grouping
packingPrice: Precio packing
hasMinPrice: Tiene precio mínimo
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
const fixedPrices = ref([]);
const warehousesOptions = ref([]);
const rowsSelected = ref([]);
-
const itemFixedPriceFilterRef = ref();
-
const params = reactive({});
-const defaultColumnAttrs = {
- align: 'left',
- sortable: true,
-};
+
onMounted(async () => {
stateStore.rightDrawer = true;
params.warehouseFk = user.value.warehouseFk;
});
onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+ align: 'left',
+ sortable: true,
+};
const columns = computed(() => [
{
- label: t('item.fixedPrice.itemId'),
- name: 'itemId',
+ label: t('item.fixedPrice.itemFk'),
+ name: 'itemFk',
...defaultColumnAttrs,
isId: true,
cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
:default-save="false"
data-key="ItemFixedPrices"
url="FixedPrices/filter"
- :order="['itemFk ASC']"
+ :order="['description DESC']"
save-url="FixedPrices/crud"
:user-params="{ warehouseFk: user.warehouseFk }"
ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
-
+
{
cy.get('input').eq(1).type('1234ABCD');
cy.get('input').eq(2).type('100');
cy.get('input').eq(3).click();
- cy.get('div[role="listbox"]').find('div.q-item').click();
+ cy.get('.q-select > .q-field__inner > .q-field__control').type(
+ '{downarrow}{enter}'
+ );
// Save
cy.get('button[type="submit"]').click();
@@ -19,12 +21,22 @@ describe('WagonCreate', () => {
// Check data has been saved successfully
cy.waitForElement('.q-card');
- cy.get('.title').should('have.text', '1234');
- cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD');
- cy.get(':nth-child(2) > .value > span').should('have.text', '100');
- cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1');
+ cy.get(
+ '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
+ ).should('have.text', '1234');
+ cy.get(
+ '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
+ ).should('have.text', '1234ABCD');
+ cy.get(
+ '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
+ ).should('have.text', '100');
+ cy.get(
+ '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
+ ).should('have.text', 'Wagon Type #1');
// Delete wagon type created
- cy.get('.actions > .q-btn--standard').click();
+ cy.get(
+ '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
+ ).click();
});
});
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index cd7ffa58f..0ad98e597 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -13,7 +13,7 @@ describe('WagonTypeCreate', () => {
});
it('delete a wagon type', () => {
cy.get(
- ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
+ '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
).click();
});
});
diff --git a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
index 6e5816e51..36dd83411 100644
--- a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
@@ -4,7 +4,7 @@ describe('WagonTypeEdit', () => {
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
- cy.visit('/#/wagon/type/2/edit');
+ cy.visit('/#/wagon/type/1/edit');
});
it('should edit the name and the divisible field of the wagon type', () => {
@@ -14,14 +14,14 @@ describe('WagonTypeEdit', () => {
cy.get('.q-btn--standard').click();
});
- it('should create a tray', () => {
- cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click();
- cy.get('input').last().type('150');
- cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}');
- });
-
it('should delete a tray', () => {
cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click();
cy.reload();
});
+
+ it('should create a tray', () => {
+ cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').last().click();
+ cy.get('input').last().type('150');
+ cy.get(trayColorRow).type('{downArrow}{downArrow}{downArrow}{enter}');
+ });
});