From 37c2f0851095b49c0c2f77cba29c8fb822b9d62d Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Sat, 11 Mar 2023 01:29:39 +0100 Subject: [PATCH] - qualifica non ci stava - lista invia ris ok --- src/components/CMyUser/CMyUser.vue | 2 +- src/components/CMyUserOnlyView/CMyUserOnlyView.vue | 2 +- src/components/CSendRISTo/CSendRISTo.ts | 10 ++++++---- src/statics/lang/it.js | 3 ++- src/store/Modules/tools.ts | 2 +- yarn.lock | 13 ++++--------- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 27194d01..08d2c4e5 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -36,7 +36,7 @@ }) }} - {{ contact.profile.qualifica }} diff --git a/src/components/CMyUserOnlyView/CMyUserOnlyView.vue b/src/components/CMyUserOnlyView/CMyUserOnlyView.vue index 9e896f51..c65f9665 100755 --- a/src/components/CMyUserOnlyView/CMyUserOnlyView.vue +++ b/src/components/CMyUserOnlyView/CMyUserOnlyView.vue @@ -36,7 +36,7 @@ }) }} - {{ contact.profile.qualifica }} diff --git a/src/components/CSendRISTo/CSendRISTo.ts b/src/components/CSendRISTo/CSendRISTo.ts index 1a753d74..efbd8eba 100755 --- a/src/components/CSendRISTo/CSendRISTo.ts +++ b/src/components/CSendRISTo/CSendRISTo.ts @@ -45,12 +45,14 @@ export default defineComponent({ } ]) - function sendCoinsToClick() { - if ((receiveRislist.value && receiveRislist.value.length > 0 || (receiveRislistgroup.value && receiveRislistgroup.value.length > 0))) { + async function sendCoinsToClick() { + await updateUserListRIS() + + if ((globalStore.datastat!.receiveRislist!.length > 0 || (globalStore.datastat!.receiveRislistgroup!.length > 0))) { usersList.value.show = true; usersList.value.title = 'Lista Utenti Riceventi'; - usersList.value.list = receiveRislist.value; - usersList.value.listgroup = receiveRislistgroup.value; + usersList.value.list = globalStore.datastat!.receiveRislist + usersList.value.listgroup = globalStore.datastat!.receiveRislistgroup } else { $router.push(tools.updateLink('/circuits')) } diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index ba7a8492..500426d3 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1188,7 +1188,8 @@ const msg_it = { vaialcircuito: 'Vai al Circuito', iscritti: 'iscritti trovati', wait_acceptation: 'ℹ️ La tua richiesta è stata inoltrata. Entro breve verrai abilitato. Se non ti sei ancora presentato al gruppo verrai contattato.', - coins_requestedris: 'Il tuo username {username} è ora in cima alla lista dei riceventi. Fai cliccare \'Invia RIS a..\' a chi ti deve inviare i RIS.', + coins_requestedris: 'Il tuo utente {username} sarà visibile sulla lista dei riceventi per 8 ore. Fai cliccare \'Invia RIS a..\' a chi ti deve inviare i RIS.', + coins_requestedrisgroup: 'Il Conto Collettivo {groupname} sarà visibile sulla lista dei riceventi per 8 ore. Fai cliccare \'Invia RIS a..\' a chi ti deve inviare i RIS.', lista_ricev_title: 'Questa è la lista degli Utenti che hanno cliccato su "Ricevi RIS" nelle ultime 8 ore', info: 'Informazioni su questo Circuito', name: 'Nome Circuito', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index be2da585..601392ba 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -7737,7 +7737,7 @@ export const tools = { await userStore.setUserReceiveRIS('', groupname).then((data) => { if (data.code === serv_constants.RIS_CODE_OK) { - this.showPositiveNotif($q, t('circuit.coins_requestedris', {groupname}), 6000) + this.showPositiveNotif($q, t('circuit.coins_requestedrisgroup', {groupname}), 6000) } else { this.showNegativeNotif($q, t('db.recfailed')) } diff --git a/yarn.lock b/yarn.lock index fd434a84..d893b8e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3637,15 +3637,10 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001400.tgz#f56c5b18d4cf2ff5f2a104ce4a50161ecf76ac2b" integrity sha512-PYH9fnvlFftomoHmkQAuqAvk2SILNkILP6GlvWLbm7uw887BFP+Pco+2eEXIho0ta3OBZhakMg8rEktM3zuQFQ== -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001400: - version "1.0.30001400" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001400.tgz#3038bee70d8b875604cd8833cb0e5e254ee0281a" - integrity sha512-Mv659Hn65Z4LgZdJ7ge5JTVbE3rqbJaaXgW5LEI9/tOaXclfIZ8DW7D7FCWWWmWiiPS7AC48S8kf3DApSxQdgA== - -caniuse-lite@^1.0.30001426: - version "1.0.30001431" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795" - integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426: + version "1.0.30001464" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz" + integrity sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g== caseless@~0.12.0: version "0.12.0"