Merge pull request 'color-print-testing' (#250) from color-print-testing into main

Reviewed-on: Pozomind/pozo-retail-app#250

src/Pages/BranchLogin/BranchLogin.jsx

@@ -92,7 +92,6 @@ const BranchLogin = () => {
       setAftergetPin(true);
     }
   }, []);
-
   useEffect(() => {
     if (aftergetPin == true && UserType == 'Super Admin User') {
       fetchData(seletedBranchData);
@@ -117,7 +116,7 @@ const BranchLogin = () => {
     };
   }, [seconds, disabled]);
 
-  const fetchData = async (e) => {
+  const fetchData = async (e, type) => {
     await sessionStore('BranchId', e);
     let data = {
       CompId: CompId,
@@ -135,7 +134,7 @@ const BranchLogin = () => {
       (item) => item.SettingIdName === filterSettingIdName
     );
 
-    if (res?.data?.statusCode == 1) {
+    if (res?.data?.statusCode == 1 && type !== 'W') {
       filteredDatas?.[0]?.SettingValue == 'Y'
         ? navigate(`${subDirectory}app-page/home`)
         : navigate(`${subDirectory}sales`);
@@ -192,8 +191,12 @@ const BranchLogin = () => {
 
   const onChangeBranch = async (e) => {
     let data = CompBranchData?.find((a) => a?.BrId == e);
-    if (data?.LocationType == 'W') await dispatch(changeWarehouse(true));
+    if (data?.LocationType == 'W') {
+      sessionStore("Warehouse", true)
+      await dispatch(changeWarehouse(true));
+    }
     else {
+      sessionStore("Warehouse", false)
       await dispatch(changeWarehouse(false));
     }
 
@@ -204,7 +207,7 @@ const BranchLogin = () => {
 
     dispatch(changeOrderCardDetails([]));
     if (UserType != 'Super Admin User') {
-      await fetchData(e);
+      await fetchData(e, data?.LocationType);
     } else {
       const checkData = SAdminUserData?.filter(
         (item) =>

src/Pages/DashBoard/RetailDashboard.jsx

@@ -36,6 +36,7 @@ import {
   encryptedValuesUrlFun,
   ExtractDateFormate,
   getSession,
+  sessionStore,
 } from '../../Services/Others';
 
 import {
@@ -46,6 +47,7 @@ import {
 } from '../../Features/ProductPage/ProductPage.js';
 import {
   ApplicationPreferences,
+  changeWarehouse,
   checkSession,
   GenerateLogout,
   getCompBranchData,
@@ -308,6 +310,23 @@ const RetailDashboard = () => {
       isMountedRef.current = false;
     };
   }, []);
+//sri  checkin warehouse condition
+  useEffect(() => {
+    const checkWarehouseorNot = async (e) => {
+      let data = CompBranchData?.find((a) => a?.BrId == e);
+      if (data?.LocationType == 'W') {
+        sessionStore("Warhouse", true)
+        await dispatch(changeWarehouse(true));
+      }
+       else {
+            sessionStore("Warehouse", false)
+            await dispatch(changeWarehouse(false));
+          }
+    }
+    if (CompBranchData?.length > 0 && BranchId) {
+      checkWarehouseorNot(BranchId)
+    }
+  }, [CompBranchData, BranchId])
 
   useEffect(() => {
     if (
@@ -2440,13 +2459,11 @@ const RetailDashboard = () => {
                 {SelectTypeName === 'OTP'
                   ? !FirstTimeOtp
                     ? `send ${SelectTypeName.toLocaleLowerCase()}`
-                    : `resend ${SelectTypeName.toLocaleLowerCase()}${
+                    : `resend ${SelectTypeName.toLocaleLowerCase()}${seconds > 0 ? ` in ${seconds}s` : ''
-                        seconds > 0 ? ` in ${seconds}s` : ''
                     }`
                   : !FirstTimePin
                     ? `send ${SelectTypeName.toLocaleLowerCase()}`
-                    : `resend ${SelectTypeName.toLocaleLowerCase()}${
+                    : `resend ${SelectTypeName.toLocaleLowerCase()}${seconds > 0 ? ` in ${seconds}s` : ''
-                        seconds > 0 ? ` in ${seconds}s` : ''
                     }`}
               </button>
             </div>

src/ProtectedRoutes.jsx

@@ -9,6 +9,7 @@ import {
   checkSession,
   getCompBranchData,
   getCommonAppPreference,
+  changeWarehouse,
 } from './Features/BrachLogin/BranchLogin.js';
 import { clearSession, getSession } from './Services/Others';
 import {
@@ -39,6 +40,7 @@ const ProtectedRoutes = ({ routesConfig }) => {
   const BranchId = getSession('BranchId');
   const UserId = getSession('UserId');
   const sessionId = getSession('SessionId');
+  const Warehouse = getSession('Warehouse');
   const [accessCheckComplete, setAccessCheckComplete] = useState(false);
   const FeatureAddonData = useSelector(GlobalFeatAddOnData);
   useTemplate(CompId, BranchId, AppId);
@@ -46,7 +48,12 @@ const ProtectedRoutes = ({ routesConfig }) => {
   useEffect(() => {
     getApplicationPreference();
   }, []);
-
+  //sri
+  useEffect(() => {
+    if (Warehouse) {
+      dispatch(changeWarehouse(true));
+    }
+  }, [Warehouse]);
   const getApplicationPreference = async () => {
     await dispatch(getCommonAppPreference(AppId)).unwrap();
   };