From 769d0b2ade7f0005df62390573d3a6cbc48f221a Mon Sep 17 00:00:00 2001
From: Babak Alizadeh <alizadeh.babak@gmail.com>
Date: Sat, 22 Mar 2025 21:30:34 +0000
Subject: [PATCH] bug fix in slogan and application name

---
 .../Controller/Front/UiGeneralController.php  |  2 +-
 webUI/src/hesabixConfig.js                    |  2 +-
 webUI/src/i18n/fa_lang.ts                     |  5 --
 webUI/src/views/acc/App.vue                   |  6 +-
 webUI/src/views/user/InstallPWA.vue           | 64 +++++++++++--------
 webUI/src/views/user/active-account.vue       |  9 ++-
 webUI/src/views/user/login.vue                |  7 +-
 .../profile/forget-password-submit-code.vue   |  7 +-
 .../views/user/profile/forget-password.vue    |  7 +-
 webUI/src/views/user/profile/profile-main.vue | 10 +--
 webUI/src/views/user/register.vue             |  7 +-
 webUI/src/views/user/single.vue               | 18 ++++--
 12 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/hesabixCore/src/Controller/Front/UiGeneralController.php b/hesabixCore/src/Controller/Front/UiGeneralController.php
index a76dce7..b5cebe7 100644
--- a/hesabixCore/src/Controller/Front/UiGeneralController.php
+++ b/hesabixCore/src/Controller/Front/UiGeneralController.php
@@ -25,7 +25,7 @@ class UiGeneralController extends AbstractController
     #[Route('/system/getslogon', name: 'general_get_slogon')]
     public function general_get_slogon(registryMGR $registryManager): JsonResponse
     {
-        $name = $registryManager->get('system', 'appSlogon');
+        $name = $registryManager->get('system', 'appSlogan');
         return $this->json($name);
     }
     #[Route('/system/geturl', name: 'general_get_url')]
diff --git a/webUI/src/hesabixConfig.js b/webUI/src/hesabixConfig.js
index 20227bf..a9dd3c8 100644
--- a/webUI/src/hesabixConfig.js
+++ b/webUI/src/hesabixConfig.js
@@ -74,7 +74,7 @@ export async function getSiteName() {
     );
 }
 
-export async function getSiteSlogon() {
+export async function getSiteSlogan() {
     return fetchAndCache(
         `${getApiUrl()}/system/getslogon`,
         KEYS.SITE_SLOGON,
diff --git a/webUI/src/i18n/fa_lang.ts b/webUI/src/i18n/fa_lang.ts
index 243854e..a34c7e1 100644
--- a/webUI/src/i18n/fa_lang.ts
+++ b/webUI/src/i18n/fa_lang.ts
@@ -432,7 +432,6 @@ const fa_lang = {
     close_dialog: "بستن",
   },
   app: {
-    name: "حسابیکس",
     loading: "در حال بارگذاری...",
     please_wait: "لطفا صبر کنید ...",
     logout: "خروج",
@@ -511,10 +510,6 @@ const fa_lang = {
     file_size_limit: 'حجم فایل انتخابی بیش از حد مجاز است.',
     "form_invalid": "لطفاً فرم را به درستی پر کنید"
   },
-  hesabix: {
-    banner: "حسابیکس سامانه جامع مدیریت کسب‌و‌کار",
-    name: "حسابیکس"
-  },
   title: {
     user: {
       "dashboard": "پیشخوان کاربر",
diff --git a/webUI/src/views/acc/App.vue b/webUI/src/views/acc/App.vue
index 29ad0ec..c4c2dfc 100644
--- a/webUI/src/views/acc/App.vue
+++ b/webUI/src/views/acc/App.vue
@@ -19,7 +19,7 @@ export default {
       timeNow: '',
       apiUrl: '',
       siteName: '',
-      siteSlogon: '',
+      siteSlogan: '',
       permissions: {},
       showShortcutsDialog: false,
       isEditingShortcuts: false,
@@ -67,7 +67,7 @@ export default {
   },
   async created() {
     this.siteName = await getSiteName();
-    this.siteSlogon = await getSiteSlogon();
+    this.siteSlogan = await getSiteSlogan();
   },
   beforeUnmount() {
     window.removeEventListener('keydown', this.handleKeyDown);
@@ -288,7 +288,7 @@ export default {
 <template>
   <v-system-bar color="primaryLight2">
     <v-avatar image="/img/logo-blue.png" size="20" class="me-2 d-none d-sm-flex" />
-    <span class="d-none d-sm-flex">{{ siteSlogon }}</span>
+    <span class="d-none d-sm-flex">{{ siteSlogan }}</span>
     <v-avatar :image="apiUrl + '/front/avatar/file/get/' + business.id" size="20" class="me-2 d-flex d-sm-none" />
     <span class="d-flex d-sm-none">{{ business.name }}</span>
     <v-spacer />
diff --git a/webUI/src/views/user/InstallPWA.vue b/webUI/src/views/user/InstallPWA.vue
index 16ac9f8..f67db13 100644
--- a/webUI/src/views/user/InstallPWA.vue
+++ b/webUI/src/views/user/InstallPWA.vue
@@ -5,7 +5,7 @@
         <v-row class="d-flex flex-column align-center justify-center">
           <img src="/img/logo-blue.png" width="120 " class="mt-2 mb-5 p-1" alt="" />
           <h4 class="text-center mt-5 px-8">
-            نسخه وب اپلیکیشن (PWA)  را به صفحه اصلی اضافه کنید.
+            نسخه وب اپلیکیشن (PWA) را به صفحه اصلی اضافه کنید.
           </h4>
           <p class="text-center mt-5 px-5">با این کار، می‌توانید برای همیشه و بدون نیاز به بروزرسانی از خدمات اپلیکیشن استفاده کنید.</p>
           <p class="text-center mt-5 px-5" v-if="chromeBanner">ابتدا از دکمه <span class="font-weight-bold text-indigo-darken-3">نصب</span> استفاده کنید و سپس <span class="font-weight-bold text-indigo-darken-3">Add</span> را بزنید. اگر برنامه نصب نشد مراحل بعدی را انجام دهید.</p>
@@ -22,7 +22,7 @@
                     class="mt-2 mb-2"
                     alt=""
                   />
-                  <h4 class="text-primary pr-2 pt-4">{{ $t("app.name") }}</h4>
+                  <h4 class="text-primary pr-2 pt-4">{{ siteName }}</h4>
                 </v-col>
                 <v-col md="4" class="pl-5">
                   <v-btn
@@ -49,7 +49,6 @@
             </v-card>
           </v-col>
         </v-row>
-
         <v-row>
           <v-btn
             block
@@ -57,56 +56,69 @@
             color="indigo-darken-3"
             variant="flat"
             :to="{ name: 'user_login' }"
-            >
-              باز گشت به صفحه ورود
+          >
+            باز گشت به صفحه ورود
           </v-btn>
         </v-row>
       </v-container>
     </v-main>
   </v-app>
 </template>
-  
+
 <script setup lang="ts">
-import axios from "axios";
+import { getSiteName } from "@/hesabixConfig";
 import { onMounted, ref } from "vue";
 
 const installPromptEvent = ref<Event | null>(null);
 const browserName = ref<string>("");
 const chromeBanner = ref<boolean>(false);
 const iosChecker = ref<boolean>(false);
+const siteName = ref<string>(""); // siteName به صورت ref
 
-// Call button method for install banner
+// تابع برای گرفتن siteName
+const fetchSiteName = () => {
+  getSiteName()
+    .then((name) => {
+      siteName.value = name; // مقدار رو توی ref می‌ذاریم
+    })
+    .catch((error) => {
+      console.error("خطا در گرفتن نام سایت:", error);
+      siteName.value = "نام پیش‌فرض"; // مقدار پیش‌فرض در صورت خطا
+    });
+};
+
+// تابع نصب
 const callInstallbtn = () => {
   if (installPromptEvent.value) {
-    // Cast as BeforeInstallPromptEvent if needed
     const event = installPromptEvent.value as BeforeInstallPromptEvent;
     event.prompt();
-    
 
     event.userChoice.then((choiceResult: { outcome: string }) => {
       if (choiceResult.outcome === "accepted") {
+        console.log("کاربر نصب رو قبول کرد");
       } else {
+        console.log("کاربر نصب رو رد کرد");
       }
-
       installPromptEvent.value = null;
     });
   }
 };
 
-const getBrowserName = (): any => {
+// تابع تشخیص مرورگر
+const getBrowserName = (): string => {
   const userAgent = navigator.userAgent;
 
   if (userAgent.includes("Chrome") && !userAgent.includes("Edg")) {
     if (userAgent.includes("Mac OS X")) {
-      iosChecker.value = true
-    } else{
+      iosChecker.value = true;
+    } else {
       chromeBanner.value = true;
     }
     return "Google Chrome";
   } else if (userAgent.includes("Firefox")) {
     if (userAgent.includes("Mac OS X")) {
-      iosChecker.value = true
-    } 
+      iosChecker.value = true;
+    }
     return "Mozilla Firefox";
   } else if (userAgent.includes("Safari") && !userAgent.includes("Chrome")) {
     iosChecker.value = true;
@@ -114,22 +126,22 @@ const getBrowserName = (): any => {
     return "Apple Safari";
   } else if (userAgent.includes("SamsungBrowser")) {
     if (userAgent.includes("Mac OS X")) {
-      iosChecker.value = true
-    } else{
+      iosChecker.value = true;
+    } else {
       chromeBanner.value = true;
     }
     return "Samsung Browser";
   } else if (userAgent.includes("Edg")) {
     if (userAgent.includes("Mac OS X")) {
-      iosChecker.value = true
-    } else{
+      iosChecker.value = true;
+    } else {
       chromeBanner.value = true;
     }
     return "Microsoft Edge";
   } else if (userAgent.includes("Opera") || userAgent.includes("OPR")) {
     if (userAgent.includes("Mac OS X")) {
-      iosChecker.value = true
-    } else{
+      iosChecker.value = true;
+    } else {
       chromeBanner.value = true;
     }
     return "Opera";
@@ -138,18 +150,14 @@ const getBrowserName = (): any => {
   }
 };
 
+// هنگام بارگذاری کامپوننت
 onMounted(() => {
   browserName.value = getBrowserName();
+  fetchSiteName(); // فراخوانی تابع بدون await
 
   window.addEventListener("beforeinstallprompt", (e: Event) => {
     e.preventDefault();
     installPromptEvent.value = e;
   });
-
-  // setTimeout(() => {
-  //   if (installPromptEvent.value) {
-  //     installBanner.value = true;
-  //   }
-  // }, 1000);
 });
 </script>
\ No newline at end of file
diff --git a/webUI/src/views/user/active-account.vue b/webUI/src/views/user/active-account.vue
index d7ff91b..1c58f6a 100644
--- a/webUI/src/views/user/active-account.vue
+++ b/webUI/src/views/user/active-account.vue
@@ -2,6 +2,7 @@
 import { defineComponent, ref } from 'vue'
 import Swal from 'sweetalert2';
 import axios from "axios";
+import { getSiteName } from '@/hesabixConfig';
 export default defineComponent({
   name: "active_account",
   data() {
@@ -16,6 +17,7 @@ export default defineComponent({
         mobile: '',
         email: '',
       },
+      siteName: '',
       response: {
         code: '',
         message: '',
@@ -36,6 +38,9 @@ export default defineComponent({
       }
     }
   },
+  async created() {
+    this.siteName = await getSiteName();
+  },
   methods: {
     onResendCodeClick() {
       axios.post('/api/user/register/resend-active-code', { 'mobile': this.$route.params.id }).then((response: any) => {
@@ -46,7 +51,7 @@ export default defineComponent({
             icon: 'success'
           });
         }
-        else{
+        else {
           Swal.fire({
             text: response.data.message,
             confirmButtonText: this.$t('dialog.ok'),
@@ -83,7 +88,7 @@ export default defineComponent({
   <v-container>
     <v-row class="d-flex justify-center">
       <v-col md="5">
-        <v-card :loading="loading ? 'blue' : null" :disabled="loading" :title="$t('app.name')"
+        <v-card :loading="loading ? 'blue' : null" :disabled="loading" :title="siteName"
           :subtitle="$t('user.active_account')">
           <v-card-text>
             کد ارسالی از طریق پیامک و یا پست الکترونیکی دریافتی خود را در کادر زیر وارد نمایید.
diff --git a/webUI/src/views/user/login.vue b/webUI/src/views/user/login.vue
index 120f7c7..4967152 100644
--- a/webUI/src/views/user/login.vue
+++ b/webUI/src/views/user/login.vue
@@ -2,7 +2,7 @@
   <v-container>
     <v-row class="d-flex justify-center">
       <v-col md="5">
-        <v-card :loading="loading ? 'blue' : undefined" :disabled="loading" :title="$t('app.name')"
+        <v-card :loading="loading ? 'blue' : undefined" :disabled="loading" :title="siteName"
           :subtitle="$t('user.login_label')">
           <v-card-text class="text-justify">
             {{ $t("login.des") }}
@@ -62,6 +62,7 @@
 </template>
 
 <script lang="ts">
+import { getSiteName } from "@/hesabixConfig";
 import axios from "axios";
 import Swal from "sweetalert2";
 import { onMounted, ref } from "vue";
@@ -76,6 +77,7 @@ export default {
       loading: false,
       captchaLoading: false,
       dialog: false,
+      siteName:'',
       showCaptcha: false,
       errorMsg: self.$t('login.input_fail'),
       captchaImage: '',
@@ -188,6 +190,9 @@ export default {
   mounted() {
     // کپچا در ابتدا نمایش داده نمی‌شه
   },
+  async created(){
+    this.siteName = await getSiteName();
+  },
 };
 </script>
 
diff --git a/webUI/src/views/user/profile/forget-password-submit-code.vue b/webUI/src/views/user/profile/forget-password-submit-code.vue
index 6e48794..2c29c07 100644
--- a/webUI/src/views/user/profile/forget-password-submit-code.vue
+++ b/webUI/src/views/user/profile/forget-password-submit-code.vue
@@ -2,6 +2,7 @@
 import { defineComponent, ref } from 'vue'
 import axios from "axios";
 import VueCountdown from '@chenfengyuan/vue-countdown';
+import { getSiteName } from '@/hesabixConfig';
 
 export default defineComponent({
   name: "reset-password",
@@ -16,6 +17,7 @@ export default defineComponent({
       loading: false,
       counting: true,
       disableSend: ref(true),
+      siteName:'',
       code: '',
       response: {
         code: '',
@@ -35,6 +37,9 @@ export default defineComponent({
       }
     }
   },
+  async created(){
+    this.siteName = await getSiteName();
+  },
   watch: {
     code(cval, bval) {
       if (Object.keys(cval).length == 6) {
@@ -81,7 +86,7 @@ export default defineComponent({
   <v-container>
     <v-row class="d-flex justify-center">
       <v-col md="5">
-        <v-card :loading="loading ? 'blue' : null" :title="$t('app.name')" :subtitle="$t('user.forget_password')">
+        <v-card :loading="loading ? 'blue' : null" :title="siteName" :subtitle="$t('user.forget_password')">
           <v-card-text>
             <v-form ref="form" :disabled="loading" fast-fail @submit.prevent="submit()">
               <v-otp-input focus-all v-model="code" :disabled="loading" style="direction: ltr"></v-otp-input>
diff --git a/webUI/src/views/user/profile/forget-password.vue b/webUI/src/views/user/profile/forget-password.vue
index 75a4969..6583e3b 100644
--- a/webUI/src/views/user/profile/forget-password.vue
+++ b/webUI/src/views/user/profile/forget-password.vue
@@ -2,7 +2,7 @@
   <v-container>
     <v-row class="d-flex justify-center">
       <v-col md="5">
-        <v-card :loading="loading ? 'blue' : undefined" :title="$t('app.name')" :subtitle="$t('user.forget_password')">
+        <v-card :loading="loading ? 'blue' : undefined" :title="siteName" :subtitle="$t('user.forget_password')">
           <v-card-text>
             <v-form ref="form" :disabled="loading" fast-fail @submit.prevent="submit()">
               <v-text-field v-model="mobile" class="mb-2" :label="$t('user.mobile')"
@@ -50,6 +50,7 @@
 import { defineComponent } from 'vue';
 import axios from "axios";
 import { ref } from 'vue';
+import { getSiteName } from '@/hesabixConfig';
 
 axios.defaults.withCredentials = true;
 
@@ -63,6 +64,7 @@ export default defineComponent({
       dialog: ref(false),
       mobile: '',
       captcha: '',
+      siteName:'',
       captchaImage: '',
       rules: {
         mobile: [
@@ -82,6 +84,9 @@ export default defineComponent({
       }
     };
   },
+  async created(){
+    this.siteName = await getSiteName();
+  },
   mounted() {
     this.loadCaptcha(); // لود اولیه کپچا
   },
diff --git a/webUI/src/views/user/profile/profile-main.vue b/webUI/src/views/user/profile/profile-main.vue
index 387822e..d01d31a 100644
--- a/webUI/src/views/user/profile/profile-main.vue
+++ b/webUI/src/views/user/profile/profile-main.vue
@@ -1,7 +1,7 @@
 <template>
   <v-system-bar color="primaryLight2">
     <v-avatar :image="getbase() + 'img/logo-blue.png'" size="20" class="me-2" />
-    <span>{{ siteSlogon }}</span>
+    <span>{{ siteSlogan }}</span>
     <v-spacer />
   </v-system-bar>
   <v-navigation-drawer v-model="drawer">
@@ -37,7 +37,7 @@
       </v-list-group>
       <v-list-item color="primary">
         <v-list-item-title>
-          <small class="text-primary">{{ $t('app.name') }} : {{ hesabix.version }}</small>
+          <small class="text-primary">{{ siteName }} : {{ hesabix.version }}</small>
         </v-list-item-title>
       </v-list-item>
     </v-list>
@@ -63,7 +63,7 @@
 
 <script lang="ts">
 import axios from "axios";
-import { getSiteName, getApiUrl, getBasePath, getSiteSlogon } from "@/hesabixConfig"
+import { getSiteName, getApiUrl, getBasePath, getSiteSlogan } from "@/hesabixConfig"
 import { applicationStore } from "@/stores/applicationStore";
 import { useUserStore } from "@/stores/userStore";
 import { ref, defineComponent } from "vue";
@@ -82,7 +82,7 @@ export default defineComponent({
       },
       siteName: '',
       siteUrl: '',
-      siteSlogon:'',
+      siteSlogan:'',
       ROLE_ADMIN: false,
       user: {
         mobile: '1'
@@ -125,7 +125,7 @@ export default defineComponent({
   components: { Change_lang },
   async created() {
     this.siteName = await getSiteName();
-    this.siteSlogon = await getSiteSlogon();
+    this.siteSlogan = await getSiteSlogan();
     this.siteUrl = getApiUrl();
   },
   methods: {
diff --git a/webUI/src/views/user/register.vue b/webUI/src/views/user/register.vue
index c6af717..cfa845d 100644
--- a/webUI/src/views/user/register.vue
+++ b/webUI/src/views/user/register.vue
@@ -2,7 +2,7 @@
   <v-container>
     <v-row class="d-flex justify-center">
       <v-col md="5">
-        <v-card :loading="loading ? 'blue' : undefined" :title="$t('app.name')" :subtitle="$t('user.register_label')"
+        <v-card :loading="loading ? 'blue' : undefined" :title="siteName" :subtitle="$t('user.register_label')"
           :disabled="!canRegister">
           <v-card-text>
             <v-form ref="form" :disabled="loading" fast-fail @submit.prevent="submit()">
@@ -65,6 +65,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import axios from "axios";
+import { getSiteName } from '@/hesabixConfig';
 
 axios.defaults.withCredentials = true;
 
@@ -76,6 +77,7 @@ export default defineComponent({
       loading: false,
       captchaLoading: false,
       dialog: false,
+      siteName: '',
       dialogColor: 'dangerLight',
       dialogIcon: 'mdi-close-octagon',
       dialogTitle: '',
@@ -104,6 +106,9 @@ export default defineComponent({
     this.checkRegisterStatus();
     this.loadData();
   },
+  async created(){
+    this.siteName = await getSiteName();
+  },
   methods: {
     validate(input: string, type: string) {
       if (type === 'fill') {
diff --git a/webUI/src/views/user/single.vue b/webUI/src/views/user/single.vue
index f08c950..252a644 100644
--- a/webUI/src/views/user/single.vue
+++ b/webUI/src/views/user/single.vue
@@ -1,5 +1,6 @@
 <script lang="ts">
 import Change_lang from "@/components/application/buttons/change_lang.vue";
+import { getBasePath } from "@/hesabixConfig";
 import axios from "axios";
 
 export default {
@@ -7,12 +8,17 @@ export default {
   components: { Change_lang },
   data() {
     return {
-      
+
     }
   },
+  methods: {
+    getbase() {
+      return getBasePath();
+    },
+  },
   created() {
-    axios.post('/api/user/check/login').then((response)=>{
-      if(response.data.Success == true){
+    axios.post('/api/user/check/login').then((response) => {
+      if (response.data.Success == true) {
         this.$router.push('/profile/business')
       }
     });
@@ -23,7 +29,7 @@ export default {
 <template>
   <v-app id="">
     <v-app-bar class="px-2" color="indigo-darken-2" flat>
-      <v-avatar size="32" image="./img/favw.png"></v-avatar>
+      <v-avatar size="32" :image="getbase() + 'img/favw.png'"></v-avatar>
 
       <v-spacer></v-spacer>
 
@@ -33,13 +39,13 @@ export default {
         <v-tab prepend-icon="mdi-lock" :text="$t('user.forget_password')" to="/user/forget-password"></v-tab>
       </v-tabs>
       <v-spacer></v-spacer>
-    
+
     </v-app-bar>
 
     <v-main class="bg-grey-lighten-3">
       <RouterView />
     </v-main>
-    
+
   </v-app>
 </template>