diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts index 92c03f3f..64463e2a 100755 --- a/src/components/CSendCoins/CSendCoins.ts +++ b/src/components/CSendCoins/CSendCoins.ts @@ -38,6 +38,11 @@ export default defineComponent({ required: false, default: null, }, + from_contocom: { + type: String, + required: false, + default: '', + }, to_contocom: { type: String, required: false, @@ -118,6 +123,9 @@ export default defineComponent({ } else if (tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT) { groupSel.value = userStore.my.profile.manage_mygroups.find((group: IMyGroup) => from_groupname.value === group.groupname) accountloaded.value = groupSel.value ? groupSel.value.account : null + } else if (tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT) { + groupSel.value = userStore.my.profile.manage_mygroups.find((group: IMyGroup) => from_groupname.value === group.groupname) + accountloaded.value = groupSel.value ? groupSel.value.account : null } groupsListAdmin.value = userStore.GroupsListWhereIAmAdmin() @@ -244,10 +252,13 @@ export default defineComponent({ symbol: circuitloaded.value.symbol, } - myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : props.to_contocom + myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : '' + myrecsendcoin.contoComDest = props.to_contocom + myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? from_groupname.value : '' + myrecsendcoin.contoComOrig = tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT ? props.from_contocom : '' + myrecsendcoin.dest = props.to_user ? props.to_user.username : '' - myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? from_groupname.value : '' if (myrecsendcoin) { tools.sendCoinsByCircuit($q, circuitloaded.value, myrecsendcoin) diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 53fc490a..683be332 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -1051,6 +1051,8 @@ export interface ISendCoin { dest: string groupdest: string grouporig: string + contoComOrig?: string + contoComDest?: string causal: string symbol: string } diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index e386b6eb..3c116e72 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1246,6 +1246,7 @@ const msg_it = { domanda_refuse_circuit: 'Rifiutare la richiesta di {username} per entrare nel Circuito {circuitname}?', refusedcircuit: 'Rifiutato a {username} la richiesta di entrare nel Circuito', sendcoins: 'Invia Monete', + sendcoins_tocom: 'Invia a Conto Comunitario', sendcoinsto: 'Invia {qty} {coin} a {dest}', question_sendcoinsto: 'Inviare {qty} {coin} a {dest}?', question_sendcoinsto_from: 'Inviare {qty} {coin} da {from} a {dest}?', @@ -1292,8 +1293,10 @@ const msg_it = { movement: { transactionDate: 'Data Transazione', accountFromId: 'Dal Conto', + accountFromCollId: 'Dal Conto Collettivo', accountFromComId: 'Dal Conto Com.', accountToId: 'Al Conto', + accountToCollId: 'Al Conto Collettivo', accountToComId: 'Al Conto Com.', amount_sent: 'Quantità inviate', amount_to_send: 'Quantità da inviare', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index 1049a0e6..0ce5ccf8 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -23,6 +23,7 @@ export const costanti = { AccountType: { USER: 0, COMMUNITY_ACCOUNT: 1, + COLLECTIVE_ACCOUNT: 2, }, Lang: { diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 78e85506..14cef9d3 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -657,9 +657,11 @@ export const colmyMovementTable = [ // AddCol({ name: '_id', label_trans: 'reg.id' }), AddCol({ name: 'transactionDate', label_trans: 'movement.transactionDate', fieldtype: costanti.FieldType.date }), AddCol({ name: 'userfrom.username', field: 'userfrom', subfield: 'username', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.string, required: true }), - AddCol({ name: 'groupfrom.groupname', field: 'groupfrom', subfield: 'groupname', label_trans: 'movement.accountFromComId', fieldtype: costanti.FieldType.string, required: true }), + AddCol({ name: 'groupfrom.groupname', field: 'groupfrom', subfield: 'groupname', label_trans: 'movement.accountFromCollId', fieldtype: costanti.FieldType.string, required: true }), + AddCol({ name: 'contocomfrom.path', field: 'contocomfrom', subfield: 'path', label_trans: 'movement.accountFromComId', fieldtype: costanti.FieldType.string, required: true }), AddCol({ name: 'userto.username', field: 'userto', subfield: 'username', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.string, required: true }), - AddCol({ name: 'groupto.groupname', field: 'groupto', subfield: 'groupname', label_trans: 'movement.accountToComId', fieldtype: costanti.FieldType.string, required: true }), + AddCol({ name: 'groupto.groupname', field: 'groupto', subfield: 'groupname', label_trans: 'movement.accountToCollId', fieldtype: costanti.FieldType.string, required: true }), + AddCol({ name: 'contocomto.path', field: 'contocomto', subfield: 'path', label_trans: 'movement.accountToComId', fieldtype: costanti.FieldType.string, required: true }), AddCol({ name: 'amount', label_trans: 'movement.amount', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index a708bfb9..c0588d62 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -6195,8 +6195,8 @@ export const tools = { const username = userStore.my.username - let orig = sendcoinrec.grouporig ? sendcoinrec.grouporig : '' - let dest = sendcoinrec.groupdest ? sendcoinrec.groupdest : sendcoinrec.dest + let orig = sendcoinrec.grouporig ? sendcoinrec.grouporig : (sendcoinrec.contoComOrig ? sendcoinrec.contoComOrig : '') + let dest = sendcoinrec.groupdest ? sendcoinrec.groupdest : (sendcoinrec.contoComDest ? sendcoinrec.contoComDest : sendcoinrec.dest) let msg = '' if (orig) { diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index 55da3630..66f3bfe6 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -50,6 +50,7 @@ export default defineComponent({ const groupnameSel = ref('') const showsendCoinTo = ref(false) + const showrules = ref(false) const animation = ref('fade') @@ -455,6 +456,7 @@ export default defineComponent({ groupsListAdmin, groupnameSel, showsendCoinTo, + showrules, } } }) diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 7fdb0a86..d0369ea7 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -27,20 +27,29 @@ v-if="circuit.name" class="fit column no-wrap justify-evenly items-center content-start" > -