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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

This commit is contained in:
Jorge Penadés 2024-03-06 10:22:33 +01:00
parent c1804790a8 5c40789633
commit 110fd3b7a0
28 changed files with 338 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -35,7 +35,7 @@
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0", "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vue/test-utils": "^2.4.4", "@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
"cypress": "^12.13.0", "cypress": "^13.6.6",
"eslint": "^8.41.0", "eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0", "eslint-config-prettier": "^8.8.0",
"eslint-plugin-cypress": "^2.13.3", "eslint-plugin-cypress": "^2.13.3",

21
pnpm-lock.yaml
View File

@ -59,8 +59,8 @@ devDependencies:
specifier: ^10.4.14 specifier: ^10.4.14
version: 10.4.17(postcss@8.4.35) version: 10.4.17(postcss@8.4.35)
cypress: cypress:
specifier: ^12.13.0 specifier: ^13.6.6
version: 12.17.4 version: 13.6.6
eslint: eslint:
specifier: ^8.41.0 specifier: ^8.41.0
version: 8.56.0 version: 8.56.0
@ -124,8 +124,8 @@ packages:
resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==} resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
dev: true dev: true
/@cypress/request@2.88.12: /@cypress/request@3.0.1:
resolution: {integrity: sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==} resolution: {integrity: sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==}
engines: {node: '>= 6'} engines: {node: '>= 6'}
dependencies: dependencies:
aws-sign2: 0.7.0 aws-sign2: 0.7.0
@ -1228,10 +1228,6 @@ packages:
'@types/node': 20.11.19 '@types/node': 20.11.19
dev: false dev: false
/@types/node@16.18.82:
resolution: {integrity: sha512-pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q==}
dev: true
/@types/node@20.11.19: /@types/node@20.11.19:
resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==} resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==}
dependencies: dependencies:
@ -2248,15 +2244,14 @@ packages:
/csstype@3.1.3: /csstype@3.1.3:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
/cypress@12.17.4: /cypress@13.6.6:
resolution: {integrity: sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==} resolution: {integrity: sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==}
engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0} engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true
dependencies: dependencies:
'@cypress/request': 2.88.12 '@cypress/request': 3.0.1
'@cypress/xvfb': 1.2.4(supports-color@8.1.1) '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
'@types/node': 16.18.82
'@types/sinonjs__fake-timers': 8.1.1 '@types/sinonjs__fake-timers': 8.1.1
'@types/sizzle': 2.3.8 '@types/sizzle': 2.3.8
arch: 2.2.0 arch: 2.2.0

7
quasar.config.js
View File

@ -67,7 +67,7 @@ module.exports = configure(function (/* ctx */) {
// analyze: true, // analyze: true,
// env: {}, // env: {},
rawDefine: { rawDefine: {
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV) 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
}, },
// ignorePublicFolder: true, // ignorePublicFolder: true,
// minify: false, // minify: false,
@ -92,7 +92,7 @@ module.exports = configure(function (/* ctx */) {
vitePlugins: [ vitePlugins: [
[ [
VueI18nPlugin({ VueI18nPlugin({
runtimeOnly: false runtimeOnly: false,
}), }),
{ {
// if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false` // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false`
@ -123,9 +123,6 @@ module.exports = configure(function (/* ctx */) {
framework: { framework: {
config: { config: {
config: { config: {
brand: {
primary: 'orange',
},
dark: 'auto', dark: 'auto',
}, },
}, },

6
src/components/ui/CardDescriptor.vue
View File

@ -171,6 +171,7 @@ const emit = defineEmits(['onFetch']);
<style lang="scss"> <style lang="scss">
.body { .body {
background-color: var(--vn-gray);
.text-h5 { .text-h5 {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
@ -188,7 +189,8 @@ const emit = defineEmits(['onFetch']);
.label { .label {
color: var(--vn-label); color: var(--vn-label);
font-size: 12px; font-size: 12px;
::after {
&:not(:has(a))::after {
content: ':'; content: ':';
} }
} }
@ -223,8 +225,6 @@ const emit = defineEmits(['onFetch']);
margin-bottom: 15px; margin-bottom: 15px;
} }
.list-box { .list-box {
background-color: var(--vn-gray);
.q-item__label { .q-item__label {
color: var(--vn-label); color: var(--vn-label);
} }

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

@ -138,6 +138,20 @@ watch(props, async () => {
.header.link:hover { .header.link:hover {
color: lighten($primary, 20%); color: lighten($primary, 20%);
} }
.q-checkbox {
display: flex;
margin-bottom: 9px;
& .q-checkbox__label {
margin-left: 25px;
color: var(--vn-text);
}
& .q-checkbox__inner {
position: absolute;
left: 0;
margin-left: 5px;
color: var(--vn-label);
}
}
} }
} }

11
src/components/ui/VnLv.vue
View File

@ -1,5 +1,4 @@
<script setup> <script setup>
import { computed } from 'vue';
import { dashIfEmpty } from 'src/filters'; import { dashIfEmpty } from 'src/filters';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useClipboard } from 'src/composables/useClipboard'; import { useClipboard } from 'src/composables/useClipboard';
@ -16,7 +15,6 @@ const $props = defineProps({
}); });
const { t } = useI18n(); const { t } = useI18n();
const isBooleanValue = computed(() => typeof $props.value === 'boolean');
const { copyText } = useClipboard(); const { copyText } = useClipboard();
function copyValueText() { function copyValueText() {
@ -42,14 +40,7 @@ function copyValueText() {
</slot> </slot>
</div> </div>
<div class="value"> <div class="value">
<span v-if="isBooleanValue"> <slot name="value">
<QIcon
:name="$props.value ? `check` : `close`"
:color="$props.value ? `positive` : `negative`"
size="sm"
/>
</span>
<slot v-else name="value">
<span :title="$props.value"> <span :title="$props.value">
{{ $props.dash ? dashIfEmpty($props.value) : $props.value }} {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
</span> </span>

11
src/components/ui/VnSearchbar.vue
View File

@ -81,8 +81,9 @@ onMounted(() => {
}); });
async function search() { async function search() {
const staticParams = Object.entries(store.userParams) const staticParams = Object.entries(store.userParams).filter(
.filter(([key, value]) => value && (props.staticParams || []).includes(key)); ([key, value]) => value && (props.staticParams || []).includes(key)
);
await arrayData.applyFilter({ await arrayData.applyFilter({
params: { params: {
...Object.fromEntries(staticParams), ...Object.fromEntries(staticParams),
@ -155,11 +156,9 @@ async function search() {
.cursor-info { .cursor-info {
cursor: help; cursor: help;
} }
#searchbar {
.body--light #searchbar {
.q-field--standout.q-field--highlighted .q-field__control { .q-field--standout.q-field--highlighted .q-field__control {
background-color: $grey-7; background-color: var(--vn-text);
color: #333;
} }
} }
</style> </style>

65
src/css/app.scss
View File

@ -1,17 +1,58 @@
// app global css in SCSS form // app global css in SCSS form
@import './icons.scss'; @import './icons.scss';
body.body--light {
--fount-color: black;
--vn-sectionColor: #ffffff;
--vn-pageColor: #e0e0e0;
background-color: var(--vn-pageColor);
.q-header .q-toolbar {
color: var(--fount-color);
}
--vn-text: var(--fount-color);
--vn-gray: var(--vn-sectionColor);
--vn-label: #5f5f5f;
--vn-dark: var(--vn-sectionColor);
--vn-light-gray: #e7e3e3;
}
body.body--dark {
--vn-pageColor: #222;
--vn-SectionColor: #3c3b3b;
background-color: var(--vn-pageColor);
--vn-text: white;
--vn-gray: var(--vn-SectionColor);
--vn-label: #a8a8a8;
--vn-dark: var(--vn-SectionColor);
--vn-light-gray: #424242;
}
a { a {
text-decoration: none; text-decoration: none;
} }
.link { .link {
color: $primary; color: $color-link;
cursor: pointer; cursor: pointer;
} }
.tx-color-link {
color: $color-link !important;
}
.header-link {
color: $color-link !important;
cursor: pointer;
border-bottom: solid $primary;
border-width: 2px;
width: 100%;
.q-icon {
float: right;
}
}
.link:hover { .link:hover {
color: $orange-4; text-decoration: underline;
} }
// Removes chrome autofill background // Removes chrome autofill background
@ -24,26 +65,6 @@ select:-webkit-autofill {
background-clip: text !important; background-clip: text !important;
} }
body.body--light {
.q-header .q-toolbar {
background-color: $white;
color: #555;
}
--vn-text: #000000;
--vn-gray: #f5f5f5;
--vn-label: #5f5f5f;
--vn-dark: white;
--vn-light-gray: #e7e3e3;
}
body.body--dark {
--vn-text: #ffffff;
--vn-gray: #313131;
--vn-label: #a8a8a8;
--vn-dark: #292929;
--vn-light-gray: #424242;
}
.bg-vn-dark { .bg-vn-dark {
background-color: var(--vn-dark); background-color: var(--vn-dark);
} }

31
src/css/quasar.variables.scss
View File

@ -11,26 +11,32 @@
// It's highly recommended to change the default colors // It's highly recommended to change the default colors
// to match your app's branding. // to match your app's branding.
// Tip: Use the "Theme Builder" on Quasar's documentation website. // Tip: Use the "Theme Builder" on Quasar's documentation website.
// Tip: to add new colors https://quasar.dev/style/color-palette/#adding-your-own-colors
$primary: #ec8916; $primary: #ec8916;
$primary-light: lighten($primary, 35%); $secondary: $primary;
$secondary: #26a69a;
$accent: #9c27b0;
$white: #fff;
$positive: #21ba45; $positive: #21ba45;
$negative: #c10015; $negative: #c10015;
$info: #31ccec; $info: #31ccec;
$warning: #f2c037; $warning: #f2c037;
$vnColor: #8ebb27;
// Pendiente de cuadrar con la base de datos // Pendiente de cuadrar con la base de datos
$success: $positive; $success: $positive;
$alert: $negative; $alert: $negative;
$white: #fff;
$dark: #3c3b3b;
// custom
$color-link: #66bfff;
$color-spacer-light: #a3a3a31f;
$color-spacer: #7979794d;
$border-thin-light: 1px solid $color-spacer-light;
$primary-light: lighten($primary, 35%);
$dark-shadow-color: black;
$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
$spacing-md: 16px;
.bg-success { .bg-success {
background-color: $positive; background-color: $positive;
} }
.bg-notice { .bg-notice {
background-color: $info; background-color: $info;
} }
@ -40,12 +46,3 @@ $alert: $negative;
.bg-alert { .bg-alert {
background-color: $negative; background-color: $negative;
} }
$color-spacer-light: rgba(255, 255, 255, 0.12);
$color-spacer: rgba(255, 255, 255, 0.3);
$border-thin-light: 1px solid $color-spacer-light;
$dark-shadow-color: #000;
$dark: #292929;
$layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24);
$spacing-md: 16px;

2
src/i18n/en/index.js
View File

@ -172,6 +172,7 @@ export default {
hasDebt: 'Customer has debt', hasDebt: 'Customer has debt',
notChecked: 'Customer not checked', notChecked: 'Customer not checked',
noWebAccess: 'Web access is disabled', noWebAccess: 'Web access is disabled',
businessTypeFk: 'Business type',
}, },
summary: { summary: {
basicData: 'Basic data', basicData: 'Basic data',
@ -437,6 +438,7 @@ export default {
shipped: 'Shipped', shipped: 'Shipped',
warehouse: 'Warehouse', warehouse: 'Warehouse',
customerCard: 'Customer card', customerCard: 'Customer card',
alias: 'Alias',
}, },
boxing: { boxing: {
expedition: 'Expedition', expedition: 'Expedition',

2
src/i18n/es/index.js
View File

@ -171,6 +171,7 @@ export default {
hasDebt: 'El cliente tiene riesgo', hasDebt: 'El cliente tiene riesgo',
notChecked: 'El cliente no está comprobado', notChecked: 'El cliente no está comprobado',
noWebAccess: 'El acceso web está desactivado', noWebAccess: 'El acceso web está desactivado',
businessTypeFk: 'Tipo de negocio',
}, },
summary: { summary: {
basicData: 'Datos básicos', basicData: 'Datos básicos',
@ -436,6 +437,7 @@ export default {
shipped: 'Enviado', shipped: 'Enviado',
warehouse: 'Almacén', warehouse: 'Almacén',
customerCard: 'Ficha del cliente', customerCard: 'Ficha del cliente',
alias: 'Alias',
}, },
boxing: { boxing: {
expedition: 'Expedición', expedition: 'Expedición',

2
src/layouts/OutLayout.vue
View File

@ -40,7 +40,7 @@ const langs = ['en', 'es'];
<template> <template>
<QLayout view="hHh LpR fFf"> <QLayout view="hHh LpR fFf">
<QHeader reveal class="bg-dark"> <QHeader reveal class="bg-vn-dark">
<QToolbar class="justify-end"> <QToolbar class="justify-end">
<QBtn <QBtn
id="switchLanguage" id="switchLanguage"

32
src/pages/Claim/Card/ClaimDescriptor.vue
View File

@ -105,7 +105,6 @@ onMounted(async () => {
<ClaimDescriptorMenu :claim="entity" /> <ClaimDescriptorMenu :claim="entity" />
</template> </template>
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
<VnLv v-if="entity.claimState" :label="t('claim.card.state')"> <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
<template #value> <template #value>
<QBadge :color="stateColor(entity.claimState.code)" dense> <QBadge :color="stateColor(entity.claimState.code)" dense>
@ -113,13 +112,13 @@ onMounted(async () => {
</QBadge> </QBadge>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('claim.card.ticketId')"> <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
<VnLv :label="t('claim.card.commercial')">
<template #value> <template #value>
<span class="link"> <VnUserLink
{{ entity.ticketFk }} :name="entity.client?.salesPersonUser?.name"
:worker-id="entity.client?.salesPersonFk"
<TicketDescriptorProxy :id="entity.ticketFk" /> />
</span>
</template> </template>
</VnLv> </VnLv>
<VnLv <VnLv
@ -134,19 +133,20 @@ onMounted(async () => {
/> />
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('claim.card.commercial')"> <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
<template #value>
<VnUserLink
:name="entity.client?.salesPersonUser?.name"
:worker-id="entity.client?.salesPersonFk"
/>
</template>
</VnLv>
<VnLv <VnLv
:label="t('claim.card.province')" :label="t('claim.card.province')"
:value="entity.ticket?.address?.province?.name" :value="entity.ticket?.address?.province?.name"
/> />
<VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" /> <VnLv :label="t('claim.card.ticketId')">
<template #value>
<span class="link">
{{ entity.ticketFk }}
<TicketDescriptorProxy :id="entity.ticketFk" />
</span>
</template>
</VnLv>
<VnLv <VnLv
:label="t('claimRate')" :label="t('claimRate')"
:value="toPercentage(entity.client?.claimsRatio?.claimingRate)" :value="toPercentage(entity.client?.claimsRatio?.claimingRate)"

30
src/pages/Claim/Card/ClaimSummary.vue
View File

@ -179,9 +179,9 @@ function openDialog(dmsId) {
</template> </template>
<template #body="{ entity: { claim, salesClaimed, developments } }"> <template #body="{ entity: { claim, salesClaimed, developments } }">
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header" :href="`#/claim/${entityId}/basic-data`"> <a class="header header-link" :href="`#/claim/${entityId}/basic-data`">
{{ t('claim.pageTitles.basicData') }} {{ t('claim.pageTitles.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
:label="t('claim.summary.created')" :label="t('claim.summary.created')"
@ -220,22 +220,22 @@ function openDialog(dmsId) {
</VnLv> </VnLv>
<VnLv :label="t('claim.summary.returnOfMaterial')" :value="claim.rma" /> <VnLv :label="t('claim.summary.returnOfMaterial')" :value="claim.rma" />
<QCheckbox <QCheckbox
:align-items="right"
:label="t('claim.basicData.picked')" :label="t('claim.basicData.picked')"
v-model="claim.hasToPickUp" v-model="claim.hasToPickUp"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-three claimVnNotes full-height"> <QCard class="vn-three claimVnNotes full-height">
<a class="header" :href="`#/claim/${entityId}/notes`"> <a class="header header-link" :href="`#/claim/${entityId}/notes`">
{{ t('claim.summary.notes') }} {{ t('claim.summary.notes') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<ClaimNotes :add-note="false" style="height: 350px" order="created ASC" /> <ClaimNotes :add-note="false" style="height: 350px" order="created ASC" />
</QCard> </QCard>
<QCard class="vn-two" v-if="salesClaimed.length > 0"> <QCard class="vn-two" v-if="salesClaimed.length > 0">
<a class="header" :href="`#/claim/${entityId}/lines`"> <a class="header header-link" :href="`#/claim/${entityId}/lines`">
{{ t('claim.summary.details') }} {{ t('claim.summary.details') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable :columns="detailsColumns" :rows="salesClaimed" flat> <QTable :columns="detailsColumns" :rows="salesClaimed" flat>
<template #header="props"> <template #header="props">
@ -268,9 +268,9 @@ function openDialog(dmsId) {
</QTable> </QTable>
</QCard> </QCard>
<QCard class="vn-two" v-if="developments.length > 0"> <QCard class="vn-two" v-if="developments.length > 0">
<a class="header" :href="claimUrl + 'development'"> <a class="header header-link" :href="claimUrl + 'development'">
{{ t('claim.summary.development') }} {{ t('claim.summary.development') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable :columns="developmentColumns" :rows="developments" flat> <QTable :columns="developmentColumns" :rows="developments" flat>
<template #header="props"> <template #header="props">
@ -283,9 +283,9 @@ function openDialog(dmsId) {
</QTable> </QTable>
</QCard> </QCard>
<QCard class="vn-max" v-if="claimDms.length > 0"> <QCard class="vn-max" v-if="claimDms.length > 0">
<a class="header" :href="`#/claim/${entityId}/photos`"> <a class="header header-link" :href="`#/claim/${entityId}/photos`">
{{ t('claim.summary.photos') }} {{ t('claim.summary.photos') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<div class="container"> <div class="container">
<div <div
@ -302,7 +302,7 @@ function openDialog(dmsId) {
v-if="media.isVideo" v-if="media.isVideo"
@click.stop="openDialog(media.dmsFk)" @click.stop="openDialog(media.dmsFk)"
> >
<QTooltip>Video</QTooltip> <QTooltip>Video</QTooltip>header
</QIcon> </QIcon>
<QCard class="multimedia relative-position"> <QCard class="multimedia relative-position">
<QImg <QImg
@ -326,9 +326,9 @@ function openDialog(dmsId) {
</QCard> </QCard>
<QCard class="vn-max"> <QCard class="vn-max">
<a class="header" :href="claimUrl + 'action'"> <a class="header header-link" :href="claimUrl + 'action'">
{{ t('claim.summary.actions') }} {{ t('claim.summary.actions') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" class="link" />
</a> </a>
<div id="slider-container" class="q-px-xl q-py-md"> <div id="slider-container" class="q-px-xl q-py-md">
<QSlider <QSlider
@ -336,7 +336,7 @@ function openDialog(dmsId) {
label label
:label-value="t('claim.summary.responsibility')" :label-value="t('claim.summary.responsibility')"
label-always label-always
color="primary" color="var()"
markers markers
:marker-labels="[ :marker-labels="[
{ value: 1, label: t('claim.summary.company') }, { value: 1, label: t('claim.summary.company') },

16
src/pages/Customer/Card/CustomerDescriptor.vue
View File

@ -40,6 +40,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
data-key="customerData" data-key="customerData"
> >
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
<VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
<VnLv
:label="t('customer.card.securedCredit')"
:value="toCurrency(entity.creditInsurance)"
/>
<VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
<VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')"> <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
<template #value> <template #value>
<VnUserLink <VnUserLink
@ -48,13 +57,10 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
/> />
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
<VnLv <VnLv
:label="t('customer.card.securedCredit')" :label="t('customer.card.businessTypeFk')"
:value="toCurrency(entity.creditInsurance)" :value="entity.businessTypeFk"
/> />
<VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
<VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
</template> </template>
<template #icons="{ entity }"> <template #icons="{ entity }">
<QCardActions> <QCardActions>

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

@ -62,9 +62,9 @@ const creditWarning = computed(() => {
<CardSummary ref="summary" :url="`Clients/${entityId}/summary`"> <CardSummary ref="summary" :url="`Clients/${entityId}/summary`">
<template #body="{ entity }"> <template #body="{ entity }">
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header" :href="`#/customer/${entityId}/basic-data`"> <a class="header header-link" :href="`#/customer/${entityId}/basic-data`">
{{ t('customer.summary.basicData') }} {{ t('customer.summary.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" /> <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
<VnLv :label="t('customer.summary.name')" :value="entity.name" /> <VnLv :label="t('customer.summary.name')" :value="entity.name" />
@ -96,9 +96,12 @@ const creditWarning = computed(() => {
/> />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header" :href="`#/customer/${entityId}/fiscal-data`"> <a
class="header header-link"
:href="`#/customer/${entityId}/fiscal-data`"
>
{{ t('customer.summary.fiscalAddress') }} {{ t('customer.summary.fiscalAddress') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
:label="t('customer.summary.socialName')" :label="t('customer.summary.socialName')"
@ -121,37 +124,58 @@ const creditWarning = computed(() => {
<VnLv :label="t('customer.summary.street')" :value="entity.street" /> <VnLv :label="t('customer.summary.street')" :value="entity.street" />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header link" :href="`#/customer/${entityId}/fiscal-data`" link> <a
class="header header-link"
:href="`#/customer/${entityId}/fiscal-data`"
link
>
{{ t('customer.summary.fiscalData') }} {{ t('customer.summary.fiscalData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <QCheckbox
:label="t('customer.summary.isEqualizated')" :label="t('customer.summary.isEqualizated')"
:value="entity.isEqualizated" v-model="entity.isEqualizated"
:disable="true"
/> />
<VnLv :label="t('customer.summary.isActive')" :value="entity.isActive" /> <QCheckbox
<VnLv :label="t('customer.summary.isActive')"
v-model="entity.isActive"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.invoiceByAddress')" :label="t('customer.summary.invoiceByAddress')"
:value="entity.hasToInvoiceByAddress" v-model="entity.hasToInvoiceByAddress"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.verifiedData')" :label="t('customer.summary.verifiedData')"
:value="entity.isTaxDataChecked" v-model="entity.isTaxDataChecked"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.hasToInvoice')" :label="t('customer.summary.hasToInvoice')"
:value="entity.hasToInvoice" v-model="entity.hasToInvoice"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.notifyByEmail')" :label="t('customer.summary.notifyByEmail')"
:value="entity.isToBeMailed" v-model="entity.isToBeMailed"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.vies')"
v-model="entity.isVies"
:disable="true"
/> />
<VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header link" :href="`#/customer/${entityId}/billing-data`" link> <a
class="header header-link"
:href="`#/customer/${entityId}/billing-data`"
link
>
{{ t('customer.summary.billingData') }} {{ t('customer.summary.billingData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
:label="t('customer.summary.payMethod')" :label="t('customer.summary.payMethod')"
@ -159,20 +183,32 @@ const creditWarning = computed(() => {
/> />
<VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" /> <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
<VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" /> <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
<VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" /> <QCheckbox
<VnLv style="padding: 0"
:label="t('customer.summary.hasCoreVnl')" :label="t('customer.summary.hasLcr')"
:value="entity.hasCoreVnl" v-model="entity.hasLcr"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.hasCoreVnl')"
v-model="entity.hasCoreVnl"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.hasB2BVnl')" :label="t('customer.summary.hasB2BVnl')"
:value="entity.hasSepaVnl" v-model="entity.hasSepaVnl"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.defaultAddress"> <QCard class="vn-one" v-if="entity.defaultAddress">
<a class="header link" :href="`#/customer/${entityId}/consignees`" link> <a
class="header header-link"
:href="`#/customer/${entityId}/consignees`"
link
>
{{ t('customer.summary.consignee') }} {{ t('customer.summary.consignee') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
:label="t('customer.summary.addressName')" :label="t('customer.summary.addressName')"
@ -188,21 +224,22 @@ const creditWarning = computed(() => {
/> />
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.account"> <QCard class="vn-one" v-if="entity.account">
<a class="header link" :href="`#/customer/${entityId}/web-access`"> <a class="header header-link" :href="`#/customer/${entityId}/web-access`">
{{ t('customer.summary.webAccess') }} {{ t('customer.summary.webAccess') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
:label="t('customer.summary.username')" :label="t('customer.summary.username')"
:value="entity.account.name" :value="entity.account.name"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.webAccess')" :label="t('customer.summary.webAccess')"
:value="entity.account.active" v-model="entity.account.active"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.account"> <QCard class="vn-one" v-if="entity.account">
<div class="header"> <div class="header header-link">
{{ t('customer.summary.businessData') }} {{ t('customer.summary.businessData') }}
</div> </div>
<VnLv <VnLv
@ -230,12 +267,12 @@ const creditWarning = computed(() => {
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.account"> <QCard class="vn-one" v-if="entity.account">
<a <a
class="header link" class="header header-link"
:href="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`" :href="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
link link
> >
{{ t('customer.summary.financialData') }} {{ t('customer.summary.financialData') }}
<QIcon name="vn:grafana" color="primary" /> <QIcon name="vn:grafana" />
</a> </a>
<VnLv <VnLv
:label="t('customer.summary.risk')" :label="t('customer.summary.risk')"

4
src/pages/Department/Card/DepartmentSummary.vue
View File

@ -37,11 +37,11 @@ onMounted(async () => {
<template #body="{ entity: department }"> <template #body="{ entity: department }">
<QCard class="column"> <QCard class="column">
<a <a
class="header" class="header header-link"
:href="`#/department/department/${entityId}/basic-data`" :href="`#/department/department/${entityId}/basic-data`"
> >
{{ t('Basic data') }} {{ t('Basic data') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<div class="full-width row wrap justify-between content-between"> <div class="full-width row wrap justify-between content-between">
<div class="column" style="min-width: 50%"> <div class="column" style="min-width: 50%">

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

@ -164,15 +164,20 @@ const fetchEntryBuys = async () => {
:url="`Entries/${entityId}/getEntry`" :url="`Entries/${entityId}/getEntry`"
@on-fetch="(data) => setEntryData(data)" @on-fetch="(data) => setEntryData(data)"
> >
<template #header-left>
<a class="header-link" :href="entryUrl">
<QIcon name="open_in_new" color="white" size="sm" />
</a>
</template>
<template #header> <template #header>
<span>{{ entry.id }} - {{ entry.supplier.nickname }}</span> <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
</template> </template>
<template #body> <template #body>
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header link" :href="`#/entry/${entityId}/basic-data`"> <a class="header header-link" :href="`#/entry/${entityId}/basic-data`">
{{ t('globals.summary.basicData') }} {{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv :label="t('entry.summary.commission')" :value="entry.commission" /> <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
@ -187,23 +192,36 @@ const fetchEntryBuys = async () => {
:label="t('entry.summary.invoiceNumber')" :label="t('entry.summary.invoiceNumber')"
:value="entry.invoiceNumber" :value="entry.invoiceNumber"
/> />
<QCheckbox
<VnLv :label="t('entry.summary.ordered')" :value="entry.isOrdered" /> :label="t('entry.summary.ordered')"
v-model="entry.isOrdered"
<VnLv :label="t('entry.summary.confirmed')" :value="entry.isConfirmed" /> :disable="true"
/>
<VnLv :label="t('entry.summary.booked')" :value="entry.isBooked" /> <QCheckbox
:label="t('entry.summary.confirmed')"
<VnLv :label="t('entry.summary.raid')" :value="entry.isRaid" /> v-model="entry.isConfirmed"
:disable="true"
<VnLv />
<QCheckbox
:label="t('entry.summary.booked')"
v-model="entry.isBooked"
:disable="true"
/>
<QCheckbox
:label="t('entry.summary.raid')"
v-model="entry.isRaid"
:disable="true"
/>
<QCheckbox
:label="t('entry.summary.excludedFromAvailable')" :label="t('entry.summary.excludedFromAvailable')"
:value="entry.isExcludedFromAvailable" v-model="entry.isExcludedFromAvailable"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header"> <a class="header header-link" :href="entryUrl">
{{ t('Travel data') }} {{ t('Travel data') }}
<QIcon name="open_in_new" />
</a> </a>
<VnLv :label="t('entry.summary.travelReference')"> <VnLv :label="t('entry.summary.travelReference')">
@ -230,11 +248,11 @@ const fetchEntryBuys = async () => {
:value="entry.travel.warehouseOut.name" :value="entry.travel.warehouseOut.name"
/> />
<VnLv <QCheckbox
:label="t('entry.summary.travelDelivered')" :label="t('entry.summary.travelDelivered')"
:value="entry.travel.isDelivered" v-model="entry.isDelivered"
:disable="true"
/> />
<VnLv <VnLv
:label="t('entry.summary.travelLanded')" :label="t('entry.summary.travelLanded')"
:value="toDate(entry.travel.landed)" :value="toDate(entry.travel.landed)"
@ -245,14 +263,16 @@ const fetchEntryBuys = async () => {
:value="entry.travel.warehouseIn.name" :value="entry.travel.warehouseIn.name"
/> />
<VnLv <QCheckbox
:label="t('entry.summary.travelReceived')" :label="t('entry.summary.travelReceived')"
:value="entry.travel.isReceived" v-model="entry.isReceived"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-two" style="min-width: 100%"> <QCard class="vn-two" style="min-width: 100%">
<a class="header"> <a class="header header-link">
{{ t('entry.summary.buys') }} {{ t('entry.summary.buys') }}
<QIcon name="open_in_new" />
</a> </a>
<QTable <QTable
:rows="entryBuys" :rows="entryBuys"

31
src/pages/InvoiceIn/Card/InvoiceInSummary.vue
View File

@ -210,9 +210,9 @@ function getLink(param) {
<!--Basic Data--> <!--Basic Data-->
<QCard class="vn-one"> <QCard class="vn-one">
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">
<a class="header" :href="getLink('basic-data')"> <a class="header header-link" :href="getLink('basic-data')">
{{ t('invoiceIn.pageTitles.basicData') }} {{ t('invoiceIn.pageTitles.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
</QCardSection> </QCardSection>
<VnLv <VnLv
@ -241,9 +241,9 @@ function getLink(param) {
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">
<a class="header" :href="getLink('basic-data')"> <a class="header header-link" :href="getLink('basic-data')">
{{ t('invoiceIn.pageTitles.basicData') }} {{ t('invoiceIn.pageTitles.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
</QCardSection> </QCardSection>
<VnLv <VnLv
@ -266,9 +266,9 @@ function getLink(param) {
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">
<a class="header" :href="getLink('basic-data')"> <a class="header header-link" :href="getLink('basic-data')">
{{ t('invoiceIn.pageTitles.basicData') }} {{ t('invoiceIn.pageTitles.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
</QCardSection> </QCardSection>
<VnLv <VnLv
@ -283,14 +283,15 @@ function getLink(param) {
:label="t('invoiceIn.summary.company')" :label="t('invoiceIn.summary.company')"
:value="invoiceIn.company?.code" :value="invoiceIn.company?.code"
/> />
<VnLv <QCheckbox
:label="t('invoiceIn.summary.booked')" :label="t('invoiceIn.summary.booked')"
:value="invoiceIn.isBooked" v-model="invoiceIn.isBooked"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">
<span class="header">{{ t('Totals') }}</span> <span class="header header-link">{{ t('Totals') }}</span>
</QCardSection> </QCardSection>
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">
<VnLv <VnLv
@ -318,9 +319,9 @@ function getLink(param) {
</QCard> </QCard>
<!--Vat--> <!--Vat-->
<QCard v-if="invoiceIn.invoiceInTax.length" class="vn-two"> <QCard v-if="invoiceIn.invoiceInTax.length" class="vn-two">
<a class="header" :href="getLink('vat')"> <a class="header header-link" :href="getLink('vat')">
{{ t('invoiceIn.card.vat') }} {{ t('invoiceIn.card.vat') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable <QTable
:columns="vatColumns" :columns="vatColumns"
@ -351,9 +352,9 @@ function getLink(param) {
</QCard> </QCard>
<!--Due Day--> <!--Due Day-->
<QCard v-if="invoiceIn.invoiceInDueDay.length" class="vn-one"> <QCard v-if="invoiceIn.invoiceInDueDay.length" class="vn-one">
<a class="header" :href="getLink('due-day')"> <a class="header header-link" :href="getLink('due-day')">
{{ t('invoiceIn.card.dueDay') }} {{ t('invoiceIn.card.dueDay') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable <QTable
class="full-width" class="full-width"
@ -381,9 +382,9 @@ function getLink(param) {
</QCard> </QCard>
<!--Intrastat--> <!--Intrastat-->
<QCard v-if="invoiceIn.invoiceInIntrastat.length"> <QCard v-if="invoiceIn.invoiceInIntrastat.length">
<a class="header" :href="getLink('intrastat')"> <a class="header header-link" :href="getLink('intrastat')">
{{ t('invoiceIn.card.intrastat') }} {{ t('invoiceIn.card.intrastat') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable <QTable
:columns="intrastatColumns" :columns="intrastatColumns"

15
src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
View File

@ -101,9 +101,10 @@ const ticketsColumns = ref([
</template> </template>
<template #body="{ entity: { invoiceOut } }"> <template #body="{ entity: { invoiceOut } }">
<QCard class="vn-one"> <QCard class="vn-one">
<div class="header"> <a class="header header-link">
{{ t('invoiceOut.pageTitles.basicData') }} {{ t('invoiceOut.pageTitles.basicData') }}
</div> <QIcon name="open_in_new" />
</a>
<VnLv <VnLv
:label="t('invoiceOut.summary.issued')" :label="t('invoiceOut.summary.issued')"
:value="toDate(invoiceOut.issued)" :value="toDate(invoiceOut.issued)"
@ -126,9 +127,10 @@ const ticketsColumns = ref([
/> />
</QCard> </QCard>
<QCard class="vn-three"> <QCard class="vn-three">
<div class="header"> <a class="header header-link">
{{ t('invoiceOut.summary.taxBreakdown') }} {{ t('invoiceOut.summary.taxBreakdown') }}
</div> <QIcon name="open_in_new" />
</a>
<QTable :columns="taxColumns" :rows="invoiceOut.taxesBreakdown" flat> <QTable :columns="taxColumns" :rows="invoiceOut.taxesBreakdown" flat>
<template #header="props"> <template #header="props">
<QTr :props="props"> <QTr :props="props">
@ -140,9 +142,10 @@ const ticketsColumns = ref([
</QTable> </QTable>
</QCard> </QCard>
<QCard class="vn-three"> <QCard class="vn-three">
<div class="header"> <a class="header header-link">
{{ t('invoiceOut.summary.tickets') }} {{ t('invoiceOut.summary.tickets') }}
</div> <QIcon name="open_in_new" />
</a>
<QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat> <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
<template #header="props"> <template #header="props">
<QTr :props="props"> <QTr :props="props">

9
src/pages/Login/LoginMain.vue
View File

@ -69,12 +69,12 @@ async function onSubmit() {
<template> <template>
<QForm @submit="onSubmit" class="q-gutter-y-md q-pa-lg formCard"> <QForm @submit="onSubmit" class="q-gutter-y-md q-pa-lg formCard">
<VnLogo alt="Logo" fit="contain" :ratio="16 / 9" class="q-mb-md" /> <VnLogo alt="Logo" fit="contain" :ratio="16 / 9" class="q-mb-md" />
<VnInput <VnInput
v-model="username" v-model="username"
:label="t('login.username')" :label="t('login.username')"
lazy-rules lazy-rules
:rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]" :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
color="primary"
/> />
<VnInput <VnInput
type="password" type="password"
@ -82,9 +82,8 @@ async function onSubmit() {
:label="t('login.password')" :label="t('login.password')"
lazy-rules lazy-rules
:rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]" :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
class="red"
/> />
<QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
<div> <div>
<QBtn <QBtn
:label="t('login.submit')" :label="t('login.submit')"
@ -95,6 +94,7 @@ async function onSubmit() {
unelevated unelevated
/> />
</div> </div>
<QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
</QForm> </QForm>
</template> </template>
@ -104,6 +104,9 @@ async function onSubmit() {
min-width: 300px; min-width: 300px;
} }
.q-input {
color: $primary;
}
@media (max-width: $breakpoint-xs-max) { @media (max-width: $breakpoint-xs-max) {
.formCard { .formCard {
min-width: 100%; min-width: 100%;

2
src/pages/Login/VerifyEmail.vue
View File

@ -99,6 +99,8 @@ onMounted(async () => {
</i18n> </i18n>
<style lang="scss"> <style lang="scss">
$vnColor: #8ebb27;
.formCard { .formCard {
max-width: 1500px; max-width: 1500px;
min-width: 700px; min-width: 700px;

4
src/pages/Shelving/Card/ShelvingSummary.vue
View File

@ -71,11 +71,11 @@ const filter = {
<template #body="{ entity }"> <template #body="{ entity }">
<QCard class="vn-one"> <QCard class="vn-one">
<RouterLink <RouterLink
class="header" class="header header-link"
:to="{ name: 'ShelvingBasicData', params: { id: entityId } }" :to="{ name: 'ShelvingBasicData', params: { id: entityId } }"
> >
{{ t('shelving.pageTitles.basicData') }} {{ t('shelving.pageTitles.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</RouterLink> </RouterLink>
<VnLv :label="t('shelving.summary.code')" :value="entity.code" /> <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
<VnLv <VnLv

49
src/pages/Supplier/Card/SupplierSummary.vue
View File

@ -52,7 +52,7 @@ const isAdministrative = computed(() => {
@on-fetch="(data) => setData(data)" @on-fetch="(data) => setData(data)"
> >
<template #header-left> <template #header-left>
<a v-if="isAdministrative" class="header link" :href="supplierUrl"> <a v-if="isAdministrative" class="header header-link" :href="supplierUrl">
<QIcon name="open_in_new" color="white" size="sm" /> <QIcon name="open_in_new" color="white" size="sm" />
</a> </a>
</template> </template>
@ -64,11 +64,11 @@ const isAdministrative = computed(() => {
<QCard class="vn-one"> <QCard class="vn-one">
<a <a
v-if="isAdministrative" v-if="isAdministrative"
class="header link" class="header header-link"
:href="`#/supplier/${entityId}/basic-data`" :href="`#/supplier/${entityId}/basic-data`"
> >
{{ t('globals.summary.basicData') }} {{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<span v-else> {{ t('globals.summary.basicData') }}</span> <span v-else> {{ t('globals.summary.basicData') }}</span>
<VnLv label="Id" :value="supplier.id" /> <VnLv label="Id" :value="supplier.id" />
@ -86,36 +86,25 @@ const isAdministrative = computed(() => {
<span> {{ dashIfEmpty(supplier.note) }} </span> <span> {{ dashIfEmpty(supplier.note) }} </span>
</template> </template>
</VnLv> </VnLv>
<QCheckbox
<VnLv :label="t('supplier.summary.verified')" class="q-mb-xs"> :label="t('supplier.summary.verified')"
<template #value> v-model="supplier.isSerious"
<QCheckbox :disable="true"
v-model="supplier.isSerious" />
dense <QCheckbox
disable :label="t('supplier.summary.isActive')"
class="full-width q-mb-xs" v-model="supplier.isActive"
/> :disable="true"
</template> />
</VnLv>
<VnLv :label="t('supplier.summary.isActive')" class="q-mb-xs">
<template #value>
<QCheckbox
v-model="supplier.isActive"
dense
disable
class="full-width q-mb-xs"
/>
</template>
</VnLv>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a <a
v-if="isAdministrative" v-if="isAdministrative"
class="header link" class="header header-link"
:href="`#/supplier/${entityId}/billing-data`" :href="`#/supplier/${entityId}/billing-data`"
> >
{{ t('supplier.summary.billingData') }} {{ t('supplier.summary.billingData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<span v-else> {{ t('supplier.summary.billingData') }}</span> <span v-else> {{ t('supplier.summary.billingData') }}</span>
<VnLv <VnLv
@ -134,11 +123,11 @@ const isAdministrative = computed(() => {
<QCard class="vn-one"> <QCard class="vn-one">
<a <a
v-if="isAdministrative" v-if="isAdministrative"
class="header link" class="header header-link"
:href="`#/supplier/${entityId}/fiscal-data`" :href="`#/supplier/${entityId}/fiscal-data`"
> >
{{ t('supplier.summary.fiscalData') }} {{ t('supplier.summary.fiscalData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<span v-else> {{ t('supplier.summary.fiscalData') }}</span> <span v-else> {{ t('supplier.summary.fiscalData') }}</span>
<VnLv <VnLv
@ -169,11 +158,11 @@ const isAdministrative = computed(() => {
<QCard class="vn-one"> <QCard class="vn-one">
<a <a
v-if="isAdministrative" v-if="isAdministrative"
class="header link" class="header header-link"
:href="`#/supplier/${entityId}/fiscal-data`" :href="`#/supplier/${entityId}/fiscal-data`"
> >
{{ t('supplier.summary.fiscalAddress') }} {{ t('supplier.summary.fiscalAddress') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<span v-else> {{ t('supplier.summary.fiscalAddress') }}</span> <span v-else> {{ t('supplier.summary.fiscalAddress') }}</span>
<VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" /> <VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" />

19
src/pages/Ticket/Card/TicketDescriptor.vue
View File

@ -88,14 +88,6 @@ const setData = (entity) =>
<TicketDescriptorMenu :ticket="entity" /> <TicketDescriptorMenu :ticket="entity" />
</template> </template>
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
<template #value>
<QBadge :color="entity.ticketState.state.classColor">
{{ entity.ticketState.state.name }}
</QBadge>
</template>
</VnLv>
<VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
<VnLv :label="t('ticket.card.customerId')"> <VnLv :label="t('ticket.card.customerId')">
<template #value> <template #value>
<span class="link"> <span class="link">
@ -104,6 +96,13 @@ const setData = (entity) =>
</span> </span>
</template> </template>
</VnLv> </VnLv>
<VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
<template #value>
<QBadge :color="entity.ticketState.state.classColor">
{{ entity.ticketState.state.name }}
</QBadge>
</template>
</VnLv>
<VnLv :label="t('ticket.summary.salesPerson')"> <VnLv :label="t('ticket.summary.salesPerson')">
<template #value> <template #value>
<VnUserLink <VnUserLink
@ -112,12 +111,14 @@ const setData = (entity) =>
/> />
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" /> <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
<VnLv <VnLv
v-if="entity.agencyMode" v-if="entity.agencyMode"
:label="t('ticket.card.agency')" :label="t('ticket.card.agency')"
:value="entity.agencyMode.name" :value="entity.agencyMode.name"
/> />
<VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
<VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
</template> </template>
<template #icons="{ entity }"> <template #icons="{ entity }">
<QCardActions> <QCardActions>

12
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -149,7 +149,7 @@ async function changeState(value) {
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header link" :href="ticketUrl + 'basic-data/step-one'"> <a class="header link" :href="ticketUrl + 'basic-data/step-one'">
{{ t('globals.summary.basicData') }} {{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv :label="t('ticket.summary.state')"> <VnLv :label="t('ticket.summary.state')">
<template #value> <template #value>
@ -195,7 +195,7 @@ async function changeState(value) {
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header link" :href="ticketUrl + 'basic-data/step-one'"> <a class="header link" :href="ticketUrl + 'basic-data/step-one'">
{{ t('globals.summary.basicData') }} {{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
:label="t('ticket.summary.shipped')" :label="t('ticket.summary.shipped')"
@ -238,7 +238,7 @@ async function changeState(value) {
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header link" :href="ticketUrl + 'observation'"> <a class="header link" :href="ticketUrl + 'observation'">
{{ t('ticket.pageTitles.notes') }} {{ t('ticket.pageTitles.notes') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <VnLv
v-for="note in ticket.notes" v-for="note in ticket.notes"
@ -260,7 +260,7 @@ async function changeState(value) {
<QCard class="vn-max"> <QCard class="vn-max">
<a class="header link" :href="ticketUrl + 'sale'"> <a class="header link" :href="ticketUrl + 'sale'">
{{ t('ticket.summary.saleLines') }} {{ t('ticket.summary.saleLines') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable :rows="ticket.sales"> <QTable :rows="ticket.sales">
<template #header="props"> <template #header="props">
@ -398,7 +398,7 @@ async function changeState(value) {
> >
<a class="header link" :href="ticketUrl + 'package'"> <a class="header link" :href="ticketUrl + 'package'">
{{ t('globals.packages') }} {{ t('globals.packages') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable :rows="ticket.packagings" flat> <QTable :rows="ticket.packagings" flat>
<template #header="props"> <template #header="props">
@ -419,7 +419,7 @@ async function changeState(value) {
<a class="header link q-mt-xl" :href="ticketUrl + 'service'"> <a class="header link q-mt-xl" :href="ticketUrl + 'service'">
{{ t('ticket.summary.service') }} {{ t('ticket.summary.service') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<QTable :rows="ticket.services" flat> <QTable :rows="ticket.services" flat>
<template #header="props"> <template #header="props">

34
src/pages/Travel/Card/TravelSummary.vue
View File

@ -269,15 +269,11 @@ async function setTravelData(travelData) {
:label="t('globals.wareHouseOut')" :label="t('globals.wareHouseOut')"
:value="travel.warehouseOut?.name" :value="travel.warehouseOut?.name"
/> />
<VnLv :label="t('travel.summary.delivered')" class="q-mb-xs"> <QCheckbox
<template #value> :label="t('travel.summary.delivered')"
<QIcon v-model="travel.isDelivered"
:name="travel.isDelivered ? 'check' : 'close'" :disable="true"
:color="travel.isDelivered ? 'positive' : 'negative'" />
size="sm"
/>
</template>
</VnLv>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" /> <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
@ -285,15 +281,11 @@ async function setTravelData(travelData) {
:label="t('globals.wareHouseIn')" :label="t('globals.wareHouseIn')"
:value="travel.warehouseIn?.name" :value="travel.warehouseIn?.name"
/> />
<VnLv :label="t('travel.summary.received')" class="q-mb-xs"> <QCheckbox
<template #value> :label="t('travel.summary.received')"
<QIcon v-model="travel.isReceived"
:name="travel.isReceived ? 'check' : 'close'" :disable="true"
:color="travel.isReceived ? 'positive' : 'negative'" />
size="sm"
/>
</template>
</VnLv>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnLv :label="t('globals.agency')" :value="travel.agency?.name" /> <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
@ -302,7 +294,7 @@ async function setTravelData(travelData) {
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" /> <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
</QCard> </QCard>
<QCard class="full-width" v-if="entriesTableRows.length > 0"> <QCard class="full-width" v-if="entriesTableRows.length > 0">
<span class="header"> <span class="header header-link">
{{ t('travel.summary.entries') }} {{ t('travel.summary.entries') }}
</span> </span>
<QTable <QTable
@ -361,14 +353,14 @@ async function setTravelData(travelData) {
<QCard class="full-width" v-if="thermographs.length > 0"> <QCard class="full-width" v-if="thermographs.length > 0">
<RouterLink <RouterLink
class="header" class="header header-link"
:to="{ :to="{
name: 'TravelThermographsIndex', name: 'TravelThermographsIndex',
params: { id: travel.id }, params: { id: travel.id },
}" }"
> >
{{ t('travel.summary.thermographs') }} {{ t('travel.summary.thermographs') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</RouterLink> </RouterLink>
<QTable <QTable
:rows="thermographs" :rows="thermographs"

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

@ -71,9 +71,9 @@ const filter = {
</template> </template>
<template #body="{ entity: worker }"> <template #body="{ entity: worker }">
<QCard class="vn-one"> <QCard class="vn-one">
<a class="header" :href="workerUrl + `basic-data`"> <a class="header header-link" :href="workerUrl + `basic-data`">
{{ t('worker.summary.basicData') }} {{ t('worker.summary.basicData') }}
<QIcon name="open_in_new" color="primary" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv :label="t('worker.card.name')" :value="worker.user.nickname" /> <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
<VnLv <VnLv
@ -111,7 +111,7 @@ const filter = {
<VnLv :label="t('worker.summary.locker')" :value="worker.locker" /> <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<div class="header"> <div class="header header-link">
{{ t('worker.summary.userData') }} {{ t('worker.summary.userData') }}
</div> </div>
<VnLv :label="t('worker.summary.userId')" :value="worker.user.id" /> <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />