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

new requested changes

This commit is contained in:
William Buezas 2023-12-07 14:54:53 -03:00
parent 0dbb23075b
commit d91c6ff11f
17 changed files with 122 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,6 +421,10 @@ export default {
addressId: 'Address id', addressId: 'Address id',
streetAddress: 'Street', streetAddress: 'Street',
}, },
statusCard: {
percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}',
pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs',
},
}, },
negativeBases: { negativeBases: {
from: 'From', from: 'From',

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

@ -423,6 +423,10 @@ export default {
addressId: 'Id dirección', addressId: 'Id dirección',
streetAddress: 'Dirección fiscal', streetAddress: 'Dirección fiscal',
}, },
statusCard: {
percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}',
pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs',
},
}, },
negativeBases: { negativeBases: {
from: 'Desde', from: 'Desde',
@ -604,7 +608,7 @@ export default {
notes: 'Notas', notes: 'Notas',
verified: 'Verificado', verified: 'Verificado',
isActive: 'Está activo', isActive: 'Está activo',
billingData: 'Billing data', billingData: 'Forma de pago',
payMethod: 'Método de pago', payMethod: 'Método de pago',
payDeadline: 'Plazo de pago', payDeadline: 'Plazo de pago',
payDay: 'Día de pago', payDay: 'Día de pago',

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

@ -125,7 +125,7 @@ const statesFilter = {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />

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

@ -167,7 +167,7 @@ const states = ref();
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />

59
src/pages/InvoiceOut/InvoiceOutGlobal.vue
View File

@ -105,11 +105,20 @@ onUnmounted(() => {
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<QCard v-if="status" class="card"> <QCard v-if="status" class="card">
<QCardSection class="card-section"> <QCardSection class="card-section">
<span class="status-text">{{ t(`status.${status}`) }}</span> <span class="text">{{ t(`status.${status}`) }}</span>
<span class="text">{{ <span class="text">{{
`${getPercentage}% (${getAddressNumber} ${t('of')} ${getNAddresses})` t('invoiceOut.globalInvoices.statusCard.percentageText', {
getPercentage: getPercentage,
getAddressNumber: getAddressNumber,
getNAddresses: getNAddresses,
})
}}</span>
<span class="text">{{
t('invoiceOut.globalInvoices.statusCard.pdfsNumberText', {
nPdfs: nPdfs,
totalPdfs: totalPdfs,
})
}}</span> }}</span>
<span class="text">{{ `${nPdfs} ${t('of')} ${totalPdfs} PDFs` }}</span>
</QCardSection> </QCardSection>
</QCard> </QCard>
@ -149,7 +158,7 @@ onUnmounted(() => {
display: flex; display: flex;
justify-content: center; justify-content: center;
width: 100%; width: 100%;
background-color: #292929; background-color: var(--vn-dark);
padding: 16px; padding: 16px;
.card-section { .card-section {
@ -158,14 +167,9 @@ onUnmounted(() => {
padding: 0px; padding: 0px;
} }
.status-text {
font-size: 14px;
color: white;
}
.text { .text {
font-size: 14px; font-size: 14px;
color: #aaaaaa; color: var(--vn-text);
} }
} }
@ -176,24 +180,19 @@ onUnmounted(() => {
</style> </style>
<i18n> <i18n>
{ en:
"en": { status:
"status": { packageInvoicing: Build packaging tickets
"packageInvoicing": "Build packaging tickets", invoicing: Invoicing client
"invoicing": "Invoicing client", stopping: Stopping process
"stopping": "Stopping process", done: Ended process
"done": "Ended process" of: of
},
"of": "of" es:
}, status:
"es": { packageInvoicing: Generación de tickets de empaque
"status":{ invoicing: Facturando a cliente
"packageInvoicing": "Generación de tickets de empaque", stopping: Deteniendo proceso
"invoicing": "Facturando a cliente", done: Proceso detenido
"stopping": "Deteniendo proceso", of: de
"done": "Proceso detenido",
},
"of": "de"
}
}
</i18n> </i18n>

49
src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
View File

@ -130,7 +130,7 @@ onMounted(async () => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -159,7 +159,7 @@ onMounted(async () => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -223,28 +223,25 @@ onMounted(async () => {
</style> </style>
<i18n> <i18n>
{ en:
"en": { invoiceDate: Invoice date
"invoiceDate": "Invoice date", maxShipped: Max date
"maxShipped": "Max date", allClients: All clients
"allClients": "All clients", oneClient: One client
"oneClient": "One client", company: Company
"company": "Company", printer: Printer
"printer": "Printer", invoiceOut: Invoice out
"invoiceOut": "Invoice out", client: Client
"client": "Client", stop: Stop
"stop": "Stop"
}, es:
"es": { invoiceDate: Fecha de factura
"invoiceDate": "Fecha de factura", maxShipped: Fecha límite
"maxShipped": "Fecha límite", allClients: Todos los clientes
"allClients": "Todos los clientes", oneClient: Un solo cliente
"oneClient": "Un solo cliente", company: Empresa
"company": "Empresa", printer: Impresora
"printer": "Impresora", invoiceOut: Facturar
"invoiceOut": "Facturar", client: Cliente
"client": "Cliente", stop: Parar
"stop": "Parar"
}
}
</i18n> </i18n>

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

@ -262,7 +262,7 @@ onMounted(async () => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -293,7 +293,7 @@ onMounted(async () => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />

3
src/pages/Supplier/Card/SupplierCard.vue
View File

@ -61,6 +61,3 @@ const { t } = useI18n();
} }
} }
</style> </style>
<i18n>
</i18n>

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

@ -86,7 +86,7 @@ const isAdministrative = computed(() => {
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('verified')" class="q-mb-xs"> <VnLv :label="t('supplier.summary.verified')" class="q-mb-xs">
<template #value> <template #value>
<QCheckbox <QCheckbox
v-model="supplier.isSerious" v-model="supplier.isSerious"
@ -96,7 +96,7 @@ const isAdministrative = computed(() => {
/> />
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('isActive')" class="q-mb-xs"> <VnLv :label="t('supplier.summary.isActive')" class="q-mb-xs">
<template #value> <template #value>
<QCheckbox <QCheckbox
v-model="supplier.isActive" v-model="supplier.isActive"

6
src/pages/Supplier/SupplierCreate.vue
View File

@ -55,11 +55,7 @@ const newSupplierForm = reactive({
display: flex; display: flex;
justify-content: center; justify-content: center;
width: 100%; width: 100%;
background-color: #292929; background-color: var(--vn-dark);
padding: 40px; padding: 40px;
} }
</style> </style>
<i18n>
</i18n>

9
src/pages/Supplier/SupplierList.vue
View File

@ -103,12 +103,9 @@ const viewSummary = (id) => {
</style> </style>
<i18n> <i18n>
{ en:
"en": {
Search suppliers: Search suppliers Search suppliers: Search suppliers
},
"es": { es:
Search suppliers: Buscar proveedores Search suppliers: Buscar proveedores
}
}
</i18n> </i18n>

15
src/pages/Travel/Card/TravelCard.vue
View File

@ -1,21 +1,9 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
const stateStore = useStateStore(); const stateStore = useStateStore();
const { t } = useI18n();
</script> </script>
<template> <template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<VnSearchbar
data-key="SuppliersList"
:limit="20"
:label="t('Search suppliers')"
/>
</Teleport>
</template>
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256"> <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
<QScrollArea class="fit"> <QScrollArea class="fit">
<!-- Aca iría left menu y descriptor --> <!-- Aca iría left menu y descriptor -->
@ -61,6 +49,3 @@ const { t } = useI18n();
} }
} }
</style> </style>
<i18n>
</i18n>

43
src/pages/Travel/ExtraCommunity.vue
View File

@ -1,17 +1,22 @@
<script setup> <script setup>
import { onMounted, ref, computed } from 'vue'; import { onMounted, ref, computed } from 'vue';
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
import { QBtn, QField, QPopupEdit } from 'quasar'; import { QBtn, QField, QPopupEdit } from 'quasar';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import ExtraCommunityFilter from './ExtraCommunityFilter.vue';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
import { usePrintService } from 'composables/usePrintService'; import { usePrintService } from 'composables/usePrintService';
import travelService from 'src/services/travel.service'; import travelService from 'src/services/travel.service';
import ExtraCommunityFilter from './ExtraCommunityFilter.vue';
const router = useRouter();
const stateStore = useStateStore(); const stateStore = useStateStore();
const { t } = useI18n(); const { t } = useI18n();
const { openReport } = usePrintService(); const { openReport } = usePrintService();
@ -222,6 +227,10 @@ const saveFieldValue = async (val, field, index) => {
await travelService.updateTravel(id, params); await travelService.updateTravel(id, params);
}; };
const navigateToTravelId = (id) => {
router.push({ path: `/travel/${id}` });
};
onMounted(async () => { onMounted(async () => {
stateStore.rightDrawer = true; stateStore.rightDrawer = true;
@ -235,6 +244,15 @@ onMounted(async () => {
</script> </script>
<template> <template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<VnSearchbar
data-key="ExtraCommunity"
:limit="20"
:label="t('searchExtraCommunity')"
/>
</Teleport>
</template>
<QToolbar class="bg-vn-dark justify-end"> <QToolbar class="bg-vn-dark justify-end">
<div id="st-data"></div> <div id="st-data"></div>
<QSpace /> <QSpace />
@ -257,7 +275,11 @@ onMounted(async () => {
class="full-width q-mt-md" class="full-width q-mt-md"
> >
<template #body="props"> <template #body="props">
<QTr :props="props" class="bg-black"> <QTr
:props="props"
@click="navigateToTravelId(props.row.id)"
class="cursor-pointer"
>
<QTd v-for="col in props.cols" :key="col.name" :props="props"> <QTd v-for="col in props.cols" :key="col.name" :props="props">
<component <component
:is="tableColumnComponents[col.name].component" :is="tableColumnComponents[col.name].component"
@ -312,7 +334,12 @@ onMounted(async () => {
</component> </component>
</QTd> </QTd>
</QTr> </QTr>
<QTr v-for="entry in props.row.entries" :key="entry.id" :props="props"> <QTr
v-for="entry in props.row.entries"
:key="entry.id"
:props="props"
class="secondary-row"
>
<QTd <QTd
><QBtn flat color="blue" class="col-content">{{ entry.id }}</QBtn> ><QBtn flat color="blue" class="col-content">{{ entry.id }}</QBtn>
<!-- Cuando se cree el modulo relacionado a entries, crear su descriptor y colocarlo acá --> <!-- Cuando se cree el modulo relacionado a entries, crear su descriptor y colocarlo acá -->
@ -346,9 +373,9 @@ onMounted(async () => {
<QTd></QTd> <QTd></QTd>
<QTd></QTd> <QTd></QTd>
<QTd></QTd> <QTd></QTd>
<QTd></QTd>
</QTr> </QTr>
</template> </template>
<pre>{{ arrayData }}</pre>
</QTable> </QTable>
</QPage> </QPage>
</template> </template>
@ -358,6 +385,10 @@ onMounted(async () => {
border-radius: 4px; border-radius: 4px;
padding: 6px 6px 6px 6px; padding: 6px 6px 6px 6px;
} }
.secondary-row {
background-color: var(--vn-gray);
}
</style> </style>
<i18n> <i18n>

4
src/pages/Travel/ExtraCommunityFilter.vue
View File

@ -154,7 +154,7 @@ const decrement = (paramsObj, key) => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -187,7 +187,7 @@ const decrement = (paramsObj, key) => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />

10
src/pages/Travel/TravelCreate.vue
View File

@ -88,7 +88,7 @@ const onFetchWarehouses = (warehouses) => {
<QInput <QInput
rounded rounded
placeholder="dd-mm-aaa" placeholder="dd-mm-aaa"
:label="t('globals.landed')" :label="t('globals.shipped')"
:model-value="toDate(data.shipped)" :model-value="toDate(data.shipped)"
> >
<template #append> <template #append>
@ -102,7 +102,7 @@ const onFetchWarehouses = (warehouses) => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -131,7 +131,7 @@ const onFetchWarehouses = (warehouses) => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -177,7 +177,3 @@ const onFetchWarehouses = (warehouses) => {
grid-gap: 20px; grid-gap: 20px;
} }
</style> </style>
<i18n>
</i18n>

4
src/pages/Travel/TravelFilter.vue
View File

@ -172,7 +172,7 @@ const decrement = (paramsObj, key) => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />
@ -205,7 +205,7 @@ const decrement = (paramsObj, key) => {
<div class="row items-center justify-end"> <div class="row items-center justify-end">
<QBtn <QBtn
v-close-popup v-close-popup
label="Close" :label="t('globals.close')"
color="primary" color="primary"
flat flat
/> />

9
src/pages/Travel/TravelList.vue
View File

@ -1,16 +1,17 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n';
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import { toDate } from 'src/filters/index'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { useQuasar } from 'quasar';
import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnPaginate from 'src/components/ui/VnPaginate.vue';
import CardList from 'src/components/ui/CardList.vue'; import CardList from 'src/components/ui/CardList.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import TravelSummaryDialog from './Card/TravelSummaryDialog.vue'; import TravelSummaryDialog from './Card/TravelSummaryDialog.vue';
import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import TravelFilter from './TravelFilter.vue'; import TravelFilter from './TravelFilter.vue';
import { toDate } from 'src/filters/index';
const router = useRouter(); const router = useRouter();
const quasar = useQuasar(); const quasar = useQuasar();