diff --git a/src/Features/AuthenicationToken/AuthenticationToken.js b/src/Features/AuthenicationToken/AuthenticationToken.js index 77a8d99..1d121c0 100644 --- a/src/Features/AuthenicationToken/AuthenticationToken.js +++ b/src/Features/AuthenicationToken/AuthenticationToken.js @@ -56,12 +56,7 @@ const addAuthHeader = async (config) => { let encryptedLoginType = getSession('LoginType') - console.log( - 'encryptedLoginType', - encryptedLoginType, - TokendecryptedValuesFun(encryptedMobileno) - ); - + // let Mobileno = encryptedUserId && encryptedLoginType != "Kiosk" ? TokendecryptedValuesFun(encryptedMobileno) : '1000000001'; let Mobileno = encryptedUserId ? encryptedMobileno diff --git a/src/Pages/RedirectApps.jsx b/src/Pages/RedirectApps.jsx index 5ec400c..5a4a76e 100644 --- a/src/Pages/RedirectApps.jsx +++ b/src/Pages/RedirectApps.jsx @@ -18,14 +18,14 @@ function RedirectApps() { const SessionId = encryptedValuesUrlFun(getSession('SessionId')); // const AuthToken = sessionStorage.getItem('auth'); - if (sessionStorage.getItem('BranchId') !== null) { + if (getSession('BranchId') !== null) { clearSession('BranchId'); } - if (sessionStorage.getItem('AppId') !== null) { + if (getSession('AppId') !== null) { clearSession('AppId'); } - if (sessionStorage.getItem('hasRefreshed') !== null) { - sessionStorage.removeItem('hasRefreshed'); + if (getSession('hasRefreshed') !== null) { + clearSession('hasRefreshed'); } const param = { MN: MobileNo, diff --git a/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx b/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx index c424dc6..a3fa7fa 100644 --- a/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx +++ b/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx @@ -41,6 +41,7 @@ const DateWiseReport = () => { getSession('AppType')?.toLowerCase() == 'wholesale' ? true : false; const [OrderFromDate, setOrderFromDate] = useState(); const [OrderToDate, setOrderToDate] = useState(); + const sessionuserid = getSession('UserId') const [UserId, setUserId] = useState( UserRole != 'Employee' ? 0 : getSession('UserId') ); @@ -63,7 +64,7 @@ const DateWiseReport = () => { setting?.SettingIdName?.toLowerCase() === 'mobilea4' && setting?.SettingValue === 'Y' ); - console.log(MobileA4Print, 'MobileA4PrintMobileA4Print'); + console.log(MobileA4Print,SettingDataSelector, 'MobileA4PrintMobileA4Print'); useEffect(() => { if (dataSource?.length > 0) { @@ -368,7 +369,7 @@ const DateWiseReport = () => { }, []); const getPreference = async () => { - const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId }; + const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: sessionuserid }; const { data: res } = await dispatch(getPreferenceData(data)).unwrap(); const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find( (setting) => @@ -545,12 +546,12 @@ const DateWiseReport = () => { let TokenData = ''; let FooterPrint = ''; if (isMobile) { - if (MobileA4Print) { - ReportMobilePDFPrint({ - printId: 'RePrint', - printStyle: style, - }); - } else { + // if (MobileA4Print) { + // ReportMobilePDFPrint({ + // printId: 'RePrint', + // printStyle: style, + // }); + // } else { var textEncoded = encodeURI(receiptText); var TypeCheck = 'PrintReceipt'; var scheme = 'pozoprinter'; @@ -578,7 +579,7 @@ const DateWiseReport = () => { FooterPrint + 'HasFooterTextE' + ';end;'; - } + // } } else { await printDiv('RePrint', style); } diff --git a/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx b/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx index 8d6e824..03bb062 100644 --- a/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx +++ b/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx @@ -69,6 +69,7 @@ const ItemWiseReport = () => { const BranchId = getSession('BranchId'); const AppId = getSession('AppId'); const UserRole = getSession('UserType'); + const sessionuserid = getSession('UserId') const [UserId, setUserId] = useState( UserRole != 'Employee' ? 0 : getSession('UserId') ); @@ -79,7 +80,7 @@ const ItemWiseReport = () => { setting?.SettingIdName?.toLowerCase() === 'mobilea4' && setting?.SettingValue === 'Y' ); - + console.log(MobileA4Print,SettingDataSelector, 'MobileA4PrintMobileA4Print') useEffect(() => { getPreference(); }, []); @@ -210,7 +211,7 @@ const ItemWiseReport = () => { } }, [apiCall]); const getPreference = async () => { - const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId }; + const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: sessionuserid }; const { data: res } = await dispatch(getPreferenceData(data)).unwrap(); const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find( (setting) => @@ -310,12 +311,12 @@ const ItemWiseReport = () => { }; const Print = async () => { if (isMobile) { - if (MobileA4Print) { - ReportMobilePDFPrint({ - printId: 'RePrint', - printStyle: style, - }); - } else { + // if (MobileA4Print) { + // ReportMobilePDFPrint({ + // printId: 'RePrint', + // printStyle: style, + // }); + // } else { let LogoImage = ''; let TokenData = ''; let FooterPrint = ''; @@ -346,7 +347,7 @@ const ItemWiseReport = () => { FooterPrint + 'HasFooterTextE' + ';end;'; - } + // } } else { await printDiv('RePrint', style); } diff --git a/src/Styles/Tablebooking/TableBooking.scss b/src/Styles/Tablebooking/TableBooking.scss index 2c80958..58f6e93 100644 --- a/src/Styles/Tablebooking/TableBooking.scss +++ b/src/Styles/Tablebooking/TableBooking.scss @@ -705,7 +705,7 @@ color: #fff; top: 0; } -.optionnew:selection { +.optionnew::selection { background-color: #ff4d4f; } .ovrly-icos {