diff --git a/src/Pages/BranchLogin/BranchLogin.jsx b/src/Pages/BranchLogin/BranchLogin.jsx index 391244f..700c86c 100644 --- a/src/Pages/BranchLogin/BranchLogin.jsx +++ b/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) => @@ -562,14 +565,12 @@ const BranchLogin = () => { {SelectTypeName === 'OTP' ? !FirstTimeOtp ? `send ${SelectTypeName.toLocaleLowerCase()}` - : `resend ${SelectTypeName.toLocaleLowerCase()}${ - seconds > 0 ? ` in ${seconds}s` : '' - }` + : `resend ${SelectTypeName.toLocaleLowerCase()}${seconds > 0 ? ` in ${seconds}s` : '' + }` : !FirstTimePin ? `send ${SelectTypeName.toLocaleLowerCase()}` - : `resend ${SelectTypeName.toLocaleLowerCase()}${ - seconds > 0 ? ` in ${seconds}s` : '' - }`} + : `resend ${SelectTypeName.toLocaleLowerCase()}${seconds > 0 ? ` in ${seconds}s` : '' + }`}