diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 8d5964c1..738cbb32 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -1,5 +1,5 @@
import type { IAction } from '@src/model/Projects'
-import type { IFriends, IGroupShort, IMyGroup, IPaymentType } from '@src/model/UserStore'
+import type { IAdmin, IFriends, IGroupShort, IMyGroup, IPaymentType } from '@src/model/UserStore'
import type {
IDepartment, IQueryAI, IProducer, IShareWithUs, IStorehouse, IProvider, IScontistica, ICategory, IGasordine, ICatProd, ISubCatProd, ICatAI,
IProduct
@@ -1493,7 +1493,7 @@ export interface ICircuit {
photos?: IImgGallery[]
date_created?: Date
date_updated?: Date
- admins?: IFriends[]
+ admins?: IAdmin[]
createdBy?: string
regulation?: string
note?: string
@@ -1607,6 +1607,7 @@ export interface IAccount {
name: string
deperibile: boolean
fidoConcesso: number
+ username_admin_abilitante?: string
qta_maxConcessa: number
importo_iniziale?: number
saldo: number
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index a68e492c..89b94e2a 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -14,6 +14,11 @@ export interface IFriends {
username: string
date?: Date
}
+export interface IAdmin {
+ username: string
+ date?: Date
+ enable_to_receive_email?: boolean
+}
export interface IGroupShort {
groupname: string
date?: Date
diff --git a/src/model/other.ts b/src/model/other.ts
index 450d8aa9..939eb27e 100755
--- a/src/model/other.ts
+++ b/src/model/other.ts
@@ -20,6 +20,7 @@ export interface IAbilitaCirc {
token: string
username: string
groupname?: string
+ username_action?: string
}
export interface ICallResult {
diff --git a/src/router/routesAdmin.ts b/src/router/routesAdmin.ts
index ee764f47..4753bdce 100644
--- a/src/router/routesAdmin.ts
+++ b/src/router/routesAdmin.ts
@@ -680,7 +680,7 @@ function getRoutesAd(site: ISites) {
{
active: true,
order: 1005,
- path: '/abcirc/:cmd/:token/:username',
+ path: '/abcirc/:cmd/:token/:username/:username_action',
materialIcon: 'how_to_reg',
name: 'pages.AbilitaCircuito',
component: () => import('@src/views/login/abilitacircuito/abilitacircuito.vue'),
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 7b293231..203f9b7d 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1669,6 +1669,7 @@ const msg_it = {
settings: 'Impostazioni',
deperibile: 'Deperibile',
fidoConcesso: 'Capacità di finanziamento',
+ username_admin_abilitante: 'Admin che ha Abilitato',
qta_maxConcessa: 'Capacità massima accumulabile',
importo_iniziale: 'Importo Iniziale',
saldo: 'Saldo',
diff --git a/src/store/Modules/serv_constants.ts b/src/store/Modules/serv_constants.ts
index 0bdccf2a..3a7f5961 100755
--- a/src/store/Modules/serv_constants.ts
+++ b/src/store/Modules/serv_constants.ts
@@ -8,6 +8,7 @@ export const serv_constants = {
RIS_CODE_AMMESSO: 1,
RIS_CODE_GIA_AMMESSO: -5,
+ RIS_CODE_ERRORE: -10,
RIS_CODE_REC_DUPLICATED_DESCR_CITY_USER: -110,
RIS_CODE_REC_ALREADY_EXIST_SYMBOL: -102,
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 585e54bc..8945ad82 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1162,7 +1162,7 @@ export const useUserStore = defineStore('UserStore', {
cmd: paramquery.cmd,
token: paramquery.token,
username: paramquery.username,
- username_action: this.my.username,
+ username_action: paramquery.username_action,
groupname: paramquery.groupname,
};
console.log(usertosend);
diff --git a/src/views/login/abilitacircuito/abilitacircuito.ts b/src/views/login/abilitacircuito/abilitacircuito.ts
index 995b99b7..ebcab7c0 100755
--- a/src/views/login/abilitacircuito/abilitacircuito.ts
+++ b/src/views/login/abilitacircuito/abilitacircuito.ts
@@ -52,8 +52,8 @@ export default defineComponent({
isLoading.value = true
username.value = (route.params.username) ? route.params.username.toString() : '';
- let param: IAbilitaCirc = { cmd: '', token: '', username: '' };
- if (route.params.token) param = { cmd: route.params.cmd.toString(), token: route.params.token.toString(), username: username.value };
+ let param: IAbilitaCirc = { cmd: '', token: '', username: '', username_action: '' };
+ if (route.params.token) param = { cmd: route.params.cmd.toString(), token: route.params.token.toString(), username: username.value, username_action: route.params.username_action.toString() };
// console.log('idlink = ', param)
return userStore
@@ -92,6 +92,7 @@ export default defineComponent({
goHome,
goToProfile,
circuitName,
+ risultato,
};
},
});
diff --git a/src/views/login/abilitacircuito/abilitacircuito.vue b/src/views/login/abilitacircuito/abilitacircuito.vue
index 6ed272d8..aabfa831 100755
--- a/src/views/login/abilitacircuito/abilitacircuito.vue
+++ b/src/views/login/abilitacircuito/abilitacircuito.vue
@@ -42,7 +42,7 @@