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:
commit
f0b8c20e0a
|
|
@ -676,13 +676,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
|
||||||
</TooltipWrapper>
|
</TooltipWrapper>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<BSNavBarWeightScale />
|
|
||||||
</div>
|
|
||||||
<div className="BSBillingNav1div2">
|
<div className="BSBillingNav1div2">
|
||||||
<div className="NavbarDivForSearch">
|
<div className="NavbarDivForSearch">
|
||||||
{/* Multiple search */}
|
{/* Multiple search */}
|
||||||
|
|
@ -720,7 +714,22 @@ const BSNavbar1 = (props, BookingNavbar) => {
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
{!OtherServicesglobal && (
|
||||||
|
<>
|
||||||
|
{FeatureAddonData?.FeatureDtls?.find(
|
||||||
|
(item) =>
|
||||||
|
item?.FeatureAddonName?.toLowerCase() === 'weight scale'
|
||||||
|
) && (
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<BSNavBarWeightScale />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
{!OtherServicesglobal && (
|
{!OtherServicesglobal && (
|
||||||
<>
|
<>
|
||||||
{OpenFailData && (
|
{OpenFailData && (
|
||||||
|
|
@ -836,18 +845,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
|
||||||
|
|
||||||
{!OtherServicesglobal && (
|
{!OtherServicesglobal && (
|
||||||
<>
|
<>
|
||||||
{FeatureAddonData?.FeatureDtls?.find(
|
|
||||||
(item) =>
|
|
||||||
item?.FeatureAddonName?.toLowerCase() === 'weight scale'
|
|
||||||
) && (
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<BSNavBarWeightScale />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{FeatureAddonData?.FeatureDtls?.find(
|
{FeatureAddonData?.FeatureDtls?.find(
|
||||||
(item) => item?.FeatureAddonName?.toLowerCase() === 'preorder'
|
(item) => item?.FeatureAddonName?.toLowerCase() === 'preorder'
|
||||||
) && (
|
) && (
|
||||||
|
|
@ -1154,20 +1152,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
|
||||||
|
|
||||||
{!OtherServicesglobal && (
|
{!OtherServicesglobal && (
|
||||||
<>
|
<>
|
||||||
{/* Weight Scale */}
|
|
||||||
{FeatureAddonData?.FeatureDtls?.find(
|
|
||||||
(item) =>
|
|
||||||
item?.FeatureAddonName?.toLowerCase() === 'weight scale'
|
|
||||||
) && (
|
|
||||||
<div
|
|
||||||
className="ResNavbarIcons"
|
|
||||||
style={{
|
|
||||||
pointerEvents: OrderType === 'Failed' ? 'none' : 'auto',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<BSNavBarWeightScale />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{/* PreOrder */}
|
{/* PreOrder */}
|
||||||
{FeatureAddonData?.FeatureDtls?.find(
|
{FeatureAddonData?.FeatureDtls?.find(
|
||||||
(item) => item?.FeatureAddonName?.toLowerCase() === 'preorder'
|
(item) => item?.FeatureAddonName?.toLowerCase() === 'preorder'
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,6 @@ const getCapCookieData = (key) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const sessionStore = (key, value) => {
|
export const sessionStore = (key, value) => {
|
||||||
console.log("Storing session:", key, value);
|
|
||||||
const encryptedValue = key !== "auth"
|
const encryptedValue = key !== "auth"
|
||||||
? CryptoJS.AES.encrypt(JSON.stringify(value), SECRET_KEY).toString()
|
? CryptoJS.AES.encrypt(JSON.stringify(value), SECRET_KEY).toString()
|
||||||
: value;
|
: value;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue