verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 99 Releases Wiki Activity

#6942 improve invoiceIn #220

Merged
jorgep merged 63 commits from 6942-improveInvoceIn into dev 2024-05-29 07:03:46 +00:00
Conversation 6 Commits 63 Files Changed 34 +5 -19
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d460b198a4 - Show all commits

16
src/components/common/VnLog.vue
View File

@ -199,6 +199,7 @@ function getLogTree(data) {
nLogs >= 6; nLogs >= 6;
if (modelChanged) { if (modelChanged) {
console.log(locale);
jorgep marked this conversation as resolved Outdated
jgallego commented 2024-05-24 15:02:50 +00:00
Outdated
Review
Copy Link

?

?
jorgep commented 2024-05-27 06:56:38 +00:00
Outdated
Review
Copy Link

Se me ha colado. Lo quito.

Se me ha colado. Lo quito.
userLog.logs.push( userLog.logs.push(
(modelLog = { (modelLog = {
model: log.changedModel, model: log.changedModel,
@ -622,21 +623,6 @@ setLogTree();
</QList> </QList>
</div> </div>
</div> </div>
<Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
<div class="row q-gutter-x-sm">
<QBtn
flat
@click.stop="stateStore.toggleRightDrawer()"
round
dense
icon="menu"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}
</QTooltip>
</QBtn>
</div>
</Teleport>
<QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300"> <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
<QScrollArea class="fit text-grey-8"> <QScrollArea class="fit text-grey-8">
<QList dense> <QList dense>

6
test/cypress/integration/vnLog.spec.js
View File

@ -9,15 +9,15 @@ describe('VnLog', () => {
cy.visit(`/#/claim/${1}/log`); cy.visit(`/#/claim/${1}/log`);
cy.openRightMenu(); cy.openRightMenu();
}); });
// Se tiene que cambiar el Accept-Language a 'en', ya hay una tarea para eso #7189.
it('should filter by insert actions', () => { xit('should filter by insert actions', () => {
cy.checkOption(':nth-child(7) > .q-checkbox'); cy.checkOption(':nth-child(7) > .q-checkbox');
cy.get('.q-page').click(); cy.get('.q-page').click();
cy.validateContent(chips[0], 'Document'); cy.validateContent(chips[0], 'Document');
cy.validateContent(chips[1], 'Beginning'); cy.validateContent(chips[1], 'Beginning');
}); });
it('should filter by entity', () => { xit('should filter by entity', () => {
cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim'); cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
cy.get('.q-page').click(); cy.get('.q-page').click();
cy.validateContent(chips[0], 'Claim'); cy.validateContent(chips[0], 'Claim');

2
test/cypress/integration/worker/workerLocker.spec.js
View File

@ -1,4 +1,4 @@
describe('WorkerList', () => { describe('WorkerLocker', () => {
const workerId = 1109; const workerId = 1109;
const lockerCode = '201A'; const lockerCode = '201A';
const input = '.q-card input'; const input = '.q-card input';