+
+
+
+
+
+
+
-
-
-
-
- {{ row.warehouse?.name }}
-
-
- deleteWarehouse(row, rows, rowIndex)
- )
- "
- >
-
- {{ t('warehouses.delete') }}
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
- {{ t('warehouses.add') }}
+
+ {{ t('mailAlias.newAlias') }}
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
deleted file mode 100644
index 1128205b8..000000000
--- a/src/pages/Account/AccountConnections.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ row.warehouse?.name }}
-
-
- deleteWarehouse(row, rows, rowIndex)
- )
- "
- >
-
- {{ t('warehouses.delete') }}
-
-
-
-
-
-
-
-
-
-
-
- {{ t('warehouses.refresh') }}
-
-
-
-
diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
deleted file mode 100644
index ca69fbb00..000000000
--- a/src/pages/Account/AccountCreate.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
- (suppliersOptions = data)"
- auto-load
- />
- (travelsOptions = data)"
- auto-load
- />
- (companiesOptions = data)"
- auto-load
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.opt?.nickname }}
-
- #{{ scope.opt?.id }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.opt?.agencyModeName }} -
- {{ scope.opt?.warehouseInName }} ({{
- toDate(scope.opt?.shipped)
- }}) →
- {{ scope.opt?.warehouseOutName }} ({{
- toDate(scope.opt?.landed)
- }})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- es:
- Supplier: Proveedor
- Travel: Envío
- Company: Empresa
-
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
deleted file mode 100644
index 4d5fdfb34..000000000
--- a/src/pages/Account/AccountLdap.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
- TODO LDAP
-
-
-
-
-
- {{ t('ldap.testConnection') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 56d54a47d..4cf27607a 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,109 +1 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ t('globals.collapseMenu') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Account list
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
deleted file mode 100644
index d04ba1ed5..000000000
--- a/src/pages/Account/AccountSamba.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
- TODO SAMBA
-
-
-
-
- {{ t('samba.testConnection') }}
-
-
-
-
- {{ t('samba.verifyCertificate') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
similarity index 63%
rename from src/pages/Account/Role/Card/RoleForm.vue
rename to src/pages/Account/Alias/AliasCreateForm.vue
index 0fef124c6..c8ed6fadf 100644
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@@ -1,39 +1,43 @@
+
-
+
@@ -43,5 +47,5 @@ const defaultInitialData = {
es:
- Create role: Crear role
+ Create alias: Crear alias
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
similarity index 73%
rename from src/pages/Account/Role/Card/RoleBasicData.vue
rename to src/pages/Account/Alias/Card/AliasBasicData.vue
index 4607ef15c..3f682fd67 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -1,26 +1,28 @@
+
-
+
-
+
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
new file mode 100644
index 000000000..8b6c9c3cf
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
similarity index 69%
rename from src/pages/Account/Role/Card/RoleDescriptor.vue
rename to src/pages/Account/Alias/Card/AliasDescriptor.vue
index 2df191950..bc174aa0e 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -2,14 +2,15 @@
import { ref, computed } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
import { useQuasar } from 'quasar';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
+
const $props = defineProps({
id: {
type: Number,
@@ -18,26 +19,28 @@ const $props = defineProps({
},
});
+const { t } = useI18n();
const route = useRoute();
-
const quasar = useQuasar();
const router = useRouter();
-
const { notify } = useNotify();
-const { t } = useI18n();
+
const entityId = computed(() => {
return $props.id || route.params.id;
});
+
const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
+
const filter = {
where: { id: entityId },
};
-const removeRole = () => {
+
+const removeAlias = () => {
quasar
.dialog({
- title: 'Are you sure you want to delete it?',
- message: 'Delete department',
+ title: t('Alias will be removed'),
+ message: t('Are you sure you want to continue?'),
ok: {
push: true,
color: 'primary',
@@ -46,14 +49,11 @@ const removeRole = () => {
})
.onOk(async () => {
try {
- await axios.post(
- `/Departments/${entityId.value}/removeChild`,
- entityId.value
- );
- router.push({ name: 'WorkerDepartment' });
- notify('department.departmentRemoved', 'positive');
+ await axios.delete(`MailAliases/${entityId.value}`);
+ notify(t('Alias removed'), 'positive');
+ router.push({ name: 'AccountAlias' });
} catch (err) {
- console.error('Error removing department');
+ console.error('Error removing alias');
}
});
};
@@ -62,32 +62,32 @@ const removeRole = () => {
-
+
{{ t('Delete') }}
-
+
-
+
en:
accountRate: Claming rate
es:
accountRate: Ratio de reclamación
+ Delete: Eliminar
+ Alias will be removed: El alias será eliminado
+ Are you sure you want to continue?: ¿Seguro que quieres continuar?
+ Alias removed: Alias eliminado
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
new file mode 100644
index 000000000..cedae28b7
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -0,0 +1,49 @@
+
+
+
+ (alias = data)"
+ >
+ {{ alias.id }} - {{ alias.alias }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
new file mode 100644
index 000000000..6367dcab7
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.user?.name }}
+
+
+ deleteAlias(row)
+ )
+ "
+ >
+
+ {{ t('Delete') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ User will be removed from alias: El usuario será borrado del alias
+ Are you sure you want to continue?: ¿Seguro que quieres continuar?
+ Delete: Eliminar
+
diff --git a/src/pages/Account/Card/AccountInheritedRoles.vue b/src/pages/Account/Card/AccountInheritedRoles.vue
deleted file mode 100644
index d8a43c623..000000000
--- a/src/pages/Account/Card/AccountInheritedRoles.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
- (accountReasons = data)"
- auto-load
- />
- (accountResults = data)"
- auto-load
- />
- (accountResponsibles = data)"
- auto-load
- />
- (accountRedeliveries = data)"
- auto-load
- />
- (workers = data)"
- auto-load
- />
-
-
-
-
-
-
-
-
-
- {{ scope.opt?.name }}
-
- {{ scope.opt?.nickname }}
- {{ scope.opt?.code }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-es:
- Reason: Motivo
- Result: Consecuencia
- Responsible: Responsable
- Worker: Trabajador
- Redelivery: Devolución
-
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
deleted file mode 100644
index 2109a3ab4..000000000
--- a/src/pages/Account/Role/AccountRoles.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('account.pageTitles.newRole') }}
-
-
-
-
-
- New rol: Nuevo role
-
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
deleted file mode 100644
index 23b72266c..000000000
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
- (states = data)" auto-load />
- (workers = data)"
- auto-load
- />
-
-
-
- {{ t(`params.${tag.label}`) }}:
- {{ formatFn(tag.value) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-en:
- params:
- search: Contains
- clientFk: Customer
- clientName: Customer
- salesPersonFk: Salesperson
- attenderFk: Attender
- accountResponsibleFk: Responsible
- accountStateFk: State
- created: Created
- myTeam: My team
-es:
- params:
- search: Contiene
- clientFk: Cliente
- clientName: Cliente
- salesPersonFk: Comercial
- attenderFk: Asistente
- accountResponsibleFk: Responsable
- accountStateFk: Estado
- created: Creada
- Customer ID: ID cliente
- Client Name: Nombre del cliente
- Salesperson: Comercial
- Attender: Asistente
- Responsible: Responsable
- State: Estado
- Item: Artículo
- Created: Creada
- More options: Más opciones
- myTeam: Mi equipo
-
diff --git a/src/pages/Account/Role/Card/InheritedRoles.vue b/src/pages/Account/Role/Card/InheritedRoles.vue
deleted file mode 100644
index cfcf224c7..000000000
--- a/src/pages/Account/Role/Card/InheritedRoles.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
deleted file mode 100644
index 7f5a45d8b..000000000
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/src/pages/Account/Role/Card/RoleLog.vue b/src/pages/Account/Role/Card/RoleLog.vue
deleted file mode 100644
index 48f5eb23a..000000000
--- a/src/pages/Account/Role/Card/RoleLog.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
deleted file mode 100644
index 05fee63a2..000000000
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- (role = data)"
- >
- {{ role.id }} - {{ role.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
deleted file mode 100644
index 48f5eb23a..000000000
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 2464d3728..f9bd7dc18 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -15,6 +15,7 @@ account:
privileges: Privileges
mailAlias: Mail Alias
mailForwarding: Mail Forwarding
+ aliasUsers: Users
card:
name: Name
nickname: User
@@ -36,11 +37,20 @@ role:
pageTitles:
inheritedRoles: Inherited Roles
subRoles: Sub Roles
-
card:
description: Description
id: Id
name: Name
+mailAlias:
+ pageTitles:
+ aliasUsers: Users
+ search: Search mail alias
+ searchInfo: Search alias by id or name
+ alias: Alias
+ description: Description
+ id: Id
+ newAlias: New alias
+ name: Name
ldap:
enableSync: Enable synchronization
server: Server
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index dd242fe63..763143940 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -15,6 +15,7 @@ account:
privileges: Privilegios
mailAlias: Alias de correo
mailForwarding: Reenvío de correo
+ aliasUsers: Usuarios
card:
nickname: Usuario
name: Nombre
@@ -51,7 +52,16 @@ role:
description: Descripción
id: Idd
name: Nombre
-
+mailAlias:
+ pageTitles:
+ aliasUsers: Usuarios
+ search: Buscar alias de correo
+ searchInfo: Buscar alias por id o nombre
+ alias: Alias
+ description: Descripción
+ id: Id
+ newAlias: Nuevo alias
+ name: Nombre
ldap:
enableSync: Habilitar sincronización
server: Servidor
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index ca60c78d8..d69098a58 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,6 +13,7 @@ import Travel from './travel';
import Order from './order';
import Department from './department';
import Role from './role';
+import mailAlias from './mailAlias';
import Entry from './entry';
import roadmap from './roadmap';
import Parking from './parking';
@@ -38,6 +39,7 @@ export default [
invoiceIn,
Department,
Role,
+ mailAlias,
Entry,
roadmap,
Parking,
diff --git a/src/router/modules/mailAlias.js b/src/router/modules/mailAlias.js
new file mode 100644
index 000000000..623c76b25
--- /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: 'AccountAlias' },
+ 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/routes.js b/src/router/routes.js
index 60cc24a75..9d3dc8710 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -11,6 +11,7 @@ import route from './modules/route';
import travel from './modules/travel';
import department from './modules/department';
import role from './modules/role';
+import mailAlias from './modules/mailAlias';
import ItemType from './modules/itemType';
import shelving from 'src/router/modules/shelving';
import order from 'src/router/modules/order';
@@ -76,6 +77,7 @@ const routes = [
travel,
department,
role,
+ mailAlias,
roadmap,
entry,
parking,