From cdfe8ed7adc03fd95527c024467f68c00fce1854 Mon Sep 17 00:00:00 2001
From: Shivam Gupta <Shivam-g001@webreinvent.com>
Date: Mon, 19 Feb 2024 11:45:59 +0530
Subject: [PATCH 1/6] Updated: language string in action and list

---
 .../Backend/RegistrationsController.php       | 14 +++++++++++
 Vue/vaahtwo/pages/registrations/List.vue      | 23 ++++++++++++-------
 .../registrations/components/Actions.vue      | 14 ++++++-----
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php
index adde3134c..c25a5fe3f 100644
--- a/Http/Controllers/Backend/RegistrationsController.php
+++ b/Http/Controllers/Backend/RegistrationsController.php
@@ -61,6 +61,20 @@ public function getAssets(Request $request): JsonResponse
                 }
             }
 
+            //---------------------------------------------------
+            
+            $data['language_strings'] = [
+                "page_title" => trans("vaahcms-registration.registrations_title"),
+                "filter_email_verification_pending" => trans("vaahcms-registration.filter_email_verification_pending"),
+                "filter_email_verified" => trans("vaahcms-registration.filter_email_verified"),
+                "filter_user_created" => trans("vaahcms-registration.filter_user_created"),
+                "table_gender_male" => trans("vaahcms-registration.table_gender_male"),
+                "table_gender_female" => trans("vaahcms-registration.table_gender_female"),
+                "table_gender_others" => trans("vaahcms-registration.table_gender_others"),
+            ];
+
+            //---------------------------------------------------
+
             $data['actions'] = [];
 
             $data['country_calling_code'] = vh_get_country_list();
diff --git a/Vue/vaahtwo/pages/registrations/List.vue b/Vue/vaahtwo/pages/registrations/List.vue
index 2a04ecd4a..3e6aa735a 100644
--- a/Vue/vaahtwo/pages/registrations/List.vue
+++ b/Vue/vaahtwo/pages/registrations/List.vue
@@ -6,11 +6,12 @@ import {useRegistrationStore} from '../../stores/store-registrations'
 
 import Actions from "./components/Actions.vue";
 import Table from "./components/Table.vue";
-
+const root = useRootStore();
 const store = useRegistrationStore();
 const route = useRoute();
 
 import { useConfirm } from "primevue/useconfirm";
+import {useRootStore} from "../../stores/root";
 const confirm = useConfirm();
 
 
@@ -57,11 +58,11 @@ onMounted(async () => {
                 <template class="p-1" #header>
 
                     <div class="flex flex-row">
-                        <div >
-                            <b class="mr-1">Registrations</b>
+                        <div v-if="store.assets && store.assets.language_strings">
+                            <b class="mr-1">{{store.assets.language_strings.page_title}}</b>
                             <Badge v-if="store.list && store.list.total > 0"
-                                   :value="store.list.total">
-                            </Badge>
+                                   :value="store.list.total"
+                            />
                         </div>
 
                     </div>
@@ -69,9 +70,12 @@ onMounted(async () => {
                 </template>
 
                 <template #icons>
-                    <div class="p-inputgroup">
+                    <div class="p-inputgroup"
+                         v-if="root.assets
+                               && root.assets.language_strings
+                               && root.assets.language_strings.crud_actions">
                         <Button class="p-button-sm"
-                                label="Create"
+                                :label="root.assets.language_strings.crud_actions.create_button"
                                 icon="pi pi-plus"
                                 @click="store.toForm()"
                                 data-testid="registration-create"
@@ -87,7 +91,10 @@ onMounted(async () => {
                     </div>
                 </template>
 
-                <Actions/>
+                <Actions v-if="root.assets
+                               && root.assets.language_strings
+                               && root.assets.language_strings.crud_actions"
+                />
                 <Table/>
             </Panel>
         </div>
diff --git a/Vue/vaahtwo/pages/registrations/components/Actions.vue b/Vue/vaahtwo/pages/registrations/components/Actions.vue
index 6da0affb1..c37adb507 100644
--- a/Vue/vaahtwo/pages/registrations/components/Actions.vue
+++ b/Vue/vaahtwo/pages/registrations/components/Actions.vue
@@ -3,7 +3,9 @@ import {ref, reactive, watch, onMounted} from 'vue';
 import { useRegistrationStore } from '../../../stores/store-registrations'
 
 import Filters from './Filters.vue'
+import {useRootStore} from "../../../stores/root";
 
+const root = useRootStore();
 const store = useRegistrationStore();
 
 onMounted(async () => {
@@ -33,7 +35,7 @@ const toggleBulkMenuState = (event) => {
         <div :class="{'flex justify-content-between': store.isViewLarge()}" class="mt-2 mb-2">
 
             <!--left-->
-            <div v-if="store.view === 'large'">
+            <div v-if="store.view === 'large' && root.assets.language_strings.general">
 
                 <!--selected_menu-->
                 <Button class="p-button-sm"
@@ -82,7 +84,7 @@ const toggleBulkMenuState = (event) => {
                                        @keyup.enter="store.delayedSearch()"
                                        @keyup.enter.native="store.delayedSearch()"
                                        @keyup.13="store.delayedSearch()"
-                                       placeholder="Search"
+                                       :placeholder="root.assets.language_strings.crud_actions.placeholder_search"
                                        name="register-search_query_filter_q"
                                        data-testid="register-search_query_filter_q"
                                        class="p-inputtext-sm"
@@ -94,9 +96,9 @@ const toggleBulkMenuState = (event) => {
                                     data-testid="register-search_icon_query_filter_q"
                             />
 
-                            <Button label="Filters"
-                                    class="p-button-sm"
-                                    @click="store.show_filters = true"
+                            <Button  class="p-button-sm"
+                                     :label="root.assets.language_strings.crud_actions.filters_button"
+                                     @click="store.show_filters = true"
                                     data-testid="register-show_filters"
                             >
                                 <Badge v-if="store.count_filters > 0" :value="store.count_filters" />
@@ -104,7 +106,7 @@ const toggleBulkMenuState = (event) => {
 
                             <Button icon="pi pi-filter-slash"
                                     class="p-button-sm"
-                                    label="Reset"
+                                    :label="root.assets.language_strings.crud_actions.reset_button"
                                     @click="store.resetQuery()"
                                     data-testid="register-reset_query"
                             />

From 6e1ad8e6e3e1041d46c7c2551ca5f3160b124337 Mon Sep 17 00:00:00 2001
From: Shivam Gupta <Shivam-g001@webreinvent.com>
Date: Mon, 19 Feb 2024 12:11:34 +0530
Subject: [PATCH 2/6] Updated: localization string  on filter and item

---
 .../Backend/RegistrationsController.php       |  2 +-
 Vue/vaahtwo/pages/registrations/Form.vue      | 28 ++++++++++++-------
 Vue/vaahtwo/pages/registrations/Item.vue      | 16 +++++++----
 .../registrations/components/Filters.vue      | 26 +++++++++--------
 .../pages/registrations/components/Table.vue  | 22 +++++++++------
 5 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php
index c25a5fe3f..ab33e2ab3 100644
--- a/Http/Controllers/Backend/RegistrationsController.php
+++ b/Http/Controllers/Backend/RegistrationsController.php
@@ -62,7 +62,7 @@ public function getAssets(Request $request): JsonResponse
             }
 
             //---------------------------------------------------
-            
+
             $data['language_strings'] = [
                 "page_title" => trans("vaahcms-registration.registrations_title"),
                 "filter_email_verification_pending" => trans("vaahcms-registration.filter_email_verification_pending"),
diff --git a/Vue/vaahtwo/pages/registrations/Form.vue b/Vue/vaahtwo/pages/registrations/Form.vue
index c67bc7032..0c3ad3a09 100644
--- a/Vue/vaahtwo/pages/registrations/Form.vue
+++ b/Vue/vaahtwo/pages/registrations/Form.vue
@@ -1,12 +1,13 @@
 <script setup>
 import {onMounted, ref, watch} from "vue";
 import { useRegistrationStore } from '../../stores/store-registrations'
+import { useRootStore } from "../../stores/root";
 
 import VhField from './../../vaahvue/vue-three/primeflex/VhField.vue'
 import {useRoute} from 'vue-router';
 import { vaah } from "../../vaahvue/pinia/vaah"
 
-
+const root = useRootStore();
 const store = useRegistrationStore();
 const route = useRoute();
 const useVaah = vaah();
@@ -39,13 +40,15 @@ const toggleFormMenu = (event) => {
                          icon="pi pi-trash"
                          v-if="store.item && store.item.deleted_at"
             >
-                <div class="flex align-items-center justify-content-between">
+                <div class="flex align-items-center justify-content-between"  v-if="root.assets
+                           && root.assets.language_strings
+                           && root.assets.language_strings.crud_actions">
                     <div>
-                        Deleted {{store.item.deleted_at}}
+                        {{root.assets.language_strings.crud_actions.form_text_deleted}} {{store.item.deleted_at}}
                     </div>
 
                     <div>
-                        <Button label="Restore"
+                        <Button :label="root.assets.language_strings.crud_actions.restore_button"
                                 class="p-button-sm"
                                 @click="store.itemAction('restore')"
                                 data-testid="register-form_item_action_restore"
@@ -61,15 +64,20 @@ const toggleFormMenu = (event) => {
                         <span v-if="store.item && store.item.id">
                             {{ store.item.name }}
                         </span>
-                        <span v-else>
-                            Create
+                        <span v-else-if="root.assets
+                                         && root.assets.language_strings
+                                         && root.assets.language_strings.crud_actions"
+                        >
+                            {{root.assets.language_strings.crud_actions.form_text_create}}
                         </span>
                     </div>
                 </div>
             </template>
 
             <template #icons>
-                <div class="p-inputgroup">
+                <div class="p-inputgroup"  v-if="root.assets
+                           && root.assets.language_strings
+                           && root.assets.language_strings.crud_actions">
                     <Button v-if="store.item && store.item.id"
                             class="p-button-sm"
                             :label=" '#' + store.item.id "
@@ -77,7 +85,7 @@ const toggleFormMenu = (event) => {
                             data-testid="registration-form_id"
                     />
 
-                    <Button label="Save"
+                    <Button :label="root.assets.language_strings.crud_actions.save_button"
                             v-if="store.item && store.item.id && store.hasPermission('can-update-registrations')"
                             @click="store.itemAction('save')"
                             icon="pi pi-save"
@@ -86,7 +94,7 @@ const toggleFormMenu = (event) => {
                     />
 
                     <Button v-else-if="store.hasPermission('can-create-registrations')"
-                            label="Create & New"
+                            :label="root.assets.language_strings.crud_actions.form_create_and_new"
                             @click="store.itemAction('create-and-new')"
                             icon="pi pi-save"
                             data-testid="register-form_item_action_create_and_new"
@@ -111,7 +119,7 @@ const toggleFormMenu = (event) => {
                     <Button v-if="(store.item && store.item.id) || store.hasPermission('can-read-registrations')"
                             class="p-button-sm"
                             icon="pi pi-eye"
-                            v-tooltip.top="'View'"
+                            v-tooltip.top="root.assets.language_strings.crud_actions.toolkit_text_view"
                             @click="store.toView(store.item)"
                     />
 
diff --git a/Vue/vaahtwo/pages/registrations/Item.vue b/Vue/vaahtwo/pages/registrations/Item.vue
index 5d3386080..15df4c31c 100644
--- a/Vue/vaahtwo/pages/registrations/Item.vue
+++ b/Vue/vaahtwo/pages/registrations/Item.vue
@@ -2,9 +2,11 @@
 import {onMounted, ref, watch} from "vue";
 import {useRoute} from 'vue-router';
 import { useRegistrationStore } from '../../stores/store-registrations'
+import { useRootStore } from "../../stores/root";
 import { vaah } from '../../vaahvue/pinia/vaah'
 import VhViewRow from '../../vaahvue/vue-three/primeflex/VhViewRow.vue';
 
+const root = useRootStore();
 const store = useRegistrationStore();
 const route = useRoute();
 const useVaah = vaah();
@@ -86,12 +88,14 @@ const toggleUserStatusMenu = (event) => {
                             data-testid="registration-item_id"
                     />
 
-                    <Button label="Edit"
+                    <Button :label="root.assets.language_strings.crud_actions.view_edit"
                             class="p-button-sm"
                             @click="store.toEdit(store.item)"
                             icon="pi pi-pencil"
                             data-testid="register-view_to_edit"
-                            v-if="store.hasPermission('can-update-registrations')"
+                            v-if="store.hasPermission('can-update-registrations') && root.assets
+                                  && root.assets.language_strings
+                                  && root.assets.language_strings.crud_actions"
                     />
 
                     <!--item_menu-->
@@ -124,13 +128,15 @@ const toggleUserStatusMenu = (event) => {
                          icon="pi pi-trash"
                          v-if="store.item.deleted_at"
                 >
-                    <div class="flex align-items-center justify-content-between">
+                    <div class="flex align-items-center justify-content-between" v-if="root.assets
+                               && root.assets.language_strings
+                               && root.assets.language_strings.crud_actions">
                         <div class="">
-                            Deleted {{store.item.deleted_at}}
+                            {{root.assets.language_strings.crud_actions.view_deleted}} {{store.item.deleted_at}}
                         </div>
 
                         <div class="">
-                            <Button label="Restore"
+                            <Button :label="root.assets.language_strings.crud_actions.view_restore"
                                     class="p-button-sm"
                                     @click="store.itemAction('restore')"
                                     data-testid="register-view_item_action_to_restore"
diff --git a/Vue/vaahtwo/pages/registrations/components/Filters.vue b/Vue/vaahtwo/pages/registrations/components/Filters.vue
index 505b74cf7..562c033c6 100644
--- a/Vue/vaahtwo/pages/registrations/components/Filters.vue
+++ b/Vue/vaahtwo/pages/registrations/components/Filters.vue
@@ -2,8 +2,10 @@
 
 import { useRegistrationStore } from '../../../stores/store-registrations'
 import VhFieldVertical from './../../../vaahvue/vue-three/primeflex/VhFieldVertical.vue'
+import { useRootStore } from "../../../stores/root";
 
 const store = useRegistrationStore();
+const root = useRootStore();
 
 </script>
 
@@ -16,7 +18,7 @@ const store = useRegistrationStore();
         >
             <VhFieldVertical >
                 <template #label>
-                    <b>Sort By:</b>
+                    <b>{{root.assets.language_strings.crud_actions.filter_sort_by}}:</b>
                 </template>
 
                 <div class="field-radiobutton">
@@ -25,7 +27,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.sort"
                                  data-testid="register-query_filter_sort_none"
                     />
-                    <label for="sort-none">None</label>
+                    <label for="sort-none">{{root.assets.language_strings.crud_actions.sort_by_none}}</label>
                 </div>
                 <div class="field-radiobutton">
                     <RadioButton name="sort-ascending"
@@ -33,7 +35,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.sort"
                                  data-testid="register-query_filter_sort_ascending"
                     />
-                    <label for="sort-ascending">Updated (Ascending)</label>
+                    <label for="sort-ascending">{{root.assets.language_strings.crud_actions.sort_by_updated_ascending}}</label>
                 </div>
                 <div class="field-radiobutton">
                     <RadioButton name="sort-descending"
@@ -41,7 +43,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.sort"
                                  data-testid="register-query_filter_sort_descending"
                     />
-                    <label for="sort-descending">Updated (Descending)</label>
+                    <label for="sort-descending">{{root.assets.language_strings.crud_actions.sort_by_updated_descending}}</label>
                 </div>
 
             </VhFieldVertical>
@@ -50,7 +52,7 @@ const store = useRegistrationStore();
 
             <VhFieldVertical >
                 <template #label>
-                    <b>Trashed:</b>
+                    <b>{{root.assets.language_strings.crud_actions.filter_trashed}}:</b>
                 </template>
 
                 <div class="field-radiobutton">
@@ -59,7 +61,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.trashed"
                                  data-testid="register-query_filter_trashed_exclude"
                     />
-                    <label for="trashed-exclude">Exclude Trashed</label>
+                    <label for="trashed-exclude">{{root.assets.language_strings.crud_actions.filter_exclude_trashed}}</label>
                 </div>
                 <div class="field-radiobutton">
                     <RadioButton name="trashed-include"
@@ -67,7 +69,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.trashed"
                                  data-testid="register-query_filter_trashed_include"
                     />
-                    <label for="trashed-include">Include Trashed</label>
+                    <label for="trashed-include">{{root.assets.language_strings.crud_actions.filter_include_trashed}}</label>
                 </div>
                 <div class="field-radiobutton">
                     <RadioButton name="trashed-only"
@@ -75,7 +77,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.trashed"
                                  data-testid="register-query_filter_trashed_only"
                     />
-                    <label for="trashed-only">Only Trashed</label>
+                    <label for="trashed-only">{{root.assets.language_strings.crud_actions.filter_only_trashed}}</label>
                 </div>
 
             </VhFieldVertical>
@@ -83,7 +85,7 @@ const store = useRegistrationStore();
             <Divider/>
             <VhFieldVertical >
                 <template #label>
-                    <b>Status:</b>
+                    <b>{{root.assets.language_strings.crud_actions.filter_status}}:</b>
                 </template>
 
                 <div class="field-radiobutton">
@@ -92,7 +94,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.status"
                                  data-testid="register-query_filter_status_email_verification_pending"
                     />
-                    <label for="email-verification-pending">Email Verification Pending</label>
+                    <label for="email-verification-pending">{{store.assets.language_strings.filter_email_verification_pending}}</label>
                 </div>
                 <div class="field-radiobutton">
                     <RadioButton name="email-verified"
@@ -100,7 +102,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.status"
                                  data-testid="register-query_filter_status_email_verified"
                     />
-                    <label for="email-verified">Email Verified</label>
+                    <label for="email-verified">{{store.assets.language_strings.filter_email_verified}}</label>
                 </div>
                 <div class="field-radiobutton">
                     <RadioButton name="user-created"
@@ -108,7 +110,7 @@ const store = useRegistrationStore();
                                  v-model="store.query.filter.status"
                                  data-testid="register-query_filter_status_user-created"
                     />
-                    <label for="user-created">User Created</label>
+                    <label for="user-created">{{store.assets.language_strings.filter_user_created}}</label>
                 </div>
 
             </VhFieldVertical>
diff --git a/Vue/vaahtwo/pages/registrations/components/Table.vue b/Vue/vaahtwo/pages/registrations/components/Table.vue
index daa94ac4c..b8616d047 100644
--- a/Vue/vaahtwo/pages/registrations/components/Table.vue
+++ b/Vue/vaahtwo/pages/registrations/components/Table.vue
@@ -1,7 +1,9 @@
 <script setup>
 import { vaah } from '../../../vaahvue/pinia/vaah'
 import { useRegistrationStore } from '../../../stores/store-registrations'
+import { useRootStore } from "../../../stores/root";
 
+const root = useRootStore();
 const store = useRegistrationStore();
 const useVaah = vaah();
 
@@ -87,25 +89,26 @@ const useVaah = vaah();
 
              <Column field="gender"
                     header="Gender"
-                    v-if="store.isViewLarge()"
+                    v-if="store.isViewLarge() && store.assets
+                          && store.assets.language_strings"
                     :sortable="true"
              >
                 <template #body="prop">
                     <Tag severity="primary"
                          class="mr-2 p-tag-xs"
                          v-if="prop.data.gender && prop.data.gender=='m'"
-                         value="Male"
+                         :value="store.assets.language_strings.table_gender_male"
                     />
 
                     <Tag severity="primary"
                          class="mr-2 p-tag-xs"
                          v-if="prop.data.gender && prop.data.gender=='f'"
-                         value="Female"
+                         :value="store.assets.language_strings.table_gender_female"
                     />
                     <Tag severity="primary"
                          class="mr-2 p-tag-xs"
                          v-if="prop.data.gender && prop.data.gender=='o'"
-                         value="others"
+                         :value="store.assets.language_strings.table_gender_others"
                     />
                 </template>
             </Column>
@@ -113,19 +116,22 @@ const useVaah = vaah();
              <Column field="actions" style="width:150px;"
                     :style="{width: store.getActionWidth() }"
                     :header="store.getActionLabel()"
+                     v-if="root.assets
+                          && root.assets.language_strings
+                          && root.assets.language_strings.crud_actions"
             >
                 <template #body="prop">
                     <div class="p-inputgroup">
                         <Button class="p-button-tiny p-button-text"
                                 v-if="store.hasPermission('can-read-registrations')"
-                                v-tooltip.top="'View'"
+                                v-tooltip.top="root.assets.language_strings.crud_actions.toolkit_text_view"
                                 @click="store.toView(prop.data)"
                                 icon="pi pi-eye"
                                 data-testid="register-table_to_view"
                         />
 
                         <Button class="p-button-tiny p-button-text"
-                                v-tooltip.top="'Update'"
+                                v-tooltip.top="root.assets.language_strings.crud_actions.toolkit_text_update"
                                 @click="store.toEdit(prop.data)"
                                 icon="pi pi-pencil"
                                 data-testid="register-table_to_edit"
@@ -135,7 +141,7 @@ const useVaah = vaah();
                         <Button class="p-button-tiny p-button-danger p-button-text"
                                 v-if="(store.isViewLarge() && !prop.data.deleted_at) || store.hasPermission('can-update-registrations')"
                                 @click="store.itemAction('trash', prop.data)"
-                                v-tooltip.top="'Trash'"
+                                v-tooltip.top="root.assets.language_strings.crud_actions.toolkit_text_trash"
                                 icon="pi pi-trash"
                                 data-testid="register-table_item_action_restore"
                         />
@@ -143,7 +149,7 @@ const useVaah = vaah();
                         <Button class="p-button-tiny p-button-success p-button-text"
                                 v-if="store.isViewLarge() && prop.data.deleted_at"
                                 @click="store.itemAction('restore', prop.data)"
-                                v-tooltip.top="'Restore'"
+                                v-tooltip.top="root.assets.language_strings.crud_actions.toolkit_text_restore"
                                 icon="pi pi-replay"
                                 data-testid="register-table_item_action_delete"
                         />

From d8976dbf0d2a66151915e5032642f8d41f0236b9 Mon Sep 17 00:00:00 2001
From: Shivam Gupta <Shivam-g001@webreinvent.com>
Date: Mon, 19 Feb 2024 15:02:53 +0530
Subject: [PATCH 3/6] Updated: selected list menu

---
 .../Backend/RegistrationsController.php       |   9 +-
 Vue/vaahtwo/stores/store-registrations.js     | 293 +++++++++---------
 2 files changed, 161 insertions(+), 141 deletions(-)

diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php
index ab33e2ab3..ae4ffe9aa 100644
--- a/Http/Controllers/Backend/RegistrationsController.php
+++ b/Http/Controllers/Backend/RegistrationsController.php
@@ -72,6 +72,7 @@ public function getAssets(Request $request): JsonResponse
                 "table_gender_female" => trans("vaahcms-registration.table_gender_female"),
                 "table_gender_others" => trans("vaahcms-registration.table_gender_others"),
             ];
+            $data['language_strings']['registration'] = $this->getGeneralStrings();
 
             //---------------------------------------------------
 
@@ -104,6 +105,12 @@ public function getAssets(Request $request): JsonResponse
         return response()->json($response);
     }
     //----------------------------------------------------------
+    public function getGeneralStrings() :array {
+        return [
+
+        ];
+    }
+    //----------------------------------------------------------
     public function getList(Request $request): JsonResponse
     {
         $permission_slug = 'has-access-of-registrations-section';
@@ -374,7 +381,7 @@ public function createUser(Request $request,$id): JsonResponse
                 $response['errors'][] = $e->getMessage();
                 $response['hint'][] = $e->getTrace();
             } else {
-                $response['errors'][] = 'Something went wrong.';
+                $response['errors'][] = trans("vaahcms-general.something_went_wrong");
             }
         }
 
diff --git a/Vue/vaahtwo/stores/store-registrations.js b/Vue/vaahtwo/stores/store-registrations.js
index 18d2451ff..5cf19ddab 100644
--- a/Vue/vaahtwo/stores/store-registrations.js
+++ b/Vue/vaahtwo/stores/store-registrations.js
@@ -198,6 +198,10 @@ export const useRegistrationStore = defineStore({
                     this.item = vaah().clone(data.empty_item);
                 }
             }
+            if (this.assets && this.assets.language_strings) {
+                this.getListBulkMenu();
+                this.getListSelectedMenu();
+            }
         },
         //---------------------------------------------------------------------
         async getList() {
@@ -249,16 +253,16 @@ export const useRegistrationStore = defineStore({
         //---------------------------------------------------------------------
         isListActionValid()
         {
-
+            const root = useRootStore();
             if(!this.action.type)
             {
-                vaah().toastErrors(['Select an action type']);
+                vaah().toastErrors([root.assets.language_strings.general.select_an_action_type]);
                 return false;
             }
 
             if(this.action.items.length < 1)
             {
-                vaah().toastErrors(['Select records']);
+                vaah().toastErrors([root.assets.language_strings.general.select_records]);
                 return false;
             }
 
@@ -536,9 +540,10 @@ export const useRegistrationStore = defineStore({
         //---------------------------------------------------------------------
         confirmDelete()
         {
+            const root = useRootStore();
             if(this.action.items.length < 1)
             {
-                vaah().toastErrors(['Select a record']);
+                vaah().toastErrors([root.assets.language_strings.general.select_a_record]);
                 return false;
             }
             this.action.type = 'delete';
@@ -701,146 +706,153 @@ export const useRegistrationStore = defineStore({
         //---------------------------------------------------------------------
         async getListSelectedMenu()
         {
-            this.list_selected_menu = [
-                {
-                    label: 'Email Verification Pending',
-                    icon: 'pi pi-calendar-times',
-                    command: async () => {
-                        await this.updateList('email-verification-pending')
-                    }
-                },
-                {
-                    label: 'Email Verified',
-                    icon: 'pi pi-envelope',
-                    command: async () => {
-                        await this.updateList('email-verified')
-                    }
-                },
-                {
-                    label: 'User Created',
-                    icon: 'pi pi-user-plus',
-                    command: async () => {
-                        await this.updateList('user-created')
-                    }
-                },
-                {
-                    separator: true
-                },
-              /*  {
-                    label: 'Activate',
-                    command: async () => {
-                        await this.updateList('activate')
-                    }
-                },
-                {
-                    label: 'Deactivate',
-                    command: async () => {
-                        await this.updateList('deactivate')
-                    }
-                },
-                {
-                    separator: true
-                },*/
-                {
-                    label: 'Trash',
-                    icon: 'pi pi-times',
-                    command: async () => {
-                        await this.updateList('trash')
-                    }
-                },
-                {
-                    label: 'Restore',
-                    icon: 'pi pi-replay',
-                    command: async () => {
-                        await this.updateList('restore')
-                    }
-                },
-                {
-                    label: 'Delete',
-                    icon: 'pi pi-trash',
-                    command: () => {
-                        this.confirmDelete()
-                    }
-                },
-            ]
+            const root = useRootStore();
+            if (this.assets && this.assets.language_strings) {
+                this.list_selected_menu = [
+                    {
+                        label: this.assets.language_strings.filter_email_verification_pending,
+                        icon: 'pi pi-calendar-times',
+                        command: async () => {
+                            await this.updateList('email-verification-pending')
+                        }
+                    },
+                    {
+                        label: this.assets.language_strings.filter_email_verified,
+                        icon: 'pi pi-envelope',
+                        command: async () => {
+                            await this.updateList('email-verified')
+                        }
+                    },
+                    {
+                        label: this.assets.language_strings.filter_user_created,
+                        icon: 'pi pi-user-plus',
+                        command: async () => {
+                            await this.updateList('user-created')
+                        }
+                    },
+                    {
+                        separator: true
+                    },
+                    /*  {
+                          label: 'Activate',
+                          command: async () => {
+                              await this.updateList('activate')
+                          }
+                      },
+                      {
+                          label: 'Deactivate',
+                          command: async () => {
+                              await this.updateList('deactivate')
+                          }
+                      },
+                      {
+                          separator: true
+                      },*/
+                    {
+                        label: root.assets.language_strings.crud_actions.bulk_trash,
+                        icon: 'pi pi-times',
+                        command: async () => {
+                            await this.updateList('trash')
+                        }
+                    },
+                    {
+                        label: root.assets.language_strings.crud_actions.bulk_restore,
+                        icon: 'pi pi-replay',
+                        command: async () => {
+                            await this.updateList('restore')
+                        }
+                    },
+                    {
+                        label: root.assets.language_strings.crud_actions.bulk_delete,
+                        icon: 'pi pi-trash',
+                        command: () => {
+                            this.confirmDelete()
+                        }
+                    },
+                ]
+            }
 
         },
         //---------------------------------------------------------------------
         getListBulkMenu()
         {
-            this.list_bulk_menu = [
-                {
-                    label: 'All Users Email Verification Pending',
-                    icon: 'pi pi-calendar-times',
-                    command: async () => {
-                        await this.listAction('email-verification-pending')
-                    }
-                },
-                {
-                    label: 'All Users Email Verified',
-                    icon: 'pi pi-envelope',
-                    command: async () => {
-                        await this.listAction('email-verified')
-                    }
-                },
-                {
-                    label: 'All User Created',
-                    icon: 'pi pi-user-plus',
-                    command: async () => {
-                        await this.listAction('user-created')
-                    }
-                },
-                {
-                    separator: true
-                },
-               /* {
-                    label: 'Mark all as active',
-                    command: async () => {
-                        await this.listAction('activate-all')
-                    }
-                },
-                {
-                    label: 'Mark all as inactive',
-                    command: async () => {
-                        await this.listAction('deactivate-all')
-                    }
-                },
-                {
-                    separator: true
-                },*/
-                {
-                    label: 'Trash All',
-                    icon: 'pi pi-times',
-                    command: async () => {
-                        await this.listAction('trash-all')
-                    }
-                },
-                {
-                    label: 'Restore All',
-                    icon: 'pi pi-replay',
-                    command: async () => {
-                        await this.listAction('restore-all')
-                    }
-                },
-                {
-                    label: 'Delete All',
-                    icon: 'pi pi-trash',
-                    command: async () => {
-                        this.confirmDeleteAll();
-                    }
-                },
-            ];
+            const root = useRootStore();
+            if (this.assets && this.assets.language_strings) {
+                this.list_bulk_menu = [
+                    {
+                        label: 'All Users Email Verification Pending',
+                        icon: 'pi pi-calendar-times',
+                        command: async () => {
+                            await this.listAction('email-verification-pending')
+                        }
+                    },
+                    {
+                        label: 'All Users Email Verified',
+                        icon: 'pi pi-envelope',
+                        command: async () => {
+                            await this.listAction('email-verified')
+                        }
+                    },
+                    {
+                        label: this.assets.language_strings.filter_user_created,
+                        icon: 'pi pi-user-plus',
+                        command: async () => {
+                            await this.listAction('user-created')
+                        }
+                    },
+                    {
+                        separator: true
+                    },
+                    /* {
+                         label: 'Mark all as active',
+                         command: async () => {
+                             await this.listAction('activate-all')
+                         }
+                     },
+                     {
+                         label: 'Mark all as inactive',
+                         command: async () => {
+                             await this.listAction('deactivate-all')
+                         }
+                     },
+                     {
+                         separator: true
+                     },*/
+                    {
+                        label: root.assets.language_strings.crud_actions.trash_all,
+                        icon: 'pi pi-times',
+                        command: async () => {
+                            await this.listAction('trash-all')
+                        }
+                    },
+                    {
+                        label: root.assets.language_strings.crud_actions.restore_all,
+                        icon: 'pi pi-replay',
+                        command: async () => {
+                            await this.listAction('restore-all')
+                        }
+                    },
+                    {
+                        label: root.assets.language_strings.crud_actions.delete_all,
+                        icon: 'pi pi-trash',
+                        command: async () => {
+                            this.confirmDeleteAll();
+                        }
+                    },
+                ];
+            }
         },
         //---------------------------------------------------------------------
         getItemMenu()
         {
+            const root = useRootStore();
             let item_menu = [];
 
             if(this.item && this.item.deleted_at)
             {
 
                 item_menu.push({
-                    label: 'Restore',
+                    label: root.assets.language_strings.crud_actions.view_restore,
                     icon: 'pi pi-refresh',
                     command: () => {
                         this.itemAction('restore');
@@ -851,7 +863,7 @@ export const useRegistrationStore = defineStore({
             if(this.item && this.item.id && !this.item.deleted_at)
             {
                 item_menu.push({
-                    label: 'Trash',
+                    label: root.assets.language_strings.crud_actions.view_trash,
                     icon: 'pi pi-times',
                     command: () => {
                         this.itemAction('trash');
@@ -860,7 +872,7 @@ export const useRegistrationStore = defineStore({
             }
 
             item_menu.push({
-                label: 'Delete',
+                label: root.assets.language_strings.crud_actions.view_delete,
                 icon: 'pi pi-trash',
                 command: () => {
                     this.confirmDeleteItem('delete');
@@ -883,6 +895,7 @@ export const useRegistrationStore = defineStore({
         //---------------------------------------------------------------------
         async getFormMenu()
         {
+            const root = useRootStore();
             let form_menu = [];
 
             if(this.item && this.item.id )
@@ -890,14 +903,14 @@ export const useRegistrationStore = defineStore({
 
                 form_menu = [
                     {
-                        label: 'Save & Close',
+                        label: root.assets.language_strings.crud_actions.form_save_and_close,
                         icon: 'pi pi-check',
                         command: () => {
                             this.itemAction('save-and-close');
                         }
                     },
                     {
-                        label: 'Save & Clone',
+                        label: root.assets.language_strings.crud_actions.form_save_and_clone,
                         icon: 'pi pi-copy',
                         command: () => {
 
@@ -906,7 +919,7 @@ export const useRegistrationStore = defineStore({
                         }
                     },
                     {
-                        label: 'Save & New',
+                        label: root.assets.language_strings.crud_actions.form_save_and_new,
                         icon: 'pi pi-plus',
                         command: () => {
 
@@ -915,14 +928,14 @@ export const useRegistrationStore = defineStore({
                         }
                     },
                     {
-                        label: 'Trash',
+                        label: root.assets.language_strings.crud_actions.form_trash,
                         icon: 'pi pi-times',
                         command: () => {
                             this.itemAction('trash');
                         }
                     },
                     {
-                        label: 'Delete',
+                        label: root.assets.language_strings.crud_actions.form_delete,
                         icon: 'pi pi-trash',
                         command: () => {
                             this.confirmDeleteItem('delete');
@@ -934,14 +947,14 @@ export const useRegistrationStore = defineStore({
 
                 form_menu = [
                     {
-                        label: 'Create & Close',
+                        label: root.assets.language_strings.crud_actions.form_create_and_close,
                         icon: 'pi pi-check',
                         command: () => {
                             this.itemAction('create-and-close');
                         }
                     },
                     {
-                        label: 'Create & Clone',
+                        label: root.assets.language_strings.crud_actions.form_create_and_clone,
                         icon: 'pi pi-copy',
                         command: () => {
 
@@ -950,7 +963,7 @@ export const useRegistrationStore = defineStore({
                         }
                     },
                     {
-                        label: 'Reset',
+                        label: root.assets.language_strings.crud_actions.form_reset,
                         icon: 'pi pi-refresh',
                         command: () => {
                             this.setActiveItemAsEmpty();
@@ -960,7 +973,7 @@ export const useRegistrationStore = defineStore({
             }
 
             form_menu.push({
-                label: 'Fill',
+                label: root.assets.language_strings.crud_actions.form_fill,
                 icon: 'pi pi-pencil',
                 command: () => {
                     this.getFaker();

From 03d102e3d336b4c61a9681c7815e94f3ee72c5bc Mon Sep 17 00:00:00 2001
From: Shivam Gupta <Shivam-g001@webreinvent.com>
Date: Mon, 19 Feb 2024 15:17:47 +0530
Subject: [PATCH 4/6] Updated: filter for all users email verification pending

---
 Database/Seeders/json/language_strings.json   | 36 +++++++++++++++++++
 .../Backend/RegistrationsController.php       |  2 ++
 Vue/vaahtwo/stores/store-registrations.js     |  4 +--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Database/Seeders/json/language_strings.json b/Database/Seeders/json/language_strings.json
index be7a5da8b..3c1d83bbe 100644
--- a/Database/Seeders/json/language_strings.json
+++ b/Database/Seeders/json/language_strings.json
@@ -910,6 +910,18 @@
         "name": "Filter Email Verification Pending",
         "content": "Email Verification Pending"
     },
+    {
+        "locale_code_iso_639": "en",
+        "category": "registration",
+        "name": "Filter Users Email Verified",
+        "content": "All Users Email Verified"
+    },
+    {
+        "locale_code_iso_639": "en",
+        "category": "registration",
+        "name": "Filter Users Email Verification Pending",
+        "content": "All Users Email Verification Pending"
+    },
     {
         "locale_code_iso_639": "en",
         "category": "registration",
@@ -4051,6 +4063,18 @@
         "name": "Filter Email Verification Pending",
         "content": "Verificación de correo electrónico pendiente"
     },
+    {
+        "locale_code_iso_639": "es",
+        "category": "registration",
+        "name": "Filter Users Email Verified",
+        "content": "Todas las usuarias correo electrónico verificado"
+    },
+    {
+        "locale_code_iso_639": "es",
+        "category": "registration",
+        "name": "Filter Users Email Verification Pending",
+        "content": "Verificación de correo electrónico de todas las usuarios pendiente"
+    },
     {
         "locale_code_iso_639": "es",
         "category": "registration",
@@ -7193,6 +7217,18 @@
         "name": "Filter Email Verification Pending",
         "content": "Vérification de l\\'e-mail en attente"
     },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "registration",
+        "name": "Filter Users Email Verified",
+        "content": "Adresse e-mail de tous les utilisateurs vérifiée"
+    },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "registration",
+        "name": "Filter Users Email Verification Pending",
+        "content": "Vérification de l\\'e-mail de tous les utilisateurs en attente"
+    },
     {
         "locale_code_iso_639": "fr",
         "category": "registration",
diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php
index ae4ffe9aa..7cfbf744d 100644
--- a/Http/Controllers/Backend/RegistrationsController.php
+++ b/Http/Controllers/Backend/RegistrationsController.php
@@ -66,6 +66,8 @@ public function getAssets(Request $request): JsonResponse
             $data['language_strings'] = [
                 "page_title" => trans("vaahcms-registration.registrations_title"),
                 "filter_email_verification_pending" => trans("vaahcms-registration.filter_email_verification_pending"),
+                "filter_users_email_verification_pending" => trans("vaahcms-registration.filter_users_email_verification_pending"),
+                "filter_users_email_verified" =>trans("vaahcms-registration.filter_users_email_verified"),
                 "filter_email_verified" => trans("vaahcms-registration.filter_email_verified"),
                 "filter_user_created" => trans("vaahcms-registration.filter_user_created"),
                 "table_gender_male" => trans("vaahcms-registration.table_gender_male"),
diff --git a/Vue/vaahtwo/stores/store-registrations.js b/Vue/vaahtwo/stores/store-registrations.js
index 5cf19ddab..a39e7e110 100644
--- a/Vue/vaahtwo/stores/store-registrations.js
+++ b/Vue/vaahtwo/stores/store-registrations.js
@@ -780,14 +780,14 @@ export const useRegistrationStore = defineStore({
             if (this.assets && this.assets.language_strings) {
                 this.list_bulk_menu = [
                     {
-                        label: 'All Users Email Verification Pending',
+                        label: this.assets.language_strings.filter_users_email_verification_pending,
                         icon: 'pi pi-calendar-times',
                         command: async () => {
                             await this.listAction('email-verification-pending')
                         }
                     },
                     {
-                        label: 'All Users Email Verified',
+                        label: this.assets.language_strings.filter_users_email_verified,
                         icon: 'pi pi-envelope',
                         command: async () => {
                             await this.listAction('email-verified')

From fd5978e80084035ba25465aa1fd8f9c319b90fcc Mon Sep 17 00:00:00 2001
From: Shivam Gupta <Shivam-g001@webreinvent.com>
Date: Mon, 19 Feb 2024 15:53:27 +0530
Subject: [PATCH 5/6] Updated: response in registration

---
 Database/Seeders/json/language_strings.json | 18 ++++++++++++++++++
 Models/Registration.php                     | 12 ++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Database/Seeders/json/language_strings.json b/Database/Seeders/json/language_strings.json
index 3c1d83bbe..d24fa7f4f 100644
--- a/Database/Seeders/json/language_strings.json
+++ b/Database/Seeders/json/language_strings.json
@@ -904,6 +904,12 @@
         "name": "Registrations Title",
         "content": "Registrations"
     },
+    {
+        "locale_code_iso_639": "en",
+        "category": "registration",
+        "name": "Alternate email should be different",
+        "content": "This alternate email should be different."
+    },
     {
         "locale_code_iso_639": "en",
         "category": "registration",
@@ -4057,6 +4063,12 @@
         "name": "Registrations Title",
         "content": "Inscripciones"
     },
+    {
+        "locale_code_iso_639": "es",
+        "category": "registration",
+        "name": "Alternate email should be different",
+        "content": "Cet autre e-mail devrait être différent"
+    },
     {
         "locale_code_iso_639": "es",
         "category": "registration",
@@ -7217,6 +7229,12 @@
         "name": "Filter Email Verification Pending",
         "content": "Vérification de l\\'e-mail en attente"
     },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "registration",
+        "name": "Alternate email should be different",
+        "content": "Cet autre e-mail devrait être différent"
+    },
     {
         "locale_code_iso_639": "fr",
         "category": "registration",
diff --git a/Models/Registration.php b/Models/Registration.php
index eee3931b8..ab02e832e 100644
--- a/Models/Registration.php
+++ b/Models/Registration.php
@@ -131,7 +131,7 @@ public static function createItem($request)
 
         if ($item) {
             $response['success'] = false;
-            $response['errors'][] = "This email is already exist.";
+            $response['errors'][] = trans('vaahcms-user.email_already_registered');
             return $response;
         }
         // check if username exist
@@ -139,7 +139,7 @@ public static function createItem($request)
 
         if ($item) {
             $response['success'] = false;
-            $response['errors'][] = "This username is already exist.";
+            $response['errors'][] = trans('vaahcms-user.username_already_registered');
             return $response;
         }
 
@@ -148,7 +148,7 @@ public static function createItem($request)
             && $inputs['email']==$inputs['alternate_email'] )
         {
              $response['success'] = false;
-             $response['errors'][] = "The alternate email id should be different";
+             $response['errors'][] = trans("vaahcms-registration.alternate_email_should_be_different");
              return $response;
         }
         if(!isset($inputs['username']))
@@ -507,7 +507,7 @@ public static function updateItem($request, $id)
             && $inputs['email']==$inputs['alternate_email'] )
         {
              $response['success'] = false;
-             $response['errors'][] = "This alternate email should be different";
+             $response['errors'][] = trans("vaahcms-registration.alternate_email_should_be_different");
              return $response;
         }
 
@@ -532,14 +532,14 @@ public static function deleteItem($request, $id): array
         $item = self::where('id', $id)->withTrashed()->first();
         if (!$item) {
             $response['success'] = false;
-            $response['messages'][] = 'Record does not exist.';
+            $response['messages'][] = trans("vaahcms-general.record_does_not_exist");
             return $response;
         }
         $item->forceDelete();
 
         $response['success'] = true;
         $response['data'] = [];
-        $response['messages'][] = 'Record has been deleted';
+        $response['messages'][] = trans("vaahcms-general.record_has_been_deleted");
 
         return $response;
     }

From af4ad7fdb29952118296cd14bf9d8dd3d94e07e4 Mon Sep 17 00:00:00 2001
From: Shivam Gupta <Shivam-g001@webreinvent.com>
Date: Wed, 21 Feb 2024 11:41:47 +0530
Subject: [PATCH 6/6] Updated: response error on create

---
 Database/Seeders/json/language_strings.json | 36 +++++++++++++++++++++
 Models/Registration.php                     |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Database/Seeders/json/language_strings.json b/Database/Seeders/json/language_strings.json
index d24fa7f4f..7115c550e 100644
--- a/Database/Seeders/json/language_strings.json
+++ b/Database/Seeders/json/language_strings.json
@@ -904,6 +904,18 @@
         "name": "Registrations Title",
         "content": "Registrations"
     },
+    {
+        "locale_code_iso_639": "en",
+        "category": "registration",
+        "name": "Email Already Exist",
+        "content": "This email is already exist."
+    },
+    {
+        "locale_code_iso_639": "en",
+        "category": "registration",
+        "name": "Username Already Exist",
+        "content": "This username is already exist."
+    },
     {
         "locale_code_iso_639": "en",
         "category": "registration",
@@ -4063,6 +4075,18 @@
         "name": "Registrations Title",
         "content": "Inscripciones"
     },
+    {
+        "locale_code_iso_639": "es",
+        "category": "registration",
+        "name": "Email Already Exist",
+        "content": "Este correo electrónico ya existe"
+    },
+    {
+        "locale_code_iso_639": "es",
+        "category": "registration",
+        "name": "Username Already Exist",
+        "content": "Este nombre de usuario ya existe."
+    },
     {
         "locale_code_iso_639": "es",
         "category": "registration",
@@ -7223,6 +7247,18 @@
         "name": "Registrations Title",
         "content": "Inscriptions"
     },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "registration",
+        "name": "Email Already Exist",
+        "content": "Cet email existe déjà"
+    },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "registration",
+        "name": "Username Already Exist",
+        "content": "Ce nom d\\'utilisateur existe déjà."
+    },
     {
         "locale_code_iso_639": "fr",
         "category": "registration",
diff --git a/Models/Registration.php b/Models/Registration.php
index ab02e832e..b0ffca551 100644
--- a/Models/Registration.php
+++ b/Models/Registration.php
@@ -131,7 +131,7 @@ public static function createItem($request)
 
         if ($item) {
             $response['success'] = false;
-            $response['errors'][] = trans('vaahcms-user.email_already_registered');
+            $response['errors'][] = trans("vaahcms-registration.email_already_exist");
             return $response;
         }
         // check if username exist
@@ -139,7 +139,7 @@ public static function createItem($request)
 
         if ($item) {
             $response['success'] = false;
-            $response['errors'][] = trans('vaahcms-user.username_already_registered');
+            $response['errors'][] = trans("vaahcms-registration.username_already_exist");
             return $response;
         }