From fbebd925b12c1bc002ad044209ed1b2758cc8032 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Fri, 19 Jan 2024 23:38:15 +0100
Subject: [PATCH] regNameSurnameMandatory askUSernameTelegramToTheReg @ davanti
 all'username

---
 src/common/shared_vuejs.ts                 |  2 ++
 src/components/COrdersCart/COrdersCart.vue | 17 ++++++++++-------
 src/components/CSignUp/CSignUp.ts          | 14 +++++++++++++-
 src/components/CSignUp/CSignUp.vue         | 11 ++++++-----
 src/store/Modules/tools.ts                 | 16 ++++++++++++++++
 src/store/UserStore.ts                     |  2 +-
 src/validation/complexity.ts               |  3 ++-
 src/validation/registereduser.ts           |  4 +++-
 8 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 9bc64feb..2acd2714 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -1197,6 +1197,8 @@ export const shared_consts = {
     AskInvitantesulBot: 8,
     AskUsernameSulBot: 16,
     registerUserWithBot: 32,
+    regNameSurnameMandatory: 64,
+    askUSernameTelegramToTheReg: 128,
   },
 
   MsgTeleg: {
diff --git a/src/components/COrdersCart/COrdersCart.vue b/src/components/COrdersCart/COrdersCart.vue
index eb0e9920..de51c318 100755
--- a/src/components/COrdersCart/COrdersCart.vue
+++ b/src/components/COrdersCart/COrdersCart.vue
@@ -44,14 +44,14 @@
       <q-separator></q-separator>
 
       <div
-        v-if="myTotalPriceCalc() !== myTotalPrice() && myTotalPriceCalc() !== ''"
+        v-if="
+          myTotalPriceCalc() !== myTotalPrice() && myTotalPriceCalc() !== ''
+        "
         class="col-6 q-mr-sm"
         style="text-align: right"
       >
         <span class="text-grey q-mr-xs">{{ t('ecomm.calcolato') }}:</span>
-        <span class="text-subtitle1 q-mr-sm"
-          >€ {{ myTotalPriceCalc() }}</span
-        >
+        <span class="text-subtitle1 q-mr-sm">€ {{ myTotalPriceCalc() }}</span>
       </div>
       <div class="col-6 q-mr-sm" style="text-align: right">
         <q-input
@@ -60,7 +60,7 @@
           :label="t('ecomm.totalPrice')"
           filled
           dense
-          style="width: 150px;"
+          style="width: 150px"
           debounce="1000"
           @change="changeTotalPrice"
         >
@@ -94,8 +94,11 @@
         @update:model-value="change_field('note')"
       >
       </q-input>
-      <q-field v-else> Note: {{ myrec.note }} </q-field>
-      
+      <div v-else>
+        <q-field> Note: {{ myrec.note }} </q-field>
+        <q-field color="red"> Note per il Gestore: {{ myrec.note_per_gestore }} </q-field>
+      </div>
+
       <q-input
         v-if="editOn && tools.isManager() && getNumItems() > 0"
         v-model="myrec.note_per_gestore"
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts
index 7ea8ef9f..91ce6233 100755
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -18,6 +18,8 @@ import { DefaultProfile, useUserStore } from '@store/UserStore'
 import useValidate from '@vuelidate/core'
 import useVuelidate from '@vuelidate/core'
 
+import { shared_consts } from '@/common/shared_vuejs'
+
 import { minLength, required, sameAs } from '@vuelidate/validators'
 
 // import { ValidationRuleset } from 'vuelidate'
@@ -118,6 +120,11 @@ export default defineComponent({
       } else if (slide.value === '2') {
         // Username
         ret = !signup.username || (inputUsername.value && inputUsername.value.hasError)
+
+        if (tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory)) {
+          ret = ret || (!signup.name || (inputName.value && inputName.value.hasError))
+          ret = ret || (!signup.surname || (inputSurname.value && inputSurname.value.hasError))
+        }
       } else if (slide.value === '3') {
         // Password
         ret = !signup.password || (!inputPassword.value || (inputPassword.value && inputPassword.value.hasError)) || (!inputPassword2.value || (inputPassword2.value && inputPassword2.value.hasError))
@@ -163,7 +170,10 @@ export default defineComponent({
           registereduser,
         },
         name: {
-          required: props.collettivo ? true : false,
+          required: (props.collettivo || tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory)) ? true : false,
+        },
+        surname: {
+          required: (tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory)) ? true : false,
         },
         terms: {
           required,
@@ -432,6 +442,8 @@ export default defineComponent({
       inputSurname,
       inputPassword,
       inputPassword2,
+      shared_consts,
+
     }
   },
 })
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index a35e6d7d..0b13f948 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -13,6 +13,7 @@
         </span>
       </q-banner>
 
+
       <div class="row q-ma-sm q-pa-sm justify-center">
         <q-btn
           class="q-ma-sm"
@@ -157,7 +158,7 @@
                 tools.errorMsg('username', v$.username) ||
                 (isalreadyReg ? 'L\'Username è gia stato registrato!' : '')
               "
-              :label="$t('reg.username_reg')"
+              :label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.askUSernameTelegramToTheReg) ? $t('reg.username_telegram') : $t('reg.username_reg')"
             >
               <template v-slot:prepend>
                 <q-icon name="person" />
@@ -198,7 +199,7 @@
                 debounce="1000"
                 @keyup.enter="$refs.inputSurname.focus()"
                 :error-message="tools.errorMsg('name', v$.name)"
-                :label="$t('reg.name_opt')"
+                :label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory) ? $t('reg.name') : $t('reg.name_opt')"
               >
                 <template v-slot:prepend>
                   <q-icon name="person" />
@@ -427,7 +428,7 @@
                     tools.errorMsg('username', v$.username) ||
                     (isalreadyReg ? 'L\'Username è gia stato registrato!' : '')
                   "
-                  :label="collettivo ? $t('reg.username_reg_collettivo') : $t('reg.username_reg')"
+                  :label="collettivo ? $t('reg.username_reg_collettivo') : (tools.getConfSiteOptionEnabled(shared_consts.ConfSite.askUSernameTelegramToTheReg) ? $t('reg.username_telegram') : $t('reg.username_reg'))"
                 >
                   <template v-slot:prepend>
                     <q-icon name="person" />
@@ -468,7 +469,7 @@
                     debounce="1000"
                     @keyup.enter="$refs.inputSurname.focus()"
                     :error-message="tools.errorMsg('name', v$.name)"
-                    :label="$t('reg.name_opt')"
+                    :label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory) ? $t('reg.name') : $t('reg.name_opt')"
                   >
                     <template v-slot:prepend>
                       <q-icon name="person" />
@@ -488,7 +489,7 @@
                       !checkifDisabled ? $refs.carousel.next() : null
                     "
                     :error-message="tools.errorMsg('surname', v$.surname)"
-                    :label="$t('reg.surname_opt')"
+                    :label="tools.getConfSiteOptionEnabled(shared_consts.ConfSite.regNameSurnameMandatory) ? $t('reg.surname') : $t('reg.surname_opt')"
                   >
                     <template v-slot:prepend>
                       <q-icon name="person" />
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index a1fe3182..b2006e31 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -291,6 +291,14 @@ export const tools = {
       label: 'Permetti di registrarsi in automatico solo entrando sul BOT',
       value: shared_consts.ConfSite.registerUserWithBot,
     },
+    {
+      label: 'Nome e Cognome Obbligatori in fase di registrazione',
+      value: shared_consts.ConfSite.regNameSurnameMandatory,
+    },
+    {
+      label: 'Username Telegram in fase di Registrazione',
+      value: shared_consts.ConfSite.askUSernameTelegramToTheReg,
+    },
 
   ],
 
@@ -8365,6 +8373,14 @@ export const tools = {
     return mylink.replace('{site}', site).replace('{value}', value);
   },
 
+  rimuoviAtInizio(stringa: string) {
+    if (stringa.startsWith('@')) {
+      return stringa.substring(1);
+    } else {
+      return stringa;
+    }
+  },
+
   // FINE !
 
   // getLocale() {
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 9e8e7fc6..058d3c03 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1289,7 +1289,7 @@ export const useUserStore = defineStore('UserStore', {
       }
 
       const usertosend = {
-        username: authData.username.trim(),
+        username: tools.rimuoviAtInizio(authData.username.trim()),
         password: authData.password.trim(),
         lang: this.lang,
         options,
diff --git a/src/validation/complexity.ts b/src/validation/complexity.ts
index e9c6ddfe..2ac9c6d2 100755
--- a/src/validation/complexity.ts
+++ b/src/validation/complexity.ts
@@ -1,9 +1,10 @@
 import { Patterns } from '@/common'
+import { tools } from '../store/Modules/tools'
 
 export function complexity(password: string) {
     return Patterns.Password.test(password)
 }
 
 export function complexityUser(username: string) {
-    return Patterns.Username.test(username)
+    return Patterns.Username.test(tools.rimuoviAtInizio(username))
 }
diff --git a/src/validation/registereduser.ts b/src/validation/registereduser.ts
index 5c99c9bd..d733fe81 100755
--- a/src/validation/registereduser.ts
+++ b/src/validation/registereduser.ts
@@ -2,6 +2,8 @@ import { default as Axios, AxiosResponse } from 'axios'
 // import { IPayload } from 'model'
 import { GlobalConfig, PayloadMessageTypes } from '../common'
 
+import { tools } from '@store/Modules/tools'
+
 import { helpers } from '@vuelidate/validators'
 const { withAsync } = helpers
 
@@ -16,7 +18,7 @@ export function _registereduser (userName: string) {
     return res.status !== PayloadMessageTypes.statusfound
   }
 
-  return Axios.get(VALIDATE_USER_URL + process.env.APP_ID + '/' + userName)
+  return Axios.get(VALIDATE_USER_URL + process.env.APP_ID + '/' + tools.rimuoviAtInizio(userName))
     .then(onSuccess)
     .catch((err) => {
       return true