diff --git a/.env.development b/.env.development index b2d5e637..6f881759 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.56" +APP_VERSION="0.5.58" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 84e67c64..11425915 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.56" +APP_VERSION="0.5.58" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index b2d5e637..6f881759 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.56" +APP_VERSION="0.5.58" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index b390a12c..791ba277 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.56" +APP_VERSION="0.5.58" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 7bdc9b5a..9bf38d22 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.56" +APP_VERSION="0.5.58" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue index 3e46b6c6..8d4c4b6a 100755 --- a/src/components/CContactUser/CContactUser.vue +++ b/src/components/CContactUser/CContactUser.vue @@ -41,9 +41,8 @@
- {{ tools.roundDec2(value) }}  {{ symbol }} + :color="value > 0 ? `green` : value === 0 ? `gray` : `red`" + text-color="white" + icon="fas fa-coins" + > + {{ tools.roundDec2(value) }} +  {{ symbol }}
-
-
- - {{ symbol }} - +
+
+ + {{ symbol }} + {{ label }}
@@ -24,36 +52,42 @@ :readonly="readonly" type="number" rounded - :class="!small ? `q-px-sm text-h5`: `q-px-xs text-h7`" + :class="!small ? `q-px-sm text-h5` : `q-px-xs text-h7`" :color="value > 0 ? `green` : `red`" > -
-
diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 5be075a0..1acdc956 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -977,7 +977,7 @@
circuitloaded.value ? `${qty.value} ` + circuitloaded.value.symbol : '') const arrayMarkerLabel = ref([]) @@ -222,7 +222,8 @@ export default defineComponent({ myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : '' myrecsendcoin.dest = props.to_user ? props.to_user.username : '' - myrecsendcoin.grouporig = props.from_group ? props.from_group.groupname : '' + + myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? from_groupname.value : '' if (myrecsendcoin) { tools.sendCoinsByCircuit($q, circuitloaded.value, myrecsendcoin) diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index bb840cdc..822ab3ea 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -24,74 +24,96 @@ > - - - -
- -
- - - -
- + {{$t('circuit.sender')}}: +
+
+ +
+ - - -
+ +
+ + + +
- - + + + + - +
+ {{$t('circuit.dest')}} +
- - + + + + + +
- -
+ -->
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index 98309773..1c41cf25 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -296,7 +296,6 @@ size="lg" color="positive" @click="submitOk" - :disabled="!allowSubmit()" :label="$t('reg.submit')" > diff --git a/src/css/app.scss b/src/css/app.scss index 3f7c342f..55d84be9 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -179,6 +179,12 @@ $heightBtn: 100%; text-align: center; } +.mybanner_left { + font-weight: bold; + font-size: 1.1rem; + text-align: left; +} + .lowperc { color: red; } diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 367d6b8f..9e56335f 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1257,11 +1257,17 @@ const msg_it = { refuse_coins_qty: 'Rifiuta', refuse_coins: 'Rifiuta Monete', movements: 'Movimenti', - gruppicom: 'Gruppi Com.', + gruppicom: 'Conti Comunitari', qta_remaining_to_send: 'Quantità massima inviabile {maxqta} {symbol}', qta_not_valid: 'Quantità non valida', qta_max_to_send: 'Quantità massima inviabile {maxqta} {symbol}', transaction_suspended: 'Transazioni sospese', + choosecontocom: 'Scegli il tuo Conto Comunitario', + contocom: 'Conto Comunitario', + user: 'Utente', + sender: 'Mittente', + dest: 'Destinatario', + note: 'Note per il Destinatario', }, account: { @@ -1285,7 +1291,7 @@ const msg_it = { accountFromId: 'Dal Conto', accountToId: 'Al Conto', amount_sent: 'Quantità inviate', - amount_to_send: 'Quantità da inviare (massimo: {qtamax})', + amount_to_send: 'Quantità da inviare', amount: 'Quantità', causal: 'Note', causal_table: 'Tabella Causale', diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index acb5dc48..4a43ee74 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -248,6 +248,11 @@ export const useUserStore = defineStore('UserStore', { return this.my.profile.manage_mygroups }, + hoContiComunitariDaAmministrare(): boolean { + const arr = this.my.profile.manage_mygroups.find((group: IMyGroup) => group.account) + return arr ? true : false + }, + IsAskedFriendByUsername(username: string): boolean { if (this.my.profile.asked_friends) return this.my.profile.asked_friends.findIndex((rec) => rec.username === username) >= 0 diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index a198a957..fd182ff9 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -237,15 +237,31 @@ export default defineComponent({ idapp: 1, 'circuit.name': 1, 'circuit._id': 1 } - }, { $lookup: { from: 'accounts', - localField: 'circuit._id', - foreignField: 'circuitId', as: 'account', + let: { groupname: '$groupname', idapp: '$idapp', circuitId: '$circuit._id' }, + pipeline: [ + { + $match: + { + $expr: + { + $and: + [ + { $eq: ['$groupname', '$$groupname'] }, + { $eq: ['$idapp', '$$idapp'] }, + { $eq: ['$circuitId', '$$circuitId'] }, + + ], + }, + }, + }, + ], }, + }, { $unwind: '$account', diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 5fc6f6a2..706b311b 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -68,7 +68,8 @@
- + + - -
- - +
+ + + + Chiedi di Entrare nei Circuiti: + + + + + + + + + + + + + + + +