diff --git a/src/common/shared_nodejs.js b/src/common/shared_nodejs.js index 2c295825..55eae4fe 100755 --- a/src/common/shared_nodejs.js +++ b/src/common/shared_nodejs.js @@ -117,7 +117,7 @@ module.exports = { }, fieldsUserToChange() { - return ['_id', 'index', 'username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'verified_by_aportador', 'ipaddr', 'lasttimeonline', 'profile', 'calcstat', 'news_on', 'aportador_solidario', 'made_gift', 'ind_order', 'old_order', 'numinvitati', 'numinvitatiattivi', 'qualified'] + return ['_id', 'index', 'username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'ipaddr', 'lasttimeonline', 'profile', 'calcstat', 'news_on', 'aportador_solidario', 'made_gift', 'ind_order', 'old_order', 'numinvitati', 'numinvitatiattivi', 'qualified'] }, }; diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 9263f00f..7634b273 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -122,6 +122,7 @@ export const shared_consts = { BOTTYPE_PAGE: 1, BOTTYPE_LINK: 2, BOTTYPE_TEXT: 3, + BOTTYPE_MENU: 4, CashType: { None: 0, @@ -155,6 +156,10 @@ export const shared_consts = { value: 3, label: 'Testo', }, + { + value: 4, // BOTTYPE_MENU + label: 'Menu', + }, ], Shippings: [ @@ -769,7 +774,7 @@ export const shared_consts = { }, fieldsUserToChange() { - return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on'] + return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on'] }, } diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index e8f02e55..22d309e5 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -380,7 +380,7 @@ export default defineComponent({ filter: null, useinput: false, icon: 'mood', - filteradv: true, + filteradv: false, }, { label: 'Regione', @@ -476,7 +476,7 @@ export default defineComponent({ filter: null, useinput: false, icon: 'fas fa-hand-holding', - filteradv: true, + filteradv: false, //icon: 'swap_horizontal_circle', }, diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 9aea1f1e..9deb2cb3 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -147,7 +147,6 @@ import('@/views/testServer/testServer.vue'), - inmenu: true, + inmenu: false, infooter: false, }, { diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts index 19f404f7..8e3698c0 100755 --- a/src/mixins/mixin-users.ts +++ b/src/mixins/mixin-users.ts @@ -116,6 +116,11 @@ export default function () { return isVerified() && userStore.my.verified_by_aportador } + function notAsk_ToVerify() { + const userStore = useUserStore() + return isVerified() && userStore.my.notask_verif + } + function paotest() { return 'Ciaoooooooooooooooo!' } @@ -177,6 +182,7 @@ export default function () { mySurname, myCell, Verificato, + notAsk_ToVerify, MadeGift, Email, getMyImg, diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index 8ecf0377..5487e730 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -105,6 +105,7 @@ export interface IUserFields { perm?: number verified_email?: boolean verified_by_aportador?: boolean + notask_verif?: boolean trust_modified?: Date aportador_solidario?: string diff --git a/src/root/mainview/mainview.vue b/src/root/mainview/mainview.vue index 2d441dca..25bdcd97 100755 --- a/src/root/mainview/mainview.vue +++ b/src/root/mainview/mainview.vue @@ -11,6 +11,19 @@ + + + Questo è l'AMBIENTE DI TEST !
Solo per prove.
+ +
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 793326ce..2a12e0ea 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -216,9 +216,9 @@ const msg_it = { components: { authentication: { telegram: { - open: 'Clicca qui per aprire il BOT Telegram e segui le istruzioni', - ifclose: 'Se non si apre Telegram cliccando sul bottone oppure l\'avevi eliminato, vai su Telegram e cerca il Bot di \'{botname}\' dall\'icona della lente, poi premi Start e segui le istruzioni.', - openbot: 'Apri \'{botname}\' su Telegram', + open: 'Clicca sul bottone qui sotto, si aprirà una chat Telegram speciale (chiamata BOT)', + ifclose: 'poi premi "AVVIA" o "START" e segui le istruzioni indicate.', + openbot: 'Entra qui', }, login: { facebook: 'Facebook', @@ -396,6 +396,7 @@ const msg_it = { legenda: 'Legenda', aportador_solidario: 'Chi ti ha Invitato', verified_by_aportador: 'Verificato dall\'Invitante', + notAsk_ToVerify: 'Non chiedere la verifica Registrazione', trust_modified: 'Fiducia Modificata', blocked: 'Bloccato', username_who_block: 'Bloccato da', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index ee157acb..22d9c2bb 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -520,7 +520,7 @@ export const colmyUserGroup = [ name: 'groupname', label_trans: 'reg.groupname', required: true, maxlength: 30, allowchar: costanti.ALLOWCHAR_CODE, - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage, }), AddCol({ name: 'title', label_trans: 'reg.name', required: true, noshowlabel: true, maxlength: 40 }), AddCol({ @@ -1906,6 +1906,11 @@ export const colTableUsersISP = [ label_trans: 'reg.verified_by_aportador', fieldtype: costanti.FieldType.boolean }), + AddCol({ + name: 'notask_verif', + label_trans: 'reg.notAsk_ToVerify', + fieldtype: costanti.FieldType.boolean + }), AddCol({ name: 'trust_modified', label_trans: 'reg.trust_modified', fieldtype: costanti.FieldType.date }), AddCol({ name: 'blocked', label_trans: 'reg.blocked', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'username_who_block', label_trans: 'reg.username_who_block' }), diff --git a/src/views/user/editprofile/editprofile.vue b/src/views/user/editprofile/editprofile.vue index 9617162f..8f167c09 100755 --- a/src/views/user/editprofile/editprofile.vue +++ b/src/views/user/editprofile/editprofile.vue @@ -151,7 +151,7 @@ -->
+ + + Questa sezione è ancora in fase di miglioramento. + + - Questa sezione è ancora in fase di test. + Questa sezione è ancora in fase di miglioramento.