karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix #324 Capacitor weightscale Integration' (#327) from CapacitorAndroidfoldermove into main 

Reviewed-on: Pozomind/pozo-retail-app#327
This commit is contained in:
karthikalakshmi 2026-03-30 18:41:24 +05:30
parent 80b252cd38 a976e8956d
commit f0b8c20e0a
2 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
View File

@ -676,13 +676,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
</TooltipWrapper>
)}
</div>
<div
style={{
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
}}
>
<BSNavBarWeightScale />
</div>
<div className="BSBillingNav1div2">
<div className="NavbarDivForSearch">
{/* Multiple search */}
@ -720,7 +714,22 @@ const BSNavbar1 = (props, BookingNavbar) => {
</>
)}
</div>
{!OtherServicesglobal && (
<>
{FeatureAddonData?.FeatureDtls?.find(
(item) =>
item?.FeatureAddonName?.toLowerCase() === 'weight scale'
) && (
<div
style={{
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
}}
>
<BSNavBarWeightScale />
</div>
)}
</>
)}
{!OtherServicesglobal && (
<>
{OpenFailData && (
@ -836,18 +845,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
{!OtherServicesglobal && (
<>
{FeatureAddonData?.FeatureDtls?.find(
(item) =>
item?.FeatureAddonName?.toLowerCase() === 'weight scale'
) && (
<div
style={{
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
}}
>
<BSNavBarWeightScale />
</div>
)}
{FeatureAddonData?.FeatureDtls?.find(
(item) => item?.FeatureAddonName?.toLowerCase() === 'preorder'
) && (
@ -1154,20 +1152,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
{!OtherServicesglobal && (
<>
{/* Weight Scale */}
{FeatureAddonData?.FeatureDtls?.find(
(item) =>
item?.FeatureAddonName?.toLowerCase() === 'weight scale'
) && (
<div
className="ResNavbarIcons"
style={{
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
}}
>
<BSNavBarWeightScale />
</div>
)}
{/* PreOrder */}
{FeatureAddonData?.FeatureDtls?.find(
(item) => item?.FeatureAddonName?.toLowerCase() === 'preorder'

1
src/Services/Others.js
View File

@ -148,7 +148,6 @@ const getCapCookieData = (key) => {
};
export const sessionStore = (key, value) => {
console.log("Storing session:", key, value);
const encryptedValue = key !== "auth"
? CryptoJS.AES.encrypt(JSON.stringify(value), SECRET_KEY).toString()
: value;