diff --git a/package-lock.json b/package-lock.json
index 20263bfc..c3b46686 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
 {
   "name": "fulfillment",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "fulfillment",
-      "version": "2.10.0",
+      "version": "2.11.1",
       "dependencies": {
         "@capacitor/android": "^2.4.7",
         "@capacitor/core": "^2.4.7",
         "@casl/ability": "^6.0.0",
         "@hotwax/app-version-info": "^1.0.0",
         "@hotwax/apps-theme": "^1.2.6",
-        "@hotwax/dxp-components": "^1.15.5",
+        "@hotwax/dxp-components": "^1.16.0",
         "@hotwax/oms-api": "^1.16.0",
         "@ionic/core": "^7.6.0",
         "@ionic/vue": "^7.6.0",
@@ -2798,9 +2798,9 @@
       "integrity": "sha512-zpUjGoY7LBlKeiP0V7tonrmoey8HQ5THQmyixQ+IDtrjmEJNBjynW/Ef3gC0FUNNPuVqxWPZdT5CVgaETLGTwg=="
     },
     "node_modules/@hotwax/dxp-components": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.15.5.tgz",
-      "integrity": "sha512-aOzipZwVk/fL6K7/BShsvE3eYqH8LagEQQpaNCPFtSs18KHgolGQxcKT3dQ1KRLTCmoKJugc7ut9uyxZVL5krg==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.16.0.tgz",
+      "integrity": "sha512-9HUrR58Sk9H3wryYGWfGfctcM9hRqq9pnLbaShnNf0mZeK/vTAIqqTPHcObfeKXkSaPtrqS6E/1Y/+Ysmv6v5A==",
       "dependencies": {
         "@hotwax/oms-api": "^1.8.1",
         "@ionic/core": "^7.6.0",
diff --git a/package.json b/package.json
index 9cf02a44..75b9aba1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fulfillment",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "private": true,
   "description": "An Ionic project",
   "scripts": {
@@ -16,7 +16,7 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.15.5",
+    "@hotwax/dxp-components": "^1.16.0",
     "@hotwax/oms-api": "^1.16.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
diff --git a/src/adapter/index.ts b/src/adapter/index.ts
index 6cd94c76..657e0939 100644
--- a/src/adapter/index.ts
+++ b/src/adapter/index.ts
@@ -1,6 +1,6 @@
   
-import { api, client, getConfig, getNotificationEnumIds, getNotificationUserPrefTypeIds, getProductIdentificationPref, fetchGoodIdentificationTypes, getUserFacilities, hasError, initialise, logout, removeClientRegistrationToken, resetConfig, setProductIdentificationPref, setUserLocale, storeClientRegistrationToken,
-  subscribeTopic, unsubscribeTopic, updateInstanceUrl, updateToken, setUserTimeZone, getAvailableTimeZones } from '@hotwax/oms-api'
+import { api, client, getConfig, getNotificationEnumIds, getNotificationUserPrefTypeIds, getProductIdentificationPref, fetchGoodIdentificationTypes, getUserFacilities, getUserPreference,  hasError, initialise, logout, removeClientRegistrationToken, resetConfig, setProductIdentificationPref, setUserLocale, storeClientRegistrationToken,
+  subscribeTopic, unsubscribeTopic, updateInstanceUrl, updateToken, setUserTimeZone, setUserPreference, getAvailableTimeZones } from '@hotwax/oms-api'
 
 export {
   api,
@@ -11,6 +11,7 @@ export {
   getProductIdentificationPref,
   fetchGoodIdentificationTypes,
   getUserFacilities,
+  getUserPreference,
   hasError,
   initialise,
   logout,
@@ -24,5 +25,6 @@ export {
   updateInstanceUrl,
   updateToken,
   setUserTimeZone,
+  setUserPreference,
   getAvailableTimeZones
 }
\ No newline at end of file
diff --git a/src/components/DownloadRejectedOrdersModal.vue b/src/components/DownloadRejectedOrdersModal.vue
index 3ea8f213..10cb2e9c 100644
--- a/src/components/DownloadRejectedOrdersModal.vue
+++ b/src/components/DownloadRejectedOrdersModal.vue
@@ -72,7 +72,7 @@
   } from '@ionic/vue';
   import { computed, defineComponent } from 'vue';
   import { closeOutline, cloudDownloadOutline} from 'ionicons/icons';
-  import { getProductIdentificationValue,  translate, useProductIdentificationStore } from '@hotwax/dxp-components';
+  import { getProductIdentificationValue,  translate, useProductIdentificationStore, useUserStore } from '@hotwax/dxp-components';
   import { mapGetters, useStore } from 'vuex';
   import { escapeSolrSpecialChars, prepareSolrQuery } from '@/utils/solrHelper'
   import { RejectionService } from '@/services/RejectionService'
@@ -136,8 +136,7 @@
     computed: {
       ...mapGetters({
         getProduct: 'product/getProduct',
-        rejectedOrders: 'rejection/getRejectedOrders',
-        currentFacility: 'user/getCurrentFacility',
+        rejectedOrders: 'rejection/getRejectedOrders'
       })
     },
     methods: {
@@ -297,8 +296,10 @@
     },
     setup() {
       const store = useStore()
+      const userStore = useUserStore()
       const productIdentificationStore = useProductIdentificationStore();
       let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+      let currentFacility: any = computed(() => userStore.getCurrentFacility) 
   
   
       return {
@@ -308,6 +309,7 @@
         productIdentificationPref,
         store,
         translate,
+        currentFacility
       }
     }
   });
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index e6475670..5138ea9d 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -50,7 +50,7 @@ import { arrowBackOutline, backspaceOutline, mailUnreadOutline, mailOpenOutline,
 import { useStore } from "@/store";
 import { useRouter } from "vue-router";
 import { hasPermission } from "@/authorization";
-import { translate } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: "Menu",
@@ -70,7 +70,6 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       isUserAuthenticated: 'user/isUserAuthenticated',
-      currentFacility: 'user/getCurrentFacility',
     })
   },
   methods: {
@@ -81,6 +80,8 @@ export default defineComponent({
   setup() {
     const store = useStore();
     const router = useRouter();
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     const appPages = [
       {
@@ -189,6 +190,7 @@ export default defineComponent({
       appPages,
       backspaceOutline,
       checkmarkDoneOutline,
+      currentFacility,
       hasPermission,
       arrowBackOutline,
       mailUnreadOutline,
diff --git a/src/components/NotificationPreferenceModal.vue b/src/components/NotificationPreferenceModal.vue
index d7806673..28f85dd0 100644
--- a/src/components/NotificationPreferenceModal.vue
+++ b/src/components/NotificationPreferenceModal.vue
@@ -44,10 +44,10 @@ import {
   modalController,
   alertController,
 } from "@ionic/vue";
-import { defineComponent } from "vue";
+import { defineComponent, computed } from "vue";
 import { closeOutline, save } from "ionicons/icons";
 import { mapGetters, useStore } from "vuex";
-import { translate } from '@hotwax/dxp-components'
+import { translate, useUserStore } from '@hotwax/dxp-components'
 import { showToast } from "@/utils";
 import emitter from "@/event-bus"
 import { generateTopicName } from "@/utils/firebase";
@@ -82,7 +82,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       instanceUrl: 'user/getInstanceUrl',
       notificationPrefs: 'user/getNotificationPrefs'
     }),
@@ -138,7 +137,7 @@ export default defineComponent({
       }
     },
     async handleTopicSubscription() {
-      const facilityId = (this.currentFacility as any).facilityId
+      const facilityId = this.currentFacility?.facilityId
       const subscribeRequests = [] as any
       this.notificationPrefToUpdate.subscribe.map(async (enumId: string) => {
         const topicName = generateTopicName(facilityId, enumId)
@@ -182,9 +181,12 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return {
       closeOutline,
+      currentFacility,
       translate,
       save,
       store
diff --git a/src/components/ReportIssuePopover.vue b/src/components/ReportIssuePopover.vue
index 28966d1b..443b848c 100644
--- a/src/components/ReportIssuePopover.vue
+++ b/src/components/ReportIssuePopover.vue
@@ -1,8 +1,8 @@
 <template>
   <ion-content>
     <ion-list>
-      <ion-item v-for="reason in rejectReasons" :key="reason.enumId" @click="updateIssue(reason.enumId)" button>
-        {{ reason.description ? translate(reason.description) : reason.enumId  }}
+      <ion-item v-for="reason in rejectReasonOptions" :key="reason.enumId" @click="updateIssue(reason.enumId)" button>
+        {{ reason.description ? translate(reason.description) : reason.enumDescription ? translate(reason.enumDescription) : reason.enumId  }}
       </ion-item>
     </ion-list>
   </ion-content>
@@ -28,7 +28,7 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      rejectReasons: 'util/getRejectReasons'
+      rejectReasonOptions: 'util/getRejectReasonOptions'
     })
   },
   props: ["shipmentPackages"],
diff --git a/src/components/ScanOrderItemModal.vue b/src/components/ScanOrderItemModal.vue
index ee4942e5..308cc703 100644
--- a/src/components/ScanOrderItemModal.vue
+++ b/src/components/ScanOrderItemModal.vue
@@ -98,6 +98,7 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       getProduct: 'product/getProduct',
+      barcodeIdentifier: 'util/getBarcodeIdentificationPref'
     }),
   },
   data() {
@@ -133,7 +134,7 @@ export default defineComponent({
 
       let currentItem = {} as any;
       const item = this.orderItems.find((orderItem: any) => {
-        const itemVal = getProductIdentificationValue(this.productIdentificationPref.primaryId, this.getProduct(orderItem.productId)) ? getProductIdentificationValue(this.productIdentificationPref.primaryId, this.getProduct(orderItem.productId)) : orderItem.productSku
+        const itemVal = getProductIdentificationValue(this.barcodeIdentifier, this.getProduct(orderItem.productId)) ? getProductIdentificationValue(this.barcodeIdentifier, this.getProduct(orderItem.productId)) : this.getProduct(orderItem.productId)?.internalName
         if(itemVal === payload) currentItem = orderItem;
         return itemVal === payload && !orderItem.isChecked;
       });
@@ -154,6 +155,7 @@ export default defineComponent({
       } else {
         showToast(translate((currentItem.productSku ? "Product is already received:" : "Scanned item is not present within the shipment:"), { itemName: payload }))
       }
+      this.queryString = ''
     },
     areAllItemsSelected() {
       return !this.orderItems.some((item: any) => !item.isChecked)
diff --git a/src/components/TransferOrderFilters.vue b/src/components/TransferOrderFilters.vue
index dda0935d..c231ae70 100644
--- a/src/components/TransferOrderFilters.vue
+++ b/src/components/TransferOrderFilters.vue
@@ -46,14 +46,14 @@ import {
   IonTitle,
   IonToolbar
 } from "@ionic/vue";
-import { defineComponent } from "vue";
+import { defineComponent, computed } from "vue";
 import { albumsOutline, banOutline, barChartOutline, calendarNumberOutline, checkmarkDoneOutline, closeOutline, filterOutline, iceCreamOutline, libraryOutline, pulseOutline, settings, shirtOutline, ticketOutline } from "ionicons/icons";
 import { mapGetters, useStore } from 'vuex'
 import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper';
 import { UtilService } from '@/services/UtilService';
 import { hasError } from '@/adapter';
 import logger from '@/logger';
-import { translate } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: "TransferOrderFilters",
@@ -77,7 +77,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       transferOrders: 'transferorder/getTransferOrders',
       getStatusDesc: 'util/getStatusDesc',
       getShipmentMethodDesc: 'util/getShipmentMethodDesc',
@@ -126,7 +125,7 @@ export default defineComponent({
         filters: {
           '-orderStatusId': { value: 'ORDER_CREATED' },
           orderTypeId: { value: 'TRANSFER_ORDER' },
-          facilityId: { value: escapeSolrSpecialChars(this.currentFacility.facilityId) },
+          facilityId: { value: escapeSolrSpecialChars(this.currentFacility?.facilityId) },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -172,7 +171,9 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
-    
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
+
     return {
       albumsOutline,
       banOutline,
@@ -180,6 +181,7 @@ export default defineComponent({
       calendarNumberOutline,
       checkmarkDoneOutline,
       closeOutline,
+      currentFacility,
       filterOutline,
       iceCreamOutline,
       libraryOutline,
diff --git a/src/components/TransferOrderItem.vue b/src/components/TransferOrderItem.vue
index 47f23617..06cc901b 100644
--- a/src/components/TransferOrderItem.vue
+++ b/src/components/TransferOrderItem.vue
@@ -15,7 +15,7 @@
       </div>
       <div class="product-count">
         <ion-item v-if="!item.shipmentId" lines="none">
-          <ion-input :label="translate('Qty')" label-placement="floating" ref="pickedQuantity" type="number" min="0" v-model="item.pickedQuantity" @ionInput="updatePickedQuantity($event, item); validatePickedQuantity($event, item); markPickedQuantityTouched()" :errorText="getErrorText(item)" />
+          <ion-input :label="translate('Qty')" label-placement="floating" ref="pickedQuantity" type="number" min="0" v-model="item.pickedQuantity" @ionInput="updatePickedQuantity($event, item); validatePickedQuantity($event, item); markPickedQuantityTouched()" :errorText="getErrorText(item)" :disabled="isForceScanEnabled" />
         </ion-item>
         <ion-item v-else lines="none">
           <ion-label slot="end">{{ item.pickedQuantity }} {{ translate('packed') }}</ion-label>
@@ -97,6 +97,7 @@ export default defineComponent({
     ...mapGetters({
       currentOrder: 'transferorder/getCurrent',
       getProduct: 'product/getProduct',
+      isForceScanEnabled: 'util/isForceScanEnabled',
     }),
   },
   methods: {
diff --git a/src/locales/en.json b/src/locales/en.json
index e67bde5f..8d58e521 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -44,6 +44,7 @@
   "Auto reject related items": "Auto reject related items",
   "Available to promise": "Available to promise",
   "Back to Launchpad": "Back to Launchpad",
+  "Barcode Identifier": "Barcode Identifier",
   "Billing Address 1": "Billing Address 1",
   "Billing Address 2": "Billing Address 2",
   "Billing City": "Billing City",
@@ -95,7 +96,6 @@
   "Confirm": "Confirm",
   "Configure the order fulfillment capacity of your facility.": "Configure the order fulfillment capacity of your facility.",
   "Control whether the store's inventory should be made available for online sales or not.": "Control whether the store's inventory should be made available for online sales or not.",
-  "Control whether the store requires the force scan during order packing or not.": "Control whether the store requires the force scan during order packing or not.",
   "Copied": "Copied { value }",
   "Copied to clipboard": "Copied to clipboard",
   "Copy ID": "Copy ID",
@@ -215,6 +215,7 @@
   "Failed to update shipment method detail.": "Failed to update shipment method detail.",
   "Failed to update tracking code settings.": "Failed to update tracking code settings.",
   "Failed to update variance type.": "Failed to update variance type.",
+  "Fetching facilities": "Fetching facilities",
   "Fetching gift card info.": "Fetching gift card info.",
   "Fetching time zones": "Fetching time zones",
   "Fetching order information...": "Fetching order information...",
@@ -306,6 +307,7 @@
   "No carrier found.": "No carrier found.",
   "No data available": "No data available",
   "No data found": "No data found",
+  "No facilities found": "No facilities found",
   "No rejection reasons found.": "No rejection reasons found.",
   "No shipments have been shipped yet": "No shipments have been shipped yet",
   "No shipping label error received from carrier.": "No shipping label error received from carrier",
@@ -343,6 +345,7 @@
   "On": "On",
   "Online Order Fulfillment": "Online Order Fulfillment",
   "Only alphanumeric characters are allowed.": "Only alphanumeric characters are allowed.",
+  "Only allow shipped quantity to be incremented by scanning the barcode of products. If the identifier is not found, the scan will default to using the internal name.": "Only allow shipped quantity to be incremented by scanning the barcode of products. {space} If the identifier is not found, the scan will default to using the internal name.",
   "Only methods for this carrier": "Only methods for this carrier",
   "Only positive numbers are allowed.": "Only positive numbers are allowed.",
   "Open": "Open",
@@ -502,6 +505,8 @@
   "Select an issue": "Select an issue",
   "Select CSV": "Select CSV",
   "Select facility": "Select facility",
+  "Select Facility": "Select Facility",
+  "Search facilities": "Search facilities",
   "Select store": "Select store",
   "Select the column for the following information in the uploaded CSV.": "Select the column for the following information in the uploaded CSV.",
   "Select the fields you want to include in your export": "Select the fields you want to include in your export",
diff --git a/src/locales/es.json b/src/locales/es.json
index 1f187019..c9be08f1 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -43,6 +43,7 @@
   "Auto reject related items": "Auto rechazar liberar items",
   "Available to promise": "Available to promise",
   "Back to Launchpad": "Volver a Launchpad",
+  "Barcode Identifier": "Barcode Identifier",
   "Billing Address 1": "Dirección de Facturación 1",
   "Billing Address 2": "Dirección de Facturación 2",
   "Billing City": "Ciudad de Facturación",
@@ -90,7 +91,6 @@
   "Confirm": "Confirmar",
   "Configure the order fulfillment capacity of your facility.": "Configure la capacidad de cumplimiento de pedidos de tu instalación.",
   "Control whether the store's inventory should be made available for online sales or not.": "Controle si el inventario de la tienda debe estar disponible para ventas en línea o no.",
-  "Control whether the store requires the force scan during order packing or not.": "Controle si la tienda requiere forzar el escaneo durante en embale de la orden o no.",
   "Copied": "Copiado { value }",
   "Copied to clipboard": "Copiado al portapapeles",
   "Copy ID": "Copiar ID",
@@ -211,6 +211,7 @@
   "Failed to update shipment method detail.": "Error al actualziar detalles metodo de envio.",
   "Failed to update tracking code settings.": "Error al actualizar la configuracion del codigo de seguimiento.",
   "Failed to update variance type.": "Error al actualizar el tipo de variante.",
+  "Fetching facilities": "Fetching facilities",
   "Fetching gift card info.": "Obteniendo información de gift card.",
   "Fetching order information...": "Obteniendo información del pedido...",
   "Fetching pickers": "Obteniendo recolectores",
@@ -304,6 +305,7 @@
   "No channels found": "No se encontraron canales",
   "No data available": "¡No hay datos disponibles!",
   "No data found": "No se encontro dato",
+  "No facilities found": "No facilities found",
   "No rejection reasons found.": "No se encontro razon de rechazo.",
   "No shipments have been shipped yet": "Aún no se han enviado envíos",
   "No shipping label error received from carrier": "No se encontraron datos.",
@@ -341,6 +343,7 @@
   "On": "Encendido",
   "Online Order Fulfillment": "Cumplimiento de pedidos en línea",
   "Only alphanumeric characters are allowed.": "solo se permiten caracteres alfanuméricos.",
+  "Only allow shipped quantity to be incremented by scanning the barcode of products. If the identifier is not found, the scan will default to using the internal name.": "Only allow shipped quantity to be incremented by scanning the barcode of products. {space} If the identifier is not found, the scan will default to using the internal name.",
   "Only methods for this carrier": "Solo metodos para este operador ",
   "Only positive numbers are allowed.": "Solo se permiten numeros positivos.",
   "Open": "Abierto",
@@ -498,6 +501,8 @@
   "Select an issue": "Selecciona un problema",
   "Select CSV": "Seleccionar CSV",
   "Select facility": "Seleccionar instalación",
+  "Select Facility": "Select Facility",
+  "Search facilities": "Search facilities",
   "Select store": "Seleccionar tienda",
   "Select the column for the following information in the uploaded CSV.": "Selecciona la columna para la siguiente información en el CSV cargado.",
   "Select the fields you want to include in your export": "Selecciona los campos que deseas incluir en tu exportación",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index da92ef03..2a823171 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -43,6 +43,7 @@
   "Auto reject related items": "Auto reject related items",
   "Available to promise": "Available to promise",
   "Back to Launchpad": "ランチパッドに戻る",
+  "Barcode Identifier": "Barcode Identifier",
   "Billing Address 1": "請求先住所 1",
   "Billing Address 2": "請求先住所 2",
   "Billing City": "請求先市",
@@ -94,7 +95,6 @@
   "Confirm": "確認",
   "Configure the order fulfillment capacity of your facility.": "施設の注文処理能力を設定します。",
   "Control whether the store's inventory should be made available for online sales or not.": "店舗の在庫をオンライン販売で利用可能にするかどうかを制御します。",
-  "Control whether the store requires the force scan during order packing or not.": "ストアが注文の梱包中に強制スキャンを必要とするかどうかを制御します。",
   "Copied": "{ value }をコピーしました",
   "Copied to clipboard": "クリップボードにコピーしました",
   "Copy ID": "IDをコピー",
@@ -214,6 +214,7 @@
   "Failed to update shipment method detail.": "Failed to update shipment method detail.",
   "Failed to update tracking code settings.": "追跡コード設定の更新に失敗しました。",
   "Failed to update variance type.": "変動タイプの更新に失敗しました。",
+  "Fetching facilities": "Fetching facilities",
   "Fetching gift card info.": "Fetching gift card info.",
   "Fetching time zones": "タイムゾーンの取得中",
   "Fetching order information...": "注文情報の取得中...",
@@ -304,6 +305,7 @@
   "No carrier found.": "キャリアが見つかりません。",
   "No data available": "データがありません",
   "No data found": "何もデータが見つかりませんでした",
+  "No facilities found": "No facilities found",
   "No rejection reasons found.": "拒否理由が見つかりません。",
   "No shipments have been shipped yet": "まだ出荷された出荷はありません",
   "No shipping label error received from carrier.": "キャリアから配送ラベルエラーは受信されていません",
@@ -340,6 +342,7 @@
   "On": "オン",
   "Online Order Fulfillment": "オンライン注文処理",
   "Only alphanumeric characters are allowed.": "英数字のみ使用できます。",
+  "Only allow shipped quantity to be incremented by scanning the barcode of products. If the identifier is not found, the scan will default to using the internal name.": "Only allow shipped quantity to be incremented by scanning the barcode of products. {space} If the identifier is not found, the scan will default to using the internal name.",
   "Only methods for this carrier": "この配送者の方法のみ",
   "Only numeric values are allowed.": "数値のみ使用できます。",
   "Open": "オープン",
@@ -498,6 +501,8 @@
   "Select an issue": "問題を選択",
   "Select CSV": "CSVを選択",
   "Select facility": "施設を選択",
+  "Select Facility": "Select Facility",
+  "Search facilities": "Search facilities",
   "Select store": "ストアを選択",
   "Select the column for the following information in the uploaded CSV.": "アップロードされたCSV内の次の情報に対する列を選択。",
   "Select the fields you want to include in your export": "エクスポートに含めるフィールドを選択",
diff --git a/src/main.ts b/src/main.ts
index 0710cd4a..aa6a61e4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,8 +31,8 @@ import permissionRules from '@/authorization/Rules';
 import permissionActions from '@/authorization/Actions';
 import { dxpComponents } from '@hotwax/dxp-components';
 import { login, logout, loader } from '@/utils/user';
-import { getConfig, fetchGoodIdentificationTypes, getProductIdentificationPref, initialise, setProductIdentificationPref, setUserLocale, setUserTimeZone,
-  getAvailableTimeZones } from './adapter';
+import { getConfig, fetchGoodIdentificationTypes, getProductIdentificationPref, getUserFacilities, getUserPreference, initialise, setProductIdentificationPref, setUserLocale, getAvailableTimeZones, setUserTimeZone, 
+  setUserPreference } from './adapter';
 import localeMessages from '@/locales';
 import { addNotification, storeClientRegistrationToken } from '@/utils/firebase';
 
@@ -70,6 +70,9 @@ const app = createApp(App)
     setUserTimeZone,
     storeClientRegistrationToken,
     getAvailableTimeZones,
+    getUserFacilities,
+    setUserPreference,
+    getUserPreference,
     hasPermission
   });
 
diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index 759b514d..7757f694 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -1,7 +1,7 @@
 import { api, hasError } from '@/adapter';
 import logger from '@/logger';
 import store from '@/store';
-import { isPdf } from '@/utils';
+import { isPdf, getCurrentFacilityId } from '@/utils';
 
 const fetchShipmentMethods = async (query: any): Promise <any>  => {
   return api({
@@ -37,7 +37,7 @@ const findShipmentIdsForOrders = async(picklistBinIds: Array<string>, orderIds:
       "primaryOrderId_op": "in",
       "picklistBinId": picklistBinIds,
       "picklistBinId_op": "in",
-      "originFacilityId": store.state.user.currentFacility.facilityId,
+      "originFacilityId": getCurrentFacilityId(),
       "statusId": statusId,
       "statusId_op": "in"
     },
@@ -492,6 +492,22 @@ const createForceScanSetting = async (payload: any): Promise<any> => {
   });
 }
 
+const updateBarcodeIdentificationPref = async (payload: any): Promise<any> => {
+  return api({
+    url: "service/updateProductStoreSetting",
+    method: "post",
+    data: payload
+  });
+}
+
+const createBarcodeIdentificationPref = async (payload: any): Promise<any> => {
+  return api({
+    url: "service/createProductStoreSetting",
+    method: "post",
+    data: payload
+  });
+}
+
 const getProductStoreSetting = async (payload: any): Promise<any> => {
   return api({
     url: "performFind",
@@ -570,6 +586,30 @@ const activateGiftCard = async (payload: any): Promise<any> => {
   });
 }
 
+const fetchFulfillmentRejectReasons = async (payload: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "post",
+    data: payload
+  });
+}
+
+const createEnumerationGroupMember = async (payload: any): Promise<any> => {
+  return api({
+    url: "service/createEnumerationGroupMember",
+    method: "post",
+    data: payload
+  });
+}
+
+const updateEnumerationGroupMember = async (payload: any): Promise<any> => {
+  return api({
+    url: "service/updateEnumerationGroupMember",
+    method: "post",
+    data: payload
+  });
+}
+
 const isEnumExists = async (enumId: string): Promise<any> => {
   try {
     const resp = await api({
@@ -597,6 +637,8 @@ const isEnumExists = async (enumId: string): Promise<any> => {
 
 export const UtilService = {
   activateGiftCard,
+  createBarcodeIdentificationPref,
+  createEnumerationGroupMember,
   createForceScanSetting,
   createPicklist,
   createEnumeration,
@@ -605,6 +647,7 @@ export const UtilService = {
   fetchEnumeration,
   fetchFacilities,
   fetchFacilityTypeInformation,
+  fetchFulfillmentRejectReasons,
   fetchGiftCardFulfillmentInfo,
   fetchGiftCardItemPriceInfo,
   fetchPartyInformation,
@@ -633,5 +676,7 @@ export const UtilService = {
   resetPicker,
   deleteEnumeration,
   updateEnumeration,
+  updateBarcodeIdentificationPref,
+  updateEnumerationGroupMember,
   updateForceScanSetting
 }
\ No newline at end of file
diff --git a/src/store/index.ts b/src/store/index.ts
index 83a81246..22eaa423 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -26,7 +26,7 @@ const state: any = {
 }
 
 const persistState = createPersistedState({
-    paths: ['user', 'util.productStoreShipmentMethCount', 'util.isForceScanEnabled'],
+    paths: ['user', 'util.productStoreShipmentMethCount', 'util.isForceScanEnabled', 'util.barcodeIdentificationPref'],
     fetchBeforeUse: true
 })
 
diff --git a/src/store/modules/carrier/actions.ts b/src/store/modules/carrier/actions.ts
index 02dafaef..137da673 100644
--- a/src/store/modules/carrier/actions.ts
+++ b/src/store/modules/carrier/actions.ts
@@ -7,7 +7,7 @@ import * as types from './mutation-types'
 import logger from '@/logger'
 import store from '@/store';
 import { translate } from '@hotwax/dxp-components';
-import { showToast, isValidCarrierCode, isValidDeliveryDays } from '@/utils';
+import { showToast, isValidCarrierCode, isValidDeliveryDays, getCurrentFacilityId } from '@/utils';
   
 
 const actions: ActionTree<CarrierState, RootState> = {
@@ -358,14 +358,14 @@ const actions: ActionTree<CarrierState, RootState> = {
   async fetchFacilityCarriers({ state, commit }, payload) {
     let facilityCarriers  = [] as any;
     let viewIndex = 0, resp, docCount = 0;
-    
+
     try {
       do {
         const params = {
           "entityName": "FacilityAndParty",
           "inputFields": {
             "roleTypeId": "CARRIER",
-            "facilityId": this.state.user.currentFacility.facilityId
+            "facilityId": getCurrentFacilityId()
           },
           "fieldList": ["facilityId", "partyId", "firstName", "lastName", "groupName", "roleTypeId", "fromDate"],
           "noConditionFind": "Y",
diff --git a/src/store/modules/order/actions.ts b/src/store/modules/order/actions.ts
index 718d7f17..5517cf84 100644
--- a/src/store/modules/order/actions.ts
+++ b/src/store/modules/order/actions.ts
@@ -9,6 +9,7 @@ import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper'
 import { UtilService } from '@/services/UtilService'
 import logger from '@/logger'
 import { getOrderCategory, removeKitComponents } from '@/utils/order'
+import { getCurrentFacilityId } from '@/utils'
 
 const actions: ActionTree<OrderState, RootState> = {
   async fetchInProgressOrdersAdditionalInformation({ commit, dispatch, state }, payload = { viewIndex: 0 }) {
@@ -171,7 +172,7 @@ const actions: ActionTree<OrderState, RootState> = {
     }
 
     try {
-      const shipmentbatches = await Promise.all(requestParams.map((params) => OrderService.fetchShipments(params.picklistBinIds, params.orderIds, this.state.user.currentFacility.facilityId)))
+      const shipmentbatches = await Promise.all(requestParams.map((params) => OrderService.fetchShipments(params.picklistBinIds, params.orderIds, getCurrentFacilityId())))
       // TODO simplify below logic by returning shipments list
       const shipments = shipmentbatches.flat();
 
@@ -324,7 +325,7 @@ const actions: ActionTree<OrderState, RootState> = {
           picklistItemStatusId: { value: 'PICKITEM_PENDING' },
           '-fulfillmentStatus': { value: ['Rejected', 'Cancelled'] },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+          facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
           productStoreId: { value: this.state.user.currentEComStore.productStoreId }
         }
       }
@@ -418,7 +419,7 @@ const actions: ActionTree<OrderState, RootState> = {
         '-fulfillmentStatus': { value: ['Cancelled', 'Rejected']},
         orderStatusId: { value: 'ORDER_APPROVED' },
         orderTypeId: { value: 'SALES_ORDER' },
-        facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+        facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
         productStoreId: { value: this.state.user.currentEComStore.productStoreId }
       }
     }
@@ -489,7 +490,7 @@ const actions: ActionTree<OrderState, RootState> = {
       filters: {
         picklistItemStatusId: { value: '(PICKITEM_PICKED OR (PICKITEM_COMPLETED AND itemShippedDate: [NOW/DAY TO NOW/DAY+1DAY]))' },
         '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-        facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+        facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
         productStoreId: { value: this.state.user.currentEComStore.productStoreId }
       }
     }
@@ -772,7 +773,7 @@ const actions: ActionTree<OrderState, RootState> = {
         '-fulfillmentStatus': { value: ['Cancelled', 'Rejected']},
         orderStatusId: { value: 'ORDER_APPROVED' },
         orderTypeId: { value: 'SALES_ORDER' },
-        facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+        facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
         productStoreId: { value: this.state.user.currentEComStore.productStoreId }
       }
     }
@@ -841,7 +842,7 @@ const actions: ActionTree<OrderState, RootState> = {
           shipGroupSeqId: { value: payload.shipGroupSeqId },
           '-fulfillmentStatus': { value: ['Cancelled', 'Rejected']},
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+          facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
           productStoreId: { value: this.state.user.currentEComStore.productStoreId }
         }
       }
@@ -908,7 +909,7 @@ const actions: ActionTree<OrderState, RootState> = {
           picklistItemStatusId: { value: '(PICKITEM_PICKED OR (PICKITEM_COMPLETED AND itemShippedDate: [NOW/DAY TO NOW/DAY+1DAY]))' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
           shipGroupSeqId: { value: payload.shipGroupSeqId },
-          facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+          facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
           productStoreId: { value: this.state.user.currentEComStore.productStoreId }
         }
       }
@@ -1026,7 +1027,7 @@ const actions: ActionTree<OrderState, RootState> = {
 
     try {
       // fetchShipments accepts Array parameters for picklistBinId and orderId
-      const shipmentBatches = await OrderService.fetchShipments([current.picklistBinId], [current.orderId], this.state.user.currentFacility.facilityId)
+      const shipmentBatches = await OrderService.fetchShipments([current.picklistBinId], [current.orderId], getCurrentFacilityId())
       const shipments = shipmentBatches.flat();
       const shipmentIds = [...new Set(shipments.map((shipment: any) => shipment.shipmentId))] as Array<string>
       let shipmentPackages = [] as any;
diff --git a/src/store/modules/rejection/actions.ts b/src/store/modules/rejection/actions.ts
index dfd6d697..b5fb2de3 100644
--- a/src/store/modules/rejection/actions.ts
+++ b/src/store/modules/rejection/actions.ts
@@ -7,6 +7,7 @@ import * as types from './mutation-types'
 import { escapeSolrSpecialChars, prepareSolrQuery } from '@/utils/solrHelper'
 import { UtilService } from '@/services/UtilService'
 import logger from '@/logger'
+import { getCurrentFacilityId } from '@/utils'
 
 const actions: ActionTree<RejectionState, RootState> = {
   async fetchRejectionStats({ commit, state }) {
@@ -25,7 +26,7 @@ const actions: ActionTree<RejectionState, RootState> = {
         viewSize: '0',  // passed viewSize as 0 to not fetch any data
         filters: {
           rejectedAt_dt: {value: rejectionPeriodFilter},
-          rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+          rejectedFrom_txt_en: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
         },
         facet: {
           "total":"unique(orderId_s)",
@@ -101,7 +102,7 @@ const actions: ActionTree<RejectionState, RootState> = {
     
 
     const filters = {
-      rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+      rejectedFrom_txt_en: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
     } as any
 
     //when user search the rejected results are not bound to time duration
diff --git a/src/store/modules/stock/actions.ts b/src/store/modules/stock/actions.ts
index 0233e673..5330f324 100644
--- a/src/store/modules/stock/actions.ts
+++ b/src/store/modules/stock/actions.ts
@@ -5,12 +5,12 @@ import StockState from './StockState'
 import * as types from './mutation-types'
 import { hasError } from '@/adapter'
 import logger from '@/logger'
-import { showToast } from '@/utils'
+import { showToast, getCurrentFacilityId } from '@/utils'
 import { translate } from '@hotwax/dxp-components'
 
 const actions: ActionTree<StockState, RootState> = {
   async fetchStock({ commit }, { productId, facilityId = '' }) {
-    const id = facilityId ? facilityId : this.state.user.currentFacility.facilityId
+    const id = facilityId ? facilityId : getCurrentFacilityId()
 
     try {
       const payload = {
diff --git a/src/store/modules/stock/getters.ts b/src/store/modules/stock/getters.ts
index 491b222d..40bf6469 100644
--- a/src/store/modules/stock/getters.ts
+++ b/src/store/modules/stock/getters.ts
@@ -1,11 +1,11 @@
 import { GetterTree } from 'vuex'
 import StockState from './StockState'
 import RootState from '../../RootState'
+import { getCurrentFacilityId } from '@/utils';
 
 const getters: GetterTree <StockState, RootState> = {
-  getProductStock: (state, getters, RootState) => (productId: any, facilityId?: any) => {
-    const id = facilityId ? facilityId : RootState.user.currentFacility.facilityId
-
+  getProductStock: (state, getters) => (productId: any, facilityId?: any) => {
+    const id = facilityId ? facilityId : getCurrentFacilityId()
     return state.products[productId] ? state.products[productId][id] ? state.products[productId][id] : {} : {}
   }
 }
diff --git a/src/store/modules/transferorder/actions.ts b/src/store/modules/transferorder/actions.ts
index a005fbea..c926cb8f 100644
--- a/src/store/modules/transferorder/actions.ts
+++ b/src/store/modules/transferorder/actions.ts
@@ -7,8 +7,8 @@ import { hasError } from '@/adapter'
 import * as types from './mutation-types'
 import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper'
 import logger from '@/logger'
-import { getProductIdentificationValue, useProductIdentificationStore, translate } from '@hotwax/dxp-components'
-import { showToast } from "@/utils";
+import { getProductIdentificationValue, translate } from '@hotwax/dxp-components'
+import { showToast, getCurrentFacilityId } from "@/utils";
 import { UtilService } from '@/services/UtilService'
 import store from "@/store";
 
@@ -29,7 +29,7 @@ const actions: ActionTree<TransferOrderState, RootState> = {
       sort: payload.sort ? payload.sort : "orderDate asc",
       filters: {
         orderTypeId: { value: 'TRANSFER_ORDER' },
-        facilityId: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) },
+        facilityId: { value: escapeSolrSpecialChars(getCurrentFacilityId()) },
         productStoreId: { value: this.state.user.currentEComStore.productStoreId }
       }
     }
@@ -154,7 +154,7 @@ const actions: ActionTree<TransferOrderState, RootState> = {
         "shipmentTypeId": "OUT_TRANSFER",
         orderId: payload.orderId,
         "shipGroupSeqId": payload.shipGroupSeqId,
-        "originFacilityId": this.state.user.currentFacility.facilityId,
+        "originFacilityId": getCurrentFacilityId(),
         "destinationFacilityId": payload.orderFacilityId,
         "items": eligibleItems,
         "packages": [{
@@ -280,11 +280,10 @@ const actions: ActionTree<TransferOrderState, RootState> = {
     // When there exists multiple line item for a single product, then may arise discrepancy in scanning
     // since some items might be completed and some pending. Hence searching is done with status check.
     const getProduct = store.getters['product/getProduct'];
-    const productIdentificationStore = useProductIdentificationStore()
-    const productIdentificationPref = productIdentificationStore.getProductIdentificationPref.primaryId
+    const barcodeIdentifier = store.getters['util/getBarcodeIdentificationPref'];
 
     const item = state.current.items.find((orderItem: any) => {
-      const itemVal = getProductIdentificationValue(productIdentificationPref, getProduct(orderItem.productId)) ? getProductIdentificationValue(productIdentificationPref, getProduct(orderItem.productId)) : orderItem.internalName;
+      const itemVal = getProductIdentificationValue(barcodeIdentifier, getProduct(orderItem.productId)) ? getProductIdentificationValue(barcodeIdentifier, getProduct(orderItem.productId)) : getProduct(orderItem.productId)?.internalName;
       return itemVal === payload && orderItem.statusId !== 'ITEM_COMPLETED' && orderItem.statusId !== 'ITEM_REJECTED' && orderItem.statusId !== 'ITEM_CANCELLED';
     })
     if(item){
diff --git a/src/store/modules/user/UserState.ts b/src/store/modules/user/UserState.ts
index eed51f6a..7cdd85b2 100644
--- a/src/store/modules/user/UserState.ts
+++ b/src/store/modules/user/UserState.ts
@@ -3,7 +3,6 @@ export default interface UserState {
     current: any;
     permissions: any;
     pwaState: any;
-    currentFacility: object;
     instanceUrl: string;
     currentEComStore: object;
     preference: {
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index 4766b260..047fa600 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -4,7 +4,7 @@ import RootState from '@/store/RootState'
 import store from '@/store';
 import UserState from './UserState'
 import * as types from './mutation-types'
-import { showToast } from '@/utils'
+import { showToast, getCurrentFacilityId } from '@/utils'
 import { hasError } from '@/adapter'
 import { translate } from '@hotwax/dxp-components'
 import { DateTime, Settings } from 'luxon';
@@ -56,9 +56,8 @@ const actions: ActionTree<UserState, RootState> = {
       
       //fetching user facilities
       const isAdminUser = appPermissions.some((appPermission: any) => appPermission?.action === "APP_STOREFULFILLMENT_ADMIN" );
-      const baseURL = store.getters['user/getBaseUrl'];
-      const facilities = await getUserFacilities(token, baseURL, userProfile?.partyId, "OMS_FULFILLMENT", isAdminUser);
-
+      const facilities = await useUserStore().getUserFacilities(userProfile?.partyId, "OMS_FULFILLMENT", isAdminUser)
+      await useUserStore().getFacilityPreference('SELECTED_FACILITY')
 
       if (!facilities.length) throw 'Unable to login. User is not assocaited with any facility'
 
@@ -71,7 +70,7 @@ const actions: ActionTree<UserState, RootState> = {
       }, []);
 
       // TODO Use a separate API for getting facilities, this should handle user like admin accessing the app
-      const currentFacility = userProfile.facilities[0];
+      const currentFacility: any = useUserStore().getCurrentFacility
       userProfile.stores = await UserService.getEComStores(token, currentFacility);
 
       let preferredStore = userProfile.stores[0]
@@ -93,7 +92,6 @@ const actions: ActionTree<UserState, RootState> = {
 
       // TODO user single mutation
       commit(types.USER_CURRENT_ECOM_STORE_UPDATED, preferredStore);
-      commit(types.USER_CURRENT_FACILITY_UPDATED, currentFacility);
       commit(types.USER_INFO_UPDATED, userProfile);
       commit(types.USER_PERMISSIONS_UPDATED, appPermissions);
       commit(types.USER_TOKEN_CHANGED, { newToken: token })
@@ -105,6 +103,7 @@ const actions: ActionTree<UserState, RootState> = {
       await dispatch("fetchAllNotificationPrefs");
       this.dispatch('util/findProductStoreShipmentMethCount')
       this.dispatch('util/getForceScanSetting', preferredStore.productStoreId);
+      this.dispatch('util/fetchBarcodeIdentificationPref', preferredStore.productStoreId);
       await dispatch('getNewRejectionApiConfig')
       await dispatch('getPartialOrderRejectionConfig')
       await dispatch('getCollateralRejectionConfig')
@@ -157,6 +156,7 @@ const actions: ActionTree<UserState, RootState> = {
     this.dispatch("orderLookup/clearOrderLookup")
     this.dispatch('user/clearNotificationState')
     this.dispatch('util/updateForceScanStatus', false)
+    this.dispatch('util/updateBarcodeIdentificationPref', "internalName")
     this.dispatch('user/clearPartialOrderRejectionConfig')
     this.dispatch('user/clearCollateralRejectionConfig')
     this.dispatch('transferorder/clearTransferOrdersList')
@@ -182,7 +182,7 @@ const actions: ActionTree<UserState, RootState> = {
   /**
    * update current facility information
    */
-  async setFacility ({ commit, dispatch, state }, payload) {
+  async setFacility ({ commit, dispatch, state }, facility) {
     // On slow api response, setFacility takes long to update facility in state.
     // Hence displaying loader to not allowing user to navigate to orders page to avoid wrong results.
     emitter.emit('presentLoader', {message: 'Updating facility', backdropDismiss: false})
@@ -190,7 +190,7 @@ const actions: ActionTree<UserState, RootState> = {
     try {
       const token = store.getters['user/getUserToken'];
       const userProfile = JSON.parse(JSON.stringify(state.current as any));
-      userProfile.stores = await UserService.getEComStores(token, payload.facility);
+      userProfile.stores = await UserService.getEComStores(token, facility);
 
       let preferredStore = userProfile.stores[0];
       const preferredStoreId =  await UserService.getPreferredStore(token);
@@ -200,11 +200,12 @@ const actions: ActionTree<UserState, RootState> = {
         store && (preferredStore = store)
       }
       commit(types.USER_INFO_UPDATED, userProfile);
-      commit(types.USER_CURRENT_FACILITY_UPDATED, payload.facility);
       commit(types.USER_CURRENT_ECOM_STORE_UPDATED, preferredStore);
       this.dispatch('order/clearOrders')
       await dispatch('getDisableShipNowConfig')
       await dispatch('getDisableUnpackConfig')
+      this.dispatch('util/getForceScanSetting', preferredStore.productStoreId)
+      this.dispatch('util/fetchBarcodeIdentificationPref', preferredStore.productStoreId);
     } catch(error: any) {
       logger.error(error);
       showToast(error?.message ? error.message : translate("Something went wrong"))
@@ -246,6 +247,7 @@ const actions: ActionTree<UserState, RootState> = {
     await dispatch('getDisableUnpackConfig')
     this.dispatch('util/findProductStoreShipmentMethCount')
     this.dispatch('util/getForceScanSetting', payload.eComStore.productStoreId)
+    this.dispatch('util/fetchBarcodeIdentificationPref', payload.eComStore.productStoreId);
   },
 
   setUserPreference({ commit }, payload){
@@ -655,7 +657,7 @@ const actions: ActionTree<UserState, RootState> = {
 
   async fetchNotificationPreferences({ commit, state }) {
     let resp = {} as any
-    const facilityId = (state.currentFacility as any).facilityId
+
     let notificationPreferences = [], enumerationResp = [], userPrefIds = [] as any
     try {
       resp = await getNotificationEnumIds(process.env.VUE_APP_NOTIF_ENUM_TYPE_ID as any)
@@ -669,7 +671,7 @@ const actions: ActionTree<UserState, RootState> = {
       // data and getNotificationUserPrefTypeIds fails or returns empty response (all disbaled)
       if (enumerationResp.length) {
         notificationPreferences = enumerationResp.reduce((notifactionPref: any, pref: any) => {
-          const userPrefTypeIdToSearch = generateTopicName(facilityId, pref.enumId)
+          const userPrefTypeIdToSearch = generateTopicName(getCurrentFacilityId(), pref.enumId)
           notifactionPref.push({ ...pref, isEnabled: userPrefIds.includes(userPrefTypeIdToSearch) })
           return notifactionPref
         }, [])
diff --git a/src/store/modules/user/getters.ts b/src/store/modules/user/getters.ts
index 08baaaa1..8dde5e31 100644
--- a/src/store/modules/user/getters.ts
+++ b/src/store/modules/user/getters.ts
@@ -18,9 +18,6 @@ const getters: GetterTree <UserState, RootState> = {
     getUserProfile (state) {
         return state.current
     },
-    getCurrentFacility (state){
-        return state.currentFacility
-    },
     getInstanceUrl (state) {
         const baseUrl = process.env.VUE_APP_BASE_URL;
         return baseUrl ? baseUrl : state.instanceUrl;
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 0431d3ce..6a1fe3d1 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -11,7 +11,6 @@ const userModule: Module<UserState, RootState> = {
       token: '',
       permissions: [],
       current: {},
-      currentFacility: {},
       instanceUrl: '',
       currentEComStore: {},
       preference: {
diff --git a/src/store/modules/user/mutation-types.ts b/src/store/modules/user/mutation-types.ts
index 006adf78..4b6861d0 100644
--- a/src/store/modules/user/mutation-types.ts
+++ b/src/store/modules/user/mutation-types.ts
@@ -2,7 +2,6 @@ export const SN_USER = 'user'
 export const USER_TOKEN_CHANGED = SN_USER + '/TOKEN_CHANGED'
 export const USER_END_SESSION = SN_USER + '/END_SESSION'
 export const USER_INFO_UPDATED = SN_USER + '/INFO_UPDATED'
-export const USER_CURRENT_FACILITY_UPDATED = SN_USER + '/CURRENT_FACILITY_UPDATED'
 export const USER_INSTANCE_URL_UPDATED = SN_USER + '/INSTANCE_URL_UPDATED'
 export const USER_CURRENT_ECOM_STORE_UPDATED = SN_USER + '/CURRENT_ECOM_STORE_UPDATED'
 export const USER_PREFERENCE_UPDATED = SN_USER + '/PREFERENCE_UPDATED'
diff --git a/src/store/modules/user/mutations.ts b/src/store/modules/user/mutations.ts
index 43e20b98..a999e2e0 100644
--- a/src/store/modules/user/mutations.ts
+++ b/src/store/modules/user/mutations.ts
@@ -9,7 +9,6 @@ const mutations: MutationTree <UserState> = {
     [types.USER_END_SESSION] (state) {
       state.token = ''
       state.current = {},
-      state.currentFacility = {}
       state.currentEComStore = {}
       state.permissions = [],
       state.allNotificationPrefs = []
@@ -17,9 +16,6 @@ const mutations: MutationTree <UserState> = {
     [types.USER_INFO_UPDATED] (state, payload) {
         state.current = { ...state.current,  ...payload}
     },
-    [types.USER_CURRENT_FACILITY_UPDATED] (state, payload) {
-        state.currentFacility = payload;
-    },
     [types.USER_INSTANCE_URL_UPDATED] (state, payload) {
         state.instanceUrl = payload;
     },
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index d43fbbd5..3834bb4b 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -13,4 +13,7 @@ export default interface UtilState {
   facilities: any;
   shipmentGatewayConfigs: any;
   isForceScanEnabled: boolean;
+  fulfillmentRejectReasons: any;
+  rejectReasonOptions: any;
+  barcodeIdentificationPref: string;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index a0bfcccf..c3596153 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -38,6 +38,53 @@ const actions: ActionTree<UtilState, RootState> = {
 
     commit(types.UTIL_REJECT_REASONS_UPDATED, rejectReasons)
   },
+  
+  async fetchRejectReasonOptions({ commit, dispatch, state }) {
+    const permissions = store.getters['user/getUserPermissions'];
+
+    const isAdminUser = permissions.some((permission: any) => permission.action === "APP_STOREFULFILLMENT_ADMIN")
+    const isApiSuccess = isAdminUser ? await dispatch("fetchRejectReasons") : await dispatch("fetchFulfillmentRejectReasons")
+
+    commit(types.UTIL_REJECT_REASON_OPTIONS_UPDATED, ((!isAdminUser && isApiSuccess) ? Object.values(state.fulfillmentRejectReasons) : state.rejectReasons ));
+  },
+
+  async fetchFulfillmentRejectReasons({ commit, dispatch }) {
+    let isApiSuccess = true;
+    const fulfillmentRejectReasons  = {}  as any;
+    try {
+      const payload = {
+        "inputFields": {
+          "enumerationGroupId": "FF_REJ_RSN_GRP"
+        },
+        // We shouldn't fetch description here, as description contains EnumGroup description which we don't wanna show on UI.
+        "fieldList": ["enumerationGroupId", "enumId", "fromDate", "sequenceNum", "enumDescription", "enumName"],
+        "distinct": "Y",
+        "entityName": "EnumerationGroupAndMember",
+        "viewSize": 200,
+        "filterByDate": "Y",
+        "orderBy": "sequenceNum"
+      }
+
+      const resp = await UtilService.fetchFulfillmentRejectReasons(payload)
+
+      if(!hasError(resp)) {
+        resp.data.docs.map((reason: any) => {
+          fulfillmentRejectReasons[reason.enumId] = reason
+        })
+      } else {
+        throw resp.data
+      }
+    } catch (err) {
+      logger.error('Failed to fetch fulfillment reject reasons', err)
+      // Fetching all rejection reasons if the api fails due to no entity found.
+      // Todo: remove this once all the oms are updated.
+      await dispatch("fetchRejectReasons");
+      isApiSuccess = false;
+    }
+
+    commit(types.UTIL_FULFILLMENT_REJECT_REASONS_UPDATED, fulfillmentRejectReasons)
+    return isApiSuccess
+  },
 
   async fetchPartyInformation({ commit, state }, partyIds) {
     let partyInformation = JSON.parse(JSON.stringify(state.partyNames))
@@ -585,9 +632,134 @@ const actions: ActionTree<UtilState, RootState> = {
     }
     commit(types.UTIL_FORCE_SCAN_STATUS_UPDATED, prefValue)
   },
+
+  async fetchBarcodeIdentificationPref({ commit, dispatch }, eComStoreId) {
+    const payload = {
+      "inputFields": {
+        "productStoreId": eComStoreId,
+        "settingTypeEnumId": "BARCODE_IDEN_PREF"
+      },
+      "filterByDate": 'Y',
+      "entityName": "ProductStoreSetting",
+      "fieldList": ["settingValue", "fromDate"],
+      "viewSize": 1
+    }
+
+    try {
+      const resp = await UtilService.getProductStoreSetting(payload) as any
+      if(!hasError(resp)) {
+        const respValue = resp.data.docs[0].settingValue
+        commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, respValue)
+      } else {
+        dispatch("createBarcodeIdentificationPref");
+      }
+    } catch(err) {
+      console.error(err)
+      commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, "internalName")
+    }
+  },
+
+  async createBarcodeIdentificationPref({ commit }) {
+    const ecomStore = store.getters['user/getCurrentEComStore'];
+    const fromDate = Date.now()
+
+    try {
+      if(!await UtilService.isEnumExists("BARCODE_IDEN_PREF")) {
+        const resp = await UtilService.createEnumeration({
+          "enumId": "BARCODE_IDEN_PREF",
+          "enumTypeId": "PROD_STR_STNG",
+          "description": "Identification preference to be used for scanning items.",
+          "enumName": "Barcode Identification Preference",
+          "enumCode": "BARCODE_IDEN_PREF"
+        })
+
+        if(hasError(resp)) {
+          throw resp.data;
+        }
+      }
+
+      const params = {
+        fromDate,
+        "productStoreId": ecomStore.productStoreId,
+        "settingTypeEnumId": "BARCODE_IDEN_PREF",
+        "settingValue": "internalName"
+      }  
+
+      await UtilService.createBarcodeIdentificationPref(params) as any
+    } catch(err) {
+      console.error(err)
+    }
+
+    // not checking for resp success and fail case as every time we need to update the state with the
+    // default value when creating a store setting
+    commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, "internalName")
+    return fromDate;
+  },
+
+  async setBarcodeIdentificationPref({ commit, dispatch, state }, value) {
+    let prefValue = state.barcodeIdentificationPref
+    const eComStoreId = store.getters['user/getCurrentEComStore'].productStoreId;
+
+    // when selecting none as ecom store, not updating the pref as it's not possible to save pref with empty productStoreId
+    if(!eComStoreId) {
+      showToast(translate("Unable to update barcode identification preference since no product store config found."))
+      commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, prefValue)
+      return;
+    }
+
+    let fromDate;
+
+    try {
+      const resp = await UtilService.getProductStoreSetting({
+        "inputFields": {
+          "productStoreId": eComStoreId,
+          "settingTypeEnumId": "BARCODE_IDEN_PREF"
+        },
+        "filterByDate": 'Y',
+        "entityName": "ProductStoreSetting",
+        "fieldList": ["fromDate"],
+        "viewSize": 1
+      }) as any
+      if(!hasError(resp)) {
+        fromDate = resp.data.docs[0]?.fromDate
+      }
+    } catch(err) {
+      console.error(err)
+    }
+
+    if(!fromDate) {
+      fromDate = await dispatch("createBarcodeIdentificationPref");
+    }
+
+    const params = {
+      "fromDate": fromDate,
+      "productStoreId": eComStoreId,
+      "settingTypeEnumId": "BARCODE_IDEN_PREF",
+      "settingValue": value
+    }
+
+    try {
+      const resp = await UtilService.updateBarcodeIdentificationPref(params) as any
+
+      if((!hasError(resp))) {
+        showToast(translate("Barcode identification preference updated successfully."))
+        prefValue = value
+      } else {
+        throw resp.data;
+      }
+    } catch(err) {
+      showToast(translate("Failed to update barcode identification preference."))
+      console.error(err)
+    }
+    commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, prefValue)
+  },
   
   async updateForceScanStatus({ commit }, payload) { 
     commit(types.UTIL_FORCE_SCAN_STATUS_UPDATED, payload)
+  },
+
+  async updateBarcodeIdentificationPref({ commit }, payload) { 
+    commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, payload)
   }
 }
 
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index 2856087d..6c381173 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -44,6 +44,15 @@ const getters: GetterTree <UtilState, RootState> = {
   },
   isForceScanEnabled(state) {
     return state.isForceScanEnabled
+  },
+  getFulfillmentRejectReasons(state) {
+    return state.fulfillmentRejectReasons
+  },
+  getRejectReasonOptions(state) {
+    return state.rejectReasonOptions
+  },
+  getBarcodeIdentificationPref(state) {
+    return state.barcodeIdentificationPref
   }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index f25c792e..30aa7ca1 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -21,7 +21,10 @@ const utilModule: Module<UtilState, RootState> = {
     productStores: [],
     facilities: [],
     shipmentGatewayConfigs: [],
-    isForceScanEnabled: false
+    isForceScanEnabled: false,
+    fulfillmentRejectReasons: {},
+    rejectReasonOptions: [],
+    barcodeIdentificationPref: "internalName"
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index 35da748a..cecb5872 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -13,4 +13,6 @@ export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_PRODUCT_STORES_UPDATED = SN_UTIL + '/PRODUCT_STORES_UPDATED'
 export const UTIL_SHIPMENT_GATEWAY_CONFIGS_UPDATED = SN_UTIL + '/SHIPMENT_GATEWAY_CONFIGS_UPDATED'
 export const UTIL_FORCE_SCAN_STATUS_UPDATED = SN_UTIL + '/FORCE_SCAN_STATUS_UPDATED'
-
+export const UTIL_FULFILLMENT_REJECT_REASONS_UPDATED = SN_UTIL + '/FULFILLMENT_REJECT_REASONS_UPDATED'
+export const UTIL_REJECT_REASON_OPTIONS_UPDATED = SN_UTIL + '/REJECT_REASON_OPTIONS_UPDATED'
+export const UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED = SN_UTIL + '/BARCODE_IDENTIFICATION_PREF_UPDATED'
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 6d3791c3..5e8d8070 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -44,6 +44,15 @@ const mutations: MutationTree <UtilState> = {
   },
   [types.UTIL_FORCE_SCAN_STATUS_UPDATED](state, payload) {
     state.isForceScanEnabled = payload
+  },
+  [types.UTIL_FULFILLMENT_REJECT_REASONS_UPDATED](state, payload) {
+    state.fulfillmentRejectReasons = payload
+  },
+  [types.UTIL_REJECT_REASON_OPTIONS_UPDATED](state, payload) {
+    state.rejectReasonOptions = payload
+  },
+  [types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED](state, payload) {
+    state.barcodeIdentificationPref = payload
   }
 }
 export default mutations;
\ No newline at end of file
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2a647b5f..9fd3aa1b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,4 +1,4 @@
-import { translate } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 import store from '@/store';
 import { JsonToCsvOption } from '@/types';
 import { Plugins } from '@capacitor/core';
@@ -217,6 +217,11 @@ const dateOrdinalSuffix = {
   23: 'rd'
 } as any
 
+const getCurrentFacilityId = () => {
+  const currentFacility: any = useUserStore().getCurrentFacility;
+  return currentFacility?.facilityId
+}
+
 function getDateWithOrdinalSuffix(time: any) {
   if (!time) return "-";
   const dateTime = DateTime.fromMillis(time);
@@ -224,5 +229,4 @@ function getDateWithOrdinalSuffix(time: any) {
   return `${dateTime.day}${suffix} ${dateTime.toFormat("MMM yyyy")}`;
 }
 
-
-export { copyToClipboard, formatCurrency, formatDate, formatPhoneNumber, formatUtcDate, generateInternalId, getColorByDesc, getDateWithOrdinalSuffix, getFeature, getIdentificationId, handleDateTimeInput, isValidDeliveryDays, isValidCarrierCode, isPdf, showToast, sortItems, hasError, parseCsv, jsonToCsv }
+export { copyToClipboard, formatCurrency, formatDate, formatPhoneNumber, formatUtcDate, generateInternalId, getCurrentFacilityId, getColorByDesc, getDateWithOrdinalSuffix, getFeature, getIdentificationId, handleDateTimeInput, isValidDeliveryDays, isValidCarrierCode, isPdf, showToast, sortItems, hasError, parseCsv, jsonToCsv }
diff --git a/src/views/AssignPickerModal.vue b/src/views/AssignPickerModal.vue
index 26b74018..3d60444f 100644
--- a/src/views/AssignPickerModal.vue
+++ b/src/views/AssignPickerModal.vue
@@ -69,12 +69,12 @@ import {
   IonTitle,
   IonToolbar,
   modalController } from "@ionic/vue";
-import { defineComponent } from "vue";
+import { defineComponent, computed } from "vue";
 import { closeOutline, saveOutline } from "ionicons/icons";
 import { mapGetters, useStore } from "vuex";
 import { showToast } from "@/utils";
 import { hasError } from "@/adapter";
-import { translate } from '@hotwax/dxp-components'
+import { translate, useUserStore } from '@hotwax/dxp-components'
 import { UtilService } from "@/services/UtilService";
 import emitter from "@/event-bus";
 import logger from "@/logger"
@@ -104,7 +104,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       openOrders: 'order/getOpenOrders'
     })
   },
@@ -149,9 +148,9 @@ export default defineComponent({
       }
 
       const formData = new FormData();
-      formData.append("facilityId", this.currentFacility.facilityId);
+      formData.append("facilityId", this.currentFacility?.facilityId);
       orderItems.map((item, index) => {
-        formData.append("facilityId_o_"+index, this.currentFacility.facilityId)
+        formData.append("facilityId_o_"+index, this.currentFacility?.facilityId)
         formData.append("shipmentMethodTypeId_o_"+index, item.shipmentMethodTypeId)
         formData.append("itemStatusId_o_"+index, "PICKITEM_PENDING")
         formData.append("shipGroupSeqId_o_"+index, item.shipGroupSeqId)
@@ -238,9 +237,12 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const userStore = useUserStore()
+    let currentFacility = computed(() => userStore.getCurrentFacility) 
 
     return {
       closeOutline,
+      currentFacility,
       saveOutline,
       store,
       translate
diff --git a/src/views/Completed.vue b/src/views/Completed.vue
index a274e889..3a3a15e6 100644
--- a/src/views/Completed.vue
+++ b/src/views/Completed.vue
@@ -212,7 +212,7 @@ import { UtilService } from '@/services/UtilService';
 import { prepareOrderQuery } from '@/utils/solrHelper';
 import emitter from '@/event-bus';
 import ViewSizeSelector from '@/components/ViewSizeSelector.vue'
-import { translate } from '@hotwax/dxp-components'
+import { translate, useUserStore } from '@hotwax/dxp-components'
 import { OrderService } from '@/services/OrderService';
 import logger from '@/logger';
 import ShippingLabelErrorModal from '@/components/ShippingLabelErrorModal.vue';
@@ -263,7 +263,6 @@ export default defineComponent({
     ...mapGetters({
       completedOrders: 'order/getCompletedOrders',
       getProduct: 'product/getProduct',
-      currentFacility: 'user/getCurrentFacility',
       currentEComStore: 'user/getCurrentEComStore',
       getPartyName: 'util/getPartyName',
       getShipmentMethodDesc: 'util/getShipmentMethodDesc',
@@ -286,7 +285,7 @@ export default defineComponent({
   },
   methods: {
     getErrorMessage() {
-      return this.searchedQuery === '' ? translate("doesn't have any completed orders right now.", { facilityName: this.currentFacility.facilityName }) : translate( "No results found for . Try searching In Progress or Open tab instead. If you still can't find what you're looking for, try switching stores.", { searchedQuery: this.searchedQuery, lineBreak: '<br />' })
+      return this.searchedQuery === '' ? translate("doesn't have any completed orders right now.", { facilityName: this.currentFacility?.facilityName }) : translate( "No results found for . Try searching In Progress or Open tab instead. If you still can't find what you're looking for, try switching stores.", { searchedQuery: this.searchedQuery, lineBreak: '<br />' })
     },
     hasAnyPackedShipment(): boolean {
       return this.completedOrders.list.some((order: any) => {
@@ -482,7 +481,7 @@ export default defineComponent({
         filters: {
           picklistItemStatusId: { value: '(PICKITEM_PICKED OR (PICKITEM_COMPLETED AND itemShippedDate: [NOW/DAY TO NOW/DAY+1DAY]))' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -523,7 +522,7 @@ export default defineComponent({
         filters: {
           picklistItemStatusId: { value: '(PICKITEM_PICKED OR (PICKITEM_COMPLETED AND itemShippedDate: [NOW/DAY TO NOW/DAY+1DAY]))' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId },
         },
         facet: {
@@ -762,8 +761,10 @@ export default defineComponent({
   setup() {
     const store = useStore();
     const router = useRouter();
+    const userStore = useUserStore()
     const productIdentificationStore = useProductIdentificationStore();
     let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return {
       Actions,
@@ -772,6 +773,7 @@ export default defineComponent({
       copyToClipboard,
       checkmarkDoneOutline,
       cubeOutline,
+      currentFacility,
       downloadOutline,
       ellipsisVerticalOutline,
       formatUtcDate,
diff --git a/src/views/DownloadPackedOrders.vue b/src/views/DownloadPackedOrders.vue
index 8ca43c98..330c3d5e 100644
--- a/src/views/DownloadPackedOrders.vue
+++ b/src/views/DownloadPackedOrders.vue
@@ -75,12 +75,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, computed } from 'vue';
 import { mapGetters, useStore } from "vuex";
 import { alertController, IonBackButton, IonButton, IonChip, IonContent, IonFab, IonFabButton, IonHeader, IonIcon, IonItem, IonLabel, IonList, IonListHeader, IonPage, IonReorder, IonReorderGroup, IonTitle, IonToolbar, modalController } from '@ionic/vue'
 import { addCircleOutline, addOutline, cloudDownloadOutline, pencilOutline, removeCircleOutline, trashOutline } from 'ionicons/icons'
 import { parseCsv, jsonToCsv, showToast } from '@/utils';
-import { translate,useUserStore } from "@hotwax/dxp-components"
+import { translate, useUserStore } from "@hotwax/dxp-components"
 import logger from '@/logger';
 import { DateTime } from 'luxon';
 import { useRouter } from 'vue-router';
@@ -123,7 +123,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       fieldMappings: 'user/getFieldMappings'
     }),
     areAllFieldsSelected() {
@@ -143,7 +142,7 @@ export default defineComponent({
         params: {
           configId: 'MDM_PACKED_SHIPMENT',
           mimeTypeId: 'application/octet',
-          facilityId: this.currentFacility.facilityId
+          facilityId: this.currentFacility?.facilityId
         }
       }
 
@@ -398,12 +397,15 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
-    const router = useRouter();
+    const router = useRouter(); 
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return {
       addCircleOutline,
       addOutline,
       cloudDownloadOutline,
+      currentFacility,
       pencilOutline,
       removeCircleOutline,
       store,
diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue
index 03535795..5e782c36 100644
--- a/src/views/InProgress.vue
+++ b/src/views/InProgress.vue
@@ -300,7 +300,7 @@ import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationS
 import ViewSizeSelector from '@/components/ViewSizeSelector.vue';
 import { OrderService } from '@/services/OrderService';
 import emitter from '@/event-bus';
-import { translate } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 import { prepareOrderQuery } from '@/utils/solrHelper';
 import { UtilService } from '@/services/UtilService';
 import { DateTime } from 'luxon';
@@ -356,10 +356,9 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       inProgressOrders: 'order/getInProgressOrders',
       getProduct: 'product/getProduct',
-      rejectReasons: 'util/getRejectReasons',
+      rejectReasonOptions: 'util/getRejectReasonOptions',
       currentEComStore: 'user/getCurrentEComStore',
       userPreference: 'user/getUserPreference',
       boxTypeDesc: 'util/getShipmentBoxDesc',
@@ -389,7 +388,8 @@ export default defineComponent({
   },
   methods: {
     getRejectionReasonDescription (rejectionReasonId: string) {
-      return this.rejectReasons?.find((reason: any) => reason.enumId === rejectionReasonId)?.description;
+      const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)
+      return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
     },
     async openRejectReasonPopover(ev: Event, item: any, order: any) {
       const reportIssuePopover = await popoverController.create({
@@ -449,7 +449,7 @@ export default defineComponent({
       }
     },
     getErrorMessage() {
-      return this.searchedQuery === '' ? translate("doesn't have any orders in progress right now.", { facilityName: this.currentFacility.facilityName }) : translate( "No results found for . Try searching Open or Completed tab instead. If you still can't find what you're looking for, try switching stores.", { searchedQuery: this.searchedQuery, lineBreak: '<br />' })
+      return this.searchedQuery === '' ? translate("doesn't have any orders in progress right now.", { facilityName: this.currentFacility?.facilityName }) : translate( "No results found for . Try searching Open or Completed tab instead. If you still can't find what you're looking for, try switching stores.", { searchedQuery: this.searchedQuery, lineBreak: '<br />' })
     },
     getInProgressOrders() {
       return JSON.parse(JSON.stringify(this.inProgressOrders.list)).splice(0, (this.inProgressOrders.query.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any));
@@ -692,7 +692,7 @@ export default defineComponent({
         // This variable is used in messages to display name of first rejected item from the itemsToReject array
         const rejectedItem = itemsToReject[0];
         if (itemsToReject.length === 1) {
-          message = translate('is identified as. This order item will be unassigned from the store and sent to be rebrokered.', { productName: rejectedItem.productName, rejectReason: ((this.rejectReasons.find((rejectReason: {[key: string]: any}) => rejectReason.enumId === rejectedItem.rejectReason)).description).toLowerCase() });
+          message = translate('is identified as. This order item will be unassigned from the store and sent to be rebrokered.', { productName: rejectedItem.productName, rejectReason: ((this.rejectReasonOptions.find((rejectReason: {[key: string]: any}) => rejectReason.enumId === rejectedItem.rejectReason)).description).toLowerCase() });
         } else {
           message = translate(', and other products were identified as unfulfillable. These items will be unassigned from this store and sent to be rebrokered.', { productName: rejectedItem.productName, products: itemsToReject.length - 1, space: '<br /><br />' });
         }
@@ -737,7 +737,7 @@ export default defineComponent({
     async updateOrder(order: any, updateParameter?: string) {
       const form = new FormData()
 
-      form.append('facilityId', this.currentFacility.facilityId)
+      form.append('facilityId', this.currentFacility?.facilityId)
       form.append('orderId', order.orderId)
 
       order.shipmentIds.map((shipmentId: string) => {
@@ -809,7 +809,7 @@ export default defineComponent({
         if (rejectedOrderItems.length > 0) {
           resp = await OrderService.rejectFulfillmentReadyOrderItem({
             data: {
-              facilityId : this.currentFacility.facilityId,
+              facilityId : this.currentFacility?.facilityId,
               rejectEntireShipment: this.isEntierOrderRejectionEnabled(order) ? "Y" : "N",
               rejectAllRelatedShipment: this.collateralRejectionConfig?.settingValue === 'true' ? "Y" : "N",
               defaultReason: this.rejectEntireOrderReasonId, //default reason for items for which reason is not selected but rejecting due to entire order rejection config.
@@ -917,7 +917,7 @@ export default defineComponent({
           picklistItemStatusId: { value: 'PICKITEM_PENDING' },
           '-fulfillmentStatus': { value: 'Rejected' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -1193,7 +1193,7 @@ export default defineComponent({
 
             try {
               resp = await UserService.recycleInProgressOrders({
-                "facilityId": this.currentFacility.facilityId,
+                "facilityId": this.currentFacility?.facilityId,
                 "productStoreId": this.currentEComStore.productStoreId,
                 "reasonId": "INACTIVE_STORE"
               })
@@ -1315,7 +1315,7 @@ export default defineComponent({
     }
   },
   async mounted () {
-    this.store.dispatch('util/fetchRejectReasons')
+    this.store.dispatch('util/fetchRejectReasonOptions')
     await Promise.all([this.fetchPickersInformation(), this.initialiseOrderQuery()])
     emitter.on('updateOrderQuery', this.updateOrderQuery)
   },
@@ -1326,8 +1326,10 @@ export default defineComponent({
   setup() {
     const authStore = useAuthStore()
     const store = useStore();
+    const userStore = useUserStore()
     const productIdentificationStore = useProductIdentificationStore();
     let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return {
       Actions,
@@ -1339,6 +1341,7 @@ export default defineComponent({
       checkmarkDoneOutline,
       closeCircleOutline,
       cubeOutline,
+      currentFacility,
       ellipsisVerticalOutline,
       fileTrayOutline,
       formatUtcDate,
diff --git a/src/views/OpenOrders.vue b/src/views/OpenOrders.vue
index fd62701a..e02a11ec 100644
--- a/src/views/OpenOrders.vue
+++ b/src/views/OpenOrders.vue
@@ -173,7 +173,7 @@ import { computed, defineComponent } from 'vue';
 import { caretDownOutline, chevronUpOutline, cubeOutline, listOutline, notificationsOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons';
 import AssignPickerModal from '@/views/AssignPickerModal.vue';
 import { mapGetters, useStore } from 'vuex';
-import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
+import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore, useUserStore } from '@hotwax/dxp-components';
 import { formatUtcDate, getFeature, showToast } from '@/utils'
 import { hasError } from '@/adapter';
 import { UtilService } from '@/services/UtilService';
@@ -218,7 +218,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       openOrders: 'order/getOpenOrders',
       getProduct: 'product/getProduct',
       currentEComStore: 'user/getCurrentEComStore',
@@ -241,7 +240,7 @@ export default defineComponent({
   },
   methods: {
     getErrorMessage() {
-      return this.searchedQuery === '' ? translate("doesn't have any outstanding orders right now.", { facilityName: this.currentFacility.facilityName }) : translate( "No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.", { searchedQuery: this.searchedQuery, lineBreak: '<br />' })
+      return this.searchedQuery === '' ? translate("doesn't have any outstanding orders right now.", { facilityName: this.currentFacility?.facilityName }) : translate( "No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.", { searchedQuery: this.searchedQuery, lineBreak: '<br />' })
     },
     viewNotifications() {
       this.store.dispatch('user/setUnreadNotificationsStatus', false)
@@ -318,7 +317,7 @@ export default defineComponent({
           '-fulfillmentStatus': { value: 'Cancelled' },
           orderStatusId: { value: 'ORDER_APPROVED' },
           orderTypeId: { value: 'SALES_ORDER' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -386,7 +385,7 @@ export default defineComponent({
 
             try {
               resp = await UserService.recycleOutstandingOrders({
-                "facilityId": this.currentFacility.facilityId,
+                "facilityId": this.currentFacility?.facilityId,
                 "productStoreId": this.currentEComStore.productStoreId,
                 "reasonId": "INACTIVE_STORE"
               })
@@ -432,14 +431,17 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const userStore = useUserStore()
     const productIdentificationStore = useProductIdentificationStore();
     let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return{
       Actions,
       caretDownOutline,
       chevronUpOutline,
       cubeOutline,
+      currentFacility,
       formatUtcDate,
       getFeature,
       getProductIdentificationValue,
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index d8c9c5df..4c6034d6 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -443,7 +443,7 @@ import {
   trashBinOutline,
   ribbonOutline
 } from 'ionicons/icons';
-import { getProductIdentificationValue, translate, DxpShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
+import { getProductIdentificationValue, translate, DxpShopifyImg, useProductIdentificationStore, useUserStore } from '@hotwax/dxp-components';
 import { copyToClipboard, formatUtcDate, getFeature, showToast } from '@/utils'
 import { Actions, hasPermission } from '@/authorization'
 import OrderActionsPopover from '@/components/OrderActionsPopover.vue'
@@ -501,13 +501,12 @@ export default defineComponent({
     ...mapGetters({
       boxTypeDesc: 'util/getShipmentBoxDesc',
       completedOrders: 'order/getCompletedOrders',
-      currentFacility: 'user/getCurrentFacility',
       currentEComStore: 'user/getCurrentEComStore',
       getProduct: 'product/getProduct',
       getProductStock: 'stock/getProductStock',
       inProgressOrders: 'order/getInProgressOrders',
       order: "order/getCurrent",
-      rejectReasons: 'util/getRejectReasons',
+      rejectReasonOptions: 'util/getRejectReasonOptions',
       userPreference: 'user/getUserPreference',
       getPartyName: 'util/getPartyName',
       getfacilityTypeDesc: 'util/getFacilityTypeDesc',
@@ -553,7 +552,7 @@ export default defineComponent({
     }
   },
   async ionViewDidEnter() {
-    this.store.dispatch('util/fetchRejectReasons')
+    this.store.dispatch('util/fetchRejectReasonOptions')
     this.category === 'open'
     ? await this.store.dispatch('order/getOpenOrder', { orderId: this.orderId, shipGroupSeqId: this.shipGroupSeqId })
     : this.category === 'in-progress'
@@ -683,7 +682,8 @@ export default defineComponent({
       }
     },
     getRejectionReasonDescription (rejectionReasonId: string) {
-      return this.rejectReasons?.find((reason: any) => reason.enumId === rejectionReasonId)?.description;
+      const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)
+      return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
     },
     isEntierOrderRejectionEnabled(order: any) {
       return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && order.hasRejectedItem
@@ -852,7 +852,7 @@ export default defineComponent({
           picklistItemStatusId: { value: 'PICKITEM_PENDING' },
           '-fulfillmentStatus': { value: 'Rejected' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -1134,6 +1134,7 @@ export default defineComponent({
         if(!hasError(resp)) {
           showToast(translate('Box added successfully'))
           await this.store.dispatch('order/getInProgressOrder', { orderId: this.orderId, shipGroupSeqId: this.shipGroupSeqId, isModified: true })
+          this.store.dispatch('order/updateInProgressOrder', this.order);
         } else {
           throw resp.data
         }
@@ -1226,7 +1227,7 @@ export default defineComponent({
     async updateOrder(order: any, updateParameter?: string) {
       const form = new FormData()
 
-      form.append('facilityId', this.currentFacility.facilityId)
+      form.append('facilityId', this.currentFacility?.facilityId)
       form.append('orderId', order.orderId)
 
       order.shipmentIds?.map((shipmentId: string) => {
@@ -1285,7 +1286,7 @@ export default defineComponent({
         if (rejectedOrderItems.length > 0) {
           resp = await OrderService.rejectFulfillmentReadyOrderItem({
             data: {
-              facilityId : this.currentFacility.facilityId,
+              facilityId : this.currentFacility?.facilityId,
               rejectEntireShipment: this.isEntierOrderRejectionEnabled(order) ? "Y" : "N",
               rejectAllRelatedShipment: this.collateralRejectionConfig?.settingValue === 'true' ? "Y" : "N",
               defaultReason: this.rejectEntireOrderReasonId, //default reason for items for which reason is not selected but rejecting due to entire order rejection config.
@@ -1342,7 +1343,7 @@ export default defineComponent({
         // This variable is used in messages to display name of first rejected item from the itemsToReject array
         const rejectedItem = itemsToReject[0];
         if (itemsToReject.length === 1) {
-          message = translate('is identified as. This order item will be unassigned from the store and sent to be rebrokered.', { productName: rejectedItem.productName, rejectReason: ((this.rejectReasons.find((rejectReason: {[key: string]: any}) => rejectReason.enumId === rejectedItem.rejectReason)).description).toLowerCase() });
+          message = translate('is identified as. This order item will be unassigned from the store and sent to be rebrokered.', { productName: rejectedItem.productName, rejectReason: ((this.rejectReasonOptions.find((rejectReason: {[key: string]: any}) => rejectReason.enumId === rejectedItem.rejectReason)).description).toLowerCase() });
         } else {
           message = translate(', and other products were identified as unfulfillable. These items will be unassigned from this store and sent to be rebrokered.', { productName: rejectedItem.productName, products: itemsToReject.length - 1, space: '<br /><br />' });
         }
@@ -1445,7 +1446,7 @@ export default defineComponent({
         filters: {
           picklistItemStatusId: { value: '(PICKITEM_PICKED OR (PICKITEM_COMPLETED AND itemShippedDate: [NOW/DAY TO NOW/DAY+1DAY]))' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId }
         },
         facet: {
@@ -1486,7 +1487,7 @@ export default defineComponent({
         filters: {
           picklistItemStatusId: { value: '(PICKITEM_PICKED OR (PICKITEM_COMPLETED AND itemShippedDate: [NOW/DAY TO NOW/DAY+1DAY]))' },
           '-shipmentMethodTypeId': { value: 'STOREPICKUP' },
-          facilityId: { value: this.currentFacility.facilityId },
+          facilityId: { value: this.currentFacility?.facilityId },
           productStoreId: { value: this.currentEComStore.productStoreId },
         },
         facet: {
@@ -1698,8 +1699,10 @@ export default defineComponent({
   setup() {
     const store = useStore();
     const router = useRouter();
+    const userStore = useUserStore()
     const productIdentificationStore = useProductIdentificationStore();
     let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return {
       addOutline,
@@ -1712,6 +1715,7 @@ export default defineComponent({
       closeCircleOutline,
       copyToClipboard,
       cubeOutline,
+      currentFacility,
       documentTextOutline,
       ellipsisVerticalOutline,
       fileTrayOutline,
diff --git a/src/views/OrderLookup.vue b/src/views/OrderLookup.vue
index 2c41e9f3..df96defa 100644
--- a/src/views/OrderLookup.vue
+++ b/src/views/OrderLookup.vue
@@ -193,7 +193,6 @@ export default defineComponent ({
     ...mapGetters({
       ordersList: 'orderLookup/getOrders',
       getProduct: 'product/getProduct',
-      currentFacilityId: 'user/getCurrentFacility',
       getProductStock: 'stock/getProductStock',
       isScrollable: 'orderLookup/isScrollable',
       query: 'orderLookup/getOrderQuery',
diff --git a/src/views/RejectionReasons.vue b/src/views/RejectionReasons.vue
index 2d7d38b5..a2bdfdd7 100644
--- a/src/views/RejectionReasons.vue
+++ b/src/views/RejectionReasons.vue
@@ -25,7 +25,11 @@
                   <ion-icon :icon="caretDownOutline" />
                 </ion-chip>
               </div>
-  
+
+              <div class="tablet">
+                <ion-toggle :checked="fulfillmentRejectReasons[reason.enumId]" @click.prevent="updateFulfillmentRejectReasonAssocStatus($event, reason)" />
+              </div>
+
               <ion-reorder />
   
               <ion-button fill="clear" color="medium" @click="openRejectionReasonActionsPopover($event, reason)">
@@ -63,6 +67,7 @@ import {
   IonReorder,
   IonReorderGroup,
   IonTitle,
+  IonToggle,
   IonToolbar,
   alertController,
   modalController,
@@ -77,6 +82,9 @@ import VarianceTypeActionsPopover from '@/components/VarianceTypeActionsPopover.
 import { mapGetters, useStore } from 'vuex';
 import { UtilService } from '@/services/UtilService';
 import { showToast } from '@/utils';
+import { DateTime } from 'luxon';
+import { hasError } from '@hotwax/oms-api';
+import logger from '@/logger';
 
 export default defineComponent({
   name: 'RejectionReasons',
@@ -94,11 +102,12 @@ export default defineComponent({
     IonReorder,
     IonReorderGroup,
     IonTitle,
+    IonToggle,
     IonToolbar,
   },
   data() {
     return {
-      filteredReasons: [],
+      filteredReasons: [] as any,
       toast: null as any
     }
   },
@@ -106,10 +115,11 @@ export default defineComponent({
     ...mapGetters({
       rejectReasons: 'util/getRejectReasons',
       rejectReasonEnumTypes: 'util/getRejectReasonEnumTypes',
+      fulfillmentRejectReasons: 'util/getFulfillmentRejectReasons'
     })
   },
   async ionViewWillEnter() {
-    await Promise.all([this.store.dispatch('util/fetchRejectReasons'), this.store.dispatch('util/fetchRejectReasonEnumTypes')])
+    await Promise.all([this.store.dispatch('util/fetchRejectReasons'), this.store.dispatch('util/fetchFulfillmentRejectReasons'), this.store.dispatch('util/fetchRejectReasonEnumTypes')])
     this.filteredReasons = this.rejectReasons ? JSON.parse(JSON.stringify(this.rejectReasons)) : []
   },
   async beforeRouteLeave() {
@@ -240,7 +250,42 @@ export default defineComponent({
       } else {
         showToast(translate("Sequence for rejection reasons updated successfully."))
       }
-    }
+    },
+
+    async updateFulfillmentRejectReasonAssocStatus(event: any, reason: any) {
+      event.stopImmediatePropagation();
+      let resp;
+
+      const payload = {
+        enumerationId: reason.enumId,
+        enumerationGroupId: "FF_REJ_RSN_GRP",
+        sequenceNum: reason.sequenceNum
+      }
+
+      try {
+        if(this.fulfillmentRejectReasons[reason.enumId]?.fromDate) {
+          resp = await UtilService.updateEnumerationGroupMember({
+            ...payload,
+            fromDate: this.fulfillmentRejectReasons[reason.enumId]?.fromDate,
+            thruDate: DateTime.now().toMillis()
+          })
+        } else {
+          resp = await UtilService.createEnumerationGroupMember({
+            ...payload,
+            fromDate: DateTime.now().toMillis()
+          })
+        }
+  
+        if(!hasError(resp)) {
+          await this.store.dispatch("util/fetchFulfillmentRejectReasons");
+        } else {
+          throw resp.data;
+        }
+      } catch(error: any) {
+        logger.error(error);
+        showToast(translate("Failed to update reason association with fulfillment group."))
+      }
+    },
   },
   setup() {
     const store = useStore()
@@ -258,7 +303,7 @@ export default defineComponent({
 
 <style scoped>
 .list-item {
-  --columns-desktop: 4;
+  --columns-desktop: 5;
 }
 
 .list-item:hover {
diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue
index 502c47ec..af9d9914 100644
--- a/src/views/Rejections.vue
+++ b/src/views/Rejections.vue
@@ -241,8 +241,7 @@ export default defineComponent({
     ...mapGetters({
       rejectionStats: 'rejection/getRejectedStats',
       getProduct: 'product/getProduct',
-      rejectedOrders: 'rejection/getRejectedOrders',
-      currentFacility: 'user/getCurrentFacility',
+      rejectedOrders: 'rejection/getRejectedOrders'
     })
   },
   async ionViewWillEnter() {
@@ -327,8 +326,10 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const userStore = useUserStore()
     const productIdentificationStore = useProductIdentificationStore();
     let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
 
     return {
@@ -344,6 +345,7 @@ export default defineComponent({
       productIdentificationPref,
       store,
       translate,
+      currentFacility
     }
   }
 });
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 98875fcb..eccc6045 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -38,6 +38,7 @@
 
       <section>
         <DxpOmsInstanceNavigator />
+        <DxpFacilitySwitcher @updateFacility="updateFacility($event)"/>
 
         <ion-card>
           <ion-card-header>
@@ -57,23 +58,6 @@
             </ion-select>
           </ion-item>
         </ion-card>
-
-        <ion-card>
-          <ion-card-header>
-            <ion-card-title>
-              {{ translate("Facility") }}
-            </ion-card-title>
-          </ion-card-header>
-          <ion-card-content>
-            {{ translate('Specify which facility you want to operate from. Order, inventory and other configuration data will be specific to the facility you select.') }}
-          </ion-card-content>
-          <ion-item lines="none">
-            <ion-select :label="translate('Select facility')" interface="popover" :value="currentFacility?.facilityId" @ionChange="setFacility($event)">
-              <ion-select-option v-for="facility in (userProfile ? userProfile.facilities : [])" :key="facility.facilityId" :value="facility.facilityId" >{{ facility.facilityName }}</ion-select-option>
-            </ion-select>
-          </ion-item>
-        </ion-card>
-
         <ion-card>
           <ion-card-header>
             <ion-card-title>
@@ -163,12 +147,15 @@
               {{ translate("Force scan") }}
             </ion-card-title>
           </ion-card-header>
-          <ion-card-content>
-            {{ translate("Control whether the store requires the force scan during order packing or not.") }}
-          </ion-card-content>
+          <ion-card-content v-html="barcodeContentMessage"></ion-card-content>
           <ion-item lines="none" :disabled="!hasPermission(Actions.APP_UPDT_FULFILL_FORCE_SCAN_CONFIG)">
             <ion-toggle label-placement="start" :checked="isForceScanEnabled" @click.prevent="updateForceScanStatus($event)">{{ translate("Require scan") }}</ion-toggle>
           </ion-item>
+          <ion-item lines="none">
+            <ion-select :label="translate('Barcode Identifier')" interface="popover" :placeholder="translate('Select')" :value="barcodeIdentificationPref" @ionChange="setBarcodeIdentificationPref($event.detail.value)">
+              <ion-select-option v-for="identification in barcodeIdentificationOptions" :key="identification" :value="identification" >{{ identification }}</ion-select-option>
+            </ion-select>
+          </ion-item>
         </ion-card>
 
         <template v-if="useNewRejectionApi()">
@@ -232,14 +219,14 @@ import {
   alertController,
   popoverController
 } from '@ionic/vue';
-import { defineComponent } from 'vue';
+import { computed, defineComponent } from 'vue';
 import { codeWorkingOutline, ellipsisVerticalOutline, globeOutline, openOutline, timeOutline } from 'ionicons/icons'
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import { UserService } from '@/services/UserService';
 import { showToast } from '@/utils';
 import { hasError, removeClientRegistrationToken, subscribeTopic, unsubscribeTopic } from '@/adapter'
-import { initialiseFirebaseApp, translate } from '@hotwax/dxp-components';
+import { initialiseFirebaseApp, translate, useProductIdentificationStore, useUserStore } from '@hotwax/dxp-components';
 import logger from '@/logger';
 import { Actions, hasPermission } from '@/authorization'
 import { DateTime } from 'luxon';
@@ -286,13 +273,13 @@ export default defineComponent({
       orderLimitType: 'unlimited',
       fulfillmentOrderLimit: "" as number | string,
       facilityGroupDetails: {} as any,
-      isEComInvEnabled: false
+      isEComInvEnabled: false,
+      barcodeContentMessage: translate("Only allow shipped quantity to be incremented by scanning the barcode of products. If the identifier is not found, the scan will default to using the internal name.", { space: '<br /><br />' })
     };
   },
   computed: {
     ...mapGetters({
       userProfile: 'user/getUserProfile',
-      currentFacility: 'user/getCurrentFacility',
       instanceUrl: 'user/getInstanceUrl',
       currentEComStore: 'user/getCurrentEComStore',
       userPreference: 'user/getUserPreference',
@@ -304,6 +291,7 @@ export default defineComponent({
       newRejectionApiConfig: 'user/getNewRejectionApiConfig',
       partialOrderRejectionConfig: 'user/getPartialOrderRejectionConfig',
       collateralRejectionConfig: 'user/getCollateralRejectionConfig',
+      barcodeIdentificationPref: 'util/getBarcodeIdentificationPref'
     })
   },
   async ionViewWillEnter() {
@@ -328,7 +316,7 @@ export default defineComponent({
         resp = await UserService.getFacilityDetails({
           "entityName": "Facility",
           "inputFields": {
-            "facilityId": this.currentFacility.facilityId
+            "facilityId": this.currentFacility?.facilityId
           },
           "viewSize": 1,
           "fieldList": ["maximumOrderLimit", "facilityId"]
@@ -354,7 +342,7 @@ export default defineComponent({
         resp = await UserService.getFacilityOrderCount({
           "entityName": "FacilityOrderCount",
           "inputFields": {
-            "facilityId": this.currentFacility.facilityId,
+            "facilityId": this.currentFacility?.facilityId,
             "entryDate": DateTime.now().toFormat('yyyy-MM-dd'),
           },
           "viewSize": 1,
@@ -402,7 +390,7 @@ export default defineComponent({
           resp = await UserService.getFacilityGroupAndMemberDetails({
             "entityName": "FacilityGroupAndMember",
             "inputFields": {
-              "facilityId": this.currentFacility.facilityId,
+              "facilityId": this.currentFacility?.facilityId,
               "facilityGroupId": this.facilityGroupDetails.facilityGroupId
             },
             "fieldList": ["facilityId", "fromDate"],
@@ -460,36 +448,26 @@ export default defineComponent({
       const result = await popover.onDidDismiss();
       // Note: here result.data returns 0 in some cases that's why it is compared with 'undefined'.
       if(result.data != undefined && result.data !== this.fulfillmentOrderLimit){
-        await this.updateFacility(result.data)
+        await this.updateFacilityMaximumOrderLimit(result.data)
         this.updateOrderLimitType()
       }
     },
-    async setFacility (event: any) {
-      // not updating the facility when an empty value is given (on logout)
-      if (!event.detail.value) {
-        return;
-      }
-
-      if (this.userProfile){
-        await this.store.dispatch('user/setFacility', {
-          'facility': this.userProfile.facilities.find((fac: any) => fac.facilityId == event.detail.value)
-        });
-        await this.store.dispatch('user/fetchNotificationPreferences')
-        this.store.dispatch('order/clearOrders')
-        this.getCurrentFacilityDetails();
-        this.getFacilityOrderCount();
-        this.getEcomInvStatus();
-      }
+    async updateFacility(facility: any) {
+      await this.store.dispatch('user/setFacility', facility);
+      await this.store.dispatch('user/fetchNotificationPreferences')
+      this.getCurrentFacilityDetails();
+      this.getFacilityOrderCount();
+      this.getEcomInvStatus();
     },
     async timeZoneUpdated(tzId: string) {
       await this.store.dispatch("user/setUserTimeZone", tzId)
     },
-    async updateFacility(maximumOrderLimit: number | string) {
+    async updateFacilityMaximumOrderLimit(maximumOrderLimit: number | string) {
       let resp;
 
       try {
         resp = await UserService.updateFacility({
-          "facilityId": this.currentFacility.facilityId,
+          "facilityId": this.currentFacility?.facilityId,
           maximumOrderLimit
         })
 
@@ -508,7 +486,7 @@ export default defineComponent({
       let resp;
       try {
         resp = await UserService.updateFacilityToGroup({
-          "facilityId": this.currentFacility.facilityId,
+          "facilityId": this.currentFacility?.facilityId,
           "facilityGroupId": this.facilityGroupDetails.facilityGroupId,
           "fromDate": this.facilityGroupDetails.fromDate,
           "thruDate": DateTime.now().toMillis()
@@ -529,7 +507,7 @@ export default defineComponent({
       let resp;
       try {
         resp = await UserService.addFacilityToGroup({
-          "facilityId": this.currentFacility.facilityId,
+          "facilityId": this.currentFacility?.facilityId,
           "facilityGroupId": this.facilityGroupDetails.facilityGroupId
         })
 
@@ -553,7 +531,7 @@ export default defineComponent({
       const message = 'Are you sure you want to perform this action?'
 
       const alert = await alertController.create({
-        header: translate(header, { facilityName: this.currentFacility.facilityName }),
+        header: translate(header, { facilityName: this.currentFacility?.facilityName }),
         message: translate(message),
         buttons: [{
           text: translate('Cancel'),
@@ -609,7 +587,7 @@ export default defineComponent({
         }
 
         emitter.emit('presentLoader',  { backdropDismiss: false })
-        const facilityId = (this.currentFacility as any).facilityId
+        const facilityId = this.currentFacility?.facilityId
         const topicName = generateTopicName(facilityId, enumId)
 
         const notificationPref = this.notificationPrefs.find((pref: any) => pref.enumId === enumId)
@@ -724,15 +702,24 @@ export default defineComponent({
         "settingValue": value
       }
       await this.store.dispatch('user/updateCollateralRejectionConfig', params)
-    }
+    },
+    setBarcodeIdentificationPref(value: string) {
+      this.store.dispatch('util/setBarcodeIdentificationPref', value)
+    },
   },
   setup() {
     const store = useStore();
     const router = useRouter();
+    const userStore = useUserStore()
+    const productIdentificationStore = useProductIdentificationStore();
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
+    let barcodeIdentificationOptions = computed(() => productIdentificationStore.getProductIdentificationOptions)
 
     return {
       Actions,
+      barcodeIdentificationOptions,
       codeWorkingOutline,
+      currentFacility,
       ellipsisVerticalOutline,
       globeOutline,
       openOutline,
diff --git a/src/views/TransferOrderDetail.vue b/src/views/TransferOrderDetail.vue
index d46b4670..64224887 100644
--- a/src/views/TransferOrderDetail.vue
+++ b/src/views/TransferOrderDetail.vue
@@ -217,9 +217,7 @@
       ...mapGetters({
         currentOrder: 'transferorder/getCurrent',
         getStatusDesc: 'util/getStatusDesc',
-        user: 'user/getCurrentFacility',
         getProduct: 'product/getProduct',
-        currentFacility: 'user/getCurrentFacility',
         productIdentificationPref: 'user/getProductIdentificationPref',
         productStoreShipmentMethCount: 'util/getProductStoreShipmentMethCount',
         getShipmentMethodDesc: 'util/getShipmentMethodDesc',
diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index 6457f8e1..e3d63465 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -72,11 +72,11 @@ import {
   IonTitle, 
   IonToolbar, 
 } from '@ionic/vue';
-import { defineComponent } from 'vue';
+import { defineComponent, computed } from 'vue';
 import { caretDownOutline, checkmarkDoneOutline, cubeOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
-import { translate } from '@hotwax/dxp-components';
+import { translate, useUserStore } from '@hotwax/dxp-components';
 import { Actions } from '@/authorization'
 import TransferOrderFilters from '@/components/TransferOrderFilters.vue'
 
@@ -103,7 +103,6 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      currentFacility: 'user/getCurrentFacility',
       transferOrders: 'transferorder/getTransferOrders',
       currentEComStore: 'user/getCurrentEComStore',
       getShipmentMethodDesc: 'util/getShipmentMethodDesc',
@@ -123,7 +122,7 @@ export default defineComponent({
   },
   methods: {
     getErrorMessage() {
-      if (this.searchedQuery === '') {
+      if(this.searchedQuery === '') {
         return this.hasCompletedTransferOrders ? translate("doesn't have any open transfer orders right now.", { facilityName: this.currentFacility.facilityName }) : translate("doesn't have any transfer orders right now.", { facilityName: this.currentFacility.facilityName });
       } else {
         return translate("No results found for .", { searchedQuery: this.searchedQuery });
@@ -191,12 +190,15 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const store = useStore();
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
 
     return{
       Actions,
       caretDownOutline,
       checkmarkDoneOutline,
       cubeOutline,
+      currentFacility,
       optionsOutline,
       pricetagOutline,
       printOutline,
diff --git a/src/views/UploadImportOrders.vue b/src/views/UploadImportOrders.vue
index 61fa8663..c5ac5686 100644
--- a/src/views/UploadImportOrders.vue
+++ b/src/views/UploadImportOrders.vue
@@ -49,11 +49,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { IonChip, IonIcon, IonPage, IonSelect, IonSelectOption, IonHeader, IonList, IonListHeader, IonToolbar, IonBackButton, IonTitle, IonContent, IonItem, IonLabel, IonButton, alertController, modalController } from '@ionic/vue'
 import { parseCsv, showToast } from '@/utils';
-import { translate } from "@hotwax/dxp-components";
+import { translate, useUserStore } from "@hotwax/dxp-components";
 import { UploadService } from "@/services/UploadService"
 import { hasError } from '@/adapter';
 import logger from '@/logger';
@@ -97,7 +97,6 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       fieldMappings: 'user/getFieldMappings',
-      currentFacility: 'user/getCurrentFacility',
     })
   },
   ionViewDidEnter() {
@@ -240,9 +239,12 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const store = useStore();
+    const userStore = useUserStore()
+    let currentFacility: any = computed(() => userStore.getCurrentFacility) 
     
     return {
       addOutline,
+      currentFacility,
       router,
       store,
       translate