wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge pull request 'dev' (!95) from dev into test 

Reviewed-on: verdnatura/salix-front#95
This commit is contained in:
Javi Gallego 2023-09-14 08:31:32 +00:00
parent d1a88776f2 edc0a013a9
commit 5e8a2c4121
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/SendEmailDialog.vue
View File

@ -40,7 +40,7 @@ async function confirm() {
} }
</script> </script>
<template> <template>
<QDialog ref="dialogRef" persistent> <QDialog ref="dialogRef">
<QCard class="q-pa-sm"> <QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none"> <QCardSection class="row items-center q-pb-none">
<span class="text-h6 text-grey">{{ t('Send email notification') }}</span> <span class="text-h6 text-grey">{{ t('Send email notification') }}</span>

2
src/components/common/VnSmsDialog.vue
View File

@ -83,7 +83,7 @@ async function send() {
</script> </script>
<template> <template>
<QDialog ref="dialogRef" persistent> <QDialog ref="dialogRef">
<QCard class="q-pa-sm"> <QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none"> <QCardSection class="row items-center q-pb-none">
<span class="text-h6 text-grey"> <span class="text-h6 text-grey">

2
src/components/ui/VnConfirm.vue
View File

@ -51,7 +51,7 @@ async function confirm() {
} }
</script> </script>
<template> <template>
<QDialog ref="dialogRef" persistent> <QDialog ref="dialogRef">
<QCard class="q-pa-sm"> <QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none"> <QCardSection class="row items-center q-pb-none">
<QAvatar <QAvatar

5
src/components/ui/VnNotes.vue
View File

@ -24,6 +24,7 @@ async function insert() {
Object.assign(body, { text: newNote.value }); Object.assign(body, { text: newNote.value });
await axios.post($props.url, body); await axios.post($props.url, body);
vnPaginateRef.value.fetch(); vnPaginateRef.value.fetch();
newNote.value = '';
} }
</script> </script>
<template> <template>
@ -71,7 +72,7 @@ async function insert() {
@click="noteModal = true" @click="noteModal = true"
/> />
</QPageSticky> </QPageSticky>
<QDialog v-model="noteModal" persistent> <QDialog v-model="noteModal" @hide="newNote = ''">
<QCard> <QCard>
<QCardSection> <QCardSection>
<QItem class="q-px-none"> <QItem class="q-px-none">
@ -86,7 +87,7 @@ async function insert() {
<QInput <QInput
autofocus autofocus
type="textarea" type="textarea"
:hint="t('Add note here...')" :label="t('Add note here...')"
filled filled
size="lg" size="lg"
autogrow autogrow

2
src/pages/Claim/Card/ClaimLinesImport.vue
View File

@ -103,7 +103,7 @@ function cancel() {
@on-fetch="(data) => (claimableSales = data)" @on-fetch="(data) => (claimableSales = data)"
auto-load auto-load
/> />
<QDialog ref="dialogRef" persistent> <QDialog ref="dialogRef">
<QCard> <QCard>
<QCardSection class="row items-center"> <QCardSection class="row items-center">
<span class="text-h6 text-grey">{{ t('Available sales lines') }}</span> <span class="text-h6 text-grey">{{ t('Available sales lines') }}</span>

14
test/cypress/integration/workerList.spec.js
View File

@ -6,19 +6,19 @@ describe('WorkerList', () => {
}); });
it('should load workers', () => { it('should load workers', () => {
cy.get('.list-items > .vn-label-value:nth-child(2) > .value') cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span')
.eq(0) .eq(0)
.should('have.text', 'JessicaJones'); .should('have.text', 'victorvd');
cy.get('.list-items > .vn-label-value:nth-child(2) > .value') cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span')
.eq(1) .eq(1)
.should('have.text', 'BruceBanner'); .should('have.text', 'JessicaJones');
cy.get('.list-items > .vn-label-value:nth-child(2) > .value') cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span')
.eq(2) .eq(2)
.should('have.text', 'CharlesXavier'); .should('have.text', 'BruceBanner');
}); });
it('should open the worker summary', () => { it('should open the worker summary', () => {
cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(0).click(); cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(1).click();
cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones'); 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(0).invoke('text').should('include', 'Basic data');
cy.get('.summary .header').eq(1).should('have.text', 'User data'); cy.get('.summary .header').eq(1).should('have.text', 'User data');