From 71b6a2a88cf568b6c95ddbc6a577b9922c7b5eba Mon Sep 17 00:00:00 2001 From: karthikalakshmi Date: Tue, 3 Feb 2026 14:25:45 +0530 Subject: [PATCH] FIX #63 Remove Plan based Setups --- src/Features/ThemeChange/ThemeChange.js | 13 +---- src/Pages/AppPage/AppPage.jsx | 78 ++++--------------------- 2 files changed, 14 insertions(+), 77 deletions(-) diff --git a/src/Features/ThemeChange/ThemeChange.js b/src/Features/ThemeChange/ThemeChange.js index 68306ec..601bdeb 100644 --- a/src/Features/ThemeChange/ThemeChange.js +++ b/src/Features/ThemeChange/ThemeChange.js @@ -2343,16 +2343,7 @@ const ThemeSlice = createSlice({ getPrintSelectionComponentData.fulfilled, (state, action) => { if (action?.payload?.data?.statusCode === 1) { - const Advance = state?.PricingAppPricingName?.some( - (item) => item.PricingName === 'Premium' - ); - const hasCustomizedTemplate = - state.FeatureAddonData?.FeatureDtls?.some( - (item) => - item?.FeatureAddonName?.toLowerCase() === - 'customized template' - ); - if (Advance || hasCustomizedTemplate) { + state.PrintTemplate = action?.payload?.data?.data?.[0]?.ComponentDetails?.find( (item) => @@ -2378,7 +2369,7 @@ const ThemeSlice = createSlice({ acc[item.ConfigName] = true; return acc; }, {}); - } + } else if (action?.payload?.data?.statusCode == 0) { state.PrintTemplate = undefined; } diff --git a/src/Pages/AppPage/AppPage.jsx b/src/Pages/AppPage/AppPage.jsx index 3c7802a..bd7ca4f 100644 --- a/src/Pages/AppPage/AppPage.jsx +++ b/src/Pages/AppPage/AppPage.jsx @@ -580,28 +580,16 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse'); 'GST Invoice Setup', `${subDirectory}setting/gst-invoice-setup` ), - ((Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && !iswarehouse) && + (!iswarehouse) && getsubItem('Customization', `${subDirectory}setting/Customize`, null, [ - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + !iswarehouse ? getsubItem( 'Sales Screen', `${subDirectory}saleslayouts/sales-selection` ) : '', - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + !iswarehouse ? getsubItem( 'Print Forms', @@ -616,11 +604,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse'); `${subDirectory}saleslayouts/kiosk-selection` ) : '', - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + !iswarehouse ? getsubItem( 'Barcode / QR', @@ -1318,29 +1302,17 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse'); 'GST Invoice Setup', `${subDirectory}setting/gst-invoice-setup` ), - ((Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + ( !iswarehouse) && getsubItem('Customization', `${subDirectory}setting/Customize`, null, [ - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + !iswarehouse ? getsubItem( 'Sales Screen', `${subDirectory}saleslayouts/sales-selection` ) : '', - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + !iswarehouse ? getsubItem( 'Print Forms', @@ -1355,11 +1327,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse'); `${subDirectory}saleslayouts/kiosk-selection` ) : '', - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - )) && + !iswarehouse ? getsubItem( 'Barcode / QR', @@ -2563,26 +2531,14 @@ const customizedmenuitem = [] 'GST Invoice Setup', `${subDirectory}setting/gst-invoice-setup` ), - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === 'customized template' - ) || - featureaddDetails?.find( - (item) => item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' - )) && + !sportsAppPreference && getsubItem( 'Customization', `${subDirectory}setting/Customized`, null, [ - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === - 'customized template' - )) && + !sportsAppPreference && !iswarehouse ? getsubItem( @@ -2590,12 +2546,7 @@ const customizedmenuitem = [] `${subDirectory}saleslayouts/sales-selection` ) : '', - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === - 'customized template' - )) && + !iswarehouse ? getsubItem( 'Print Forms', @@ -2611,12 +2562,7 @@ const customizedmenuitem = [] `${subDirectory}saleslayouts/kiosk-selection` ) : '', - (Advance || - featureaddDetails?.find( - (item) => - item?.FeatureAddonName?.toLowerCase() === - 'customized template' - )) && + !iswarehouse && !sportsAppPreference ? getsubItem(