Payeer e AdvCash

This commit is contained in:
Paolo Arena
2020-09-04 00:08:36 +02:00
parent 25dcde96df
commit f94186be75
33 changed files with 561 additions and 217 deletions

View File

@@ -34,6 +34,8 @@ export const shared_consts = {
FILTER_ATTIVI: 2048, FILTER_ATTIVI: 2048,
FILTER_NASCOSTI: 4096, FILTER_NASCOSTI: 4096,
FILTER_NAVI_NON_PRESENTI: 8192, FILTER_NAVI_NON_PRESENTI: 8192,
FILTER_QUALIFIED: 16384,
FILTER_ASK_ZOOM_VISTO: 32768,
Permissions: { Permissions: {
Admin: { Admin: {
@@ -65,6 +67,12 @@ export const shared_consts = {
label: 'dashboard.traduttrici', label: 'dashboard.traduttrici',
icon: 'fas fa-user-tie', icon: 'fas fa-user-tie',
color: 'orange' color: 'orange'
},
Zoomeri: {
value: 32,
label: 'dashboard.zoomeri',
icon: 'fas fa-user-tie',
color: 'yellow'
} }
}, },

View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="row justify-between q-pa-xs-sm"> <div class="row justify-between q-pa-xs-sm">
<div :style="'font-size:'+ fontsize + ' padding-right: 8px;'"> <div :style="' padding-right: 8px;'">
{{mytext}} {{mytext}}
</div> </div>
<div> <div>

View File

@@ -83,6 +83,10 @@ export default class CGridTableRec extends Vue {
return UserStore.state.isTutor return UserStore.state.isTutor
} }
get isZoomeri() {
return UserStore.state.isZoomeri
}
get isTratuttrici() { get isTratuttrici() {
return UserStore.state.isTratuttrici return UserStore.state.isTratuttrici
} }

View File

@@ -71,8 +71,7 @@
Cuore desidera ardentemente? Cuore desidera ardentemente?
</li> </li>
<li>Attivare almeno <strong>2 metodi di pagamento</strong>. <li>Attivare almeno <strong>2 metodi di pagamento</strong>.
<strong>Revolut</strong> è quello maggiormente consigliato.<br> <strong>Revolut, Payeer e Paypal (tramite MoneyBox)</strong> sono quelli maggiormente consigliati.<br>
Come seconda scelta c'è Paypal, ma ultimamente stiamo avendo problemi perchè tendono a bloccare i soldi sul conto per 6 mesi per controlli, quindi da utilizzare solo se impossiblitati ad aprire un conto con Revolut.
</li> </li>
</ol> </ol>
@@ -208,10 +207,9 @@
</li> </li>
<li>Pisanje svojih sanj: kaj je tisto, kar bi želeli doseči, in po čem vaše srce hrepeni? <li>Pisanje svojih sanj: kaj je tisto, kar bi želeli doseči, in po čem vaše srce hrepeni?
</li> </li>
<li>Aktivirajte vsaj 2 načina plačila. PayPal je obvezen (za aktiviranje potrebujete 2 minuti). <li>Aktivirajte vsaj 2 načina plačila.
Omogoča vam brezplačne prenose v evro območju in nanj lahko povežete kartice in preverjate <strong>Revolut, Payeer in Paypal (preko MoneyBoxa)</strong> so najbolj priporočljivi.<br>
račune. Vaši podatki so varni in se ne delijo s prejemnikom. Račun Revolut ali N26 se priporoča
kot druga možnost, Western Union, Xoom ali TransferWise pa v primeru neevropskih daril.
</li> </li>
</ol> </ol>
@@ -342,12 +340,8 @@
deseas de corazón? deseas de corazón?
</li> </li>
<li>Activar por lo menos <strong>2 métodos de pago</strong>. <li>Activar por lo menos <strong>2 métodos de pago</strong>.
<strong>PayPal</strong> es obligatorio (toma 2 minutos activarlo). Te permite hacer <strong>Revolut, Payeer y Paypal (a través de MoneyBox)</strong> son los más recomendados.<br>
transferencias gratuitas en la zona euro y puedes conectar tarjetas y cuenta corriente a ella.
Tus datos están seguros y no se comparten con el receptor. Recomendamos la cuenta <strong>Revolut</strong>
o <strong>N26</strong>
como segunda opción y <strong>Western Union, Xoom o TransferWise</strong> en casos de regalos
extra-europeos.
</li> </li>
</ol> </ol>
@@ -502,13 +496,8 @@
Anseio do coração? Anseio do coração?
</li> </li>
<li>Ativar pelo menos <strong>2 formas de pagamento</strong>. <li>Ativar pelo menos <strong>2 formas de pagamento</strong>.
<strong>PayPal</strong> é obrigatório (demora 2 minutos a activá-lo). <strong>Revolut, Payeer e Paypal (via MoneyBox)</strong> são os mais recomendados.<br>
Permite-lhe transferências gratuitas na zona Euro e pode ligar-lhe cartões e contas.
correntes. Os seus dados estão seguros e não são partilhados com o receptor.
Recomendamos o <strong>Revolução</strong> ou <strong>N26</strong> conta como segunda opção e
<strong>Ocidente
Union</strong>, Xoom ou TransferWise em casos de
presentes extra-europeus.
</li> </li>
</ol> </ol>
<p class="cltexth3 text-blue q-ma-lg">Passo 3: Programação e ativação do Navio</p>. <p class="cltexth3 text-blue q-ma-lg">Passo 3: Programação e ativação do Navio</p>.
@@ -642,14 +631,8 @@
<li>Ecrivez <strong>Votre Rêve</strong>: quelle est la chose ou le projet que vous aimeriez réaliser <li>Ecrivez <strong>Votre Rêve</strong>: quelle est la chose ou le projet que vous aimeriez réaliser
et que votre coeur désire ardemment ? et que votre coeur désire ardemment ?
</li> </li>
<li>Activer au moins 2 <strong>moyens de paiement</strong>. <strong>PayPal</strong> est obligatoire <li>Activer au moins 2 <strong>moyens de paiement</strong>
(il faut 2 minutes pour <strong>Revolut, Payeer et Paypal (via MoneyBox)</strong> sont les plus recommandés.<br>
l'activer). Il vous permet d'effectuer des transferts gratuits dans la zone Euro et vous pouvez
y relier cartes bancaires et comptes courants. Vos données personnelles sont en sécurité et ne
sont pas partagées avec le destinataire. Nous recommandons le compte <strong>Revolut</strong> ou
<strong>N26</strong> comme
deuxième option et <strong>Western Union, Xoom ou TransferWise</strong> pour les dons
extra-européens.
</li> </li>
</ol> </ol>
<p class="cltexth3 text-blue q-ma-lg">Etape 3: PROGRAMMATION ET ACTIVATION DE DES NAVIRES</p>. <p class="cltexth3 text-blue q-ma-lg">Etape 3: PROGRAMMATION ET ACTIVATION DE DES NAVIRES</p>.
@@ -797,12 +780,7 @@
that your Heart is longing? that your Heart is longing?
</li> </li>
<li>Activate at least <strong>2 payment methods</strong> (is recommended). <li>Activate at least <strong>2 payment methods</strong> (is recommended).
<strong>PayPal</strong> is mandatory (it takes 2 minutes to activate it). <strong>Revolut, Payeer and Paypal (via MoneyBox)</strong> are the most recommended.<br>
It allows you free transfers in the Euro area and you can connect cards and accounts to it.
Your data is safe and not shared with the receiver.
We recommend the <strong>Revolut</strong> or <strong>N26</strong> account as the second option
and <strong>Western Union</strong>, Xoom or TransferWise in cases of
extra-European gifts.
</li> </li>
</ol> </ol>
@@ -899,10 +877,6 @@
(Video-Conferenza On Line) (Video-Conferenza On Line)
</li> </li>
<li>dichiaro di aver ben compreso che per la mia sicurezza devo aprire un <strong>conto
Paypal</strong>
per consegnare il regalo.
</li>
</ul> </ul>
</div> </div>
<div v-else-if="toolsext.isLang('si')"> <div v-else-if="toolsext.isLang('si')">
@@ -927,10 +901,6 @@
video-konferenca) video-konferenca)
</li> </li>
<li>Izjavljam, da razumem, da moram zaradi svoje varnosti odpreti <strong>Paypal</strong> račun za
dostavo darila.
</li>
</ul> </ul>
</div> </div>
<div v-else-if="toolsext.isLang('es')"> <div v-else-if="toolsext.isLang('es')">
@@ -950,10 +920,6 @@
Conferencia En-línea). Conferencia En-línea).
</li> </li>
<li>Declaro haber entendido bien que por mi seguridad tengo que abrir una <strong>cuenta de
Paypal</strong> para hacer el regalo.
</li>
<li> <li>
Puedo ejercer mi derecho de retirada dentro de los 14 días siguientes al envío del regalo si no Puedo ejercer mi derecho de retirada dentro de los 14 días siguientes al envío del regalo si no
deseo continuar mi viaje. deseo continuar mi viaje.
@@ -979,11 +945,6 @@
(Videoconferência On Line) (Videoconferência On Line)
</li> </li>
<li>Eu declaro que compreendi bem que para minha segurança tenho que abrir uma <strong>conta
Paypal</strong>.
para entregar o presente.
</li>
<li> <li>
Posso exercer o meu direito de retirada no prazo de 14 dias após o envio do presente se não Posso exercer o meu direito de retirada no prazo de 14 dias após o envio do presente se não
quiser mais quiser mais
@@ -1010,10 +971,6 @@
ligne); ligne);
</li> </li>
<li>Je déclare avoir bien compris que pour ma sécurité, je dois ouvrir un compte Paypal pour verser
le Don;
</li>
<li>Je peux exercer mon droit de rétractation dans les 14 jours suivant l'envoi du cadeau si je ne <li>Je peux exercer mon droit de rétractation dans les 14 jours suivant l'envoi du cadeau si je ne
souhaite plus poursuivre mon voyage. souhaite plus poursuivre mon voyage.
</li> </li>
@@ -1039,10 +996,6 @@
(Video-Conference On Line) (Video-Conference On Line)
</li> </li>
<li>I declare to have well understood that for my safety I have to open a <strong>Paypal</strong>
account to deliver the gift.
</li>
<li>I can exercise my right of withdrawal within 14 days of sending the gift if I no longer wish to <li>I can exercise my right of withdrawal within 14 days of sending the gift if I no longer wish to
continue my trip. continue my trip.
</li> </li>

View File

@@ -297,7 +297,7 @@ export default class CMyDashboard extends MixinUsers {
if (val1 < 0) if (val1 < 0)
val1 = 0 val1 = 0
let valmax = val1; let valmax = val1
if (valmax < 2) if (valmax < 2)
valmax = 2 valmax = 2
@@ -375,7 +375,7 @@ export default class CMyDashboard extends MixinUsers {
if (val2 < 0) if (val2 < 0)
val2 = 0 val2 = 0
return val1 + '/' + val2 return val1 + '/' + val2
} }
public isprovvisoria(mianave) { public isprovvisoria(mianave) {
@@ -433,23 +433,31 @@ export default class CMyDashboard extends MixinUsers {
const rigamin = tools.getRiganave(mianave.riga) const rigamin = tools.getRiganave(mianave.riga)
const colmin = tools.getColnave(mianave.col) const colmin = tools.getColnave(mianave.col)
const mynavedest = tools.getfirstnaveSognatore(mianave.riga, mianave.col)
let riga = this.myrigaattuale let riga = this.myrigaattuale
let col = this.mycolattuale let col = this.mycolattuale
let colvera = colmin let colvera = colmin
if (rigamin > 3) { if (rigamin > 1) {
for (let index = rigamin; index < riga - 1; index++) { for (let index = rigamin; index < riga; index++) {
colvera = colvera * 2 colvera = colvera * 2
} }
} else { } else {
colvera = 7 colvera = 7
} }
if (col <= colvera) { if (riga === mynavedest.riga) {
colvera = mynavedest.col
}
// colvera = mynavedest.col
if (col < colvera) {
riga = riga - 1 riga = riga - 1
} }
// console.log('[' + rigamin + '.' + colmin + ']', 'riga', riga, 'col', col, 'colvera', colvera) console.log('[' + rigamin + '.' + colmin + ']', 'riga', riga, 'col', col, 'colvera', colvera)
if (riga > rigamin + 6) if (riga > rigamin + 6)
riga = rigamin + 6 riga = rigamin + 6

View File

@@ -12,6 +12,7 @@ import { CMySelect } from '../CMySelect'
import { GlobalStore, UserStore } from '../../store/Modules' import { GlobalStore, UserStore } from '../../store/Modules'
import { CMyChipList } from '../CMyChipList' import { CMyChipList } from '../CMyChipList'
import { CMyToggleList } from '../CMyToggleList' import { CMyToggleList } from '../CMyToggleList'
import translate from '@src/globalroutines/util'
@Component({ @Component({
name: 'CMyFieldDb', name: 'CMyFieldDb',
@@ -27,6 +28,7 @@ export default class CMyFieldDb extends MixinBase {
@Prop({ required: false, default: false }) public disable: boolean @Prop({ required: false, default: false }) public disable: boolean
@Prop({ required: false, default: '' }) public jointable: string @Prop({ required: false, default: '' }) public jointable: string
@Prop({ required: false, default: 'settings' }) public table: string @Prop({ required: false, default: 'settings' }) public table: string
@Prop({ required: false, default: '' }) public myimg: string
public $t public $t
public myvalue = '' public myvalue = ''
@@ -90,9 +92,9 @@ export default class CMyFieldDb extends MixinBase {
return '***************' return '***************'
} else { } else {
if (val === undefined) if (val === undefined)
return '-' return ' <span class="text-grey">(' + translate('reg.select') + ')</span> '
else if (val === '') { else if (val === '') {
return '-' return ' <span class="text-grey">(' + translate('reg.select') + ')</span> '
} else { } else {
let mystr = tools.firstchars(val, 5000) let mystr = tools.firstchars(val, 5000)
if (val) { if (val) {

View File

@@ -1,10 +1,21 @@
<template> <template>
<div class="text-center"> <div class="text-center">
<div class="row items-center justify-center q-gutter-md q-ma-xs"> <div class="row items-center justify-center q-gutter-md q-ma-xs">
<div class="q-ma-xs"> <div class="q-ma-xs">
<q-field rounded outlined bg-color="orange-3" dense style="min-width:110px;"> <q-field rounded outlined bg-color="blue-1" dense style="min-width:110px;">
<template v-slot:control> <template v-slot:control>
<div class="self-center full-width no-outline text-center" tabindex="0">{{title}}</div> <div class="centermydiv">
<div v-if="myimg" class="text-center">
<q-img
:src="myimg"
class="text-center"
style="height: 50px; width: 50px;"
:alt="title">
</q-img>
</div>
<div class="self-center full-width no-outline text-center" tabindex="0">{{ title }}</div>
</div>
</template> </template>
</q-field> </q-field>
</div> </div>
@@ -56,7 +67,7 @@
</div> </div>
<div v-else-if="type === tools.FieldType.intcode"> <div v-else-if="type === tools.FieldType.intcode">
{{ myvalprinted }} <div v-html="myvalprinted"></div>
</div> </div>
<div v-else-if="((type === tools.FieldType.multiselect) || (type === tools.FieldType.multioption))"> <div v-else-if="((type === tools.FieldType.multiselect) || (type === tools.FieldType.multioption))">
@@ -88,7 +99,7 @@
@input="savefieldboolean"></q-toggle> @input="savefieldboolean"></q-toggle>
</div> </div>
<div v-else> <div v-else>
{{ myvalprinted }} <div v-html="myvalprinted"></div>
</div> </div>
<q-popup-edit <q-popup-edit
@@ -103,7 +114,8 @@
<div v-if="type === tools.FieldType.boolean"> <div v-if="type === tools.FieldType.boolean">
<q-checkbox v-model="myvalue" :label="col.title"> <q-checkbox v-model="myvalue" :label="col.title">
</q-checkbox> </q-checkbox>
{{ visuValByType(myvalue) }} <div v-html="visuValByType(myvalue)">
</div>
</div> </div>
<div v-else-if="type === tools.FieldType.string"> <div v-else-if="type === tools.FieldType.string">
<q-input v-model="myvalue" <q-input v-model="myvalue"
@@ -205,25 +217,25 @@
:isarray="true"> :isarray="true">
</CMyToggleList> </CMyToggleList>
<!-- <!--
<q-select <q-select
v-model="myvalue" v-model="myvalue"
rounded rounded
dense dense
outlined outlined
multiple multiple
options-dense options-dense
:display-value="db_fieldsTable.getTitleByTable(col.jointable)" :display-value="db_fieldsTable.getTitleByTable(col.jointable)"
emit-value emit-value
map-options map-options
:options="db_fieldsTable.getTableJoinByName(col.jointable)" :options="db_fieldsTable.getTableJoinByName(col.jointable)"
:option-label="db_fieldsTable.getLabelByTable(col.jointable)" :option-label="db_fieldsTable.getLabelByTable(col.jointable)"
:option-value="db_fieldsTable.getKeyByTable(col.jointable)" :option-value="db_fieldsTable.getKeyByTable(col.jointable)"
style="min-width: 150px" style="min-width: 150px"
> >
</q-select> </q-select>
--> -->
</div> </div>
<div v-else-if="col.fieldtype === tools.FieldType.multioption"> <div v-else-if="col.fieldtype === tools.FieldType.multioption">
</div> </div>
@@ -239,5 +251,5 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import './CMyFieldDb.scss'; @import './CMyFieldDb.scss';
</style> </style>

View File

@@ -61,6 +61,8 @@ export default class CMyFlotta extends MixinNave {
public date_close: Date = null public date_close: Date = null
public revolut: string = '' public revolut: string = ''
public email_paypal: string = '' public email_paypal: string = ''
public payeer_id: string = ''
public advcash_id: string = ''
public note_payment: string = '' public note_payment: string = ''
public link_payment: string = '' public link_payment: string = ''
public link_superchat: string = '' public link_superchat: string = ''
@@ -136,6 +138,8 @@ export default class CMyFlotta extends MixinNave {
this.note_payment = this.flotta.note_payment this.note_payment = this.flotta.note_payment
this.revolut = this.flotta.revolut this.revolut = this.flotta.revolut
this.email_paypal = this.flotta.email_paypal this.email_paypal = this.flotta.email_paypal
this.payeer_id = this.flotta.payeer_id
this.advcash_id = this.flotta.advcash_id
this.link_payment = this.flotta.link_payment this.link_payment = this.flotta.link_payment
this.link_superchat = this.flotta.link_superchat this.link_superchat = this.flotta.link_superchat
} }

View File

@@ -84,6 +84,20 @@
</div> </div>
<div class="justify-sm-start q-ma-md"> <div class="justify-sm-start q-ma-md">
<q-input v-model="payeer_id" style="max-width: 300px;" label="ID Payeer:"
filled dense
:readonly="true"
debounce="1000"
@input="change_field('payeer_id')">
</q-input>
<q-input v-model="advcash_id" style="max-width: 300px;" label="ID Advanced Cash:"
filled dense
:readonly="true"
debounce="1000"
@input="change_field('advcash_id')">
</q-input>
<q-input v-model="email_paypal" style="max-width: 300px;" label="Email Paypal:" <q-input v-model="email_paypal" style="max-width: 300px;" label="Email Paypal:"
filled dense filled dense
:readonly="true" :readonly="true"
@@ -99,7 +113,7 @@
</q-input> </q-input>
<q-input standout bottom-slots <q-input standout bottom-slots
v-model="link_payment" style="max-width: 400px;" label="Link per Paypal.me:" v-model="link_payment" style="max-width: 400px;" label="Link MoneyBox PayPal:"
:readonly="true" :readonly="true"
debounce="1000" debounce="1000"
filled dense filled dense
@@ -251,6 +265,8 @@
<div class="justify-evenly" style="max-width: 300px;"> <div class="justify-evenly" style="max-width: 300px;">
<strong>Legenda dei codici speciali da inserire nei messaggi: </strong> <strong>Legenda dei codici speciali da inserire nei messaggi: </strong>
<div>{link_paypalme}</div> <div>{link_paypalme}</div>
<div>{payeer_id}</div>
<div>{advcash_id}</div>
<div>{link_superchat}</div> <div>{link_superchat}</div>
<div>{tutor1}</div> <div>{tutor1}</div>
<div>{tutor2}</div> <div>{tutor2}</div>
@@ -447,7 +463,8 @@
@click="Mostraplacca(tools.getRiganave(rec.riga), tools.getColnave(rec.col))"> @click="Mostraplacca(tools.getRiganave(rec.riga), tools.getColnave(rec.col))">
</q-btn> </q-btn>
</div> </div>
<div style="width: 30px;"> <div v-if="!!rec.profile" style="width: 30px;">
<q-avatar v-if="tools.geticon(rec.profile.nationality)" :class="tools.geticon(rec.profile.nationality)" <q-avatar v-if="tools.geticon(rec.profile.nationality)" :class="tools.geticon(rec.profile.nationality)"
size="sm"> size="sm">
</q-avatar> </q-avatar>

View File

@@ -97,15 +97,15 @@ export default class CMyNave extends MixinNave {
sortable: true sortable: true
}, },
{ name: 'nave', align: 'center', label: 'Gift Chat', field: 'nave', sortable: true }, { name: 'nave', align: 'center', label: 'Gift Chat', field: 'nave', sortable: true },
{ name: 'name', align: 'center', label: 'Nome Cognome', field: 'name', sortable: true }, { name: 'name', align: 'center', label: translate('reg.name_complete'), field: 'name', sortable: true },
{ name: 'posizione', align: 'center', label: 'Posizione', field: 'posizione', sortable: true }, { name: 'posizione', align: 'center', label: translate('dashboard.posizione'), field: 'posizione', sortable: true },
{ name: 'date_made_gift', align: 'center', label: 'Inviato', field: 'date_made_gift', sortable: true }, { name: 'date_made_gift', align: 'center', label: translate('dashboard.inviato'), field: 'date_made_gift', sortable: true },
// { name: 'tel', align: 'center', label: 'Tel', field: 'tel', sortable: true }, // { name: 'tel', align: 'center', label: 'Tel', field: 'tel', sortable: true },
{ name: 'made_gift', align: 'center', label: 'Conferm.', field: 'made_gift', sortable: true }, { name: 'made_gift', align: 'center', label: translate('dashboard.azione'), field: 'made_gift', sortable: true },
{ {
name: 'commento_al_sognatore', name: 'commento_al_sognatore',
align: 'center', align: 'center',
label: 'Commento', label: translate('dashboard.commento'),
field: 'commento_al_sognatore', field: 'commento_al_sognatore',
sortable: true sortable: true
}, },
@@ -223,6 +223,12 @@ export default class CMyNave extends MixinNave {
if (!!this.getRevolutPagamentoSognatore()) { if (!!this.getRevolutPagamentoSognatore()) {
this.tabpagam = 'revolut' this.tabpagam = 'revolut'
} }
if (!!this.getAdvCashPagamentoSognatore()) {
this.tabpagam = 'advcash'
}
if (!!this.getPayeerPagamentoSognatore()) {
this.tabpagam = 'payeer'
}
} }
public getListaDonatoriDaConfermare() { public getListaDonatoriDaConfermare() {
@@ -418,6 +424,10 @@ export default class CMyNave extends MixinNave {
} }
public getIdPagam() {
}
public HoEffettuatoIlDono() { public HoEffettuatoIlDono() {
const msgtitle = translate('dashboard.confermi_dono') const msgtitle = translate('dashboard.confermi_dono')
const msginvia = msgtitle const msginvia = msgtitle
@@ -434,7 +444,7 @@ export default class CMyNave extends MixinNave {
col: this.posiz.col, col: this.posiz.col,
_id: this.iodonatore._id, _id: this.iodonatore._id,
date_made_gift: tools.getDateNow(), date_made_gift: tools.getDateNow(),
commento_al_sognatore: this.commento_al_sognatore + ' (' + this.tabpagam + ')', commento_al_sognatore: this.commento_al_sognatore + ' (' + this.tabpagam + ')' + this.getIdPagam(),
}, },
param2: this.sognatoredelDono().username, param2: this.sognatoredelDono().username,
param3: mymsg param3: mymsg
@@ -499,6 +509,41 @@ export default class CMyNave extends MixinNave {
return '' return ''
} }
public getPayeerPagamentoSognatore() {
const rec = this.sognatoredelDono()
if (!!rec) {
if (!!rec.profile)
return rec.profile.payeer_id
}
return ''
}
public getAdvCashPagamentoSognatore() {
const rec = this.sognatoredelDono()
if (!!rec) {
if (!!rec.profile)
return rec.profile.advcash_id
}
return ''
}
public getLinkPayeerPagamentoSognatore() {
const payeerid = this.getPayeerPagamentoSognatore()
if (!!payeerid) {
return 'https://payeer.com/en/account/send/'
}
return ''
}
public getLinkAdvCashPagamentoSognatore() {
const advcash = this.getAdvCashPagamentoSognatore()
if (!!advcash) {
return 'https://wallet.advcash.com/pages/transfer/wallet'
}
return ''
}
public getpaypalmePagamentoSognatore() { public getpaypalmePagamentoSognatore() {
const rec = this.sognatoredelDono() const rec = this.sognatoredelDono()
if (!!rec) { if (!!rec) {

View File

@@ -130,11 +130,90 @@
narrow-indicator narrow-indicator
@input="changetab" @input="changetab"
> >
<q-tab v-if="!!getlinkRevolutSognatore()" name="revolut" icon="img:statics/images/revolut.jpg" label="revolut"></q-tab> <q-tab v-if="!!getPayeerPagamentoSognatore()" name="payeer" icon="img:statics/images/payeer.jpg"
<q-tab v-if="!!getemailPagamentoSognatore()" name="paypal" icon="img:statics/images/paypal.jpg" label="paypal"></q-tab> label="payeer"></q-tab>
<q-tab v-if="!!getAdvCashPagamentoSognatore()" name="advcash"
icon="img:statics/images/advcash.jpg"
label="advcash"></q-tab>
<q-tab v-if="!!getlinkRevolutSognatore()" name="revolut" icon="img:statics/images/revolut.jpg"
label="revolut"></q-tab>
<q-tab v-if="!!getemailPagamentoSognatore()" name="paypal" icon="img:statics/images/paypal.jpg"
label="paypal"></q-tab>
</q-tabs> </q-tabs>
<q-tab-panels v-model="tabpagam" animated> <q-tab-panels v-model="tabpagam" animated>
<q-tab-panel name="payeer">
<q-img src="../../statics/images/regalo.jpg"
class=""
style="height: 150px; width: 150px;"
alt="regalo">
</q-img>
<q-img src="../../statics/images/payeer.jpg"
class=""
style="height: 150px; width: 150px;"
alt="Payeer">
</q-img>
<br><br>
<q-btn
rounded
icon="fas fa-gift"
color="primary"
type="a"
size="md"
label="Payeer"
:href="getLinkPayeerPagamentoSognatore()"
target="__blank">
</q-btn>
<br>
<br>
<a :href="getLinkPayeerPagamentoSognatore()" target="_blank">{{
getLinkPayeerPagamentoSognatore() }}</a>
<div class="text-center text-h4">
<CCopyBtn title="Advanced Cash Email" :texttocopy="getPayeerPagamentoSognatore()">
</CCopyBtn>
</div>
</q-tab-panel>
<q-tab-panel name="advcash">
<q-img src="../../statics/images/regalo.jpg"
class=""
style="height: 150px; width: 150px;"
alt="regalo">
</q-img>
<q-img src="../../statics/images/advcash.jpg"
class=""
style="height: 150px; width: 150px;"
alt="AdvCash">
</q-img>
<br><br>
<q-btn
rounded
icon="fas fa-gift"
color="primary"
type="a"
size="md"
label="AdvCash"
:href="getLinkAdvCashPagamentoSognatore()"
target="__blank">
</q-btn>
<br>
<br>
<a :href="getLinkAdvCashPagamentoSognatore()" target="_blank">{{
getLinkAdvCashPagamentoSognatore() }}</a>
<div class="text-center text-h4">
<CCopyBtn title="Advanced Cash Email" :texttocopy="getAdvCashPagamentoSognatore()">
</CCopyBtn>
</div>
</q-tab-panel>
<q-tab-panel name="paypal"> <q-tab-panel name="paypal">
<div> <div>
<q-img src="../../statics/images/regalo.jpg" <q-img src="../../statics/images/regalo.jpg"
@@ -246,7 +325,7 @@
rounded rounded
color="positive" color="positive"
size="lg" size="lg"
:label="$t('dashboard.ho_effettuato_il_dono')" :label="$t('dashboard.ho_effettuato_il_dono') + ' (' + tabpagam + ')'"
icon="fas fa-gift" icon="fas fa-gift"
@click="HoEffettuatoIlDono"> @click="HoEffettuatoIlDono">
</q-btn> </q-btn>
@@ -258,7 +337,7 @@
text-color="green" text-color="green"
color="white" color="white"
icon="fas fa-gift"> icon="fas fa-gift">
{{ $t('dashboard.ho_effettuato_il_dono') }} {{ $t('dashboard.ho_effettuato_il_dono') + ' (' + tabpagam + ')' }}
</q-chip> </q-chip>
</div> </div>
</div> </div>

View File

@@ -164,20 +164,9 @@ export default class CMyRequirement extends MixinUsers {
return '' return ''
}, },
isok(user) { isok(user) {
let ispaypal = false
if (user) { if (user) {
if (!!user.profile.paymenttypes) { if (!!user.profile.paymenttypes) {
if (user.profile.paymenttypes.includes('paypal')) { return UserStore.state.my.profile.paymenttypes.length > 1
if (user.profile.email_paypal) {
ispaypal = true
}
}
if (!!user.profile)
if (!!user.profile.email_paypal) {
const ris = (user.profile.email_paypal !== '') && ispaypal
return ris
}
} }
} }
return false return false

View File

@@ -16,6 +16,7 @@ import { CRequisiti } from '../CRequisiti'
import { shared_consts } from '../../common/shared_vuejs' import { shared_consts } from '../../common/shared_vuejs'
import { CGuidelines } from '../CGuidelines' import { CGuidelines } from '../CGuidelines'
import { CVideoPromo } from '../CVideoPromo' import { CVideoPromo } from '../CVideoPromo'
import { lists } from '../../store/Modules/lists'
@Component({ @Component({
components: { components: {
@@ -49,6 +50,16 @@ export default class CStatus extends MixinBase {
return 0 return 0
} }
private DiceDiAverPartec: boolean = false
/*@Watch('UserStore.state.my.profile.ask_zoom_partecipato', { immediate: true, deep: true })
public array_changed() {
console.log('*** ask_zoom_partecipato *** ', '[', UserStore.state.my.profile.ask_zoom_partecipato, ']')
if (UserStore.state.my.profile.ask_zoom_partecipato !== undefined)
this.DiceDiAverPartec = UserStore.state.my.profile.ask_zoom_partecipato
console.log('*** this.DiceDiAverPartec *** ', '[', this.DiceDiAverPartec, ']')
}*/
public arrsteps = [ public arrsteps = [
// { // {
// title: 'steps.chat_biblio', // title: 'steps.chat_biblio',
@@ -175,18 +186,7 @@ export default class CStatus extends MixinBase {
descr: 'steps.paymenttype_long', descr: 'steps.paymenttype_long',
page: '', page: '',
funccheck(index) { funccheck(index) {
let ispaypal = false return UserStore.state.my.profile.paymenttypes.length > 1
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('paypal')) {
if (UserStore.state.my.profile.email_paypal)
ispaypal = true
}
if (UserStore.state.my.profile)
if (UserStore.state.my.profile.paymenttypes)
return (UserStore.state.my.profile.paymenttypes.length >= 1) && ispaypal
}
return false
}, },
funccheck_error(index) { funccheck_error(index) {
return true return true
@@ -344,10 +344,12 @@ export default class CStatus extends MixinBase {
} }
public created() { public created() {
this.DiceDiAverPartec = UserStore.state.my.profile.ask_zoom_partecipato
this.my_dream = UserStore.state.my.profile.my_dream
this.setstep() this.setstep()
this.setsteptodo() this.setsteptodo()
this.my_dream = UserStore.state.my.profile.my_dream
} }
public change_mydream() { public change_mydream() {
@@ -452,33 +454,6 @@ export default class CStatus extends MixinBase {
return UserStore.state.my.profile.paymenttypes return UserStore.state.my.profile.paymenttypes
} }
get isselectPaypal() {
if (UserStore.state.my.profile) {
// console.log('pay', UserStore.state.my.profile.paymenttypes)
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('paypal')) {
return true
}
}
return false
}
}
get isselectRevolut() {
if (UserStore.state.my.profile) {
// console.log('pay', UserStore.state.my.profile.paymenttypes)
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('revolut')) {
return true
}
}
return false
}
}
public geticonstep(mystep) { public geticonstep(mystep) {
if (!!mystep.icon) if (!!mystep.icon)
return mystep.icon return mystep.icon
@@ -526,24 +501,17 @@ export default class CStatus extends MixinBase {
} }
public hagiapartecipato() {
tools.AskGiaPartecipatoZoom(this, UserStore.state.my)
}
get Completato9Req() { get Completato9Req() {
// return tools.Is9ReqOk(this.dashboard.myself) // return tools.Is9ReqOk(this.dashboard.myself)
return this.CompletatoRequisiti && (this.getnuminvitati_attivi() >= 2) return this.CompletatoRequisiti && (this.getnuminvitati_attivi() >= 2)
} }
get RequisitoPayment() { get RequisitoPayment() {
let ispaypal = false return (UserStore.state.my.profile.paymenttypes.length > 1)
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('paypal')) {
if (UserStore.state.my.profile.email_paypal)
ispaypal = true
}
if (UserStore.state.my.profile)
if (UserStore.state.my.profile.paymenttypes)
return (UserStore.state.my.profile.paymenttypes.length >= 1) && ispaypal
}
return false
} }
get percstep() { get percstep() {
@@ -572,6 +540,10 @@ export default class CStatus extends MixinBase {
return this.getstep >= this.NUMSTEP_OBBLIGATORI return this.getstep >= this.NUMSTEP_OBBLIGATORI
} }
public NoPartNoZoom() {
return !this.DiceDiAverPartec && !this.VistoZoom
}
public scrolltostep(mystep) { public scrolltostep(mystep) {
this.step = mystep this.step = mystep
if (mystep > 0) if (mystep > 0)
@@ -581,6 +553,18 @@ export default class CStatus extends MixinBase {
} }
public Callback(funz) {
console.log('callback')
if (funz === lists.MenuAction.ZOOM_GIA_PARTECIPATO) {
UserStore.mutations.setDiceDiAverPartecipato(true)
this.DiceDiAverPartec = UserStore.state.my.profile.ask_zoom_partecipato
// UserStore.state.my.profile.ask_zoom_partecipato = true
console.log('UserStore.state.my.profile.ask_zoom_partecipato = true')
console.log('this.DiceDiAverPartec', this.DiceDiAverPartec)
}
}
public nextstep(index) { public nextstep(index) {
this.step = index + 1 this.step = index + 1
this.setsteptodo() this.setsteptodo()

View File

@@ -104,9 +104,10 @@
<div v-html="$t(mystep.descr, {sitename: $t('ws.sitename')})"></div> <div v-html="$t(mystep.descr, {sitename: $t('ws.sitename')})"></div>
</div> </div>
<!--
<CTitleBanner class="q-pa-xs" :title="$t('steps.paymenttype_revolut')" bgcolor="bg-primary" <CTitleBanner class="q-pa-xs" :title="$t('steps.paymenttype_revolut')" bgcolor="bg-primary"
clcolor="text-white" clcolor="text-white"
myclass="myshad" canopen="true" :visible="true"> myclass="myshad" canopen="true" :visible="false">
<CVideo myvideokey="nST5iHM2LbE"> <CVideo myvideokey="nST5iHM2LbE">
@@ -118,6 +119,7 @@
</q-btn> </q-btn>
</CTitleBanner> </CTitleBanner>
-->
<!-- <!--
<CTitleBanner class="q-pa-xs" :title="$t('steps.paymenttype_paypal')" bgcolor="bg-primary" <CTitleBanner class="q-pa-xs" :title="$t('steps.paymenttype_paypal')" bgcolor="bg-primary"
@@ -160,21 +162,39 @@
jointable="paymenttypes"> jointable="paymenttypes">
</CMyFieldDb> </CMyFieldDb>
<CMyFieldDb v-if="isselectRevolut" :title="$t('reg.revolut')" <CMyFieldDb v-if="tools.isselectRevolut()" :title="$t('reg.revolut')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="revolut" mysubkey="revolut"
:type="tools.FieldType.string"> :type="tools.FieldType.string">
</CMyFieldDb> </CMyFieldDb>
<CMyFieldDb v-if="isselectPaypal" :title="$t('reg.email_paypal')" <CMyFieldDb v-if="tools.isselectPaypal()"
:title="$t('reg.email_paypal')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="email_paypal" mysubkey="email_paypal"
:type="tools.FieldType.string"> :type="tools.FieldType.string">
</CMyFieldDb> </CMyFieldDb>
<CMyFieldDb :title="$t('reg.link_payment')" <CMyFieldDb v-if="tools.isselectPayeer()"
:title="$t('reg.payeer_id')"
table="users"
mykey="profile"
mysubkey="payeer_id"
:type="tools.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectAdvCash()"
:title="$t('reg.advcash_id')"
table="users"
mykey="profile"
mysubkey="advcash_id"
:type="tools.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectPaypal()"
:title="$t('reg.link_payment')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="link_payment" mysubkey="link_payment"
@@ -220,6 +240,19 @@
:msgFalse="$t('steps.zoom_no_partecipato')"> :msgFalse="$t('steps.zoom_no_partecipato')">
</CRequisiti> </CRequisiti>
<div v-if="NoPartNoZoom()">
<q-btn rounded color="blue" @click="hagiapartecipato()"
:label="$t('steps.zoom_gia_partecipato')"></q-btn>
<br>
</div>
<div v-else>
<CRequisiti v-if="!VistoZoom" :statebool="true" :msgTrue="$t('steps.zoom_richiesta_inviata')"
msgFalse="">
</CRequisiti>
</div>
<div v-if="mystep.descr"> <div v-if="mystep.descr">
<div v-html="$t(mystep.descr, {sitename: $t('ws.sitename')})"></div> <div v-html="$t(mystep.descr, {sitename: $t('ws.sitename')})"></div>
</div> </div>

View File

@@ -65,6 +65,10 @@ export default class Header extends Vue {
return UserStore.state.isTutor return UserStore.state.isTutor
} }
get isZoomeri() {
return UserStore.state.isZoomeri
}
get isTratuttrici() { get isTratuttrici() {
return UserStore.state.isTratuttrici return UserStore.state.isTratuttrici
} }

View File

@@ -16,6 +16,8 @@ export interface IUserProfile {
sex?: ESexType sex?: ESexType
country_pay?: string country_pay?: string
email_paypal?: string email_paypal?: string
payeer_id?: string
advcash_id?: string
revolut?: string revolut?: string
link_payment?: string link_payment?: string
note_payment?: string note_payment?: string
@@ -26,6 +28,7 @@ export interface IUserProfile {
paymenttypes?: IPaymentType[] paymenttypes?: IPaymentType[]
manage_telegram?: boolean manage_telegram?: boolean
saw_zoom_presentation?: boolean saw_zoom_presentation?: boolean
ask_zoom_partecipato?: boolean
saw_and_accepted?: boolean saw_and_accepted?: boolean
qualified?: boolean qualified?: boolean
qualified_2invitati?: boolean qualified_2invitati?: boolean
@@ -112,6 +115,7 @@ export interface IUserState {
isAdmin?: boolean isAdmin?: boolean
isManager?: boolean isManager?: boolean
isTutor?: boolean isTutor?: boolean
isZoomeri?: boolean
isTraduttrici?: boolean isTraduttrici?: boolean
isTeacher?: boolean isTeacher?: boolean
usersList?: IUserFields[] usersList?: IUserFields[]

View File

@@ -34,6 +34,10 @@ export default class UsersList extends Vue {
label: 'Non hanno visto Zoom', label: 'Non hanno visto Zoom',
value: shared_consts.FILTER_USER_NO_ZOOM value: shared_consts.FILTER_USER_NO_ZOOM
}, },
{
label: 'hanno detto di aver visto lo Zoom',
value: shared_consts.FILTER_ASK_ZOOM_VISTO
},
{ {
label: 'Non hanno l\'Invitante', label: 'Non hanno l\'Invitante',
value: shared_consts.FILTER_USER_NO_INVITANTE value: shared_consts.FILTER_USER_NO_INVITANTE

View File

@@ -151,6 +151,8 @@ const msg_de = {
cellreg: 'Cellulare con cui ti eri registrato', cellreg: 'Cellulare con cui ti eri registrato',
nationality: 'Nationality', nationality: 'Nationality',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
payeer_id: 'ID Payeer',
advcash_id: 'Advanced Cash Email',
revolut: 'Revolut', revolut: 'Revolut',
country_pay: 'Country of Destination Payments', country_pay: 'Country of Destination Payments',
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',

View File

@@ -72,8 +72,8 @@ const msg_enUs = {
video_intro_2: '2. Birth of {sitename}', video_intro_2: '2. Birth of {sitename}',
read_guidelines: 'I have read and agreed to these terms and conditions written above', read_guidelines: 'I have read and agreed to these terms and conditions written above',
saw_video_intro: 'I declare I\'ve seen the videos', saw_video_intro: 'I declare I\'ve seen the videos',
paymenttype: 'Methods of Payment (Revolut)', paymenttype: 'Methods of Payment',
paymenttype_long: 'Choose <strong>at least 2 Payment Methods</strong>, to exchange gifts.<br><br>The <strong>payment methods are: <ul><li><strong>Paypal</strong> (<strong>mandatory</strong>) because it is a very popular system throughout Europe (the transfer is free of charge) and you can connect prepaid cards, credit cards and bank account <strong>WITHOUT COMMISSIONS</strong>. In this way you won\'t have to share your card or c/c numbers but only the email you used during the registration on Paypal. Available the app for your mobile phone.</li><li><strong>Revolut</strong>: the Revolut Prepaid Card with English IBAN (outside EU) completely free, more free and easy to use. Available the app for mobile.</li>', paymenttype_long: 'Choose <strong>at least 2 Payment Methods</strong>, to exchange gifts.<br><br>The <strong>payment methods are: <ul><li><strong>Payeer</strong></li><li><strong>Revolut</strong></li>',
paymenttype_paypal: 'How to open a Paypal account (in 2 minutes)', paymenttype_paypal: 'How to open a Paypal account (in 2 minutes)',
paymenttype_paypal_carta_conto: 'How to associate a Credit/Debit Card or Bank Account on PayPal', paymenttype_paypal_carta_conto: 'How to associate a Credit/Debit Card or Bank Account on PayPal',
paymenttype_paypal_link: 'Open Account with Paypal', paymenttype_paypal_link: 'Open Account with Paypal',
@@ -84,6 +84,7 @@ const msg_enUs = {
video_intro: 'I see the videos', video_intro: 'I see the videos',
zoom: 'I partecipate at least 1 Zoom', zoom: 'I partecipate at least 1 Zoom',
zoom_si_partecipato: 'You have participated in at least 1 Zoom', zoom_si_partecipato: 'You have participated in at least 1 Zoom',
zoom_gia_partecipato: 'Hai gia partecipato alla Video-Conferenza di Benvenuto',
zoom_partecipa: 'Participated in at least 1 Zoom', zoom_partecipa: 'Participated in at least 1 Zoom',
zoom_no_partecipato: 'You have not yet participated in a Zoom (it is a requirement to enter)', zoom_no_partecipato: 'You have not yet participated in a Zoom (it is a requirement to enter)',
zoom_long: 'You are required to participate in at least 1 Zoom, but it is recommended that you take part in the movement more actively.<br><br><strong>By participating in Zooms the Staff will record attendance and you will be enabled.</strong>', zoom_long: 'You are required to participate in at least 1 Zoom, but it is recommended that you take part in the movement more actively.<br><br><strong>By participating in Zooms the Staff will record attendance and you will be enabled.</strong>',
@@ -329,8 +330,10 @@ const msg_enUs = {
cellreg: 'Cellulare con cui ti eri registrato', cellreg: 'Cellulare con cui ti eri registrato',
nationality: 'Nationality', nationality: 'Nationality',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
payeer_id: 'Payeer ID',
advcash_id: 'Advanced Cash Email',
revolut: 'Revolut', revolut: 'Revolut',
link_payment: 'Paypal.me link', link_payment: 'MoneyBox Paypal link',
note_payment: 'Additional notes', note_payment: 'Additional notes',
country_pay: 'Country of Destination Payments', country_pay: 'Country of Destination Payments',
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',
@@ -345,8 +348,9 @@ const msg_enUs = {
saw_and_accepted: 'Condizioni', saw_and_accepted: 'Condizioni',
saw_zoom_presentation: 'Ha visto Zoom', saw_zoom_presentation: 'Ha visto Zoom',
manage_telegram: 'Gestori Telegram', manage_telegram: 'Gestori Telegram',
paymenttype: 'Available Payment Methods (Revolut)', paymenttype: 'Available Payment Methods',
selected: 'Selezionati', selected: 'Selected',
select: 'Select',
img: 'File Image', img: 'File Image',
date_reg: 'Reg. Date', date_reg: 'Reg. Date',
requirement: 'Requirements', requirement: 'Requirements',

View File

@@ -73,8 +73,8 @@ const msg_es = {
video_intro_2: '2. Nacimiento de {sitename}', video_intro_2: '2. Nacimiento de {sitename}',
read_guidelines: 'He leído y estoy de acuerdo con estos términos escritos anteriormente', read_guidelines: 'He leído y estoy de acuerdo con estos términos escritos anteriormente',
saw_video_intro: 'Declaro que he visto los vídeos', saw_video_intro: 'Declaro que he visto los vídeos',
paymenttype: 'Métodos de pago (Revolut)', // (Obligatorio Paypal) paymenttype: 'Métodos de pago', // (Obligatorio Paypal)
paymenttype_long: 'Elija <strong>al menos 2 métodos de pago</strong>, para intercambiar regalos.<br><br>Los <strong>métodos de pago son: <ul><li><strong>Revolut</strong>: la Tarjeta Prepagada Revolut con IBAN inglés (fuera de la UE) completamente gratis, más gratis y fácil de usar. Disponible la aplicación para móvil.</li><li><strong>Paypal</strong> porque es un sistema muy popular en toda Europa (la transferencia es gratuita) y se pueden conectar tarjetas de prepago, tarjetas de crédito y cuenta bancaria <strong> SIN COMISIONES</strong>. De esta manera no tendrás que compartir tu tarjeta o números de c/c, sino sólo el correo electrónico que usaste durante el registro en Paypal. Disponible la aplicación para tu teléfono móvil.</li></ul>', paymenttype_long: 'Elija <strong>al menos 2 métodos de pago</strong>, para intercambiar regalos.<br><br>Los <strong>métodos de pago son: <ul><li><strong>Revolut</strong>:</li><li><strong>Payeer</strong></li><li><strong>Paypal</strong></li></ul>',
paymenttype_paypal: 'Cómo abrir una cuenta de Paypal (en 2 minutos)', paymenttype_paypal: 'Cómo abrir una cuenta de Paypal (en 2 minutos)',
paymenttype_paypal_carta_conto: 'Cómo asociar una tarjeta de crédito/débito o una cuenta bancaria en PayPal', paymenttype_paypal_carta_conto: 'Cómo asociar una tarjeta de crédito/débito o una cuenta bancaria en PayPal',
paymenttype_paypal_link: "Abrir una cuenta con Paypal", paymenttype_paypal_link: "Abrir una cuenta con Paypal",
@@ -85,6 +85,7 @@ const msg_es = {
video_intro: "Veo los videos", video_intro: "Veo los videos",
zoom: "Hacer 1 zoom de bienvenida<br>(mira la home para fechas)", zoom: "Hacer 1 zoom de bienvenida<br>(mira la home para fechas)",
zoom_si_partecipato: "Vous avez participé à au moins 1 Zoom", zoom_si_partecipato: "Vous avez participé à au moins 1 Zoom",
zoom_gia_partecipato: 'Hai gia partecipato alla Video-Conferenza di Benvenuto',
zoom_partecipa: "Participó al menos 1 Zoom", zoom_partecipa: "Participó al menos 1 Zoom",
zoom_no_partecipato: "Aún no ha participado en un Zoom (es un requisito para entrar)", zoom_no_partecipato: "Aún no ha participado en un Zoom (es un requisito para entrar)",
zoom_long: "Se requiere que participe en al menos 1 Zoom, pero se recomienda participar en el movimiento de una manera más activa.<br><br><strong>Al participar en los Zooms el Staff registrará la asistencia y usted estará habilitado.</strong>", zoom_long: "Se requiere que participe en al menos 1 Zoom, pero se recomienda participar en el movimiento de una manera más activa.<br><br><strong>Al participar en los Zooms el Staff registrará la asistencia y usted estará habilitado.</strong>",
@@ -335,7 +336,7 @@ const msg_es = {
nationality: 'Nacionalidad', nationality: 'Nacionalidad',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
revolut: 'Revolut', revolut: 'Revolut',
link_payment: 'Enlaces Paypal.me', link_payment: 'Enlaces Paypal Moneybox',
note_payment: 'Notas adicionales', note_payment: 'Notas adicionales',
country_pay: 'País del Pagos de destino', country_pay: 'País del Pagos de destino',
username_telegram: 'Usuario Telegram', username_telegram: 'Usuario Telegram',
@@ -350,8 +351,9 @@ const msg_es = {
saw_and_accepted: 'Condizioni', saw_and_accepted: 'Condizioni',
saw_zoom_presentation: 'Ha visto Zoom', saw_zoom_presentation: 'Ha visto Zoom',
manage_telegram: 'Gestori Telegram', manage_telegram: 'Gestori Telegram',
paymenttype: 'Métodos de pago disponibles (Revolut)', paymenttype: 'Métodos de pago disponibles',
selected: 'seleccionado', selected: 'seleccionado',
select: 'selecciona',
img: 'File image', img: 'File image',
date_reg: 'Fecha Reg.', date_reg: 'Fecha Reg.',
deleted: 'Cancellato', deleted: 'Cancellato',

View File

@@ -73,8 +73,8 @@ const msg_fr = {
video_intro_2: '2. Naissance de l\'{sitename}', video_intro_2: '2. Naissance de l\'{sitename}',
read_guidelines: 'J\'ai lu et j\'accepte ces conditions écrites ci-dessus', read_guidelines: 'J\'ai lu et j\'accepte ces conditions écrites ci-dessus',
saw_video_intro: 'Je déclare avoir vu la vidéo', saw_video_intro: 'Je déclare avoir vu la vidéo',
paymenttype: 'Méthodes de paiement (Revolut)', paymenttype: 'Méthodes de paiement',
paymenttype_long: 'Choisissez <strong>au moins 2 modes de paiement</strong>, pour échanger des cadeaux.<br><br>Les modes de paiement <strong>sont : <ul><li><strong>Revolut</strong> : la carte prépayée Revolut avec IBAN anglais (hors UE) complètement gratuite, plus gratuite et facile à utiliser. Disponible l\'application pour mobile.</li><li><strong>Paypal</strong>car c\'est un système très populaire dans toute l\'Europe (le transfert est gratuit) et vous pouvez connecter des cartes prépayées, des cartes de crédit et un compte bancaire <strong> SANS COMMISSIONS</strong>. De cette façon, vous n\'aurez pas à partager vos numéros de carte ou de c/c mais seulement l\'email que vous avez utilisé lors de l\'inscription sur Paypal. Disponible l\'application pour votre téléphone portable.</li></ul>', paymenttype_long: 'Choisissez <strong>au moins 2 modes de paiement</strong>, pour échanger des cadeaux.<br><br>Les modes de paiement <strong>sont : <ul><li><strong>Payeer</strong></li><li><strong>Revolut</strong> : la carte prépayée Revolut avec IBAN anglais (hors UE) complètement gratuite, plus gratuite et facile à utiliser. Disponible l\'application pour mobile.</li><li><strong>Paypal MoneyBox</strong>car c\'est un système très populaire dans toute l\'Europe (le transfert est gratuit) et vous pouvez connecter des cartes prépayées, des cartes de crédit et un compte bancaire <strong> SANS COMMISSIONS</strong>. De cette façon, vous n\'aurez pas à partager vos numéros de carte ou de c/c mais seulement l\'email que vous avez utilisé lors de l\'inscription sur Paypal. Disponible l\'application pour votre téléphone portable.</li></ul>',
paymenttype_paypal: 'Comment ouvrir un compte Paypal (en 2 minutes)Comment ouvrir un compte Paypal (en 2 minutes)', paymenttype_paypal: 'Comment ouvrir un compte Paypal (en 2 minutes)Comment ouvrir un compte Paypal (en 2 minutes)',
paymenttype_paypal_carta_conto: "Comment associer une carte de crédit/débit ou un compte bancaire sur PayPal", paymenttype_paypal_carta_conto: "Comment associer une carte de crédit/débit ou un compte bancaire sur PayPal",
paymenttype_paypal_link: 'Ouverture d\'un compte avec Paypal', paymenttype_paypal_link: 'Ouverture d\'un compte avec Paypal',
@@ -85,6 +85,7 @@ const msg_fr = {
video_intro: "Je vois la vidéo", video_intro: "Je vois la vidéo",
zoom: "A participé à au moins 1 Zoom", zoom: "A participé à au moins 1 Zoom",
zoom_si_partecipato: "Vous avez participé à au moins 1 Zoom", zoom_si_partecipato: "Vous avez participé à au moins 1 Zoom",
zoom_gia_partecipato: 'Hai gia partecipato alla Video-Conferenza di Benvenuto',
zoom_partecipa: "A participé à au moins 1 Zoom", zoom_partecipa: "A participé à au moins 1 Zoom",
zoom_no_partecipato: "Vous n'avez pas encore participé à un Zoom (il est obligatoire d'entrer)", zoom_no_partecipato: "Vous n'avez pas encore participé à un Zoom (il est obligatoire d'entrer)",
zoom_long: "Vous devez participer à au moins un Zoom, mais il est recommandé de participer au mouvement de manière plus active. <br><br><strong>En participant aux Zooms, le personnel enregistrera votre présence et vous serez activé. </strong>", zoom_long: "Vous devez participer à au moins un Zoom, mais il est recommandé de participer au mouvement de manière plus active. <br><br><strong>En participant aux Zooms, le personnel enregistrera votre présence et vous serez activé. </strong>",
@@ -156,6 +157,7 @@ const msg_fr = {
authentication: { authentication: {
telegram: { telegram: {
open: 'Cliquez ici pour ouvrir le télégramme BOT et suivez les instructions', open: 'Cliquez ici pour ouvrir le télégramme BOT et suivez les instructions',
ifclose: 'Si vous n\'ouvrez pas Telegram en cliquant sur le bouton ou si vous l\'avez supprimé, allez à Telegram et cherchez "{botname}" dans l\'icône de l\'objectif, puis appuyez sur Start et suivez les instructions.',
openbot: 'Ouvre BOT Telegram', openbot: 'Ouvre BOT Telegram',
}, },
login: { login: {
@@ -330,8 +332,10 @@ const msg_fr = {
cellreg: 'Cellulare con cui ti eri registrato', cellreg: 'Cellulare con cui ti eri registrato',
nationality: 'Nationalité', nationality: 'Nationalité',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
payeer_id: 'Id Payeer',
advcash_id: 'Email Advanced Cash',
revolut: 'Revolut', revolut: 'Revolut',
link_payment: 'Liens Paypal.me', link_payment: 'Liens Paypal MoneyBox',
note_payment: 'Notes complémentaires', note_payment: 'Notes complémentaires',
country_pay: 'Pays de destination Paiements', country_pay: 'Pays de destination Paiements',
username_telegram: 'Nom d\'utilisateur du Telegram', username_telegram: 'Nom d\'utilisateur du Telegram',
@@ -346,8 +350,9 @@ const msg_fr = {
saw_and_accepted: 'Condizioni', saw_and_accepted: 'Condizioni',
saw_zoom_presentation: 'Ha visto Zoom', saw_zoom_presentation: 'Ha visto Zoom',
manage_telegram: 'Gestori Telegram', manage_telegram: 'Gestori Telegram',
paymenttype: 'Méthodes de paiement disponibles (Revolut)', paymenttype: 'Méthodes de paiement disponibles',
selected: 'sélectionné', selected: 'sélectionné',
select: 'sélectionnez',
img: 'Fichier image', img: 'Fichier image',
date_reg: 'Date Inscript.', date_reg: 'Date Inscript.',
requirement: 'Exigences', requirement: 'Exigences',

View File

@@ -94,8 +94,8 @@ const msg_it = {
video_intro_2: '2. Nascita di {sitename}', video_intro_2: '2. Nascita di {sitename}',
read_guidelines: 'Ho letto ed Accetto queste condizioni scritte qui sopra', read_guidelines: 'Ho letto ed Accetto queste condizioni scritte qui sopra',
saw_video_intro: 'Dichiaro di aver visto i Video', saw_video_intro: 'Dichiaro di aver visto i Video',
paymenttype: 'Modalità di Pagamento (Revolut)', paymenttype: 'Modalità di Pagamento',
paymenttype_long: 'I <strong>metodi di Pagamento sono: <ul><li><strong style="font-size: 1.25rem; color: green; background-color: yellow;">Revolut</strong> (ALTAMENTE CONSIGLIATA):<br>la Carta Prepagata Revolut con IBAN Inglese, trasferimenti gratuiti, più libera e semplice da utilizzare. Disponibile l\'app per il cellulare.</li><br><li><strong>Paypal</strong> perchè è un sistema molto diffuso in tutta Europa (il trasferimento e gratuito) e si possono collegare le carte prepagate, le carte di credito e il conto corrente <strong>SENZA COMMISSIONI</strong>. In questo modo non dovrai condividere i numeri delle tue carte o del c/c ma solo la mail che avrai usato in fase di iscrizione su Paypal. Disponibile l\'app per il cellulare. <br><br><span style="font-style: italic; font-size: 1rem; color:red;"><strong>NOTA BENE</strong>: Ultimamente Paypal sta avendo problemi perchè tendono a bloccare i soldi sul conto del Sognatore per 6 mesi per controlli, quindi da utilizzare SOLO se impossiblitati ad aprire un conto con Revolut.</span></li></ul>', paymenttype_long: 'I <strong>metodi di Pagamento sono: <ul><li><strong><a href="https://payeer.com/03774412" target="_blank">Payeer</a></strong><br>Molto Versatile. Viene utilizzata in oltre 30 paesi del mondo. E\' possibile acquistare anche criptovalute (Bitcoin, Ethereum).</li><br><li><strong style="font-size: 1.25rem; color: green; background-color: yellow;"><a href="http://wallet.advcash.com/referral/0425f707-1836-4318-8995-7f6af5b21e0f" target="_blank">Advanced Cash</a></strong><br>Per info Vedi la pagina "Metodi di Pagamento"</li><br><li><strong style="font-size: 1.25rem; color: green; background-color: yellow;"><a href="https://www.revolut.com" target="_blank">Revolut</a></strong>:<br>la Carta Prepagata Revolut con IBAN Inglese, trasferimenti gratuiti, più libera e semplice da utilizzare. Disponibile l\'app per il cellulare.</li><br><li><strong>Paypal con MoneyBox</strong> perchè è un sistema molto diffuso in tutta Europa (il trasferimento e gratuito) e si possono collegare le carte prepagate, le carte di credito e il conto corrente <strong>SENZA COMMISSIONI</strong>. In questo modo non dovrai condividere i numeri delle tue carte o del c/c ma solo la mail che avrai usato in fase di iscrizione su Paypal. Disponibile l\'app per il cellulare.</li></ul>',
paymenttype_long2: 'Si consiglia di avere a disposizione <strong>almeno 2 Modalità di Pagamento</strong>, per scambiarsi i doni.', paymenttype_long2: 'Si consiglia di avere a disposizione <strong>almeno 2 Modalità di Pagamento</strong>, per scambiarsi i doni.',
paymenttype_paypal: 'Come Aprire un conto Paypal (in 2 minuti)', paymenttype_paypal: 'Come Aprire un conto Paypal (in 2 minuti)',
paymenttype_paypal_carta_conto: 'Come associare una carta di Credito/Debito o un Conto Bancario su PayPal', paymenttype_paypal_carta_conto: 'Come associare una carta di Credito/Debito o un Conto Bancario su PayPal',
@@ -107,9 +107,11 @@ const msg_it = {
video_intro: 'Vedo il Video', video_intro: 'Vedo il Video',
zoom: 'Partecipo ad almeno 1 Video-Conferenza', zoom: 'Partecipo ad almeno 1 Video-Conferenza',
zoom_si_partecipato: 'Hai partecipato ad almeno 1 Video-Conferenza', zoom_si_partecipato: 'Hai partecipato ad almeno 1 Video-Conferenza',
zoom_gia_partecipato: 'Hai gia partecipato alla Video-Conferenza di Benvenuto?',
zoom_richiesta_inviata: 'La tua richiesta di aver già partecipato ad una Video-Conferenza è stata inviata, verrà analizzata appena possibile. Riceverai un messaggio dal BOT quando verrá confermato.',
zoom_partecipa: 'Partecipato ad almeno 1 Zoom', zoom_partecipa: 'Partecipato ad almeno 1 Zoom',
zoom_no_partecipato: 'Attualmente non hai ancora partecipato ad una Video-Conferenza (è un requisito per poter entrare)', zoom_no_partecipato: 'Attualmente non hai ancora partecipato ad una Video-Conferenza (è un requisito per poter entrare)',
zoom_long: 'Si richiede di partecipare ad almeno 1 Video-Conferenza, ma se sentirai che questi icontri sono anche un modo per condividere e stare in compagnia, allora potrai partecipare tutte le volte che lo desideri.<br><br><strong><br>Partecipando alle Video-Conferenze di Benvenuto lo Staff registrerà la vostra presenza <strong>ENTRO 24 ORE</strong>.</strong>', zoom_long: 'Si richiede di partecipare ad almeno 1 Video-Conferenza, ma se sentirai che questi incontri sono anche un modo per condividere e stare in compagnia, allora potrai partecipare tutte le volte che lo desideri.<br><br><strong><br>Partecipando alle Video-Conferenze di Benvenuto lo Staff registrerà la vostra presenza <strong>ENTRO 24 ORE</strong>.</strong>',
zoom_what: 'Tutorial come installare Zoom Cloud Meeting', zoom_what: 'Tutorial come installare Zoom Cloud Meeting',
// sharemovement_devi_invitare_almeno_2: 'Ancora non hai invitato 2 persone', // sharemovement_devi_invitare_almeno_2: 'Ancora non hai invitato 2 persone',
// sharemovement_hai_invitato: 'Hai invitato almeno 2 persone', // sharemovement_hai_invitato: 'Hai invitato almeno 2 persone',
@@ -218,6 +220,9 @@ const msg_it = {
options: 'Opzioni', options: 'Opzioni',
}, },
dashboard: { dashboard: {
commento: 'Commento',
azione: 'Azione',
inviato: 'Inviato',
data: 'Data', data: 'Data',
data_rich: 'Data Rich.', data_rich: 'Data Rich.',
ritorno: 'Ritorno', ritorno: 'Ritorno',
@@ -242,6 +247,7 @@ const msg_it = {
nave_partita: 'Partita il', nave_partita: 'Partita il',
tutor: 'Tutor', tutor: 'Tutor',
traduttrici: 'Traduttrici', traduttrici: 'Traduttrici',
zoomeri: 'Zoomeri',
/* sonomediatore: 'Quando diventi Meditore vieni contattato da un <strong>TUTOR</strong>, con lui devi:<br><ol class="lista">' + /* sonomediatore: 'Quando diventi Meditore vieni contattato da un <strong>TUTOR</strong>, con lui devi:<br><ol class="lista">' +
'<li>Aprire la tua <strong>Gift Chat</strong> (tu come proprietario e il Tutor ' + '<li>Aprire la tua <strong>Gift Chat</strong> (tu come proprietario e il Tutor ' +
'come amministratore) con questo nome:<br><strong>{nomenave}</strong></li>' + 'come amministratore) con questo nome:<br><strong>{nomenave}</strong></li>' +
@@ -362,8 +368,10 @@ const msg_it = {
cellreg: 'Cellulare con cui ti eri registrato', cellreg: 'Cellulare con cui ti eri registrato',
nationality: 'Nazionalità', nationality: 'Nazionalità',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
payeer_id: 'Id Payeer',
advcash_id: 'Email Advanced Cash',
revolut: 'Revolut', revolut: 'Revolut',
link_payment: 'Link Paypal.me', link_payment: 'Link Paypal MoneyBox',
note_payment: 'Note Aggiuntive', note_payment: 'Note Aggiuntive',
country_pay: 'Paese di Destinazione Pagamenti', country_pay: 'Paese di Destinazione Pagamenti',
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',
@@ -378,9 +386,11 @@ const msg_it = {
my_dream: 'Il mio Sogno', my_dream: 'Il mio Sogno',
saw_and_accepted: 'Condizioni', saw_and_accepted: 'Condizioni',
saw_zoom_presentation: 'Ha visto Zoom', saw_zoom_presentation: 'Ha visto Zoom',
ask_zoom_partecipato: 'dice di avere gia partecipato',
manage_telegram: 'Gestori Telegram', manage_telegram: 'Gestori Telegram',
paymenttype: 'Modalità di Pagamenti Disponbili (Revolut)', paymenttype: 'Modalità di Pagamento Disponibili',
selected: 'Selezionati', selected: 'Selezionati',
select: 'Selezionare',
img: 'Immagine', img: 'Immagine',
date_reg: 'Data Reg.', date_reg: 'Data Reg.',
requirement: 'Requisiti', requirement: 'Requisiti',

View File

@@ -83,7 +83,7 @@ const msg_pt = {
video_intro_2: '2. Nascimento do {sitename}', video_intro_2: '2. Nascimento do {sitename}',
read_guidelines: 'Eu li e concordo com estes termos escritos acima', read_guidelines: 'Eu li e concordo com estes termos escritos acima',
saw_video_intro: 'Declaro ter visto o vídeo', saw_video_intro: 'Declaro ter visto o vídeo',
paymenttype: 'Formas de Pagamento (Revolut)', paymenttype: 'Formas de Pagamento',
paymenttype_long: 'Escolha <strong> pelo menos 2 Métodos de pagamento</strong>, para trocar presentes.<br>As formas de pagamento são: <ul><li><strong>Revolut</strong>: o Revolut Prepaid Card com IBAN inglês (fora da UE) completamente gratuito, mais gratuito e fácil de usar. Disponível o aplicativo para mobile.</li><li><strong>Paypal</strong> porque é um sistema muito popular em toda a Europa (a transferência é gratuita) e você pode conectar cartões pré-pagos, cartões de crédito e conta bancária <strong> SEM COMISSÕES</strong>. Desta forma não terá de partilhar o seu cartão ou números de c/c, mas apenas o e-mail que utilizou durante o registo no Paypal. Disponível o aplicativo para o seu celular.</li><br>', paymenttype_long: 'Escolha <strong> pelo menos 2 Métodos de pagamento</strong>, para trocar presentes.<br>As formas de pagamento são: <ul><li><strong>Revolut</strong>: o Revolut Prepaid Card com IBAN inglês (fora da UE) completamente gratuito, mais gratuito e fácil de usar. Disponível o aplicativo para mobile.</li><li><strong>Paypal</strong> porque é um sistema muito popular em toda a Europa (a transferência é gratuita) e você pode conectar cartões pré-pagos, cartões de crédito e conta bancária <strong> SEM COMISSÕES</strong>. Desta forma não terá de partilhar o seu cartão ou números de c/c, mas apenas o e-mail que utilizou durante o registo no Paypal. Disponível o aplicativo para o seu celular.</li><br>',
paymenttype_paypal: 'Como abrir uma conta Paypal (em 2 minutos)', paymenttype_paypal: 'Como abrir uma conta Paypal (em 2 minutos)',
paymenttype_paypal_carta_conto: 'Como associar um cartão de crédito/débito ou conta bancária no PayPal', paymenttype_paypal_carta_conto: 'Como associar um cartão de crédito/débito ou conta bancária no PayPal',
@@ -95,6 +95,7 @@ const msg_pt = {
video_intro: 'Eu vejo o vídeo', video_intro: 'Eu vejo o vídeo',
zoom: 'Tenho pelo menos 1 Zoom in', zoom: 'Tenho pelo menos 1 Zoom in',
zoom_si_partecipato: 'Você participou de pelo menos 1 Zoom', zoom_si_partecipato: 'Você participou de pelo menos 1 Zoom',
zoom_gia_partecipato: 'Hai gia partecipato alla Video-Conferenza di Benvenuto',
zoom_partecipa: 'Participou em pelo menos 1 Zoom', zoom_partecipa: 'Participou em pelo menos 1 Zoom',
zoom_no_partecipato: 'Você ainda não participou de um Zoom (é um requisito para entrar)', zoom_no_partecipato: 'Você ainda não participou de um Zoom (é um requisito para entrar)',
zoom_long: 'É necessário participar em pelo menos 1 Zoom, mas é recomendável participar mais activamente no movimento.<br><br><strong> Ao participar nos Zooms o Staff registará a assistência e você estará habilitado.</strong>', zoom_long: 'É necessário participar em pelo menos 1 Zoom, mas é recomendável participar mais activamente no movimento.<br><br><strong> Ao participar nos Zooms o Staff registará a assistência e você estará habilitado.</strong>',
@@ -342,8 +343,10 @@ const msg_pt = {
cellreg: 'Cellulare con cui ti eri registrato', cellreg: 'Cellulare con cui ti eri registrato',
nationality: 'Nacionalidade', nationality: 'Nacionalidade',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
payeer_id: 'Id Payeer',
advcash_id: 'Email Advanced Cash',
revolut: 'Revolut', revolut: 'Revolut',
link_payment: 'Ligações Paypal.me', link_payment: 'Ligações Paypal MoneyBox',
note_payment: 'Notas Adicionais', note_payment: 'Notas Adicionais',
country_pay: 'País de destino dos pagamentos', country_pay: 'País de destino dos pagamentos',
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',
@@ -359,8 +362,9 @@ const msg_pt = {
saw_and_accepted: 'Condizioni', saw_and_accepted: 'Condizioni',
saw_zoom_presentation: 'Ha visto Zoom', saw_zoom_presentation: 'Ha visto Zoom',
manage_telegram: 'Gestori Telegram', manage_telegram: 'Gestori Telegram',
paymenttype: 'Formas de Pagamento disponíveis (Revolut)', paymenttype: 'Formas de Pagamento disponíveis',
selected: 'Selezionati', selected: 'Selezionati',
select: 'seleccionar',
img: 'Immagine', img: 'Immagine',
date_reg: 'Data Reg.', date_reg: 'Data Reg.',
requirement: 'Requisitos', requirement: 'Requisitos',

View File

@@ -85,7 +85,7 @@ const msg_si = {
video_intro_2: '2. Rojstvo {sitename}', video_intro_2: '2. Rojstvo {sitename}',
read_guidelines: 'Sem prebral in sprejel napisal zgornje pogoje', read_guidelines: 'Sem prebral in sprejel napisal zgornje pogoje',
saw_video_intro: 'Izjavljam, da sem pogledal videoposnetke', saw_video_intro: 'Izjavljam, da sem pogledal videoposnetke',
paymenttype: 'Načini plačila (Revolut)', paymenttype: 'Načini plačila',
paymenttype_long: '<strong> Načini plačila so: <ul> <li> <strong> Revolut </strong>: predplačniška kartica Revolut z angleškim IBAN (zunaj EU) popolnoma brezplačna, svobodnejša in enostavnejša za uporabo. Na voljo je aplikacija za mobilne naprave. </li><li> <strong> Paypal </strong> ker gre za zelo pogost sistem po vsej Evropi (prenos je brezplačen ) kjer lahko povežete predplačniške kartice, kreditne kartice ali tekoči račun <strong> BREZ KOMISIJ </strong>. Na ta način vam ne bo treba deliti številk svojih kartic ali c / c, ampak samo e-pošto, ki ste jo uporabili pri prijavi na Paypal. Mobilna aplikacija je na voljo. </li></ul>', paymenttype_long: '<strong> Načini plačila so: <ul> <li> <strong> Revolut </strong>: predplačniška kartica Revolut z angleškim IBAN (zunaj EU) popolnoma brezplačna, svobodnejša in enostavnejša za uporabo. Na voljo je aplikacija za mobilne naprave. </li><li> <strong> Paypal </strong> ker gre za zelo pogost sistem po vsej Evropi (prenos je brezplačen ) kjer lahko povežete predplačniške kartice, kreditne kartice ali tekoči račun <strong> BREZ KOMISIJ </strong>. Na ta način vam ne bo treba deliti številk svojih kartic ali c / c, ampak samo e-pošto, ki ste jo uporabili pri prijavi na Paypal. Mobilna aplikacija je na voljo. </li></ul>',
paymenttype_long2: 'Paypal je potreben <br> Za izmenjavo daril priporočamo, da imate na voljo <strong> vsaj 2 načina plačila </strong>.', paymenttype_long2: 'Paypal je potreben <br> Za izmenjavo daril priporočamo, da imate na voljo <strong> vsaj 2 načina plačila </strong>.',
paymenttype_paypal: 'Kako odpreti Paypal račun (v 2 minutah)', paymenttype_paypal: 'Kako odpreti Paypal račun (v 2 minutah)',
@@ -98,6 +98,7 @@ const msg_si = {
video_intro: 'Pogledam video', video_intro: 'Pogledam video',
zoom: 'Sodelujem pri vsaj 1 zoomu', zoom: 'Sodelujem pri vsaj 1 zoomu',
zoom_si_partecipato: 'Udeležili ste se vsaj 1-ga zooma', zoom_si_partecipato: 'Udeležili ste se vsaj 1-ga zooma',
zoom_gia_partecipato: 'Hai gia partecipato alla Video-Conferenza di Benvenuto',
zoom_partecipa: 'Sodeloval je v vsaj 1-em Zoomu', zoom_partecipa: 'Sodeloval je v vsaj 1-em Zoomu',
zoom_no_partecipato: 'Še niste sodelovali pri zoomu (zahteva, da lahko vstopite)', zoom_no_partecipato: 'Še niste sodelovali pri zoomu (zahteva, da lahko vstopite)',
zoom_long: 'Potrebno je sodelovati pri vsaj enem zoomu, vendar je priporočljivo, da se v gibanje vključite bolj aktivno. <br> <br>\n' + zoom_long: 'Potrebno je sodelovati pri vsaj enem zoomu, vendar je priporočljivo, da se v gibanje vključite bolj aktivno. <br> <br>\n' +
@@ -344,8 +345,10 @@ const msg_si = {
cellreg: 'Telefonska s katero si se registriral', cellreg: 'Telefonska s katero si se registriral',
nationality: 'Nacionalnost', nationality: 'Nacionalnost',
email_paypal: 'Email Paypal', email_paypal: 'Email Paypal',
payeer_id: 'Id Payeer',
advcash_id: 'Email Advanced Cash',
revolut: 'Revolut', revolut: 'Revolut',
link_payment: 'Povezava paypal.me', link_payment: 'Povezava paypal MoneyBox',
note_payment: 'Dodatne opombe', note_payment: 'Dodatne opombe',
country_pay: 'Država destinacije Vplačil', country_pay: 'Država destinacije Vplačil',
username_telegram: 'Uporabniško ime Telegram', username_telegram: 'Uporabniško ime Telegram',
@@ -361,8 +364,9 @@ const msg_si = {
saw_and_accepted: 'Pogoji', saw_and_accepted: 'Pogoji',
saw_zoom_presentation: 'Je bil prisoten na Zoom-u', saw_zoom_presentation: 'Je bil prisoten na Zoom-u',
manage_telegram: 'Skrbniki Telegram', manage_telegram: 'Skrbniki Telegram',
paymenttype: 'Razpoložljivi načini Plačila (Revolut)', paymenttype: 'Razpoložljivi načini Plačila',
selected: 'Izbrani', selected: 'Izbrani',
select: 'izbrati',
img: 'Slika', img: 'Slika',
date_reg: 'Datum Reg.', date_reg: 'Datum Reg.',
requirement: 'Zahteve', requirement: 'Zahteve',

View File

@@ -41,6 +41,7 @@ export const DefaultUser: IUserFields = {
img: '', img: '',
teleg_id: 0, teleg_id: 0,
saw_zoom_presentation: false, saw_zoom_presentation: false,
ask_zoom_partecipato: false,
saw_and_accepted: false, saw_and_accepted: false,
qualified: false, qualified: false,
qualified_2invitati: false, qualified_2invitati: false,
@@ -60,6 +61,8 @@ export const DefaultProfile: IUserProfile = {
sex: 0, sex: 0,
country_pay: '', country_pay: '',
email_paypal: '', email_paypal: '',
payeer_id: '',
advcash_id: '',
revolut: '', revolut: '',
link_payment: '', link_payment: '',
note_payment: '', note_payment: '',
@@ -69,6 +72,7 @@ export const DefaultProfile: IUserProfile = {
my_dream: '', my_dream: '',
manage_telegram: false, manage_telegram: false,
saw_zoom_presentation: false, saw_zoom_presentation: false,
ask_zoom_partecipato: false,
saw_and_accepted: false, saw_and_accepted: false,
paymenttypes: [], paymenttypes: [],
qualified: false, qualified: false,
@@ -87,6 +91,7 @@ const state: IUserState = {
isAdmin: false, isAdmin: false,
isManager: false, isManager: false,
isTutor: false, isTutor: false,
isZoomeri: false,
isTraduttrici: false, isTraduttrici: false,
usersList: [], usersList: [],
countusers: 0, countusers: 0,
@@ -147,16 +152,23 @@ namespace Getters {
return false return false
}, 'VistoZoom') }, 'VistoZoom')
const DiceDiAverPartecipato = b.read((mystate) => {
if (mystate.my && mystate.my.profile) {
return (mystate.my.profile.ask_zoom_partecipato)
}
return false
}, 'DiceDiAverPartecipato')
const isServerError = b.read((mystate) => { const isServerError = b.read((mystate) => {
return (state.servercode === tools.ERR_SERVERFETCH) return (mystate.servercode === tools.ERR_SERVERFETCH)
}, 'isServerError') }, 'isServerError')
const getServerCode = b.read((mystate) => { const getServerCode = b.read((mystate) => {
return state.servercode return mystate.servercode
}, 'getServerCode') }, 'getServerCode')
const getMsg = b.read((mystate) => { const getMsg = b.read((mystate) => {
return state.msg return mystate.msg
}, 'getMsg') }, 'getMsg')
const getNameSurnameByUserId = b.read((mystate: IUserState) => (userId: string) => { const getNameSurnameByUserId = b.read((mystate: IUserState) => (userId: string) => {
@@ -259,6 +271,9 @@ namespace Getters {
get VistoZoom() { get VistoZoom() {
return VistoZoom() return VistoZoom()
}, },
get DiceDiAverPartecipato() {
return DiceDiAverPartecipato()
},
get getServerCode() { get getServerCode() {
return getServerCode() return getServerCode()
}, },
@@ -312,6 +327,7 @@ namespace Mutations {
mystate.isAdmin = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Admin.value) mystate.isAdmin = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Admin.value)
mystate.isManager = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Manager.value) mystate.isManager = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Manager.value)
mystate.isTutor = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Tutor.value) mystate.isTutor = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Tutor.value)
mystate.isZoomeri = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Zoomeri.value)
mystate.isTeacher = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Teacher.value) mystate.isTeacher = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Teacher.value)
mystate.isTraduttrici = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Traduttrici.value) mystate.isTraduttrici = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Traduttrici.value)
@@ -392,6 +408,11 @@ namespace Mutations {
mystate.servercode = num mystate.servercode = num
} }
function setDiceDiAverPartecipato(mystate: IUserState, partecipato: boolean) {
console.log('setDiceDiAverPartecipato', partecipato)
mystate.my.profile.ask_zoom_partecipato = partecipato
}
function setResStatus(mystate: IUserState, status: number) { function setResStatus(mystate: IUserState, status: number) {
mystate.resStatus = status mystate.resStatus = status
} }
@@ -468,6 +489,7 @@ namespace Mutations {
setResStatus: b.commit(setResStatus), setResStatus: b.commit(setResStatus),
setAuth: b.commit(setAuth), setAuth: b.commit(setAuth),
clearAuthData: b.commit(clearAuthData), clearAuthData: b.commit(clearAuthData),
setDiceDiAverPartecipato: b.commit(setDiceDiAverPartecipato),
setErrorCatch: b.commit(setErrorCatch), setErrorCatch: b.commit(setErrorCatch),
getMsgError: b.commit(getMsgError), getMsgError: b.commit(getMsgError),
setusersList: b.commit(setusersList) setusersList: b.commit(setusersList)

View File

@@ -457,7 +457,7 @@ export const fieldsTable = {
getTableJoinByName(table) { getTableJoinByName(table) {
if (table === 'permissions') if (table === 'permissions')
return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Tutor, shared_consts.Permissions.Traduttrici] return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Tutor, shared_consts.Permissions.Traduttrici, shared_consts.Permissions.Zoomeri]
else if (table === 'accepted') else if (table === 'accepted')
return [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI] return [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI]
else if (table === 'fieldstype') else if (table === 'fieldstype')
@@ -564,6 +564,13 @@ export const fieldsTable = {
label_trans: 'reg.saw_zoom_presentation', label_trans: 'reg.saw_zoom_presentation',
fieldtype: tools.FieldType.boolean fieldtype: tools.FieldType.boolean
}), }),
AddCol({
name: 'profile.ask_zoom_partecipato',
field: 'profile',
subfield: 'ask_zoom_partecipato',
label_trans: 'reg.ask_zoom_partecipato',
fieldtype: tools.FieldType.boolean
}),
AddCol({ AddCol({
name: 'profile.qualified', name: 'profile.qualified',
field: 'profile', field: 'profile',
@@ -585,6 +592,18 @@ export const fieldsTable = {
subfield: 'email_paypal', subfield: 'email_paypal',
label_trans: 'reg.email_paypal' label_trans: 'reg.email_paypal'
}), }),
AddCol({
name: 'profile.payeer_id',
field: 'profile',
subfield: 'payeer_id',
label_trans: 'reg.payeer_id'
}),
AddCol({
name: 'profile.advcash_id',
field: 'profile',
subfield: 'advcash_id',
label_trans: 'reg.advcash_id'
}),
AddCol({ AddCol({
name: 'profile.revolut', name: 'profile.revolut',
field: 'profile', field: 'profile',
@@ -709,6 +728,18 @@ export const fieldsTable = {
subfield: 'email_paypal', subfield: 'email_paypal',
label_trans: 'reg.email_paypal' label_trans: 'reg.email_paypal'
}), }),
AddCol({
name: 'profile.payeer_id',
field: 'profile',
subfield: 'payeer_id',
label_trans: 'reg.payeer_id'
}),
AddCol({
name: 'profile.advcash_id',
field: 'profile',
subfield: 'advcash_id',
label_trans: 'reg.advcash_id'
}),
AddCol({ AddCol({
name: 'profile.revolut', name: 'profile.revolut',
field: 'profile', field: 'profile',

View File

@@ -33,7 +33,8 @@ export const lists = {
DAMMI_PRIMO_UTENTE_LIBERO: 390, DAMMI_PRIMO_UTENTE_LIBERO: 390,
CAN_EDIT_TABLE: 400, CAN_EDIT_TABLE: 400,
SHOW_PREV_REC: 401 SHOW_PREV_REC: 401,
ZOOM_GIA_PARTECIPATO: 510
}, },
selectTheme: [ selectTheme: [

View File

@@ -1483,6 +1483,29 @@ export const tools = {
} else } else
tools.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) tools.showNegativeNotif(myself.$q, myself.$t('db.recfailed'))
}) })
} else if (func === lists.MenuAction.ZOOM_GIA_PARTECIPATO) {
// console.log('param1', par.param1, 'id', par.param1._id)
const mydatatosave = {
id: par.param1._id,
ind_order: par.param1.ind_order,
myfunc: func,
data: par.param2,
username: par.param2.username,
notifBot: null,
}
// if (par.param2.notifBot)
// mydatatosave.notifBot = { un: par.param2.notifBot, txt: par.param3 }
// myself.EseguiCallServer()
GlobalStore.actions.callFunz({ mydata: mydatatosave }).then((ris) => {
if (ris) {
myself.Callback(func)
tools.showPositiveNotif(myself.$q, par.param3)
} else
tools.showNegativeNotif(myself.$q, myself.$t('db.recfailed'))
})
} else if (func === lists.MenuAction.REGALA_INVITATO) { } else if (func === lists.MenuAction.REGALA_INVITATO) {
// console.log('param1', par.param1, 'id', par.param1._id) // console.log('param1', par.param1, 'id', par.param1._id)
let mydatatosave = { let mydatatosave = {
@@ -2073,6 +2096,10 @@ export const tools = {
return UserStore.state.isTutor return UserStore.state.isTutor
}, },
isZoomeri() {
return UserStore.state.isZoomeri
},
isTraduttrici() { isTraduttrici() {
return UserStore.state.isTraduttrici return UserStore.state.isTraduttrici
}, },
@@ -2183,7 +2210,7 @@ export const tools = {
${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) }` ${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) }`
} else { } else {
mystr = `${tools.getstrDate(myevent.dateTimeStart)} mystr = `${tools.getstrDate(myevent.dateTimeStart)}
${mythis.$t('cal.starttime')} ${ tools.getstrTime(myevent.dateTimeStart) } ${mythis.$t('cal.starttime')} ${ tools.getstrTime(myevent.dateTimeStart) }
${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) }` ${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) }`
} }
} else { } else {
@@ -3121,8 +3148,15 @@ export const tools = {
param1: eventparam, param1: eventparam,
param2: true param2: true
}) })
} },
, AskGiaPartecipatoZoom(mythis, user) {
console.log('AskGiaPartecipatoZoom', user.username)
tools.askConfirm(mythis.$q, translate('steps.zoom_gia_partecipato'), translate('steps.zoom_gia_partecipato'), translate('dialog.yes'), translate('dialog.no'), mythis, '', lists.MenuAction.ZOOM_GIA_PARTECIPATO, 0, {
param1: user,
param2: user,
param3: 'Confermato',
})
},
ActionRecTable(mythis, action, table, id, item, askaction) { ActionRecTable(mythis, action, table, id, item, askaction) {
// console.log('ActionRecTable', id) // console.log('ActionRecTable', id)
return tools.askConfirm(mythis.$q, 'Action', translate(askaction) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, table, action, 0, { return tools.askConfirm(mythis.$q, 'Action', translate(askaction) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, table, action, 0, {
@@ -3508,7 +3542,7 @@ export const tools = {
const arrlang = ['IT', 'ES', 'PT', 'BR', 'US', 'GB', 'UK', 'DE', 'FR', 'SI', 'MD', 'IE', 'KE', 'AU', 'ML', 'DO', const arrlang = ['IT', 'ES', 'PT', 'BR', 'US', 'GB', 'UK', 'DE', 'FR', 'SI', 'MD', 'IE', 'KE', 'AU', 'ML', 'DO',
'NG', 'SK', 'CH', 'CM', 'CO', 'CG', 'PE', 'MS', 'SM', 'HR', 'RO', 'VE', 'CL', 'PL', 'EG', 'AR', 'MX', 'SN', 'PK', 'AT', 'NP', 'NG', 'SK', 'CH', 'CM', 'CO', 'CG', 'PE', 'MS', 'SM', 'HR', 'RO', 'VE', 'CL', 'PL', 'EG', 'AR', 'MX', 'SN', 'PK', 'AT', 'NP',
'CU', 'MA', 'PH', 'BA', 'UA', 'BE', 'NL', 'CI'] 'CU', 'MA', 'PH', 'BA', 'UA', 'BE', 'NL', 'CI', 'BF']
const flag = arrlang.find((mylang) => mylang === lang) const flag = arrlang.find((mylang) => mylang === lang)
if (!!flag) { if (!!flag) {
@@ -3630,6 +3664,8 @@ export const tools = {
return 'Montserrat' return 'Montserrat'
} else if (nat === 'CI') { } else if (nat === 'CI') {
return 'Cote d\'Ivoire' return 'Cote d\'Ivoire'
} else if (nat === 'BF') {
return 'Burkina Faso'
} else if (nat === 'IE') { } else if (nat === 'IE') {
return 'Ireland' return 'Ireland'
} else if (nat === 'KE') { } else if (nat === 'KE') {
@@ -3685,19 +3721,14 @@ export const tools = {
return ris return ris
}, },
isPayPalSel(user) { isSel2Metodi(user) {
let ispaypal = false
if (user.profile.paymenttypes) { if (user.profile.paymenttypes) {
if (user.profile.paymenttypes.includes('paypal')) { return user.profile.paymenttypes.length > 1
if (!!user.profile.email_paypal) {
if (user.profile.email_paypal !== '')
ispaypal = true
}
}
} }
return ispaypal return false
}, },
getnumrequisiti(user) { getnumrequisiti(user) {
let req = 0 let req = 0
@@ -3708,7 +3739,7 @@ export const tools = {
req += user.profile.saw_zoom_presentation ? 1 : 0 req += user.profile.saw_zoom_presentation ? 1 : 0
if (!!user.profile.my_dream) if (!!user.profile.my_dream)
req += user.profile.my_dream.length >= 10 ? 1 : 0 req += user.profile.my_dream.length >= 10 ? 1 : 0
req += this.isPayPalSel(user) ? 1 : 0 req += this.isSel2Metodi(user) ? 1 : 0
return req return req
}, },
@@ -3857,6 +3888,54 @@ export const tools = {
} }
return mylink return mylink
},
isselectPaypal() {
if (UserStore.state.my.profile) {
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('paypal')) {
return true
}
}
return false
}
},
isselectPayeer() {
if (UserStore.state.my.profile) {
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('payeer')) {
return true
}
}
return false
}
},
isselectRevolut() {
if (UserStore.state.my.profile) {
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('revolut')) {
return true
}
}
return false
}
},
isselectAdvCash() {
if (UserStore.state.my.profile) {
if (UserStore.state.my.profile.paymenttypes) {
if (UserStore.state.my.profile.paymenttypes.includes('advcash')) {
return true
}
}
return false
}
} }
// getLocale() { // getLocale() {

View File

@@ -171,6 +171,14 @@
@click="EseguiFunz('generaFlotte')"></q-btn> @click="EseguiFunz('generaFlotte')"></q-btn>
<br> <br>
</div> </div>
<div class="row">
<q-btn label="METTI SOGNO E PAYPAL (SOLO VISU)" color="primary"
@click="EseguiFunz('mettiSognoePaypalView')"></q-btn>
<br>
<q-btn label="METTI SOGNO E PAYPAL" color="primary"
@click="EseguiFunz('mettiSognoePaypal')"></q-btn>
<br>
</div>
<!--<div class="row"> <!--<div class="row">
<q-btn label="AGGIUNGI NAVE PER UTENTI CHE NON CE L'HANNO (flag navinonpresenti)!" color="primary" <q-btn label="AGGIUNGI NAVE PER UTENTI CHE NON CE L'HANNO (flag navinonpresenti)!" color="primary"
@click="EseguiFunz('addNavePerUtentiNaviNonPresenti')"></q-btn> @click="EseguiFunz('addNavePerUtentiNaviNonPresenti')"></q-btn>

0
src/views/login/requestresetpwd.vue Normal file → Executable file
View File

0
src/views/login/signup/signup-validate.ts Normal file → Executable file
View File

0
src/views/login/updatepassword.vue Normal file → Executable file
View File

View File

@@ -81,21 +81,43 @@
<CTitleBanner class="q-pa-xs" :title="$t('pages.payment')" bgcolor="bg-primary" clcolor="text-white" <CTitleBanner class="q-pa-xs" :title="$t('pages.payment')" bgcolor="bg-primary" clcolor="text-white"
myclass="myshad" :canopen="true"> myclass="myshad" :canopen="true">
<div class="row fa-border justify-center items-center"> <div class="row fa-border justify-center items-center">
<CMyFieldDb :title="$t('reg.revolut')"
<CMyFieldDb v-if="tools.isselectPayeer()"
:title="$t('reg.payeer_id')"
table="users"
mykey="profile"
myimg="statics/images/payeer.jpg"
mysubkey="payeer_id"
:type="tools.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectAdvCash()"
:title="$t('reg.advcash_id')"
table="users"
mykey="profile"
mysubkey="advcash_id"
myimg="statics/images/advcash.jpg"
:type="tools.FieldType.string">
</CMyFieldDb>
<CMyFieldDb v-if="tools.isselectRevolut()"
:title="$t('reg.revolut')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="revolut" mysubkey="revolut"
myimg="statics/images/revolut.jpg"
:type="tools.FieldType.string"> :type="tools.FieldType.string">
</CMyFieldDb> </CMyFieldDb>
<CMyFieldDb :title="$t('reg.email_paypal')" <CMyFieldDb v-if="tools.isselectPaypal()"
:title="$t('reg.email_paypal')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="email_paypal" mysubkey="email_paypal"
myimg="statics/images/paypal.jpg"
:type="tools.FieldType.string"> :type="tools.FieldType.string">
</CMyFieldDb> </CMyFieldDb>
<CMyFieldDb :title="$t('reg.link_payment')" <CMyFieldDb v-if="tools.isselectPaypal()"
:title="$t('reg.link_payment')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="link_payment" mysubkey="link_payment"