forked from verdnatura/salix-front
Merge branch 'dev' into 6993-HideAllPagination
This commit is contained in:
commit
e99b727b77
|
@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [2414.01] - 2024-04-04
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2400.01] - 2024-01-04
|
||||
|
||||
### Added
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-front",
|
||||
"version": "24.12.0",
|
||||
"version": "24.14.0",
|
||||
"description": "Salix frontend",
|
||||
"productName": "Salix",
|
||||
"author": "Verdnatura",
|
||||
|
|
|
@ -264,7 +264,7 @@ function openDialog(dmsId) {
|
|||
>
|
||||
<ItemDescriptorProxy
|
||||
v-if="col.name == 'description'"
|
||||
:id="props.row.id"
|
||||
:id="props.row.sale.itemFk"
|
||||
:sale-fk="props.row.saleFk"
|
||||
></ItemDescriptorProxy>
|
||||
</QTh>
|
||||
|
|
|
@ -40,9 +40,9 @@ describe('VnLocation', () => {
|
|||
cy.waitForElement('.q-card');
|
||||
});
|
||||
|
||||
it('Show all options', function() {
|
||||
it('Show locations options', function() {
|
||||
cy.get(inputLocation).click();
|
||||
cy.get(locationOptions).should('have.length', 1);
|
||||
cy.get(locationOptions).should('have.length', 5);
|
||||
});
|
||||
});
|
||||
})
|
||||
|
|
|
@ -16,7 +16,7 @@ describe('WorkerList', () => {
|
|||
it('should open the worker summary', () => {
|
||||
cy.openListSummary(0);
|
||||
cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
|
||||
cy.get('.summary .header').eq(0).invoke('text').should('include', 'Basic data');
|
||||
cy.get('.summary .header').eq(1).should('have.text', 'User data');
|
||||
cy.get('.summary .header-link').eq(0).invoke('text').should('include', 'Basic data');
|
||||
cy.get('.summary .header-link').eq(1).should('have.text', 'User data');
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue