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

- Togliere la terza cifra nell'invio dei RIS... massimo 0.99

Browse Source
This commit is contained in:
Surya Paolo
2024-10-01 00:46:45 +02:00
parent 3a4faf0122
commit 1424060813
8 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quasar.conf.js
View File

@@ -251,6 +251,8 @@ module.exports = configure((ctx) => ({
'Cookies',
'Loading',
'AppVisibility',
'LocalStorage',
'SessionStorage',
],
get plugins_1() {
return this._plugins;

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

@@ -32,7 +32,7 @@ export default defineComponent({
const userStore = useUserStore()
const globalStore = useGlobalStore()
const showsendCoinTo = ref(true)
const showsendCoinTo = ref(false)
const showingtooltip = ref(false)
const site = computed(() => globalStore.site)

4
src/components/CContactUser/CContactUser.vue
View File

@@ -71,12 +71,12 @@
</div>
</div>
</div>
<div v-if="showsendCoinTo || sendRIS > 0">
<div v-if="showsendCoinTo || sendRIS">
<CSendCoins
:showprop="showsendCoinTo"
:to_user="myuser"
:sendRIS="sendRIS"
@close="showsendCoinTo = false"
@close="showsendCoinTo = false; loading = false"
@showed="loading = false"
>
</CSendCoins>

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

@@ -422,7 +422,7 @@
clickable
v-close-popup
dense
@click="naviga(`/my/` + contact.username)"
@click="naviga(`/my/` + contact.username + '?sendris=0')"
>
<q-item-section avatar>
<q-icon color="positive" name="fas fa-coins" />
@@ -811,7 +811,7 @@
clickable
v-close-popup
dense
@click="naviga(`/my/` + contact.username)"
@click="naviga(`/my/` + contact.username + '?sendris=0')"
>
<q-item-section avatar>
<q-icon color="positive" name="fas fa-coins" />

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

@@ -282,6 +282,7 @@ export default defineComponent({
qty.value = props.qtydefault
if (props.sendRIS) {
if (props.sendRIS !== '0')
qty.value = props.sendRIS
}
@@ -403,7 +404,7 @@ export default defineComponent({
}
function checkRisValid() {
return qty.value ? qty.value && getQty() > 0.01 && accountloaded.value
return qty.value ? qty.value && getQty() >= 0.01 && accountloaded.value
&& getQty() <= circuitStore.getRemainingCoinsToSend(accountloaded.value) : false
}

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

@@ -17,7 +17,13 @@
</q-bar>
<q-card-section>
<q-stepper v-model="step" ref="stepper" color="primary" animated class="mystepper">
<q-stepper
v-model="step"
ref="stepper"
color="primary"
animated
class="mystepper"
>
<q-step
:name="0"
:title="getTitle(0)"
@@ -160,7 +166,6 @@
:icon="getIcon(1)"
:done="ifNextCheck(1)"
>
<div v-if="circuitloaded && !!circuitloaded._id">
<q-banner
v-if="!circuitloaded.transactionsEnabled"
@@ -229,6 +234,29 @@
:icon="getIcon(2)"
:done="ifNextCheck(2)"
>
<!-- Destination -->
<CMyUserOnlyView
v-if="to_user"
:mycontact="to_user"
:visu="costanti.FIND_PEOPLE"
@setCmd="tools.setCmd"
>
</CMyUserOnlyView>
<CMyGroupOnlyView
v-if="to_group"
:mygrp="to_group"
:visu="costanti.USER_GROUPS"
:circuitname="circuitloaded.name"
>
</CMyGroupOnlyView>
<CMyGroupOnlyView
v-if="circuitloaded && !!circuitloaded._id && to_contocom"
:mygrp="{ groupname: to_contocom }"
:visu="costanti.USER_GROUPS"
:circuitname="circuitloaded.name"
>
</CMyGroupOnlyView>
<q-field class="text-center text-bold">
{{ $t('circuit.descr_casuale') }}
</q-field>
@@ -242,7 +270,9 @@
>
</q-input>
<div class="sendris">{{$t('circuit.sendcoinsto', {
<div class="sendris">
{{
$t('circuit.sendcoinsto', {
qty,
coin: circuitloaded.symbol,
dest: to_group
@@ -250,7 +280,9 @@
: to_user
? tools.getNomeUtenteByRecUser(to_user)
: to_contocom,
})}} sul {{circuitsel }}
})
}}
sul {{ circuitsel }}
</div>
</q-step>
</q-stepper>
@@ -281,7 +313,9 @@
})
"
color="positive"
:icon="(step === 2) ? 'img: images/1ris_rosso_100.png' : 'navigate_next'"
:icon="
step === 2 ? 'img: images/1ris_rosso_100.png' : 'navigate_next'
"
@click="clickAvanti(step)"
></q-btn>
</q-card-actions>

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

@@ -1,5 +1,5 @@
<template>
<CNotifAtTop />
<!--<CNotifAtTop />-->
<div v-if="tools.isUserOk()" class="q-gutter-sm q-pa-sm q-pb-md">
<div v-if="!circuit && !loading">
<div v-if="mystatus === 403">
@@ -187,19 +187,19 @@
class="fit column no-wrap justify-evenly items-center content-start"
>
<div class="row justify-center">
<q-avatar v-if="getImgCircuit()" size="70px">
<q-avatar v-if="getImgCircuit()" size="50px">
<q-img
:src="getImgCircuit()"
:alt="circuit.name"
img-class="imgprofile"
height="70px"
height="50px"
@click="showPic = true"
/>
</q-avatar>
<div class="q-mx-xs text-h6" style="align-self: center">
<span v-if="checkifShow('name')">{{ circuit.name }}</span>
</div>
<div>
<div class="row no-wrap justify-center items-center">
<CSaldo
v-if="account"
:symbol="circuit.symbol"
@@ -209,6 +209,17 @@
:qtarem="account ? qtarem : 0"
:valueextra="saldo_pend != saldo ? `* ` : ''"
></CSaldo>
<q-btn
v-if="account && !loadSaldo"
outline
rounded
dense
color="green"
style="height: 40px;"
icon="fas fa-redo"
class="q-mx-sm"
@click="aggiornaSaldo()"
></q-btn>
</div>
<q-dialog v-model="showMov" :maximized="$q.screen.lt.sm" permanent>
@@ -319,16 +330,6 @@
:thickness="2"
/>
</div>
<q-btn
v-if="account && !loadSaldo"
outline
rounded
dense
color="green"
icon="fas fa-redo"
:label="t('movement.updatewallet')"
@click="aggiornaSaldo()"
></q-btn>
<div class="q-ma-sm text-center">
<q-btn
@@ -480,7 +481,6 @@
:label="t('shared.info1')"
name="info"
icon="fas fa-info"
@click="loadCircuit()"
></q-tab>
<q-tab
v-if="

1
src/views/user/mycircuits/mycircuits.vue
View File

@@ -2,6 +2,7 @@
<div v-if="isfinishLoading" class>
<div v-if="tools.isLogged()">
<CNotifAtTop />
<CMyCircuits v-model="filter" :finder="true" :showfinder="true" :showBarSelection="true">
<CFinder
:ind="tools.getIndMainCardsByTable(shared_consts.TABLES_CIRCUITS)"