+
@@ -19,7 +19,4 @@ const $props = defineProps({
a {
font-size: large;
}
-.titleBox {
- padding-bottom: 2%;
-}
diff --git a/src/components/common/VnWeekdayPicker.vue b/src/components/common/VnWeekdayPicker.vue
new file mode 100644
index 000000000..10e6b2c4d
--- /dev/null
+++ b/src/components/common/VnWeekdayPicker.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index d2ba21888..b83cca3f4 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 }}
@@ -235,6 +242,7 @@ const emit = defineEmits(['onFetch']);
width: 256px;
.header {
display: flex;
+ align-items: center;
}
.icons {
margin: 0 10px;
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..bced893fe 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: $color-font-secondary;
font-weight: bold;
font-size: 0.8rem;
text-align: center;
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 386594750..fd508cea3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -46,6 +46,10 @@ const props = defineProps({
type: Array,
default: () => [],
},
+ redirect: {
+ type: Boolean,
+ default: true,
+ },
});
const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
@@ -93,7 +97,7 @@ async function search() {
isLoading.value = false;
emit('search');
- navigate(store.data, {});
+ if (props.redirect) navigate(store.data, {});
}
async function reload() {
@@ -104,7 +108,7 @@ async function reload() {
if (!props.showAll && !params.length) store.data = [];
isLoading.value = false;
emit('refresh');
- navigate(store.data, {});
+ if (props.redirect) navigate(store.data, {});
}
async function clearFilters() {
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b0cdd0e15..937ec4b6c 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -20,7 +20,12 @@ const state = useState();
const currentUser = ref(state.getUser());
const newNote = ref('');
const vnPaginateRef = ref();
-
+function handleKeyUp(event) {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ if (!event.shiftKey) insert();
+ }
+}
async function insert() {
const body = $props.body;
Object.assign(body, { text: newNote.value });
@@ -48,12 +53,12 @@ async function insert() {
size="lg"
autogrow
autofocus
- @keyup.ctrl.enter.stop="insert"
+ @keyup="handleKeyUp"
clearable
>
-
+
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 38dcf97d1..3df84f76e 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,13 +1,15 @@
-
-
-
-
-
-
-
-
- {{ t(props.info) }}
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ t(props.info) }}
+
+
+
+
+
+
+ en:
+ accountRate: Claming rate
+ es:
+ accountRate: Ratio de reclamación
+
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Role/Card/RoleForm.vue
new file mode 100644
index 000000000..d6fc16598
--- /dev/null
+++ b/src/pages/Account/Role/Card/RoleForm.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ es:
+ Create role: Crear role
+
diff --git a/src/pages/Account/Role/Card/RoleLog.vue b/src/pages/Account/Role/Card/RoleLog.vue
new file mode 100644
index 000000000..20b6dcccf
--- /dev/null
+++ b/src/pages/Account/Role/Card/RoleLog.vue
@@ -0,0 +1,6 @@
+
+
+
+
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
new file mode 100644
index 000000000..d404fa2f0
--- /dev/null
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -0,0 +1,52 @@
+
+
+
+
+ {{ role.id }} - {{ role.name }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Account/Role/Card/SubRoleCreateForm.vue b/src/pages/Account/Role/Card/SubRoleCreateForm.vue
new file mode 100644
index 000000000..89eceed62
--- /dev/null
+++ b/src/pages/Account/Role/Card/SubRoleCreateForm.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
new file mode 100644
index 000000000..1fb84fe4f
--- /dev/null
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.inherits?.name }}
+ {{
+ row.inherits?.description
+ }}
+
+
+
+
+
+ {{ t('globals.delete') }}
+
+
+
+
+
+
+
+
+
-
+ />
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index c3c5f5b7b..eee2713d3 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import CustomerFilter from './CustomerFilter.vue';
@@ -10,8 +9,8 @@ import CardList from 'src/components/ui/CardList.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import CustomerSummary from './Card/CustomerSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
-const stateStore = useStateStore();
const router = useRouter();
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
@@ -26,35 +25,16 @@ const redirectToCreateView = () => {
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
-
import { QBtn, QCheckbox, useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
-
import { toCurrency, toDate, dateRange } from 'filters/index';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
@@ -14,9 +11,10 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInput from 'src/components/common/VnInput.vue';
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
-const stateStore = useStateStore();
+import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
-const { t, locale } = useI18n();
+const { t } = useI18n();
const quasar = useQuasar();
const dataRef = ref(null);
@@ -26,7 +24,7 @@ const selected = ref([]);
const tableColumnComponents = {
client: {
component: QBtn,
- props: () => ({ flat: true, color: 'blue', noCaps: true }),
+ props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
isWorker: {
@@ -39,7 +37,12 @@ const tableColumnComponents = {
},
salesPerson: {
component: QBtn,
- props: () => ({ flat: true, color: 'blue', noCaps: true }),
+ props: () => ({ flat: true, class: 'link', noCaps: true }),
+ event: () => {},
+ },
+ department: {
+ component: 'span',
+ props: () => {},
event: () => {},
},
country: {
@@ -59,7 +62,7 @@ const tableColumnComponents = {
},
author: {
component: QBtn,
- props: () => ({ flat: true, color: 'blue', noCaps: true }),
+ props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
lastObservation: {
@@ -82,6 +85,16 @@ const tableColumnComponents = {
props: () => {},
event: () => {},
},
+ finished: {
+ component: QCheckbox,
+
+ props: (prop) => ({
+ disable: true,
+ 'model-value': prop.value,
+ class: 'disabled-checkbox',
+ }),
+ event: () => {},
+ },
};
const columns = computed(() => [
@@ -105,6 +118,13 @@ const columns = computed(() => [
name: 'salesPerson',
sortable: true,
},
+ {
+ align: 'left',
+ field: 'departmentName',
+ label: t('Department'),
+ name: 'department',
+ sortable: true,
+ },
{
align: 'left',
field: 'country',
@@ -166,6 +186,12 @@ const columns = computed(() => [
name: 'from',
sortable: true,
},
+ {
+ align: 'left',
+ field: 'finished',
+ label: t('Has recover'),
+ name: 'finished',
+ },
]);
const viewAddObservation = (rowsSelected) => {
@@ -178,7 +204,39 @@ const viewAddObservation = (rowsSelected) => {
});
};
-const onFetch = (data) => {
+const departments = ref(new Map());
+
+const onFetch = async (data) => {
+ const salesPersonFks = data.map((item) => item.salesPersonFk);
+ const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
+ try {
+ const { data: workerDepartment } = await axios.get(
+ `WorkerDepartments/${salesPersonFk}`
+ );
+ const { data: department } = await axios.get(
+ `Departments/${workerDepartment.departmentFk}`
+ );
+ departments.value.set(salesPersonFk, department.name);
+ } catch (error) {
+ console.error('Err: ', error);
+ }
+ });
+ const recoveryData = await axios.get('Recoveries');
+
+ const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
+ clientFk,
+ finished,
+ }));
+
+ await Promise.all(departmentNames);
+
+ data.forEach((item) => {
+ item.departmentName = departments.value.get(item.salesPersonFk);
+ item.isWorker = item.businessTypeFk === 'worker';
+ const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
+ item.finished = recovery?.finished === null;
+ });
+
for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
@@ -191,6 +249,7 @@ function exprBuilder(param, value) {
case 'creditInsurance':
case 'amount':
case 'workerFk':
+ case 'departmentFk':
case 'countryFk':
case 'payMethod':
case 'salesPersonFk':
@@ -204,30 +263,11 @@ function exprBuilder(param, value) {
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
@@ -243,7 +283,6 @@ function exprBuilder(param, value) {
-
-
+
@@ -302,7 +341,7 @@ function exprBuilder(param, value) {
)
"
>
-
+
{{ props.value }}
@@ -354,6 +394,7 @@ es:
Client: Cliente
Is worker: Es trabajador
Salesperson: Comercial
+ Department: Departamento
Country: País
P. Method: F. Pago
Pay method: Forma de pago
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 26a6743d5..9220bd7c0 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -45,11 +45,10 @@ const authors = ref();
-
-
+
+
@@ -85,6 +86,7 @@ const authors = ref();
rounded
use-input
v-model="params.salesPersonFk"
+ @update:model-value="searchFn()"
/>
@@ -108,6 +110,7 @@ const authors = ref();
rounded
use-input
v-model="params.countryFk"
+ @update:model-value="searchFn()"
/>
@@ -153,6 +156,7 @@ const authors = ref();
rounded
use-input
v-model="params.workerFk"
+ @update:model-value="searchFn()"
/>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index b5b509d1b..79459d1a1 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -14,6 +14,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
import { useArrayData } from 'composables/useArrayData';
import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters';
+import RightMenu from 'src/components/common/RightMenu.vue';
const { t } = useI18n();
const router = useRouter();
@@ -494,32 +495,15 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
+
+
-
-
+
+
(selectedSalesPersonId.value = id);
/>
-
{
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
-
-
+
+
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index 70c578fc2..b49f5f9e2 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -2,7 +2,6 @@
import { computed, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
import { useVnConfirm } from 'composables/useVnConfirm';
import VnLv from 'src/components/ui/VnLv.vue';
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
@@ -23,7 +22,6 @@ const $props = defineProps({
},
});
-const quasar = useQuasar();
const route = useRoute();
const router = useRouter();
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/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 8a8a7ac32..e0da663f0 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -174,7 +174,7 @@ const redirectToBuysView = () => {
@on-fetch="(data) => (packagingsOptions = data)"
auto-load
/>
-
+
@@ -222,7 +222,7 @@ const redirectToBuysView = () => {
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 766587bde..5c56146b9 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -338,7 +338,7 @@ const fetchEntryBuys = async () => {
{{ row.item.subName }}
-
+
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index da4190a04..cae59207b 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -19,6 +19,7 @@ import { toDate, toCurrency } from 'src/filters';
import { useSession } from 'composables/useSession';
import { dashIfEmpty } from 'src/filters';
import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
const router = useRouter();
const { getTokenMultimedia } = useSession();
@@ -646,14 +647,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
@on-config-saved="visibleColumns = ['picture', ...$event]"
/>
-
-
-
-
+
+
-
-
+
+
(stateStore.rightDrawer = false));
-
+
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 6f146e21a..805b49190 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -11,6 +11,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters/index';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
const stateStore = useStateStore();
const router = useRouter();
@@ -29,23 +30,18 @@ onMounted(async () => {
stateStore.rightDrawer = true;
});
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
arrayData.store.data);
+const invoiceIn = computed(() => useArrayData().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 {
@@ -81,7 +81,7 @@ async function setCreateDms() {
createDmsRef.value.show();
}
-async function upsert() {
+async function onSubmit() {
try {
const isEdit = !!dms.value.id;
const errors = {
@@ -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') }}
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
-
-
-
-
+
+
+
+
{{ t('Edit document') }}
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('globals.selectFile') }}
+
+
+
+
+ {{
+ `${t(
+ 'Allowed content types'
+ )}: ${allowedContentTypes.join(', ')}`
+ }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('globals.selectFile') }}
-
-
-
-
- {{
- `${t(
- 'Allowed content types'
- )}: ${allowedContentTypes.join(', ')}`
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
{{ t('Create document') }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('globals.selectFile') }}
+
+
+
+
+ {{
+ `${t(
+ 'Allowed content types'
+ )}: ${allowedContentTypes.join(', ')}`
+ }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('globals.selectFile') }}
-
-
-
-
- {{
- `${t(
- 'Allowed content types'
- )}: ${allowedContentTypes.join(', ')}`
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+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 +525,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..9325a5b41 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();
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..67c197636 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -6,26 +6,19 @@ 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().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 +70,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 d58dad2b4..b7f8adf50 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().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,20 +269,19 @@ function getLink(param) {
-
@@ -290,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))
}}
@@ -349,17 +355,17 @@ function getLink(param) {
-
+
-
-
-
-
+
+
+
+
{{ t(col.label) }}
@@ -368,26 +374,32 @@ function getLink(param) {
- {{ toCurrency(invoiceIn.totals.totalDueDay) }}
+
+ {{ toCurrency(entity.totals.totalDueDay, currency) }}
+
-
+
-
-
-
+
+
+
{{ t(col.label) }}
@@ -395,7 +407,7 @@ function getLink(param) {
- {{ toCurrency(intrastatTotals.amount) }}
+ {{ toCurrency(intrastatTotals.amount, currency) }}
{{ intrastatTotals.net }}
{{ intrastatTotals.stems }}
@@ -410,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..58f6e0d01 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -11,13 +11,13 @@ 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 { t } = useI18n();
const quasar = useQuasar();
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData();
const invoiceIn = computed(() => arrayData.store.data);
-
+const invoiceId = +useRoute().params.id;
+const currency = computed(() => invoiceIn.value?.currency?.code);
const expenses = ref([]);
const sageTaxTypes = ref([]);
const sageTransactionTypes = ref([]);
@@ -55,7 +55,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 +68,7 @@ const columns = computed(() => [
options: sageTaxTypes.value,
model: 'taxTypeSageFk',
optionValue: 'id',
- optionLabel: 'vat',
+ optionLabel: 'id',
sortable: true,
tabindex: 3,
align: 'left',
@@ -80,7 +80,7 @@ const columns = computed(() => [
options: sageTransactionTypes.value,
model: 'transactionTypeSageFk',
optionValue: 'id',
- optionLabel: 'transaction',
+ optionLabel: 'id',
sortable: true,
tabIndex: 4,
align: 'left',
@@ -90,7 +90,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 +114,7 @@ const filter = {
'transactionTypeSageFk',
],
where: {
- invoiceInFk: route.params.id,
+ invoiceInFk: invoiceId,
},
};
@@ -161,6 +161,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 +307,19 @@ async function addExpense() {
/>
+
+
+
+
+
+ {{ toCurrency(getTotalTaxableBase(rows), currency) }}
+
+
+
+ {{ toCurrency(getTotalRate(rows), currency) }}
+
+
+
@@ -391,7 +408,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/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 2ed8b6a9a..e26c63881 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -16,6 +16,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
import { useSummaryDialog } from 'composables/useSummaryDialog';
import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
import { useRouter } from 'vue-router';
+import RightMenu from 'src/components/common/RightMenu.vue';
const stateStore = useStateStore();
const { t } = useI18n();
@@ -133,35 +134,16 @@ function navigateToRoadmapSummary(event, row) {
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index eb2035011..ba3e855d6 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -15,14 +15,11 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
import FetchData from 'components/FetchData.vue';
import { openBuscaman } from 'src/utils/buscaman';
import SendSmsDialog from 'components/common/SendSmsDialog.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
const { t } = useI18n();
const quasar = useQuasar();
const route = useRoute();
-const stateStore = useStateStore();
const selectedRows = ref([]);
const columns = computed(() => [
{
@@ -222,11 +219,6 @@ const openSmsDialog = async () => {
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
{
{{ 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') }}
{
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c6e5cb60c..c065cf6bf 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -11,6 +11,7 @@ import TicketFilter from './TicketFilter.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import CardList from 'src/components/ui/CardList.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
const router = useRouter();
const { t } = useI18n();
@@ -35,35 +36,16 @@ function navigate(id) {
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
{
-
-
-
-
-
+
+
+
+
+
+
{
-
-
-
-
-
{
-
-
-
-
-
{
@on-fetch="(data) => (warehouses = data)"
auto-load
/>
-
-
+
+
+
-
-
+
+
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index cfde97f93..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,
});
});
}
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 950557656..91e118708 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -126,7 +126,7 @@ const handleEventSelected = (event, { year, month, day }) => {
}
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);
};
@@ -140,20 +140,20 @@ 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 +162,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 +202,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 +234,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 976469476..513edcf45 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -71,66 +71,47 @@ function reloadData() {
bordered
:key="row.id"
v-for="row of rows"
- class="card q-pt-xs q-mb-sm"
+ class="card q-px-md q-mb-sm container"
>
-
-
-
-
-
-
- Id:
-
- {{ row?.deviceProductionFk }}
-
- {{ t('Model') }}:
-
- {{ row?.deviceProduction?.modelFk }}
-
- {{ t('SIM serial number') }}:
-
- {{
- row?.deviceProduction?.serialNumber
- }}
-
-
-
-
-
-
- {{ row?.simSerialNumber }}
-
-
-
-
-
-
-
- {{ t('worker.pda.removePDA') }}
-
-
-
-
+
+
+
+
+
+
+
+ {{ t('worker.pda.removePDA') }}
+
+
+
@@ -187,26 +168,20 @@ function reloadData() {
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?
- PDA deallocated: PDA desasignada
- SIM serial number: Número de serie de la SIM
- Model: Modelo
+ 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
- Add new device: Añadir nuevo dispositivo
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 129e0ce8c..6d6dde97b 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -73,7 +73,7 @@ const filter = {
@@ -113,7 +113,7 @@ const filter = {
-import VnTree from 'components/ui/VnTree.vue';
+import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
-
+
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/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b11d531dd..8057e3e7c 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
+
-
-
+
+
route.name);
+const customRouteRedirectName = computed(() => {
+ if (routeName.value === 'ZoneLocations') return null;
+ return routeName.value;
+});
+const searchbarMakeFetch = computed(() => routeName.value !== 'ZoneEvents');
const searchBarDataKeys = {
ZoneWarehouses: 'ZoneWarehouses',
ZoneSummary: 'ZoneSummary',
+ ZoneLocations: 'ZoneLocations',
+ ZoneEvents: 'ZoneEvents',
};
-
-
-
-
-
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
new file mode 100644
index 000000000..721f4bbc3
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ node.name }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
new file mode 100644
index 000000000..808f14a53
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
new file mode 100644
index 000000000..e4fe5ff22
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+ {{ t('globals.collapseMenu') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('eventsInclusionForm.addEvent') }}
+
+
+
+
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
new file mode 100644
index 000000000..2cfa98246
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+ {{
+ t('eventsPanel.editMode')
+ }}
+
+
+
+ {{
+ t('eventsPanel.events')
+ }}
+
+
+
+
+ {{ toDateFormat(event.dated) }}
+
+
+
+ {{ formatWdays(event) }}
+
+
+ ({{ toDateFormat(event.started) }} -
+ {{ toDateFormat(event.ended) }})
+
+
+
+ {{ t('eventsPanel.closing') }}:
+
+ {{ dashIfEmpty(toTimeFormat(event.hour)) }}
+
+
+
+ {{ t('eventsPanel.travelingDays') }}:
+
+ {{ dashIfEmpty(event.travelingDays) }}
+
+
+
+ {{ t('eventsPanel.price') }}:
+
+ {{ dashOrCurrency(event.price)() }}
+
+
+ {{ t('eventsPanel.bonus') }}:
+
+ {{ dashOrCurrency(event.bonus)() }}
+
+
+ {{ t('eventsPanel.m3Max') }}:
+ {{ dashIfEmpty(event.m3Max) }}
+
+
+
+
+ {{ t('eventsPanel.delete') }}
+
+
+
+
+ {{ t('globals.noResults') }}
+
+
+
+
+
+
diff --git a/src/pages/Zone/Card/ZoneLocations.vue b/src/pages/Zone/Card/ZoneLocations.vue
index e4305c898..f357e9e5b 100644
--- a/src/pages/Zone/Card/ZoneLocations.vue
+++ b/src/pages/Zone/Card/ZoneLocations.vue
@@ -1 +1,81 @@
-Zone Locations
+
+
+
+
+
+
+
+ {{ node.name }}
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
new file mode 100644
index 000000000..70384a1bb
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneCalendar.vue
similarity index 77%
rename from src/pages/Zone/ZoneDeliveryCalendar.vue
rename to src/pages/Zone/ZoneCalendar.vue
index 96a62086e..f336415a4 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneCalendar.vue
@@ -2,6 +2,7 @@
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar';
+import { useRoute } from 'vue-router';
import ZoneClosingTable from './ZoneClosingTable.vue';
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
@@ -38,7 +39,10 @@ const props = defineProps({
},
});
+const emit = defineEmits(['onDateSelected']);
+
const { locale } = useI18n();
+const route = useRoute();
const calendarRef = ref(null);
const weekdayStore = useWeekdayStore();
@@ -52,7 +56,11 @@ const todayTimestamp = computed(() => {
});
const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
+const isZoneDeliveryView = computed(() => route.name === 'ZoneDeliveryDays');
+
const onEventSelection = async ({ year, month, day }) => {
+ if (!isZoneDeliveryView.value) return;
+
const date = new Date(year, month - 1, day);
const stamp = date.getTime();
const events = props.daysMap[stamp];
@@ -81,6 +89,13 @@ const getEventByTimestamp = ({ year, month, day }) => {
);
};
+const getEventType = ({ year, month, day }) => {
+ const stamp = new Date(year, month - 1, day).getTime();
+ if (props.exclusions[stamp]) return 'exclusion';
+ if (props.geoExclusions[stamp]) return 'geoExclusion';
+ return 'event';
+};
+
const getEventAttrs = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
@@ -104,6 +119,28 @@ const isToday = (timestamp) => {
const calendarHeaderTitle = computed(() => {
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
});
+
+const handleDateClick = (timestamp) => {
+ if (isZoneDeliveryView.value) return;
+
+ const event = getEventByTimestamp(timestamp);
+ const { year, month, day } = timestamp;
+ const date = new Date(year, month - 1, day);
+ const stamp = date.getTime();
+ const eventType = getEventType(timestamp);
+
+ let geoIds = [];
+ if (eventType === 'geoExclusion')
+ geoIds = props.geoExclusions[stamp].map((geoExclusion) => geoExclusion.geoFk);
+
+ emit('onDateSelected', {
+ date,
+ isNewMode: !event,
+ event: event && event.length > 0 ? event[0] : null,
+ eventType,
+ geoIds,
+ });
+};
@@ -128,6 +165,7 @@ const calendarHeaderTitle = computed(() => {
short-weekday-label
:locale="locale"
:now="today"
+ @click-date="handleDateClick($event.scope.timestamp)"
mini-mode
>
@@ -135,7 +173,11 @@ const calendarHeaderTitle = computed(() => {
{
'--today': isToday(timestamp),
}"
>
-
+
+import { computed, onMounted, ref, watch, onUnmounted, nextTick } from 'vue';
+
+import ZoneCalendar from './ZoneCalendar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const props = defineProps({
+ dataKey: {
+ type: String,
+ required: true,
+ },
+});
+
+const emit = defineEmits([
+ 'update:firstDay',
+ 'update:lastDay',
+ 'update:events',
+ 'onDateSelected',
+]);
+
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const _data = ref(null);
+const firstDay = ref(null);
+const lastDay = ref(null);
+const months = ref([]);
+const days = ref({});
+const exclusions = ref({});
+const geoExclusions = ref({});
+const events = ref([]);
+
+const arrayData = useArrayData(props.dataKey);
+const { store } = arrayData;
+
+const refreshEvents = () => {
+ days.value = {};
+ if (!data.value) return;
+
+ let day = new Date(firstDay.value.getTime());
+
+ while (day <= lastDay.value) {
+ let stamp = day.getTime();
+ let wday = day.getDay();
+ let dayEvents = [];
+ let _exclusions = exclusions.value[stamp] || [];
+
+ if (events.value) {
+ for (let event of events.value) {
+ let match;
+ switch (event.type) {
+ case 'day':
+ match = event.dated == stamp;
+ break;
+ default:
+ match =
+ event.wdays[wday] &&
+ (!event.started || stamp >= event.started) &&
+ (!event.ended || stamp <= event.ended);
+ break;
+ }
+ if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
+ dayEvents.push(event);
+ }
+ }
+ }
+ if (dayEvents.length) days.value[stamp] = dayEvents;
+
+ day.setDate(day.getDate() + 1);
+ }
+ emit('update:events', events.value);
+};
+
+const date = computed({
+ get: () => _date.value,
+ set: (value) => {
+ _date.value = value;
+ let stamp = value.getTime();
+
+ firstDay.value = new Date(stamp);
+ firstDay.value.setDate(1);
+
+ lastDay.value = new Date(stamp);
+ lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+ lastDay.value.setDate(0);
+
+ months.value = [];
+ for (let i = 0; i < nMonths.value; i++) {
+ let monthDate = new Date(stamp);
+ monthDate.setMonth(value.getMonth() + i);
+ months.value.push(monthDate);
+ }
+
+ emit('update:firstDay', firstDay.value);
+ emit('update:lastDay', lastDay.value);
+ refreshEvents();
+ },
+});
+
+const data = computed({
+ get: () => {
+ return _data.value;
+ },
+ set: (value) => {
+ _data.value = value;
+
+ value = value || {};
+
+ events.value = value.events;
+ function toStamp(date) {
+ return date && new Date(date).setHours(0, 0, 0, 0);
+ }
+
+ exclusions.value = {};
+ let _exclusions = value.exclusions;
+
+ if (_exclusions) {
+ for (let exclusion of _exclusions) {
+ let stamp = toStamp(exclusion.dated);
+ if (!exclusions[stamp]) exclusions.value[stamp] = [];
+ exclusions.value[stamp].push(exclusion);
+ }
+ }
+
+ geoExclusions.value = {};
+ let _geoExclusions = value.geoExclusions;
+ if (_geoExclusions) {
+ for (let geoExclusion of _geoExclusions) {
+ let stamp = toStamp(geoExclusion.dated);
+ if (!geoExclusions.value[stamp]) geoExclusions.value[stamp] = [];
+ geoExclusions.value[stamp].push(geoExclusion);
+ }
+ }
+
+ let _events = value.events;
+ if (_events) {
+ for (let event of _events) {
+ event.dated = toStamp(event.dated);
+ event.ended = toStamp(event.ended);
+ event.started = toStamp(event.started);
+ event.wdays = weekdayStore.fromSet(event.weekDays || '');
+ }
+ }
+
+ refreshEvents();
+ },
+});
+
+watch(
+ () => store.data,
+ (value) => {
+ data.value = value;
+ },
+ { immediate: true }
+);
+
+const getMonthNameAndYear = (date) => {
+ const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
+ const year = date.getFullYear();
+ return `${monthName} ${year}`;
+};
+
+const headerTitle = computed(() => {
+ if (!months.value?.length) return;
+
+ const firstMonth = getMonthNameAndYear(months.value[0]);
+ const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
+
+ return `${firstMonth} - ${lastMonth}`;
+});
+
+const step = (direction) => {
+ const _date = new Date(date.value);
+ _date.setMonth(_date.getMonth() + nMonths.value * direction);
+ date.value = _date;
+};
+
+const onDateSelected = (data) => emit('onDateSelected', data);
+
+onMounted(async () => {
+ let initialDate = Date.vnNew();
+ initialDate.setDate(1);
+ initialDate.setHours(0, 0, 0, 0);
+ date.value = initialDate;
+ weekdayStore.initStore();
+ await nextTick();
+ stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => arrayData.destroy());
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index d6ce70f6d..ddde3f6b3 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1,257 +1,26 @@
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
-
-
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index c754d484f..03f534701 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -2,7 +2,6 @@
import { onMounted, ref, reactive } from 'vue';
import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import { useArrayData } from 'src/composables/useArrayData';
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 5a7d07d71..0932a0b57 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';
@@ -15,6 +13,8 @@ import { useVnConfirm } from 'composables/useVnConfirm';
import useNotify from 'src/composables/useNotify.js';
import { useStateStore } from 'stores/useStateStore';
import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
const stateStore = useStateStore();
const { t } = useI18n();
@@ -71,35 +71,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 +87,11 @@ onMounted(() => (stateStore.rightDrawer = true));
-
-
-
-
-
-
-
+
+
-
-
+
+
+import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore';
import LeftMenu from 'src/components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+const { t } = useI18n();
const stateStore = useStateStore();
+
+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..31eeb2b7f 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -5,8 +5,9 @@ zone:
zoneCreate: Create zone
locations: Locations
deliveryDays: Delivery days
- upcomingList: Upcoming deliveries
+ upcomingDeliveries: Upcoming deliveries
warehouses: Warehouses
+ calendar: Calendar
list:
clone: Clone
id: Id
@@ -42,6 +43,8 @@ summary:
filterPanel:
name: Name
agencyModeFk: Agency
+zoneLocations:
+ locations: Locations
deliveryPanel:
pickup: Pick up
delivery: Delivery
@@ -64,3 +67,42 @@ warehouses:
deleteSubtitle: Are you sure you want to continue?
warehouse: Warehouse
add: Add
+eventsPanel:
+ editMode: Edit mode
+ include: Include
+ exclude: Exclude
+ events: Events
+ closing: Closing
+ travelingDays: Traveling days
+ price: Price
+ bonus: Bonus
+ m3Max: Max m³
+ everyday: Everyday
+ delete: Delete
+ deleteTitle: This item will be deleted
+ deleteSubtitle: Are you sure you want to continue?
+eventsExclusionForm:
+ addExclusion: Add exclusion
+ editExclusion: Edit exclusion
+ day: Day
+ all: All
+ specificLocations: Specific locations
+ rootTreeLabel: Locations where it is not distributed
+eventsInclusionForm:
+ addEvent: Add event
+ editEvent: Edit event
+ oneDay: One day
+ indefinitely: Indefinitely
+ rangeOfDates: Range of dates
+ day: Day
+ closing: Closing
+ travelingDays: Traveling days
+ price: Price
+ bonus: Bonus
+ m3Max: Max m³
+ from: From
+ to: To
+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..c670c2c08 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -5,8 +5,9 @@ zone:
zoneCreate: Nueva zona
locations: Localizaciones
deliveryDays: Días de entrega
- upcomingList: Próximos repartos
+ upcomingDeliveries: Próximos repartos
warehouses: Almacenes
+ calendar: Calendario
list:
clone: Clonar
id: Id
@@ -42,6 +43,8 @@ summary:
filterPanel:
name: Nombre
agencyModeFk: Agencia
+zoneLocations:
+ locations: Localizaciones
deliveryPanel:
pickup: Recogida
delivery: Entrega
@@ -66,3 +69,42 @@ warehouses:
deleteSubtitle: ¿Seguro que quieres continuar?
warehouse: Almacén
add: Añadir
+eventsPanel:
+ editMode: Modo edición
+ include: Incluir
+ exclude: Excluir
+ events: Eventos
+ closing: Cierre
+ travelingDays: Días de viaje
+ price: Precio
+ bonus: Bonificación
+ m3Max: Meidida máxima
+ everyday: Todos los días
+ delete: Eliminar
+ deleteTitle: Este elemento será eliminado
+ deleteSubtitle: ¿Seguro que quieres continuar?
+eventsExclusionForm:
+ addExclusion: Añadir exclusión
+ editExclusion: Editar exclusión
+ day: Día
+ all: Todo
+ specificLocations: Localizaciones concretas
+ rootTreeLabel: Localizaciones en las que no se reparte
+eventsInclusionForm:
+ addEvent: Añadir evento
+ editEvent: Editar evento
+ oneDay: Un día
+ indefinitely: Indefinido
+ rangeOfDates: Rango de fechas
+ day: Día
+ closing: Cierre
+ travelingDays: Días de viaje
+ price: Precio
+ bonus: Bonificación
+ m3Max: Medida máxima
+ from: Desde
+ to: Hasta
+upcomingDeliveries:
+ province: Provincia
+ closing: Cierre
+ id: Id
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
new file mode 100644
index 000000000..bc95719ef
--- /dev/null
+++ b/src/router/modules/account.js
@@ -0,0 +1,68 @@
+import { RouterView } from 'vue-router';
+
+export default {
+ path: '/account',
+ name: 'Account',
+ meta: {
+ title: 'users',
+ icon: 'face',
+ moduleName: 'Account',
+ },
+ component: RouterView,
+ redirect: { name: 'AccountMain' },
+ menus: {
+ main: ['AccountList', 'AccountAliasList', 'AccountRoles', 'AccountAcls'],
+ card: [],
+ },
+ children: [
+ {
+ path: '',
+ name: 'AccountMain',
+ component: () => import('src/pages/Account/AccountMain.vue'),
+ redirect: { name: 'AccountList' },
+ children: [
+ {
+ path: 'list',
+ name: 'AccountList',
+ meta: {
+ title: 'list',
+ icon: 'view_list',
+ },
+ component: () => import('src/pages/Account/AccountList.vue'),
+ },
+ {
+ path: 'alias-list',
+ name: 'AccountAliasList',
+ meta: {
+ title: 'alias',
+ icon: 'email',
+ },
+ component: () => import('src/pages/Account/AccountAliasList.vue'),
+ },
+ {
+ path: 'acls',
+ name: 'AccountAcls',
+ meta: {
+ title: 'acls',
+ icon: 'check',
+ },
+ component: () => import('src/pages/Account/AccountAcls.vue'),
+ },
+ {
+ path: 'acl-form',
+ name: 'AccountAclForm',
+ component: () => import('src/pages/Account/Acls/AclFormView.vue'),
+ },
+ {
+ path: 'role-list',
+ name: 'AccountRoles',
+ meta: {
+ title: 'roles',
+ icon: 'group',
+ },
+ component: () => import('src/pages/Account/Role/AccountRoles.vue'),
+ },
+ ],
+ },
+ ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 38bcd54d5..bf7e46b00 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -18,7 +18,10 @@ import Parking from './parking';
import Agency from './agency';
import ItemType from './itemType';
import Zone from './zone';
+import Account from './account';
import Monitor from './monitor';
+import MailAlias from './mailAlias';
+import Role from './role';
export default [
Item,
@@ -41,5 +44,8 @@ export default [
Agency,
ItemType,
Zone,
+ Account,
+ MailAlias,
Monitor,
+ Role,
];
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/mailAlias.js b/src/router/modules/mailAlias.js
new file mode 100644
index 000000000..8e0f8abdc
--- /dev/null
+++ b/src/router/modules/mailAlias.js
@@ -0,0 +1,57 @@
+import { RouterView } from 'vue-router';
+
+export default {
+ path: 'account/alias',
+ name: 'Alias',
+ meta: {
+ title: 'alias',
+ icon: 'email',
+ moduleName: 'Alias',
+ },
+ component: RouterView,
+ redirect: { name: 'AccountAliasList' },
+ menus: {
+ main: [],
+ card: ['AliasBasicData', 'AliasUsers'],
+ },
+ children: [
+ {
+ name: 'AliasCard',
+ path: ':id',
+ component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
+ redirect: { name: 'AliasSummary' },
+ children: [
+ {
+ name: 'AliasSummary',
+ path: 'summary',
+ meta: {
+ title: 'summary',
+ icon: 'launch',
+ },
+ component: () =>
+ import('src/pages/Account/Alias/Card/AliasSummary.vue'),
+ },
+ {
+ name: 'AliasBasicData',
+ path: 'basic-data',
+ meta: {
+ title: 'basicData',
+ icon: 'vn:settings',
+ },
+ component: () =>
+ import('src/pages/Account/Alias/Card/AliasBasicData.vue'),
+ },
+ {
+ name: 'AliasUsers',
+ path: 'users',
+ meta: {
+ title: 'aliasUsers',
+ icon: 'group',
+ },
+ component: () =>
+ import('src/pages/Account/Alias/Card/AliasUsers.vue'),
+ },
+ ],
+ },
+ ],
+};
diff --git a/src/router/modules/role.js b/src/router/modules/role.js
new file mode 100644
index 000000000..47cd10b18
--- /dev/null
+++ b/src/router/modules/role.js
@@ -0,0 +1,76 @@
+import { RouterView } from 'vue-router';
+
+export default {
+ path: 'account/role',
+ name: 'Role',
+ meta: {
+ title: 'role',
+ icon: 'vn:greuge',
+ moduleName: 'Role',
+ },
+ component: RouterView,
+ redirect: { name: 'AccountRoles' },
+ menus: {
+ main: [],
+ card: ['RoleBasicData', 'SubRoles', 'InheritedRoles', 'RoleLog'],
+ },
+ children: [
+ {
+ name: 'RoleCard',
+ path: ':id',
+ component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
+ redirect: { name: 'RoleSummary' },
+ children: [
+ {
+ name: 'RoleSummary',
+ path: 'summary',
+ meta: {
+ title: 'summary',
+ icon: 'launch',
+ },
+ component: () =>
+ import('src/pages/Account/Role/Card/RoleSummary.vue'),
+ },
+ {
+ name: 'RoleBasicData',
+ path: 'basic-data',
+ meta: {
+ title: 'basicData',
+ icon: 'vn:settings',
+ },
+ component: () =>
+ import('src/pages/Account/Role/Card/RoleBasicData.vue'),
+ },
+ {
+ name: 'SubRoles',
+ path: 'sub-roles',
+ meta: {
+ title: 'subRoles',
+ icon: 'group',
+ },
+ component: () => import('src/pages/Account/Role/Card/SubRoles.vue'),
+ },
+
+ {
+ name: 'InheritedRoles',
+ path: 'inherited-roles',
+ meta: {
+ title: 'inheritedRoles',
+ icon: 'account_tree',
+ },
+ component: () =>
+ import('src/pages/Account/Role/Card/InheritedRoles.vue'),
+ },
+ {
+ name: 'RoleLog',
+ path: 'log',
+ meta: {
+ title: 'log',
+ icon: 'history',
+ },
+ component: () => import('src/pages/Account/Role/Card/RoleLog.vue'),
+ },
+ ],
+ },
+ ],
+};
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 384978d13..927d11802 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -24,7 +24,6 @@ export default {
'WorkerTimeControl',
'WorkerLocker',
],
- departmentCard: ['BasicData'],
},
children: [
{
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index b79c430e5..fd6fa959b 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,8 +11,19 @@ export default {
component: RouterView,
redirect: { name: 'ZoneMain' },
menus: {
- main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
- card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
+ main: [
+ 'ZoneList',
+ 'ZoneDeliveryDays',
+ 'ZoneUpcomingList',
+ 'ZoneUpcomingDeliveries',
+ ],
+ card: [
+ 'ZoneBasicData',
+ 'ZoneWarehouses',
+ 'ZoneHistory',
+ 'ZoneLocations',
+ 'ZoneEvents',
+ ],
},
children: [
{
@@ -57,6 +68,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 +117,7 @@ export default {
path: 'location',
meta: {
title: 'locations',
- icon: 'vn:greuge',
+ icon: 'my_location',
},
component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
},
@@ -110,6 +139,15 @@ export default {
},
component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
},
+ {
+ name: 'ZoneEvents',
+ path: 'events',
+ meta: {
+ title: 'calendar',
+ icon: 'vn:calendar',
+ },
+ component: () => import('src/pages/Zone/Card/ZoneEvents.vue'),
+ },
],
},
],
diff --git a/src/router/routes.js b/src/router/routes.js
index 6a0430d51..359ce5317 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -18,7 +18,10 @@ import roadmap from 'src/router/modules/roadmap';
import parking from 'src/router/modules/parking';
import agency from 'src/router/modules/agency';
import zone from 'src/router/modules/zone';
+import account from './modules/account';
import monitor from 'src/router/modules/monitor';
+import mailAlias from './modules/mailAlias';
+import role from './modules/role';
const routes = [
{
@@ -79,6 +82,9 @@ const routes = [
agency,
ItemType,
zone,
+ account,
+ role,
+ mailAlias,
{
path: '/:catchAll(.*)*',
name: 'NotFound',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 263a9dec8..4dd5ed2ae 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -23,6 +23,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
'worker',
'wagon',
'zone',
+ 'account',
];
const pinnedModules = ref([]);
const role = useRole();
diff --git a/src/stores/useWeekdayStore.js b/src/stores/useWeekdayStore.js
index ac17356ae..57a302dc1 100644
--- a/src/stores/useWeekdayStore.js
+++ b/src/stores/useWeekdayStore.js
@@ -73,6 +73,22 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
return locales;
});
+ const getLocalesMap = computed(() => {
+ const locales = {};
+ for (let code of localeOrder.es) {
+ const weekDay = weekdaysMap[code];
+ const locale = t(`weekdays.${weekdaysMap[code].code}`);
+ const obj = {
+ ...weekDay,
+ locale,
+ localeChar: locale.substr(0, 1),
+ localeAbr: locale.substr(0, 3),
+ };
+ locales[weekDay.code] = obj;
+ }
+ return locales;
+ });
+
const getLocaleMonths = computed(() => {
const locales = [];
for (let code of monthCodes) {
@@ -106,6 +122,28 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
return wdays;
};
+ /**
+ * Perform the inverse operation of fromSet() method. Transforms an
+ * array whose indexes are weekday index with selected days set to %true to
+ * weekday codes separated by commas.
+ *
+ * @param {Array} _weekDays Array with selected days set to %true
+ * @return {String} weekDays Weekday codes separated by commas
+ */
+ const toSet = (_weekDays) => {
+ let wdays = [];
+
+ if (_weekDays) {
+ for (let i = 0; i < _weekDays.length; i++) {
+ if (!_weekDays[i]) continue;
+ let data = weekdays[i];
+ if (data) wdays.push(data.code);
+ }
+ }
+
+ return wdays.join(',');
+ };
+
return {
initStore,
weekdaysMap,
@@ -115,5 +153,7 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
monthCodes,
getLocaleMonths,
fromSet,
+ toSet,
+ getLocalesMap,
};
});
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/agency/agencyWorkCenter.spec.js b/test/cypress/integration/agency/agencyWorkCenter.spec.js
index ff3c53214..8349260ee 100644
--- a/test/cypress/integration/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/agency/agencyWorkCenter.spec.js
@@ -13,7 +13,6 @@ describe('AgencyWorkCenter', () => {
cy.get(
'.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
).type('workCenterOne{enter}');
- cy.get('.q-btn--standard > .q-btn__content > .block').click();
cy.get('.q-notification__message').should('have.text', 'Data created');
});
@@ -35,13 +34,11 @@ describe('AgencyWorkCenter', () => {
cy.get(
'.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
).type('workCenterOne{enter}');
- cy.get('.q-btn--standard > .q-btn__content > .block').click();
cy.get('.q-notification__message').should('have.text', 'Data created');
cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
cy.get(
'.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
).type('workCenterOne{enter}');
- cy.get('.q-btn--standard > .q-btn__content > .block').click();
cy.get(
':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
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
index 9af994a70..4184735ae 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -15,7 +15,7 @@ describe('WorkerPda', () => {
});
it('delete pda', () => {
- cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+ cy.get('.btn-delete').click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
).click();
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' },
}),
}));