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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2025-04-04 11:36:25 +02:00
parent 6ef3df2322 4f821c86c1
commit a3d828498b
14 changed files with 38 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ async function confirm() {
v-model="address"
is-outlined
autofocus
data-cy="SendEmailNotifiactionDialogInput"
data-cy="SendEmailNotificationDialogInput"
/>
</QCardSection>
<QCardActions align="right">

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

@ -10,6 +10,7 @@ import { useFilterParams } from 'src/composables/useFilterParams';
import FetchData from '../FetchData.vue';
import { useValidator } from 'src/composables/useValidator';
import { useCapitalize } from 'src/composables/useCapitalize';
import VnAvatar from '../ui/VnAvatar.vue';
const $props = defineProps({
dataKey: {
@ -99,7 +100,6 @@ function getActions() {
:columns="columns"
:redirect="false"
:hiddenTags="['originFk', 'creationDate']"
:exprBuilder
search-url="logs"
:showTagChips="false"
>

18
src/components/ui/CardSummary.vue
View File

@ -177,6 +177,8 @@ async function fetch() {
.value {
color: var(--vn-text-color);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.header {
@ -208,27 +210,21 @@ async function fetch() {
}
.vn-card-group {
display: flex;
flex-direction: column;
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 16px;
}
.vn-card-content {
display: flex;
flex-direction: column;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
> div {
max-height: 70px;
}
}
@media (min-width: 1010px) {
.vn-card-group {
flex-direction: row;
}
.vn-card-content {
flex: 1;
}
}
</style>
<style lang="scss" scoped>
.summaryHeader .vn-label-value {

4
src/components/ui/VnDescriptor.vue
View File

@ -252,6 +252,10 @@ const toModule = computed(() => {
content: ':';
}
}
&.ellipsis > .value {
text-overflow: ellipsis;
white-space: pre;
}
.value {
color: var(--vn-text-color);
font-size: 14px;

2
src/composables/useRole.js
View File

@ -13,7 +13,7 @@ export function useRole() {
name: data.user.name,
nickname: data.user.nickname,
lang: data.user.lang || 'es',
departmentFk: data.user.worker.department.departmentFk,
departmentFk: data.user?.worker?.department?.departmentFk,
};
state.setUser(userData);
state.setRoles(roles);

7
src/pages/Customer/Card/CustomerSummary.vue
View File

@ -104,8 +104,11 @@ const sumRisk = ({ clientRisks }) => {
:value="entity.email"
class="ellipsis"
copy
><template #value> <VnLinkMail :email="entity.email" /> </template
></VnLv>
>
<template #value>
<VnLinkMail :email="entity.email" />
</template>
</VnLv>
<VnLv :label="t('globals.department')">
<template #value>
<span class="link" v-text="entity.department?.name" />

37
src/pages/Entry/Card/EntrySummary.vue
View File

@ -70,8 +70,8 @@ onMounted(async () => {
:url="`#/entry/${entityId}/basic-data`"
:text="t('globals.summary.basicData')"
/>
<div class="card-group">
<div class="card-content">
<div class="vn-card-group">
<div class="vn-card-content">
<VnLv
:label="t('entry.summary.commission')"
:value="entry?.commission"
@ -93,7 +93,7 @@ onMounted(async () => {
:value="entry?.invoiceNumber"
/>
</div>
<div class="card-content">
<div class="vn-card-content">
<VnCheckbox
:label="t('entry.list.tableVisibleColumns.isOrdered')"
v-model="entry.isOrdered"
@ -130,8 +130,8 @@ onMounted(async () => {
:url="`#/travel/${entry.travel.id}/summary`"
:text="t('Travel')"
/>
<div class="card-group">
<div class="card-content">
<div class="vn-card-group">
<div class="vn-card-content">
<VnLv :label="t('entry.summary.travelReference')">
<template #value>
<span class="link">
@ -161,7 +161,7 @@ onMounted(async () => {
:value="entry.travel.warehouseIn?.name"
/>
</div>
<div class="card-content">
<div class="vn-card-content">
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
<VnCheckbox
:label="t('entry.summary.travelDelivered')"
@ -193,31 +193,6 @@ onMounted(async () => {
</template>
</CardSummary>
</template>
<style lang="scss" scoped>
.card-group {
display: flex;
flex-direction: column;
}
.card-content {
display: flex;
flex-direction: column;
text-overflow: ellipsis;
> div {
max-height: 24px;
}
}
@media (min-width: 1010px) {
.card-group {
flex-direction: row;
}
.card-content {
flex: 1;
margin-right: 16px;
}
}
</style>
<i18n>
es:
Travel: Envío

4
src/pages/Ticket/TicketList.vue
View File

@ -113,7 +113,7 @@ const columns = computed(() => [
},
{
align: 'left',
name: 'shipped',
name: 'shippedDate',
cardVisible: true,
label: t('ticketList.shipped'),
columnFilter: {
@ -123,7 +123,7 @@ const columns = computed(() => [
},
{
align: 'left',
name: 'shipped',
name: 'shippedHour',
component: 'time',
columnFilter: false,
label: t('ticketList.hour'),

1
src/pages/Ticket/locale/en.yml
View File

@ -205,6 +205,7 @@ ticketList:
toLines: Go to lines
addressNickname: Address nickname
ref: Reference
hour: Hour
rounding: Rounding
noVerifiedData: No verified data
purchaseRequest: Purchase request

2
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
<template #body="{ entity }">
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
<VnLv
class="ellipsis-text"
class="ellipsis"
:label="t('globals.params.email')"
:value="entity.user?.emailUser?.email"
copy

1
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -132,6 +132,7 @@ onBeforeMount(async () => {
<VnTitle :text="t('worker.summary.userData')" />
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
<VnLv
class="ellipsis"
:label="t('globals.params.email')"
:value="worker.user?.emailUser?.email"
copy

20
src/pages/Zone/Card/ZoneSummary.vue
View File

@ -75,13 +75,13 @@ onMounted(async () => {
<template #body="{ entity: zone }">
<QCard class="vn-one">
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
<div class="card-group">
<div class="card-content">
<div class="vn-card-group">
<div class="vn-card-content">
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
</div>
<div class="card-content">
<div class="vn-card-content">
<VnLv
:label="t('summary.closeHour')"
:value="toTimeFormat(zone.hour)"
@ -98,7 +98,7 @@ onMounted(async () => {
</div>
</div>
</QCard>
<QCard class="vn-one">
<QCard class="vn-max">
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
<QTable
:columns="columns"
@ -109,15 +109,3 @@ onMounted(async () => {
</template>
</CardSummary>
</template>
<style lang="scss" scoped>
.card-group {
display: flex;
flex-direction: column;
}
.card-content {
display: flex;
flex-direction: column;
}
</style>

2
test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
View File

@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => {
cy.visit('/#/invoice-in/6/summary');
cy.selectDescriptorOption(5);
cy.dataCy('SendEmailNotifiactionDialogInput_input').type(
cy.dataCy('SendEmailNotificationDialogInput_input').type(
'{selectall}jorgito@gmail.mx',
);
cy.clickConfirm();

6
test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
View File

@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => {
});
});
it('should transfer the invoice ', () => {
it.skip('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(1)).click();
@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
cy.get(confirmSend).click();
cy.checkNotification('Notification sent');
});
@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
cy.get(confirmSend).click();
cy.checkNotification('Notification sent');
});