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

Merge branch 'dev' into 6256-breakWord

This commit is contained in:
Carlos Satorres 2024-01-03 08:16:56 +00:00
parent 191114cf85 e711040876
commit be02a1f47a
18 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/NavBar.vue
View File

@ -24,11 +24,8 @@ const pinnedModulesRef = ref();
</script>
<template>
<QHeader class="bg-dark" color="white" elevated>
<QToolbar
class="q-py-sm q-px-md"
:class="{ 'q-gutter-x-sm': !quasar.platform.is.mobile }"
>
<QHeader color="white" elevated>
<QToolbar class="q-py-sm q-px-md">
<QBtn @click="stateStore.toggleLeftDrawer()" icon="menu" round dense flat>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}
@ -108,6 +105,9 @@ const pinnedModulesRef = ref();
.searchbar {
width: max-content;
}
.q-header {
background-color: var(--vn-dark);
}
</style>
<i18n>
en:

13
src/components/UserPanel.vue
View File

@ -81,6 +81,10 @@ function logout() {
session.destroy();
router.push('/login');
}
function copyUserToken(){
navigator.clipboard.writeText(session.getToken());
}
</script>
<template>
@ -122,7 +126,8 @@ function logout() {
<div class="text-subtitle1 q-mt-md">
<strong>{{ user.nickname }}</strong>
</div>
<div class="text-subtitle3 text-grey-7 q-mb-xs">@{{ user.name }}</div>
<div class="text-subtitle3 text-grey-7 q-mb-xs copyUserToken" @click="copyUserToken()" >@{{ user.name }}
</div>
<QBtn
id="logout"
@ -143,4 +148,10 @@ function logout() {
.panel {
width: 150px;
}
.copyUserToken {
&:hover{
cursor: alias;
}
}
</style>

4
src/components/common/VnBreadcrumbs.vue
View File

@ -69,6 +69,10 @@ function getBreadcrumb(param) {
> div {
flex-wrap: nowrap;
}
&--last,
&__separator {
color: var(--vn-label);
}
}
@media (max-width: $breakpoint-md) {
.q-breadcrumbs {

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

@ -5,7 +5,7 @@ import { dashIfEmpty } from 'src/filters';
const $props = defineProps({
label: { type: String, default: null },
value: {
type: [String, Boolean],
type: [String, Boolean, Number],
default: null,
},
info: { type: String, default: null },

2
src/composables/useUserConfig.js
View File

@ -16,7 +16,7 @@ export function useUserConfig() {
return data;
} catch (error) {
notify('globals.errors.userConfig', 'negative');
notify('errors.userConfig', 'negative');
console.error('Error fetching user config:', error);
}
}

4
src/css/app.scss
View File

@ -17,9 +17,9 @@ a {
// Removes chrome autofill background
input:-webkit-autofill,
select:-webkit-autofill {
color: $input-text-color !important;
color: var(--vn-text) ;
font-family: $typography-font-family;
-webkit-text-fill-color: $input-text-color !important;
-webkit-text-fill-color: var(--vn-text) ;
-webkit-background-clip: text !important;
background-clip: text !important;
}

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

@ -371,7 +371,7 @@ export default {
},
invoiceOut: {
pageTitles: {
invoiceOuts: 'Fact. emitidas',
invoiceOuts: 'Crear factura',
list: 'Listado',
negativeBases: 'Bases Negativas',
globalInvoicing: 'Facturación global',

50
src/pages/Claim/Card/ClaimAction.vue
View File

@ -127,11 +127,14 @@ async function updateDestination(claimDestinationFk, row, options = {}) {
}
async function regularizeClaim() {
const query = `Claims/${claimId}/regularizeClaim`;
await axios.post(query);
await axios.post(`Claims/${claimId}/regularizeClaim`);
await claimRef.value.fetch();
await arrayData.fetch({ append: false });
quasar.notify({
message: t('globals.dataSaved'),
type: 'positive',
});
if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
await claimRef.value.fetch();
quasar
.dialog({
component: VnConfirm,
@ -141,29 +144,19 @@ async function regularizeClaim() {
},
})
.onOk(async () => await onUpdateGreugeAccept());
} else {
quasar.notify({
message: t('globals.dataSaved'),
type: 'positive',
});
}
await arrayData.fetch({ append: false });
}
async function updateGreuge(greuges) {
const { data } = await axios.post(`Greuges`, greuges);
quasar.notify({
message: t('globals.dataSaved'),
type: 'positive',
});
return data;
}
async function onUpdateGreugeAccept() {
const greugeTypeFreightId = await getGreugeTypeId();
const freightPickUpPrice = await getGreugeConfig();
const greugeTypeFreightId = (
await axios.get(`GreugeTypes/findOne`, {
filter: { where: { code: 'freightPickUp' } },
})
).data.id;
const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data
.freightPickUpPrice;
await updateGreuge({
await axios.post(`Greuges`, {
clientFk: claim.value.clientFk,
description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
amount: freightPickUpPrice,
@ -176,19 +169,6 @@ async function onUpdateGreugeAccept() {
});
}
async function getGreugeTypeId() {
const params = { filter: { where: { code: 'freightPickUp' } } };
const query = `GreugeTypes/findOne`;
const { data } = await axios.get(query, { params });
return data.id;
}
async function getGreugeConfig() {
const query = `GreugeConfigs/findOne`;
const { data } = await axios.get(query);
return data.freightPickUpPrice;
}
async function save(data) {
const query = `Claims/${claimId}/updateClaimAction`;
await axios.patch(query, data);

2
src/pages/Claim/ClaimList.vue
View File

@ -84,7 +84,7 @@ function viewDescriptor(id) {
<VnPaginate
data-key="ClaimList"
url="Claims/filter"
order="id DESC"
order="claimStateFk"
auto-load
>
<template #body="{ rows }">

6
src/pages/InvoiceIn/Card/InvoiceInLog.vue Normal file
View File

@ -0,0 +1,6 @@
<script setup>
import VnLog from 'src/components/common/VnLog.vue';
</script>
<template>
<VnLog model="InvoiceIn" />
</template>

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

@ -203,7 +203,7 @@ function getLink(param) {
@on-fetch="(data) => setData(data)"
>
<template #header="{ entity: invoiceIn }">
<div>{{ invoiceIn.id }} - {{ invoiceIn.supplier.name }}</div>
<div>{{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}</div>
</template>
<template #body="{ entity: invoiceIn }">
<!--Basic Data-->
@ -216,7 +216,7 @@ function getLink(param) {
</QCardSection>
<VnLv
:label="t('invoiceIn.summary.supplier')"
:value="invoiceIn.supplier.name"
:value="invoiceIn.supplier?.name"
/>
<VnLv
:label="t('invoiceIn.summary.supplierRef')"
@ -224,7 +224,7 @@ function getLink(param) {
/>
<VnLv
:label="t('invoiceIn.summary.currency')"
:value="invoiceIn.currency.code"
:value="invoiceIn.currency?.code"
/>
<VnLv
:label="t('invoiceIn.summary.docNumber')"
@ -265,7 +265,7 @@ function getLink(param) {
</QCardSection>
<VnLv
:label="t('invoiceIn.summary.sage')"
:value="invoiceIn.sageWithholding.withholding"
:value="invoiceIn.sageWithholding?.withholding"
/>
<VnLv
:label="t('invoiceIn.summary.vat')"
@ -273,7 +273,7 @@ function getLink(param) {
/>
<VnLv
:label="t('invoiceIn.summary.company')"
:value="invoiceIn.company.code"
:value="invoiceIn.company?.code"
/>
<VnLv
:label="t('invoiceIn.summary.booked')"

55
src/pages/InvoiceIn/InvoiceInList.vue
View File

@ -84,9 +84,9 @@ function viewSummary(id) {
:key="row.id"
:title="row.supplierRef"
@click="navigate(row.id)"
:id="row.id"
>
<template #list-items>
<VnLv label="ID" :value="row.id" />
<VnLv
:label="t('invoiceIn.list.supplierRef')"
:value="row.supplierRef"
@ -112,42 +112,34 @@ function viewSummary(id) {
:label="t('invoiceIn.list.amount')"
:value="toCurrency(row.amount)"
/>
<VnLv :label="t('invoiceIn.list.isBooked')">
<template #value>
<QCheckbox
class="no-pointer-events"
v-model="row.isBooked"
size="xs"
:true-value="1"
:false-value="0"
/>
</template>
</VnLv>
<VnLv
:label="t('invoiceIn.list.isBooked')"
:value="!!row.isBooked"
/>
</template>
<template #actions>
<QBtn
flat
icon="arrow_circle_right"
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
>
<QTooltip>
{{ t('components.smartCard.openCard') }}
</QTooltip>
</QBtn>
<QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
<QTooltip>
{{ t('components.smartCard.openSummary') }}
</QTooltip>
</QBtn>
class="bg-vn-dark"
outline
type="reset"
/>
<QBtn
flat
icon="cloud_download"
:label="t('components.smartCard.openSummary')"
@click.stop="viewSummary(row.id)"
color="primary"
type="submit"
class="q-mt-sm"
/>
<QBtn
:label="t('Download')"
class="q-mt-sm"
@click.stop="downloadFile(row.dmsFk)"
>
<QTooltip>
{{ t('components.smartCard.downloadFile') }}
</QTooltip>
</QBtn>
type="submit"
color="primary"
/>
</template>
</CardList>
</template>
@ -176,4 +168,5 @@ function viewSummary(id) {
es:
Search invoice: Buscar factura emitida
You can search by invoice reference: Puedes buscar por referencia de la factura
Download: Descargar
</i18n>

30
src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
View File

@ -174,7 +174,23 @@ const columns = ref([
]);
const downloadCSV = async () => {
await invoiceOutGlobalStore.getNegativeBasesCsv(dateRange.from, dateRange.to);
const params = filter.value;
const filterParams = {
limit: 20,
where: {
and: [],
},
};
for (const param in params) {
if (params[param]) filterParams.where.and.push({ [param]: params[param] });
}
await invoiceOutGlobalStore.getNegativeBasesCsv(
dateRange.from,
dateRange.to,
JSON.stringify(filterParams)
);
};
const search = async () => {
@ -187,13 +203,13 @@ const search = async () => {
}
});
const searchFilter = {
limit: 20
}
limit: 20,
};
if (and.length) {
searchFilter.where = {
and
}
and,
};
}
const params = {
@ -230,9 +246,7 @@ const selectWorkerId = (id) => {
selectedWorkerId.value = id;
};
onMounted(async () => {
refresh();
});
onMounted(() => refresh());
</script>
<template>

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

@ -49,7 +49,7 @@ async function setData(data) {
function formattedAddress() {
if (!ticket.value) return '';
const address = this.ticket.address;
const address = ticket.value.address;
const postcode = address.postalCode;
const province = address.province ? `(${address.province.name})` : '';
@ -58,7 +58,7 @@ function formattedAddress() {
function isEditable() {
try {
return !this.ticket.ticketState.state.alertLevel;
return !ticket.value.ticketState.state.alertLevel;
} catch (e) {
console.error(e);
}
@ -67,10 +67,10 @@ function isEditable() {
}
async function changeState(value) {
if (!this.ticket.id) return;
if (!ticket.value.id) return;
const formData = {
ticketFk: this.ticket.id,
ticketFk: ticket.value.id,
code: value,
};

10
src/router/modules/invoiceIn.js
View File

@ -16,6 +16,7 @@ export default {
'InvoiceInVat',
'InvoiceInDueDay',
'InvoiceInIntrastat',
'InvoiceInLog',
],
},
children: [
@ -92,6 +93,15 @@ export default {
component: () =>
import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
},
{
name: 'InvoiceInLog',
path: 'log',
meta: {
title: 'log',
icon: 'history',
},
component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
},
],
},
],

4
src/stores/invoiceOutGlobal.js
View File

@ -219,9 +219,9 @@ export const useInvoiceOutGlobalStore = defineStore({
throw err;
},
async getNegativeBasesCsv(from, to) {
async getNegativeBasesCsv(from, to, filter = {}) {
try {
const params = { from: from, to: to };
const params = { from: from, to: to, filter };
const CSVResponse = await invoiceOutService.getNegativeBasesCsv(params);
if (CSVResponse.data && CSVResponse.data.error) throw new Error();

2
src/stores/useNavigationStore.js
View File

@ -11,13 +11,13 @@ export const useNavigationStore = defineStore('navigationStore', () => {
'claim',
'ticket',
'invoiceOut',
'invoiceIn',
'worker',
'shelving',
'wagon',
'route',
'supplier',
'travel',
'invoiceIn',
];
const pinnedModules = ref([]);
const role = useRole();

9
test/cypress/integration/invoiceIn/invoiceInList.spec.js
View File

@ -1,8 +1,8 @@
/// <reference types="cypress" />
describe('InvoiceInList', () => {
const firstCard = '.q-card:nth-child(1)';
const firstId =
'.q-card:nth-child(1) .list-items > .vn-label-value:first-child > .value > span';
const firstChipId =
':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
const firstDetailBtn = '.q-card:nth-child(1) .q-btn:nth-child(2)';
const summaryHeaders = '.summaryBody .header';
@ -12,9 +12,10 @@ describe('InvoiceInList', () => {
});
it('should redirect on clicking a invoice', () => {
cy.get(firstId)
cy.get(firstChipId)
.invoke('text')
.then((id) => {
.then((content) => {
const id = content.substring(4);
cy.get(firstCard).click();
cy.url().should('include', `/invoice-in/${id}/summary`);
});