surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add transactionsEnabled : enable the circuit to the transactions

Browse Source
This commit is contained in:
Paolo Arena
2022-09-22 11:06:04 +02:00
parent 7358216e6f
commit bc2080c42c
19 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
.env.example.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/popolodelnuovomondo.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="12"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/terradellavisione.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.15"
APP_VERSION="0.5.16"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL=newfreeplanet

2
src/components/CFinder/CFinder.ts
View File

@@ -1085,6 +1085,8 @@ export default defineComponent({
date_updated: 1,
nome_valuta: 1,
fido_scoperto_default: 1,
deperimento: 1,
transactionsEnabled: 1,
qta_max_default: 1,
valuta_per_euro: 1,
symbol: 1,

1
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -908,6 +908,7 @@
</q-card-actions>
</q-card>
</q-dialog>
<br />
</div>
</template>
<script lang="ts" src="./CGridTableRec.ts">

1
src/components/CMyUser/CMyUser.vue
View File

@@ -315,6 +315,7 @@
<CSendCoins
:showprop="showsendCoinTo"
:to_user="contact"
:circuitname="circuitname"
@close="showsendCoinTo = false"
>

10
src/components/CSendCoins/CSendCoins.ts
View File

@@ -18,6 +18,10 @@ export default defineComponent({
type: Boolean,
default: false,
},
circuitname: {
type: String,
default: ''
},
to_user: {
type: Object as PropType<IUserFields>,
required: true,
@@ -109,7 +113,11 @@ export default defineComponent({
console.log('user', props.to_user)
bothcircuits.value = userStore.IsMyCircuitByUser(props.to_user)
circuitsel.value = tools.getCookie(tools.CIRCUIT_USE, bothcircuits.value[0])
if (props.circuitname) {
circuitsel.value = props.circuitname
} else {
circuitsel.value = tools.getCookie(tools.CIRCUIT_USE, bothcircuits.value[0])
}
if (!userStore.IsMyCircuitByName(circuitsel.value)) {
circuitsel.value = bothcircuits.value[0]
}

11
src/components/CSendCoins/CSendCoins.vue
View File

@@ -34,6 +34,15 @@
</CMyUserOnlyView>
<div v-if="circuitloaded">
<q-banner
v-if="!circuitloaded.transactionsEnabled"
rounded
class="bg-red text-white"
style="text-align: center;"
>
<em style="font-weight: bold">{{ $t('circuit.transactionsEnabled_text') }}</em><br>
</q-banner>
<q-input
ref="qtyRef"
class="q-py-sm text-h5"
@@ -82,7 +91,7 @@
<q-card-actions align="center">
<q-btn
v-if="circuitloaded"
:disable="qtyRef ? qtyRef.hasError : false"
:disable="qtyRef ? (qtyRef.hasError || !circuitloaded.transactionsEnabled) : false"
:label="$t('circuit.sendcoinsto', {qty, coin: circuitsel, dest: to_user.username })" color="positive"
@click="sendCoin()"></q-btn>
<q-btn flat :label="$t('dialog.cancel')" color="primary" v-close-popup></q-btn>

14
src/layouts/toolbar/coinsPopover/coinsPopover.vue
View File

@@ -25,6 +25,12 @@
</q-item-section>
<q-item-section>{{ $t('notifs.setallread') }}</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="notifStore.deleteAll(username, shared_consts.QualiNotifs.CIRCUITS)">
<q-item-section side>
<q-icon name="fas fa-trash-alt"/>
</q-item-section>
<q-item-section>{{ $t('notifs.deleteall') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
@@ -148,7 +154,7 @@
</q-item-section>
<q-item-section side>
<q-item-label>
<q-btn v-if="!notif.read" dense rounded icon="fas fa-ellipsis-h">
<q-btn dense rounded icon="fas fa-ellipsis-h">
<q-menu>
<q-list style="min-width: 150px">
<q-item clickable v-close-popup @click="notifStore.setRead(notif._id)">
@@ -157,6 +163,12 @@
</q-item-section>
<q-item-section>{{ $t('notifs.read') }}</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="notifStore.deleteRec(username, notif._id)">
<q-item-section side>
<q-icon name="fas fa-trash-alt"/>
</q-item-section>
<q-item-section>{{ $t('notifs.delete_notif') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>

1
src/model/GlobalStore.ts
View File

@@ -934,6 +934,7 @@ export interface ICircuit {
qta_max_default?: number
data_costituz?: Date
deperimento: boolean
transactionsEnabled: boolean
freq_deper?: string
minuto_deper?: string
ora_deper?: string

2
src/statics/lang/it.js
View File

@@ -1127,6 +1127,8 @@ const msg_it = {
valuta_per_euro: 'Valuta per Euro',
fido_scoperto_default: 'Fiducia concessa',
fido_scoperto_default_tips: 'Rappresenta quanta moneta puoi creare autonomamente',
transactionsEnabled: 'Transazioni Abilitate',
transactionsEnabled_text: 'Le transazioni al Circuito sono attualmente sospese, in attesa di attivare il gruppo territoriale',
qta_max_default: 'Massimo accumulo',
qta_max_default_tips: 'Rappresenta quanta moneta ti è concesso accumulare temporaneamente. Incentiviamo di utilizzarla...',
data_costituz: 'Data Costituzione',

2
src/store/Modules/fieldsTable.ts
View File

@@ -2490,6 +2490,7 @@ export const colTableCircuitComplete = [
AddCol({ name: 'qta_max_default', label_trans: 'circuit.qta_max_default', fieldtype: costanti.FieldType.currency }),
AddCol({ name: 'data_costituz', label_trans: 'circuit.data_costituz', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'deperimento', label_trans: 'circuit.deperimento', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'freq_deper', label_trans: 'circuit.freq_deper' }),
AddCol({ name: 'minuto_deper', label_trans: 'circuit.minuto_deper', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'ora_deper', label_trans: 'circuit.ora_deper', fieldtype: costanti.FieldType.number }),
@@ -2603,6 +2604,7 @@ export const colTableCircuit = [
}),
AddCol({ name: 'regulation', label_trans: 'circuit.regulation', fieldtype: costanti.FieldType.html, required: true }),
AddCol({ name: 'deperimento', label_trans: 'circuit.deperimento', fieldtype: costanti.FieldType.boolean, disable: true }),
AddCol({ name: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'data_costituz', label_trans: 'circuit.data_costituz', fieldtype: costanti.FieldType.date }),
AddCol({
name: 'photos',

1
src/store/Modules/tools.ts
View File

@@ -5898,6 +5898,7 @@ export const tools = {
admins: [],
color: '#ff5500',
deperimento: false,
transactionsEnabled: true,
symbol: 'RIS',
fido_scoperto_default: 100,
qta_max_default: 200,

4
src/views/user/mycircuit/mycircuit.vue
View File

@@ -283,6 +283,10 @@
</CCurrencyValue>
</div>
</div>
<div class="sezioni">
<q-icon name="fas fa-toggle-on" class="iconcirc"></q-icon>
{{ t('circuit.transactionsEnabled') }}: <span class="text-section">{{ circuit.transactionsEnabled ? t('dialog.yes') : t('dialog.no') }} {{ }}</span>
</div>
<div class="sezioni" v-if="circuit.deperimento !== undefined">
<q-icon name="fas fa-battery-full" class="iconcirc"></q-icon>
{{ t('circuit.deperimento') }}: <span class="text-section">{{ circuit.deperimento ? t('dialog.yes') : t('dialog.no') }} {{ }}</span>

12
src/views/user/mygroup/mygroup.vue
View File

@@ -104,7 +104,6 @@
<q-tab v-if="!!mygrp.note" :label="t('groups.page')" name="page" icon="fas fa-file-word"></q-tab>
<q-tab v-if="tools.iCanShowGroupsMember(mygrp) || tools.iAmAdminGroup(groupname)"
:label="t('shared.subscribes')" name="members" icon="fas fa-users"></q-tab>
<q-tab :label="t('groups.circuits')" name="circuits" icon="fas fa-coins"></q-tab>
</q-tabs>
<q-tab-panels v-model="tabgrp" animated>
@@ -235,17 +234,6 @@
</div>
</q-tab-panel>
<q-tab-panel name="circuits">
Scegli il Circuito
mygrp.circuits_list {{mygrp.circuits_list}}
Mostra la lista dei Circuiti Esistenti
(come la lista gruppi, in formato scheda)
con possibilità di aggiungerli ai gruppi in cui sei Admin
</q-tab-panel>
<q-tab-panel name="members" style="max-width: 400px;" v-if="tools.iCanShowGroupsMember(mygrp)">
<q-tabs