+
@@ -19,7 +19,4 @@ const $props = defineProps({
a {
font-size: large;
}
-.titleBox {
- padding-bottom: 2%;
-}
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index d2ba21888..0e74016cd 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -5,6 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
import { useArrayData } from 'composables/useArrayData';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';
const $props = defineProps({
url: {
@@ -15,21 +16,21 @@ const $props = defineProps({
type: Object,
default: null,
},
- module: {
- type: String,
- required: true,
- },
title: {
type: String,
default: '',
},
subtitle: {
type: Number,
- default: 0,
+ default: null,
},
dataKey: {
type: String,
- default: '',
+ default: null,
+ },
+ module: {
+ type: String,
+ default: null,
},
summary: {
type: Object,
@@ -40,21 +41,27 @@ const $props = defineProps({
const state = useState();
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
-const arrayData = useArrayData($props.dataKey || $props.module, {
- url: $props.url,
- filter: $props.filter,
- skip: 0,
-});
-const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+let arrayData;
+let store;
+let entity;
const isLoading = ref(false);
-defineExpose({
- getData,
-});
+defineExpose({ getData });
+
onBeforeMount(async () => {
- await getData();
- watch($props, async () => await getData());
+ arrayData = useArrayData($props.dataKey, {
+ url: $props.url,
+ filter: $props.filter,
+ skip: 0,
+ });
+ store = arrayData.store;
+ entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+ // It enables to load data only once if the module is the same as the dataKey
+ if ($props.dataKey !== useRoute().meta.moduleName) await getData();
+ watch(
+ () => [$props.url, $props.filter],
+ async () => await getData()
+ );
});
async function getData() {
@@ -132,7 +139,7 @@ const emit = defineEmits(['onFetch']);
- {{ $props.title }}
+ {{ entity[title] ?? $props.title }}
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 57d1cb19a..ae9a43578 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -56,11 +56,20 @@ async function fetch() {
}
const showRedirectToSummaryIcon = computed(() => {
- const routeExists = route.matched.some(
- (route) => route.name === `${route.meta.moduleName}Summary`
- );
- return !isSummary.value && route.meta.moduleName && routeExists;
+ const exist = existSummary(route.matched);
+ return !isSummary.value && route.meta.moduleName && exist;
});
+
+function existSummary(routes) {
+ const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+ if (hasSummary) return hasSummary;
+ for (const current of routes) {
+ if (current.path != '/' && current.children) {
+ const exist = existSummary(current.children);
+ if (exist) return exist;
+ }
+ }
+}
diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 12bce9d4b..beaa85bfe 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -1,5 +1,7 @@
@@ -72,7 +61,7 @@ defineProps({
.inline-tag {
height: 1rem;
margin: 0.05rem;
- color: $secondary;
+ color: $color-font-secondary;
text-align: center;
font-size: smaller;
padding: 1px;
@@ -83,9 +72,8 @@ defineProps({
min-width: 4rem;
max-width: 4rem;
}
-
.empty {
- border: 1px solid $color-spacer-light;
+ border: 1px solid #2b2b2b;
}
}
diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 3ecea89c2..25491417d 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -59,12 +59,10 @@ const containerClasses = computed(() => {
// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
background-color: $primary !important;
- color: white !important;
}
.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
background-color: $primary !important;
- color: white !important;
}
.q-calendar-month__head--weekday {
@@ -112,7 +110,6 @@ const containerClasses = computed(() => {
cursor: pointer;
}
}
-
.q-calendar-month__week--days > div:nth-child(6),
.q-calendar-month__week--days > div:nth-child(7) {
// Cambia el color de los días sábado y domingo
@@ -150,7 +147,7 @@ const containerClasses = computed(() => {
.q-calendar-month__head--workweek,
.q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
text-transform: capitalize;
- color: #777;
+ color: var(---color-font-secondary);
font-weight: bold;
font-size: 0.8rem;
text-align: center;
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 38dcf97d1..e5b2f02d2 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,5 +1,5 @@
{
"
>
-
+
{{ t('Delete') }}
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index fd431043f..a378266aa 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -410,7 +410,7 @@ const lockIconType = (groupingMode, mode) => {
{{ props.row.item.subName }}
-
+
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index c33cc4383..5ae11cb40 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -345,7 +345,7 @@ const fetchEntryBuys = async () => {
{{ row.item.subName }}
-
+
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index da4190a04..79d118b96 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -707,7 +707,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
-
+
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index a963f1792..bd7d758b4 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -9,18 +9,21 @@ import { downloadFile } from 'src/composables/downloadFile';
import FormModel from 'components/FormModel.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
const quasar = useQuasar();
-const route = useRoute();
const { t } = useI18n();
const dms = ref({});
+const route = useRoute();
const editDownloadDisabled = ref(false);
-const arrayData = useArrayData('InvoiceIn');
-const invoiceIn = computed(() => arrayData.store.data);
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
const userConfig = ref(null);
+const invoiceId = computed(() => +route.params.id);
+const expenses = ref([]);
const currencies = ref([]);
const currenciesRef = ref();
const companies = ref([]);
@@ -31,14 +34,11 @@ const warehouses = ref([]);
const warehousesRef = ref();
const allowTypesRef = ref();
const allowedContentTypes = ref([]);
+const sageWithholdings = ref([]);
const inputFileRef = ref();
const editDmsRef = ref();
const createDmsRef = ref();
-const requiredFieldRule = (val) => val || t('globals.requiredField');
-const dateMask = '####-##-##';
-const fillMask = '_';
-
async function checkFileExists(dmsId) {
if (!dmsId) return;
try {
@@ -173,11 +173,17 @@ async function upsert() {
@on-fetch="(data) => (userConfig = data)"
auto-load
/>
+
+
@@ -201,7 +207,7 @@ async function upsert() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+ />
-
-
+
+
+ {{ `${scope.opt.id}: ${scope.opt.name}` }}
+
+
+
+ {{ t('Create document') }}
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
@@ -411,7 +330,7 @@ async function upsert() {
-
-
@@ -522,7 +441,7 @@ async function upsert() {
-
@@ -545,7 +464,7 @@ async function upsert() {
:options="warehouses"
option-value="id"
option-label="name"
- :rules="[requiredFieldRule]"
+ :required="true"
/>
-
import { ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useArrayData } from 'src/composables/useArrayData';
import { useCapitalize } from 'src/composables/useCapitalize';
@@ -8,12 +8,11 @@ import CrudModel from 'src/components/CrudModel.vue';
import FetchData from 'src/components/FetchData.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
-const router = useRouter();
-const route = useRoute();
+const { push, currentRoute } = useRouter();
const { t } = useI18n();
-const invoiceId = route.params.id;
-const arrayData = useArrayData('InvoiceIn');
+const invoiceId = +currentRoute.value.params.id;
+const arrayData = useArrayData(currentRoute.value.meta.moduleName);
const invoiceIn = computed(() => arrayData.store.data);
const invoiceInCorrectionRef = ref();
const filter = {
@@ -74,7 +73,7 @@ const rowsSelected = ref([]);
const requiredFieldRule = (val) => val || t('globals.requiredField');
-const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/summary`);
+const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`);
-import { ref, reactive, computed, onBeforeMount, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
+import { useRouter, onBeforeRouteLeave } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import axios from 'axios';
import { toCurrency, toDate } from 'src/filters';
import { useRole } from 'src/composables/useRole';
-import useCardDescription from 'src/composables/useCardDescription';
import { downloadFile } from 'src/composables/downloadFile';
import { useArrayData } from 'src/composables/useArrayData';
import { usePrintService } from 'composables/usePrintService';
@@ -17,27 +16,23 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
import VnConfirm from 'src/components/ui/VnConfirm.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import { useCapitalize } from 'src/composables/useCapitalize';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import InvoiceInToBook from '../InvoiceInToBook.vue';
-const $props = defineProps({
- id: {
- type: Number,
- required: false,
- default: null,
- },
-});
+const $props = defineProps({ id: { type: Number, default: null } });
+
+const { push, currentRoute } = useRouter();
-const route = useRoute();
-const router = useRouter();
const quasar = useQuasar();
const { hasAny } = useRole();
const { t } = useI18n();
const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData('InvoiceIn');
+const { store } = useArrayData(currentRoute.value.meta.moduleName);
-const invoiceIn = computed(() => arrayData.store.data);
+const invoiceIn = computed(() => store.data);
const cardDescriptorRef = ref();
const correctionDialogRef = ref();
-const entityId = computed(() => $props.id || +route.params.id);
+const entityId = computed(() => $props.id || +currentRoute.value.params.id);
const totalAmount = ref();
const currentAction = ref();
const config = ref();
@@ -45,28 +40,21 @@ const cplusRectificationTypes = ref([]);
const siiTypeInvoiceOuts = ref([]);
const invoiceCorrectionTypes = ref([]);
const actions = {
- book: {
- title: 'Are you sure you want to book this invoice?',
- cb: checkToBook,
- action: toBook,
+ unbook: {
+ title: t('assertAction', { action: t('unbook') }),
+ action: toUnbook,
},
delete: {
- title: 'Are you sure you want to delete this invoice?',
+ title: t('assertAction', { action: t('delete') }),
action: deleteInvoice,
},
clone: {
- title: 'Are you sure you want to clone this invoice?',
+ title: t('assertAction', { action: t('clone') }),
action: cloneInvoice,
},
- showPdf: {
- cb: showPdfInvoice,
- },
- sendPdf: {
- cb: sendPdfInvoiceConfirmation,
- },
- correct: {
- cb: () => correctionDialogRef.value.show(),
- },
+ showPdf: { cb: showPdfInvoice },
+ sendPdf: { cb: sendPdfInvoiceConfirmation },
+ correct: { cb: () => correctionDialogRef.value.show() },
};
const filter = {
include: [
@@ -94,11 +82,7 @@ const filter = {
},
],
};
-const data = ref(useCardDescription());
-const invoiceInCorrection = reactive({
- correcting: [],
- corrected: null,
-});
+const invoiceInCorrection = reactive({ correcting: [], corrected: null });
const routes = reactive({
getSupplier: (id) => {
return { name: 'SupplierCard', params: { id } };
@@ -139,16 +123,17 @@ const correctionFormData = reactive({
});
const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
-onBeforeMount(async () => await setInvoiceCorrection(entityId.value));
+onBeforeMount(async () => {
+ await setInvoiceCorrection(entityId.value);
+ const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
+ totalAmount.value = data.totalDueDay;
+});
-watch(
- () => route.params.id,
- async (newId) => {
- invoiceInCorrection.correcting.length = 0;
- invoiceInCorrection.corrected = null;
- if (newId) await setInvoiceCorrection(entityId.value);
- }
-);
+onBeforeRouteLeave(async (to, from) => {
+ invoiceInCorrection.correcting.length = 0;
+ invoiceInCorrection.corrected = null;
+ if (to.params.id !== from.params.id) await setInvoiceCorrection(entityId.value);
+});
async function setInvoiceCorrection(id) {
const [{ data: correctingData }, { data: correctedData }] = await Promise.all([
@@ -179,17 +164,6 @@ async function setInvoiceCorrection(id) {
);
}
-async function setData(entity) {
- data.value = useCardDescription(entity.supplierRef, entity.id);
- const { totalDueDay } = await getTotals();
- totalAmount.value = totalDueDay;
-}
-
-async function getTotals() {
- const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
- return data;
-}
-
function openDialog() {
quasar.dialog({
component: VnConfirm,
@@ -200,38 +174,17 @@ function openDialog() {
});
}
-async function checkToBook() {
- let directBooking = true;
+async function toUnbook() {
+ const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+ const { isLinked, bookEntry, accountingEntries } = data;
- const totals = await getTotals();
- const taxableBaseNotEqualDueDay = totals.totalDueDay != totals.totalTaxableBase;
- const vatNotEqualDueDay = totals.totalDueDay != totals.totalVat;
+ const type = isLinked ? 'warning' : 'positive';
+ const message = isLinked
+ ? t('isLinked', { bookEntry, accountingEntries })
+ : t('isNotLinked', { bookEntry });
- if (taxableBaseNotEqualDueDay && vatNotEqualDueDay) directBooking = false;
-
- const { data: dueDaysCount } = await axios.get('InvoiceInDueDays/count', {
- where: {
- invoiceInFk: entityId.value,
- dueDated: { gte: Date.vnNew() },
- },
- });
-
- if (dueDaysCount) directBooking = false;
-
- if (!directBooking) openDialog();
- else toBook();
-}
-
-async function toBook() {
- await axios.post(`InvoiceIns/${entityId.value}/toBook`);
-
- quasar.notify({
- type: 'positive',
- message: t('globals.dataSaved'),
- });
-
- await cardDescriptorRef.value.getData();
- setTimeout(() => location.reload(), 500);
+ quasar.notify({ type, message });
+ if (!isLinked) store.data.isBooked = false;
}
async function deleteInvoice() {
@@ -240,7 +193,7 @@ async function deleteInvoice() {
type: 'positive',
message: t('Invoice deleted'),
});
- router.push({ path: '/invoice-in' });
+ push({ path: '/invoice-in' });
}
async function cloneInvoice() {
@@ -249,11 +202,9 @@ async function cloneInvoice() {
type: 'positive',
message: t('Invoice cloned'),
});
- router.push({ path: `/invoice-in/${data.id}/summary` });
+ push({ path: `/invoice-in/${data.id}/summary` });
}
-const requiredFieldRule = (val) => val || t('globals.requiredField');
-
const isAdministrative = () => hasAny(['administrative']);
const isAgricultural = () =>
@@ -299,10 +250,9 @@ const createInvoiceInCorrection = async () => {
'InvoiceIns/corrective',
Object.assign(correctionFormData, { id: entityId.value })
);
- router.push({ path: `/invoice-in/${correctingId}/summary` });
+ push({ path: `/invoice-in/${correctingId}/summary` });
};
-
{
+
+
+
+ {{ t('To book') }}
+
+
+
- {{ t('To book') }}
+
+ {{ t('To unbook') }}
+
{
>
{{ t('components.smartCard.downloadFile') }}
-
- {{ t('components.smartCard.downloadFile') }}
-
-
+
+
+
+ {{ entity?.supplier?.nickname }}
+
+
+
+
-
+
{
:options="siiTypeInvoiceOuts"
option-value="id"
option-label="code"
- :rules="[requiredFieldRule]"
+ :required="true"
/>
@@ -496,7 +457,7 @@ const createInvoiceInCorrection = async () => {
:options="cplusRectificationTypes"
option-value="id"
option-label="description"
- :rules="[requiredFieldRule]"
+ :required="true"
/>
{
:options="invoiceCorrectionTypes"
option-value="id"
option-label="description"
- :rules="[requiredFieldRule]"
+ :required="true"
/>
@@ -544,11 +505,18 @@ const createInvoiceInCorrection = async () => {
}
+en:
+ isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
+ isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information
+ assertAction: Are you sure you want to {action} this invoice?
es:
+ book: asentar
+ unbook: desasentar
+ delete: eliminar
+ clone: clonar
To book: Contabilizar
- Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+ To unbook: Descontabilizar
Delete invoice: Eliminar factura
- Are you sure you want to delete this invoice?: Estas seguro de querer eliminar esta factura?
Invoice deleted: Factura eliminada
Clone invoice: Clonar factura
Invoice cloned: Factura clonada
@@ -560,4 +528,7 @@ es:
Rectificative invoice: Factura rectificativa
Original invoice: Factura origen
Entry: entrada
+ isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
+ isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración
+ assertAction: Estas seguro de querer {action} esta factura?
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 0e68b740f..de59b142e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -9,24 +9,21 @@ import CrudModel from 'src/components/CrudModel.vue';
import FetchData from 'src/components/FetchData.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnCurrency from 'src/components/common/VnCurrency.vue';
+import { toCurrency } from 'src/filters';
const route = useRoute();
const { t } = useI18n();
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData(route.meta.moduleName);
const invoiceIn = computed(() => arrayData.store.data);
const rowsSelected = ref([]);
const banks = ref([]);
const invoiceInFormRef = ref();
-const invoiceId = route.params.id;
+const invoiceId = +route.params.id;
const placeholder = 'yyyy/mm/dd';
-const filter = {
- where: {
- invoiceInFk: invoiceId,
- },
-};
+const filter = { where: { invoiceInFk: invoiceId } };
const columns = computed(() => [
{
@@ -73,6 +70,7 @@ async function insert() {
await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
await invoiceInFormRef.value.reload();
}
+const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount, 0);
+
+
+
+
+
+
+ {{
+ toCurrency(getTotalAmount(rows), invoiceIn.currency.code)
+ }}
+
+
+
+
@@ -294,7 +305,11 @@ async function insert() {
-
+
es:
Date: Fecha
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 6bdc1c0b5..1d1205d9e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -6,26 +6,21 @@ import { toCurrency } from 'src/filters';
import CrudModel from 'src/components/CrudModel.vue';
import FetchData from 'src/components/FetchData.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
const { t } = useI18n();
-const route = useRoute();
+const route = useRoute();
+const currency = computed(
+ () => useArrayData(route.meta.moduleName).store.data?.currency?.code
+);
const invoceInIntrastat = ref([]);
-const amountTotal = computed(() => getTotal('amount'));
-const netTotal = computed(() => getTotal('net'));
-const stemsTotal = computed(() => getTotal('stems'));
const rowsSelected = ref([]);
const countries = ref([]);
const intrastats = ref([]);
const invoiceInFormRef = ref();
-
-const filter = {
- where: {
- invoiceInFk: route.params.id,
- },
-};
-
+const invoiceInId = computed(() => +route.params.id);
+const filter = { where: { invoiceInFk: invoiceInId.value } };
const columns = computed(() => [
{
name: 'code',
@@ -77,13 +72,8 @@ const columns = computed(() => [
},
]);
-function getTotal(type) {
- if (!invoceInIntrastat.value.length) return 0.0;
- return invoceInIntrastat.value.reduce(
- (total, intrastat) => total + intrastat[type],
- 0.0
- );
-}
+const getTotal = (data, key) =>
+ data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ toCurrency(getTotal(rows, 'amount'), currency) }}
+
+
+ {{ getTotal(rows, 'net') }}
+
+
+ {{ getTotal(rows, 'stems') }}
+
+
+
+
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d1f48416d..3ee90b5c2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -3,32 +3,24 @@ import { onMounted, ref, computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { toCurrency, toDate } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
import { getUrl } from 'src/composables/getUrl';
import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import InvoiceIntoBook from '../InvoiceInToBook.vue';
import VnTitle from 'src/components/common/VnTitle.vue';
-onMounted(async () => {
- salixUrl.value = await getUrl('');
- invoiceInUrl.value = salixUrl.value + `invoiceIn/${entityId.value}/`;
-});
-
-const route = useRoute();
+const props = defineProps({ id: { type: [Number, String], default: 0 } });
const { t } = useI18n();
+const route = useRoute();
-const $props = defineProps({
- id: {
- type: Number,
- default: 0,
- },
-});
-
-const entityId = computed(() => $props.id || route.params.id);
-
-const salixUrl = ref();
+const entityId = computed(() => props.id || +route.params.id);
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const currency = computed(() => invoiceIn.value?.currency?.code);
const invoiceInUrl = ref();
const amountsNotMatch = ref(null);
-const intrastatTotals = ref({});
+const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
const vatColumns = ref([
{
@@ -42,14 +34,16 @@ const vatColumns = ref([
name: 'landed',
label: 'invoiceIn.summary.taxableBase',
field: (row) => row.taxableBase,
- format: (value) => toCurrency(value),
+ format: (value) => toCurrency(value, currency.value),
sortable: true,
align: 'left',
},
{
name: 'vat',
label: 'invoiceIn.summary.sageVat',
- field: (row) => row.taxTypeSage?.vat,
+ field: (row) => {
+ if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
+ },
format: (value) => value,
sortable: true,
align: 'left',
@@ -57,7 +51,10 @@ const vatColumns = ref([
{
name: 'transaction',
label: 'invoiceIn.summary.sageTransaction',
- field: (row) => row.transactionTypeSage?.transaction,
+ field: (row) => {
+ if (row.transactionTypeSage)
+ return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
+ },
format: (value) => value,
sortable: true,
align: 'left',
@@ -66,9 +63,9 @@ const vatColumns = ref([
name: 'rate',
label: 'invoiceIn.summary.rate',
field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
- format: (value) => toCurrency(value),
+ format: (value) => toCurrency(value, currency.value),
sortable: true,
- align: 'left',
+ align: 'center',
},
{
name: 'currency',
@@ -99,7 +96,7 @@ const dueDayColumns = ref([
name: 'amount',
label: 'invoiceIn.summary.amount',
field: (row) => row.amount,
- format: (value) => toCurrency(value),
+ format: (value) => toCurrency(value, currency.value),
sortable: true,
align: 'left',
},
@@ -122,13 +119,15 @@ const intrastatColumns = ref([
},
sortable: true,
align: 'left',
+ style: 'width: 10px',
},
{
name: 'amount',
label: 'invoiceIn.summary.amount',
- field: (row) => toCurrency(row.amount),
+ field: (row) => toCurrency(row.amount, currency.value),
sortable: true,
align: 'left',
+ style: 'width: 10px',
},
{
name: 'net',
@@ -155,58 +154,55 @@ const intrastatColumns = ref([
},
]);
-function getAmountNotMatch(totals) {
- return (
+onMounted(async () => {
+ invoiceInUrl.value = `${await getUrl('')}invoiceIn/${entityId.value}/`;
+});
+
+const init = (data) => {
+ if (!data) return;
+
+ const { totals, invoiceInIntrastat } = data;
+ amountsNotMatch.value =
totals.totalDueDay != totals.totalTaxableBase &&
- totals.totalDueDay != totals.totalVat
- );
-}
+ totals.totalDueDay != totals.totalVat;
-function getIntrastatTotals(intrastat) {
- const totals = {
- amount: intrastat.reduce((acc, cur) => acc + cur.amount, 0),
- net: intrastat.reduce((acc, cur) => acc + cur.net, 0),
- stems: intrastat.reduce((acc, cur) => acc + cur.stems, 0),
- };
+ invoiceInIntrastat.forEach((val) => {
+ intrastatTotals.value.amount += val.amount;
+ intrastatTotals.value.net += val.net;
+ intrastatTotals.value.stems += val.stems;
+ });
+};
- return totals;
-}
+const taxRate = (taxableBase = 0, rate = 0) => (rate / 100) * taxableBase;
-function getTaxTotal(tax) {
- return tax.reduce(
- (acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate),
- 0
- );
-}
+const getTotalTax = (tax) =>
+ tax.reduce((acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate), 0);
-function setData(entity) {
- if (!entity) return false;
-
- amountsNotMatch.value = getAmountNotMatch(entity.totals);
-
- if (entity.invoiceInIntrastat.length)
- intrastatTotals.value = { ...getIntrastatTotals(entity.invoiceInIntrastat) };
-}
-
-function taxRate(taxableBase = 0, rate = 0) {
- return (rate / 100) * taxableBase;
-}
-
-function getLink(param) {
- return `#/invoice-in/${entityId.value}/${param}`;
-}
+const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
- {{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}
+
+ {{ entity.id }} - {{ entity.supplier?.name }}
-
+
+
+
+
+
+
+
+
@@ -217,19 +213,26 @@ function getLink(param) {
+ :value="entity.supplier?.name"
+ >
+
+
+ {{ entity.supplier?.name }}
+
+
+
+
@@ -242,19 +245,19 @@ function getLink(param) {
@@ -266,21 +269,19 @@ function getLink(param) {
-
@@ -291,58 +292,62 @@ function getLink(param) {
/>
-
-
-
-
-
-
- {{ toCurrency(invoiceIn.totals.totalDueDay) }}
-
-
-
-
+
+
+
+
+
+ {{ toCurrency(entity.totals.totalDueDay, currency) }}
+
+
+
-
+
-
-
-
+
+
+
{{ t(col.label) }}
-
- {{ toCurrency(invoiceIn.totals.totalTaxableBase) }}
-
{{
- toCurrency(getTaxTotal(invoiceIn.invoiceInTax))
+ toCurrency(entity.totals.totalTaxableBase, currency)
+ }}
+
+
+ {{
+ toCurrency(getTotalTax(entity.invoiceInTax, currency))
}}
@@ -350,17 +355,17 @@ function getLink(param) {
-
+
-
-
-
-
+
+
+
+
{{ t(col.label) }}
@@ -369,26 +374,32 @@ function getLink(param) {
- {{ toCurrency(invoiceIn.totals.totalDueDay) }}
+
+ {{ toCurrency(entity.totals.totalDueDay, currency) }}
+
-
+
-
-
-
+
+
+
{{ t(col.label) }}
@@ -396,7 +407,7 @@ function getLink(param) {
- {{ toCurrency(intrastatTotals.amount) }}
+ {{ toCurrency(intrastatTotals.amount, currency) }}
{{ intrastatTotals.net }}
{{ intrastatTotals.stems }}
@@ -411,13 +422,28 @@ function getLink(param) {
.bg {
background-color: var(--vn-accent-color);
}
-.bordered {
- border: 1px solid var(--vn-text-color);
- max-width: 18em;
+@media (min-width: $breakpoint-md) {
+ .summaryBody {
+ .vat {
+ flex: 65%;
+ }
+
+ .due-day {
+ flex: 30%;
+ }
+ .vat,
+ .due-day {
+ .q-table th {
+ padding-right: 0;
+ }
+ }
+ }
}
es:
Search invoice: Buscar factura recibida
You can search by invoice reference: Puedes buscar por referencia de la factura
+ Totals: Totales
+ To book: Contabilizar
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index ae3aa9349..6fc844eff 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -11,13 +11,14 @@ import VnSelect from 'src/components/common/VnSelect.vue';
import CrudModel from 'src/components/CrudModel.vue';
import VnCurrency from 'src/components/common/VnCurrency.vue';
-const route = useRoute();
+const router = useRoute();
const { t } = useI18n();
const quasar = useQuasar();
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData(router.meta.moduleName);
const invoiceIn = computed(() => arrayData.store.data);
-
+const invoiceId = +router.params.id;
+const currency = computed(() => invoiceIn.value?.currency?.code);
const expenses = ref([]);
const sageTaxTypes = ref([]);
const sageTransactionTypes = ref([]);
@@ -55,7 +56,7 @@ const columns = computed(() => [
{
name: 'taxablebase',
label: t('Taxable base'),
- field: (row) => toCurrency(row.taxableBase),
+ field: (row) => toCurrency(row.taxableBase, currency.value),
model: 'taxableBase',
sortable: true,
tabIndex: 2,
@@ -68,7 +69,7 @@ const columns = computed(() => [
options: sageTaxTypes.value,
model: 'taxTypeSageFk',
optionValue: 'id',
- optionLabel: 'vat',
+ optionLabel: 'id',
sortable: true,
tabindex: 3,
align: 'left',
@@ -80,7 +81,7 @@ const columns = computed(() => [
options: sageTransactionTypes.value,
model: 'transactionTypeSageFk',
optionValue: 'id',
- optionLabel: 'transaction',
+ optionLabel: 'id',
sortable: true,
tabIndex: 4,
align: 'left',
@@ -90,7 +91,7 @@ const columns = computed(() => [
label: t('Rate'),
sortable: true,
tabIndex: 5,
- field: (row) => toCurrency(taxRate(row, row.taxTypeSageFk)),
+ field: (row) => toCurrency(taxRate(row, row.taxTypeSageFk), currency.value),
align: 'left',
},
{
@@ -114,7 +115,7 @@ const filter = {
'transactionTypeSageFk',
],
where: {
- invoiceInFk: route.params.id,
+ invoiceInFk: invoiceId,
},
};
@@ -161,6 +162,9 @@ async function addExpense() {
});
}
}
+const getTotalTaxableBase = (rows) =>
+ rows.reduce((acc, { taxableBase }) => acc + +taxableBase, 0);
+const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0);
@@ -303,6 +308,19 @@ async function addExpense() {
/>
+
+
+
+
+
+ {{ toCurrency(getTotalTaxableBase(rows), currency) }}
+
+
+
+ {{ toCurrency(getTotalRate(rows), currency) }}
+
+
+
@@ -391,7 +409,7 @@ async function addExpense() {
- {{ toCurrency(taxRate(props.row)) }}
+ {{ toCurrency(taxRate(props.row), currency) }}
en:
newRoute: New Route
+ hourStarted: Started hour
+ hourFinished: Finished hour
es:
ID: ID
Worker: Trabajador
diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue
index 66ce78f23..bbf19068e 100644
--- a/src/pages/Route/RouteMain.vue
+++ b/src/pages/Route/RouteMain.vue
@@ -1,8 +1,10 @@
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index eb2035011..0efcd6e0c 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -222,11 +222,6 @@ const openSmsDialog = async () => {
-
-
-
-
-
{
{{ buy.subName }}
-
+
{{ dashIfEmpty(buy.quantity) }}
{{ dashIfEmpty(buy.price) }}
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index fc806f588..b8479d8f6 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -183,7 +183,7 @@ const getEntryQueryParams = (supplier) => {
{{ t('Go to client') }}
-
+
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -165,4 +194,13 @@ es:
Education level: Nivel educación
SSN: NSS
Locker: Taquilla
+ fiDueDate: Fecha de caducidad del DNI
+ seniority: Antigüedad
+ hasMachineryAuthorized: Autorizado para llevar maquinaria
+ isFreelance: Autónomo
+ isDisable: Trabajador desactivado
+ fi: DNI/NIE/NIF
+ sex: Sexo
+ birth: Fecha de Nacimiento
+ isSsDiscounted: Bonificación SS
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 2e525aa30..ea6e62683 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -82,6 +82,7 @@ const onFetchAbsences = (data) => {
type: type.code,
absenceId: absence.id,
isFestive: false,
+ isHoliday: false,
});
});
}
@@ -170,23 +171,6 @@ watch([year, businessFk], () => refreshData());
ref="WorkerFreelanceRef"
auto-load
/>
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
{
}
const date = new Date(year, month - 1, day);
- if (!event.absenceId) createEvent(date);
+ if (!event?.absenceId) createEvent(date);
else if (event.type == props.absenceType.code) deleteEvent(event, date);
else editEvent(event);
};
@@ -136,24 +136,31 @@ const getEventByTimestamp = ({ year, month, day }) => {
return props.events[stamp] || null;
};
+const isFestive = (timestamp) => {
+ const event = getEventByTimestamp(timestamp);
+ if (!event) return false;
+
+ const { isFestive } = event;
+ return isFestive;
+};
const getEventAttrs = (timestamp) => {
const event = getEventByTimestamp(timestamp);
if (!event) return {};
- const { name, color, isFestive } = event;
+ const { name, color, isFestive, type } = event;
// Atributos a asignar a cada slot que representa un evento en el calendario
const attrs = {
title: name,
- style: color ? `background-color: ${color};` : '',
+ style: color ? `background-color: ${color};` : ``,
label: timestamp.day,
};
if (isFestive) {
attrs.class = '--festive';
- attrs.label = event.absenceId ? timestamp.day : '';
- }
+ attrs.label = event.absenceId ?? timestamp.day;
+ } else attrs.class = `--${type}`;
return attrs;
};
@@ -162,7 +169,6 @@ const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
-
onBeforeMount(() => {
updateSelectedDate(_year.value);
});
@@ -203,7 +209,6 @@ watch(_year, (newValue) => {
+.q-calendar-month__day:has(.q-calendar-month__day--content):has(.q-btn.--festive)
+ .q-calendar-month__day--label__wrapper
+ button {
+ color: transparent;
+}
.calendar-event {
display: flex;
justify-content: center;
@@ -231,14 +241,19 @@ watch(_year, (newValue) => {
font-size: 13px;
line-height: 1.715em;
cursor: pointer;
- color: white;
&.--today {
border: 2px solid $info;
}
&.--festive {
- border: 2px solid $negative;
+ color: $negative;
+ }
+
+ &.--holiday {
+ & > span:nth-child(2) .block {
+ color: white;
+ }
}
&:hover {
diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index 171074b20..f19fc8ae6 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -27,7 +27,7 @@ const save = async (data) => {
const lockerId = data.id ?? originaLockerId.value;
const workerFk = lockerId == originaLockerId.value ? null : entityId.value;
- await axios.patch(`Lockers/${lockerId}`, { workerFk });
+ return axios.patch(`Lockers/${lockerId}`, { workerFk });
};
const init = async (data) => {
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 5e7c89326..513edcf45 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -1,140 +1,187 @@
-
-
-
-
+
+
-
-
+
-
-
- {{ currentPDA.description }}
-
-
-
-
+
+
+
+
+
{{ t('worker.pda.removePDA') }}
-
-
-
-
-
-
-
-
- ID: {{ scope.opt?.id }}
-
- {{ scope.opt?.modelFk }},
- {{ scope.opt?.serialNumber }}
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ ID: {{ scope.opt?.id }}
+
+ {{ scope.opt?.modelFk }},
+ {{ scope.opt?.serialNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('globals.new') }}
+
+
-
+
es:
+ Model: Modelo
+ Serial number: Número de serie
+ Current SIM: SIM actual
+ Add new device: Añadir nuevo dispositivo
PDA deallocated: PDA desasignada
+ Remove PDA: Eliminar PDA
+ Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+ You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+ This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 5b25fe335..6d6dde97b 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -2,7 +2,7 @@
import { ref, onMounted, computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
import { getUrl } from 'src/composables/getUrl';
import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@@ -73,7 +73,7 @@ const filter = {
@@ -111,6 +111,47 @@ const filter = {
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d0b91e3a7..d9a650d9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -489,23 +489,6 @@ onMounted(async () => {
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
diff --git a/src/components/CreateDepartmentChild.vue b/src/pages/Worker/CreateDepartmentChild.vue
similarity index 100%
rename from src/components/CreateDepartmentChild.vue
rename to src/pages/Worker/CreateDepartmentChild.vue
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
index 3c0e5fdd0..fe4c23051 100644
--- a/src/pages/Worker/WorkerDepartment.vue
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -1,10 +1,10 @@
-
+
diff --git a/src/components/ui/VnTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
similarity index 99%
rename from src/components/ui/VnTree.vue
rename to src/pages/Worker/WorkerDepartmentTree.vue
index 928d045e9..34340b019 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState';
import { useQuasar } from 'quasar';
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import CreateDepartmentChild from '../CreateDepartmentChild.vue';
+import CreateDepartmentChild from './CreateDepartmentChild.vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import { useRouter } from 'vue-router';
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 6451fe00c..1abbb78bf 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -5,38 +5,29 @@ import { computed } from 'vue';
import VnCard from 'components/common/VnCard.vue';
import ZoneDescriptor from './ZoneDescriptor.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
const { t } = useI18n();
-const stateStore = useStateStore();
const route = useRoute();
const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+ if (routeName.value === 'ZoneLocations') return null;
+ return routeName.value;
+});
const searchBarDataKeys = {
ZoneWarehouses: 'ZoneWarehouses',
ZoneSummary: 'ZoneSummary',
+ ZoneLocations: 'ZoneLocations',
};
-
-
-
-
-
diff --git a/src/pages/Zone/Card/ZoneLocations.vue b/src/pages/Zone/Card/ZoneLocations.vue
index e4305c898..76a216215 100644
--- a/src/pages/Zone/Card/ZoneLocations.vue
+++ b/src/pages/Zone/Card/ZoneLocations.vue
@@ -1 +1,80 @@
-Zone Locations
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
new file mode 100644
index 000000000..a42111592
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+ {{ node.name }}
+
+
+
+
+
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 5a7d07d71..0955dcd08 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -6,8 +6,6 @@ import { toCurrency } from 'src/filters';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { toTimeFormat } from 'src/filters/date';
@@ -71,35 +69,6 @@ const columns = computed(() => [
},
]);
-const exprBuilder = (param, value) => {
- switch (param) {
- case 'name':
- return {
- name: { like: `%${value}%` },
- };
- case 'code':
- return {
- code: { like: `%${value}%` },
- };
- case 'agencyModeFk':
- return {
- agencyModeFk: value,
- };
- case 'search':
- if (value) {
- if (!isNaN(value)) {
- return { id: value };
- } else {
- return {
- name: {
- like: `%${value}%`,
- },
- };
- }
- }
- }
-};
-
async function clone(id) {
const { data } = await axios.post(`Zones/${id}/clone`);
notify(t('globals.dataSaved'), 'positive');
@@ -116,25 +85,6 @@ onMounted(() => (stateStore.rightDrawer = true));
-
-
-
-
-
-
-
-
-
-
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
import { useStateStore } from 'stores/useStateStore';
import LeftMenu from 'src/components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
+const { t } = useI18n();
const stateStore = useStateStore();
+const route = useRoute();
+
+const exprBuilder = (param, value) => {
+ switch (param) {
+ case 'name':
+ return {
+ name: { like: `%${value}%` },
+ };
+ case 'code':
+ return {
+ code: { like: `%${value}%` },
+ };
+ case 'agencyModeFk':
+ return {
+ agencyModeFk: value,
+ };
+ case 'search':
+ if (value) {
+ if (!isNaN(value)) {
+ return { id: value };
+ } else {
+ return {
+ name: {
+ like: `%${value}%`,
+ },
+ };
+ }
+ }
+ }
+};
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index d405c95f6..be7b12534 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -1,53 +1,85 @@
-
-
-
-
-
+
-
- {{ t(`${getWeekDay(/*detail.shipped*/)}`) }} -
- {{ t /*'detail.shipped'*/() }}
-
-
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index dd79f6ac4..a1d741b84 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -5,7 +5,7 @@ zone:
zoneCreate: Create zone
locations: Locations
deliveryDays: Delivery days
- upcomingList: Upcoming deliveries
+ upcomingDeliveries: Upcoming deliveries
warehouses: Warehouses
list:
clone: Clone
@@ -42,6 +42,8 @@ summary:
filterPanel:
name: Name
agencyModeFk: Agency
+zoneLocations:
+ locations: Locations
deliveryPanel:
pickup: Pick up
delivery: Delivery
@@ -64,3 +66,7 @@ warehouses:
deleteSubtitle: Are you sure you want to continue?
warehouse: Warehouse
add: Add
+upcomingDeliveries:
+ province: Province
+ closing: Closing
+ id: Id
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 43b636d4f..d12c4f204 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -5,7 +5,7 @@ zone:
zoneCreate: Nueva zona
locations: Localizaciones
deliveryDays: Días de entrega
- upcomingList: Próximos repartos
+ upcomingDeliveries: Próximos repartos
warehouses: Almacenes
list:
clone: Clonar
@@ -42,6 +42,8 @@ summary:
filterPanel:
name: Nombre
agencyModeFk: Agencia
+zoneLocations:
+ locations: Localizaciones
deliveryPanel:
pickup: Recogida
delivery: Entrega
@@ -66,3 +68,7 @@ warehouses:
deleteSubtitle: ¿Seguro que quieres continuar?
warehouse: Almacén
add: Añadir
+upcomingDeliveries:
+ province: Provincia
+ closing: Cierre
+ id: Id
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 869a3555a..75d0612aa 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -37,6 +37,15 @@ export default {
},
component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'),
},
+ {
+ path: 'create',
+ name: 'InvoiceInCreare',
+ meta: {
+ title: 'invoiceInCreate',
+ icon: 'create',
+ },
+ component: () => import('src/pages/InvoiceIn/InvoiceInCreate.vue'),
+ },
],
},
{
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index b79c430e5..cf2e5321e 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,7 +11,7 @@ export default {
component: RouterView,
redirect: { name: 'ZoneMain' },
menus: {
- main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
+ main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingDeliveries'],
card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
},
children: [
@@ -57,6 +57,24 @@ export default {
},
component: () => import('src/pages/Zone/ZoneCreate.vue'),
},
+ // {
+ // path: 'counter',
+ // name: 'ZoneCounter',
+ // meta: {
+ // title: 'zoneCounter',
+ // icon: 'add_circle',
+ // },
+ // component: () => import('src/pages/Zone/ZoneCounter.vue'),
+ // },
+ {
+ name: 'ZoneUpcomingDeliveries',
+ path: 'upcoming-deliveries',
+ meta: {
+ title: 'upcomingDeliveries',
+ icon: 'vn:calendar',
+ },
+ component: () => import('src/pages/Zone/ZoneUpcoming.vue'),
+ },
],
},
{
@@ -88,7 +106,7 @@ export default {
path: 'location',
meta: {
title: 'locations',
- icon: 'vn:greuge',
+ icon: 'my_location',
},
component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
},
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index d1cddd0e7..84b2086cc 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -39,7 +39,7 @@ describe('VnLocation', () => {
});
it('Create postCode', function () {
cy.get(
- ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+ ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
).click();
cy.get('.q-card > h1').should('have.text', 'New postcode');
cy.get(dialogInputs).eq(0).clear('12');
diff --git a/test/cypress/integration/claim/claimPhoto.spec.js b/test/cypress/integration/claim/claimPhoto.spec.js
index 6ea1fd8b7..9b2978b19 100755
--- a/test/cypress/integration/claim/claimPhoto.spec.js
+++ b/test/cypress/integration/claim/claimPhoto.spec.js
@@ -21,8 +21,7 @@ describe('ClaimPhoto', () => {
cy.get('.q-notification__message').should('have.text', 'Data saved');
});
- /* it.skip('should open first image dialog change to second and close', () => {
- skiped fix on https://redmine.verdnatura.es/issues/7113
+ it('should open first image dialog change to second and close', () => {
cy.get(
':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
).click();
@@ -38,19 +37,23 @@ describe('ClaimPhoto', () => {
cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
'not.be.visible'
);
- }); */
+ });
it('should remove third and fourth file', () => {
cy.get(
'.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
).click();
- cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+ cy.get(
+ '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+ ).click();
cy.get('.q-notification__message').should('have.text', 'Data deleted');
cy.get(
'.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
).click();
- cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+ cy.get(
+ '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+ ).click();
cy.get('.q-notification__message').should('have.text', 'Data deleted');
});
});
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 963dda3e2..77a11969b 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -2,8 +2,7 @@
describe('InvoiceInBasicData', () => {
const formInputs = '.q-form > .q-card input';
const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
- const appendBtns = '.q-form label button';
- const dialogAppendBtns = '.q-dialog label button';
+ const documentBtns = '.q-form .q-field button';
const dialogInputs = '.q-dialog input';
const dialogActionBtns = '.q-card__actions button';
@@ -15,8 +14,7 @@ describe('InvoiceInBasicData', () => {
it('should edit the provideer and supplier ref', () => {
cy.selectOption(firstFormSelect, 'Bros');
cy.get('[title="Reset"]').click();
- cy.get(appendBtns).eq(0).click();
- cy.get(formInputs).eq(1).type(4739);
+ cy.get(formInputs).eq(1).type('{selectall}4739');
cy.saveCard();
cy.get(`${firstFormSelect} input`).invoke('val').should('eq', 'Plants nick');
@@ -27,22 +25,20 @@ describe('InvoiceInBasicData', () => {
const firtsInput = 'Ticket:65';
const secondInput = "I don't know what posting here!";
- cy.get(appendBtns).eq(3).click();
- cy.get(dialogAppendBtns).eq(0).click();
- cy.get(dialogInputs).eq(0).type(firtsInput);
- cy.get(dialogAppendBtns).eq(1).click();
- cy.get('textarea').type(secondInput);
+ cy.get(documentBtns).eq(1).click();
+ cy.get(dialogInputs).eq(0).type(`{selectall}${firtsInput}`);
+ cy.get('textarea').type(`{selectall}${secondInput}`);
cy.get(dialogActionBtns).eq(1).click();
- cy.get(appendBtns).eq(3).click();
-
+ cy.get(documentBtns).eq(1).click();
cy.get(dialogInputs).eq(0).invoke('val').should('eq', firtsInput);
cy.get('textarea').invoke('val').should('eq', secondInput);
});
it('should throw an error creating a new dms if a file is not attached', () => {
- cy.get(appendBtns).eq(2).click();
- cy.get(appendBtns).eq(1).click();
+ cy.get(formInputs).eq(5).click();
+ cy.get(formInputs).eq(5).type('{selectall}{backspace}');
+ cy.get(documentBtns).eq(0).click();
cy.get(dialogActionBtns).eq(1).click();
cy.get('.q-notification__message').should(
'have.text',
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
new file mode 100644
index 000000000..f2d9a3497
--- /dev/null
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -0,0 +1,24 @@
+describe('InvoiceInDescriptor', () => {
+ const dialogBtns = '.q-card__actions button';
+ const firstDescritorOpt = '.q-menu > .q-list > :nth-child(1) > .q-item__section';
+ const isBookedField =
+ '.q-card:nth-child(3) .vn-label-value:nth-child(5) > .value > span';
+
+ it('should booking and unbooking the invoice properly', () => {
+ cy.login('developer');
+ cy.visit(`/#/invoice-in/1/summary?limit=10`);
+
+ cy.openLeftMenu();
+ cy.openActionsDescriptor();
+ cy.get(firstDescritorOpt).click();
+ cy.get(dialogBtns).eq(1).click();
+ cy.get('.fullscreen').first().click();
+ cy.get(isBookedField).should('have.attr', 'title', 'true');
+
+ cy.openLeftMenu();
+ cy.openActionsDescriptor();
+ cy.get(firstDescritorOpt).click();
+ cy.get(dialogBtns).eq(1).click();
+ cy.get(isBookedField).should('have.attr', 'title', 'false');
+ });
+});
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 389be671c..63e99eac1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -18,7 +18,7 @@ describe('InvoiceInVat', () => {
cy.saveCard();
cy.visit(`/#/invoice-in/1/vat`);
- cy.getValue(firstLineVat).should('equal', 'H.P. IVA 21% CEE');
+ cy.getValue(firstLineVat).should('equal', '8');
});
it('should add a new row', () => {
diff --git a/test/cypress/integration/vnLog.spec.js b/test/cypress/integration/vnLog.spec.js
index 80b9d07df..4db724e99 100644
--- a/test/cypress/integration/vnLog.spec.js
+++ b/test/cypress/integration/vnLog.spec.js
@@ -9,15 +9,15 @@ describe('VnLog', () => {
cy.visit(`/#/claim/${1}/log`);
cy.openRightMenu();
});
-
- it('should filter by insert actions', () => {
+ // Se tiene que cambiar el Accept-Language a 'en', ya hay una tarea para eso #7189.
+ xit('should filter by insert actions', () => {
cy.checkOption(':nth-child(7) > .q-checkbox');
cy.get('.q-page').click();
cy.validateContent(chips[0], 'Document');
cy.validateContent(chips[1], 'Beginning');
});
- it('should filter by entity', () => {
+ xit('should filter by entity', () => {
cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
cy.get('.q-page').click();
cy.validateContent(chips[0], 'Claim');
diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index 38e7ea6d0..1e9292626 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -20,6 +20,6 @@ describe('WorkerList', () => {
.eq(0)
.invoke('text')
.should('include', 'Basic data');
- cy.get('.summary .header-link').eq(1).should('have.text', 'User data ');
+ cy.get('.summary .header-link').eq(2).should('have.text', 'User data ');
});
});
diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index 01e74760b..ef2f88300 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -1,6 +1,6 @@
-describe('WorkerList', () => {
+describe('WorkerLocker', () => {
const workerId = 1109;
- const lockerCode = '201A';
+ const lockerCode = '2F';
const input = '.q-card input';
const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
beforeEach(() => {
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
new file mode 100644
index 000000000..4184735ae
--- /dev/null
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -0,0 +1,24 @@
+describe('WorkerPda', () => {
+ const deviceProductionField =
+ '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('developer');
+ cy.visit(`/#/worker/1110/pda`);
+ });
+
+ it('assign pda', () => {
+ cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+ cy.get(deviceProductionField).type('{downArrow}{enter}');
+ cy.get('.vn-row > #simSerialNumber').type('123{enter}');
+ cy.get('.q-notification__message').should('have.text', 'Data created');
+ });
+
+ it('delete pda', () => {
+ cy.get('.btn-delete').click();
+ cy.get(
+ '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+ ).click();
+ cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+ });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index e7f8cb9d9..a237622e6 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -92,8 +92,13 @@ Cypress.Commands.add('checkOption', (selector) => {
// Global buttons
Cypress.Commands.add('saveCard', () => {
+ const dropdownArrow = '.q-btn-dropdown__arrow-container > .q-btn__content > .q-icon';
+ cy.get('#st-actions').then(($el) => {
+ if ($el.find(dropdownArrow).length) cy.get(dropdownArrow).click();
+ });
cy.get('[title="Save"]').click();
});
+
Cypress.Commands.add('resetCard', () => {
cy.get('[title="Reset"]').click();
});
diff --git a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInBasicData.spec.js b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInBasicData.spec.js
deleted file mode 100644
index a3c383f74..000000000
--- a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInBasicData.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import InvoiceInBasicData from 'src/pages/InvoiceIn/Card/InvoiceInBasicData.vue';
-
-describe('InvoiceInBasicData', () => {
- let vm;
-
- beforeAll(() => {
- vm = createWrapper(InvoiceInBasicData, {
- global: {
- stubs: [],
- mocks: {
- fetch: vi.fn(),
- },
- },
- }).vm;
- });
-
- describe('upsert()', () => {
- it('should throw an error when data is empty', async () => {
- vi.spyOn(axios, 'post').mockResolvedValue({ data: [] });
- vi.spyOn(vm.quasar, 'notify');
-
- await vm.upsert();
-
- expect(vm.quasar.notify).toHaveBeenCalledWith(
- expect.objectContaining({
- message: `The company can't be empty`,
- type: 'negative',
- })
- );
- });
- });
-});
diff --git a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js
index 55ca19d71..adfb054c6 100644
--- a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js
+++ b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js
@@ -19,13 +19,13 @@ describe('InvoiceInIntrastat', () => {
describe('getTotal()', () => {
it('should correctly handle the sum', () => {
- vm.invoceInIntrastat = [
+ const invoceInIntrastat = [
{ amount: 10, stems: 162 },
{ amount: 20, stems: 21 },
];
- const totalAmount = vm.getTotal('amount');
- const totalStems = vm.getTotal('stems');
+ const totalAmount = vm.getTotal(invoceInIntrastat, 'amount');
+ const totalStems = vm.getTotal(invoceInIntrastat, 'stems');
expect(totalAmount).toBe(10 + 20);
expect(totalStems).toBe(162 + 21);
diff --git a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js
index 6cc082a35..76453f65a 100644
--- a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js
+++ b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js
@@ -1,5 +1,5 @@
import { vi, describe, expect, it, beforeAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
import InvoiceInVat from 'src/pages/InvoiceIn/Card/InvoiceInVat.vue';
describe('InvoiceInVat', () => {
@@ -16,41 +16,6 @@ describe('InvoiceInVat', () => {
}).vm;
});
- describe('addExpense()', () => {
- beforeAll(() => {
- vi.spyOn(axios, 'post').mockResolvedValue({ data: [] });
- vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
- vi.spyOn(vm.quasar, 'notify');
- });
-
- it('should throw an error when the code property is undefined', async () => {
- await vm.addExpense();
-
- expect(vm.quasar.notify).toHaveBeenCalledWith(
- expect.objectContaining({
- message: `The code can't be empty`,
- type: 'negative',
- })
- );
- });
-
- it('should correctly handle expense addition', async () => {
- vm.newExpense = {
- code: 123,
- isWithheld: false,
- description: 'Descripción del gasto',
- };
-
- await vm.addExpense();
- expect(vm.quasar.notify).toHaveBeenCalledWith(
- expect.objectContaining({
- message: 'Data saved',
- type: 'positive',
- })
- );
- });
- });
-
describe('taxRate()', () => {
it('should correctly compute the tax rate', () => {
const invoiceInTax = { taxableBase: 100, taxTypeSageFk: 1 };
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index 89cc640fd..4eeea25a8 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -24,6 +24,7 @@ vi.mock('vue-router', () => ({
params: {
id: 1,
},
+ meta: { moduleName: 'mockName' },
},
},
}),
@@ -31,6 +32,7 @@ vi.mock('vue-router', () => ({
matched: [],
query: {},
params: {},
+ meta: { moduleName: 'mockName' },
}),
}));