+
+
{{ t('components.userPanel.settings') }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ Message: Mensaje
+ Send: Enviar
+ Characters remaining: Carácteres restantes
+ Special characters like accents counts as a multiple: Carácteres especiales como los acentos cuentan como varios
+ The destination can't be empty: El destinatario no puede estar vacio
+ The message can't be empty: El mensaje no puede estar vacio
+ The message it's too long: El mensaje es demasiado largo
+
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 666f14c72..337507233 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -5,16 +5,16 @@ import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
import { useCamelCase } from 'src/composables/useCamelCase';
-const router = useRouter();
-const quasar = useQuasar();
-const { t } = useI18n();
+const { currentRoute } = useRouter();
+const { screen } = useQuasar();
+const { t, te } = useI18n();
let matched = ref([]);
let breadcrumbs = ref([]);
let root = ref(null);
watchEffect(() => {
- matched.value = router.currentRoute.value.matched.filter(
+ matched.value = currentRoute.value.matched.filter(
(matched) => Object.keys(matched.meta).length
);
breadcrumbs.value.length = 0;
@@ -34,13 +34,17 @@ function getBreadcrumb(param) {
icon: param.meta.icon,
path: param.path,
root: root.value,
+ locale: t(`globals.pageTitles.${param.meta.title}`),
};
- if (quasar.screen.gt.sm) {
+ if (screen.gt.sm) {
breadcrumb.name = param.name;
breadcrumb.title = useCamelCase(param.meta.title);
}
+ const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
+ if (te(moduleLocale)) breadcrumb.locale = t(moduleLocale);
+
return breadcrumb;
}
@@ -50,7 +54,7 @@ function getBreadcrumb(param) {
v-for="(breadcrumb, index) of breadcrumbs"
:key="index"
:icon="breadcrumb.icon"
- :label="t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)"
+ :label="breadcrumb.locale"
:to="breadcrumb.path"
/>
@@ -71,7 +75,7 @@ function getBreadcrumb(param) {
}
&--last,
&__separator {
- color: var(--vn-label);
+ color: var(--vn-label-color);
}
}
@media (max-width: $breakpoint-md) {
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index d5c59517d..bf3f4d384 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -27,6 +27,10 @@ const $props = defineProps({
type: Object,
default: null,
},
+ url: {
+ type: String,
+ default: null,
+ },
});
const warehouses = ref();
@@ -65,14 +69,15 @@ function mapperDms(data) {
}
function getUrl() {
+ if ($props.url) return $props.url;
if ($props.formInitialData) return 'dms/' + $props.formInitialData.id + '/updateFile';
return `${$props.model}/${route.params.id}/uploadFile`;
}
async function save() {
const body = mapperDms(dms.value);
- await axios.post(getUrl(), body[0], body[1]);
- emit('onDataSaved', body[1].params);
+ const response = await axios.post(getUrl(), body[0], body[1]);
+ emit('onDataSaved', body[1].params, response);
}
function defaultData() {
@@ -193,9 +198,11 @@ function addDefaultData(data) {
en:
contentTypesInfo: Allowed file types {allowedContentTypes}
EntryDmsDescription: Reference {reference}
+ SupplierDmsDescription: Reference {reference}
es:
Generate identifier for original file: Generar identificador para archivo original
contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
EntryDmsDescription: Referencia {reference}
+ SupplierDmsDescription: Referencia {reference}
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 5057c0790..23e00f5d9 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -218,7 +218,6 @@ function parseDms(data) {
/>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8a01e0bee..ec836f2cd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -1,5 +1,5 @@
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index f818f7457..794e4cc8f 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -403,7 +403,7 @@ setLogTree();
auto-load
/>
@@ -819,7 +819,7 @@ setLogTree();
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index c53193e6f..97aa91728 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,9 +1,10 @@
-
-
+
+
-
-
-
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index b5b9aae99..968f1e294 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -107,7 +107,11 @@ onMounted(async () => {
-
+
{{ entity.claimState.description }}
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0b740cf64..9d38461f4 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -150,10 +150,8 @@ const columns = computed(() => [
{{ t('Amount') }}
-
+
{{ toCurrency(amount) }}
@@ -201,11 +201,9 @@ function showImportDialog() {
:columns="columns"
:rows="rows"
:dense="$q.screen.lt.md"
- :pagination="{ rowsPerPage: 0 }"
row-key="id"
selection="multiple"
v-model:selected="selected"
- hide-pagination
:grid="$q.screen.lt.md"
>
diff --git a/src/pages/Claim/Card/ClaimLinesImport.vue b/src/pages/Claim/Card/ClaimLinesImport.vue
index be8914eec..d2b28c609 100644
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@@ -121,7 +121,6 @@ function cancel() {
class="my-sticky-header-table"
:columns="columns"
:rows="claimableSales"
- :pagination="{ rowsPerPage: 10 }"
row-key="saleFk"
selection="multiple"
v-model:selected="selected"
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 5f66450fc..f2ada6092 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -11,8 +11,8 @@ import FetchData from 'components/FetchData.vue';
const router = useRouter();
const quasar = useQuasar();
const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
const claimId = computed(() => router.currentRoute.value.params.id);
diff --git a/src/pages/Claim/Card/ClaimRma.vue b/src/pages/Claim/Card/ClaimRma.vue
deleted file mode 100644
index bba901d7b..000000000
--- a/src/pages/Claim/Card/ClaimRma.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('claim.rma.user') }}
-
-
- {{ row?.worker?.user?.name }}
-
-
-
-
-
-
- {{ t('claim.rma.created') }}
-
-
- {{
- toDate(row.created, {
- timeStyle: 'medium',
- })
- }}
-
-
-
-
-
-
-
- {{ t('globals.remove') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-es:
- This claim is not associated to any RMA: Esta reclamación no está asociada a ninguna ARM
-
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index bf6b57973..612e0d755 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -11,11 +11,12 @@ import VnLv from 'src/components/ui/VnLv.vue';
import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
const route = useRoute();
const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
const $props = defineProps({
id: {
@@ -172,6 +173,7 @@ function openDialog(dmsId) {
@@ -179,10 +181,10 @@ function openDialog(dmsId) {
-
+
-
+
-
+
@@ -279,11 +281,10 @@ function openDialog(dmsId) {
-
-
+
-
+