ordering-ui-admin-external 1.3.1 → 1.3.3

package/src/components/Stores/BusinessMenu/index.js

@@ -1,11 +1,10 @@
 import React, { useEffect, useState } from 'react'
-import { useLanguage, useConfig, useSession, BusinessMenu as BusinessMenuController } from 'ordering-components-admin-external'
+import { useLanguage, BusinessMenu as BusinessMenuController } from 'ordering-components-admin-external'
 import { BusinessMenuOptions } from '../BusinessMenuOptions'
 import { Confirm, Modal, SearchBar } from '../../Shared'
 import { useWindowSize } from '../../../hooks/useWindowSize'
 import { Button, Checkbox } from '../../../styles'
 import { ChevronRight } from 'react-bootstrap-icons'
-import { DisabledFeatureAlert } from '../../DisabledFeatureAlert'
 
 import {
   MainContainer,
@@ -33,8 +32,6 @@ const BusinessMenuUI = (props) => {
     sitesState
   } = props
   const [, t] = useLanguage()
-  const [{ configs }] = useConfig()
-  const [{ user }] = useSession()
   const { width } = useWindowSize()
 
   const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })
@@ -43,8 +40,6 @@ const BusinessMenuUI = (props) => {
   const [isOpenSharedProduct, setIsOpenSharedProduct] = useState(false)
   const [searchValue, setSearchValue] = useState('')
   const [menuList, setMenuList] = useState([])
-  const [isDisabledFeature, setIsDisabledFeature] = useState(false)
-  const featureName = 'shared_menus'
 
   const handleOpenOptions = (name, menu) => {
     setCurrentMenu(menu)
@@ -71,16 +66,6 @@ const BusinessMenuUI = (props) => {
     setMenuList(filteredMenus)
   }, [JSON.stringify(businessMenusState.menus), JSON.stringify(businessMenusState.menusShared), searchValue, isSelectedSharedMenus])
 
-  useEffect(() => {
-    if (configs && Object.keys(configs).length > 0 && user) {
-      if (!Object.keys(configs).includes(featureName) && user?.level === 0 && isSelectedSharedMenus) {
-        setIsDisabledFeature(true)
-        return
-      }
-      setIsDisabledFeature(false)
-    }
-  }, [configs, isSelectedSharedMenus])
-
   return (
     <MainContainer>
       <MenuContainer isHide={isOpenSharedProduct}>
@@ -90,7 +75,6 @@ const BusinessMenuUI = (props) => {
             borderRadius='8px'
             color='lightPrimary'
             onClick={() => handleOpenOptions('option', {})}
-            disabled={isDisabledFeature}
           >
             {t('ADD_MENU', 'Add menu')}
           </Button>
@@ -116,7 +100,7 @@ const BusinessMenuUI = (props) => {
             {t('SHARED_MENUS', 'Shared menus')}
           </Tab>
         </TabsContainer>
-        <SearchBarWrapper isDisabledFeature={isDisabledFeature}>
+        <SearchBarWrapper>
           <SearchBar
             isCustomLayout
             lazyLoad
@@ -145,8 +129,7 @@ const BusinessMenuUI = (props) => {
             key={menu.id}
             isBorderTop={index === 0}
             active={menu.id === currentMenu?.id}
-            onClick={(e) => !isDisabledFeature && handleOpenEdit(e, menu)}
-            isDisabledFeature={isDisabledFeature}
+            onClick={(e) => handleOpenEdit(e, menu)}
           >
             <CheckboxWrapper
               className='business_checkbox_control'
@@ -168,7 +151,6 @@ const BusinessMenuUI = (props) => {
           </AddMenuButton>
         )}
       </MenuContainer>
-      {isDisabledFeature && (<DisabledFeatureAlert />)}
       {width >= 1000 ? (
         <>
           {showOption === 'option' && (

package/src/components/Stores/BusinessMenu/styles.js

@@ -73,14 +73,6 @@ export const MeunItem = styled.div`
     margin: 0 3px;
     font-size: 13px;
   }
-
-  ${({ isDisabledFeature }) => isDisabledFeature && css`
-      cursor: not-allowed;
-      opacity: 0.4;
-      &:hover {
-        background-color: ${props => props.theme.colors.white};
-      }
-  `}
 `
 
 export const MenuName = styled.span`
@@ -140,13 +132,6 @@ export const Tab = styled.div`
 
 export const SearchBarWrapper = styled.div`
   margin-bottom: 15px;
-  ${({ isDisabledFeature }) => isDisabledFeature && css`
-      cursor: not-allowed;
-      > div {
-        pointer-events: none;
-        opacity: 0.4;
-      }
-  `}
 `
 export const SelectButtonGroup = styled.div`
   display: flex;

package/src/components/Stores/BusinessPaymentMethods/index.js

@@ -3,7 +3,6 @@ import Skeleton from 'react-loading-skeleton'
 import {
   useLanguage,
   useConfig,
-  useSession,
   BusinessPaymethods as BusinessPaymentMethodsController
 } from 'ordering-components-admin-external'
 import RiCheckboxBlankLine from '@meronex/icons/ri/RiCheckboxBlankLine'
@@ -67,7 +66,6 @@ const BusinessPaymentMethodsUI = (props) => {
 
   const [, t] = useLanguage()
   const [{ configs }] = useConfig()
-  const [{ user }] = useSession()
   const { width } = useWindowSize()
   const [isEdit, setIsEdit] = useState(false)
   const [selectedBusinessPaymethod, setSelectedBusinessPaymethod] = useState(null)
@@ -75,8 +73,6 @@ const BusinessPaymentMethodsUI = (props) => {
   const [searchValue, setSearchValue] = useState('')
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const [isOpenWalletDetails, setIsOpenWalletDetails] = useState(false)
-  const featureName = 'payments_advanced'
-  const [isDisabledFeature, setIsDisabledFeature] = useState(false)
   const isWalletCashEnabled = configs?.wallet_enabled?.value === '1'
 
   const orderTypes = [
@@ -157,16 +153,6 @@ const BusinessPaymentMethodsUI = (props) => {
     setSelectedBusinessPaymethod(updatedPaymethod)
   }, [businessPaymethodsState?.paymethods, selectedBusinessPaymethod])
 
-  useEffect(() => {
-    if (configs && Object.keys(configs).length > 0 && user) {
-      if (!Object.keys(configs).includes(featureName) && user?.level === 0) {
-        setIsDisabledFeature(true)
-        return
-      }
-      setIsDisabledFeature(false)
-    }
-  }, [configs])
-
   return (
     <MainContainer>
       <PaymentMethodsContainer isOpenWalletDetails={isOpenWalletDetails}>
@@ -267,23 +253,22 @@ const BusinessPaymentMethodsUI = (props) => {
                 'square',
                 ...methodsPay
               ].includes(selectedPaymethodGateway) && (
-                  <PaymentOption
-                    sitesState={sitesState}
-                    open={isEdit}
-                    onClose={() => handleCloseEdit()}
-                    businessPaymethod={selectedBusinessPaymethod}
-                    changesState={changesState}
-                    orderTypes={orderTypes}
-                    handleChangeBusinessPaymentState={handleChangeBusinessPaymentState}
-                    cleanChangesState={cleanChangesState}
-                    actionState={actionState}
-                    handleChangeSandbox={handleChangeSandbox}
-                    handleChangeInput={handleChangeInput}
-                    handleSaveClick={handleSaveClick}
-                    handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                    isDisabledFeature={isDisabledFeature}
-                  />
-                )}
+                <PaymentOption
+                  sitesState={sitesState}
+                  open={isEdit}
+                  onClose={() => handleCloseEdit()}
+                  businessPaymethod={selectedBusinessPaymethod}
+                  changesState={changesState}
+                  orderTypes={orderTypes}
+                  handleChangeBusinessPaymentState={handleChangeBusinessPaymentState}
+                  cleanChangesState={cleanChangesState}
+                  actionState={actionState}
+                  handleChangeSandbox={handleChangeSandbox}
+                  handleChangeInput={handleChangeInput}
+                  handleSaveClick={handleSaveClick}
+                  handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
+                />
+              )}
               {selectedPaymethodGateway === 'apple_pay' && (
                 <PaymentOptionMethods
                   sitesState={sitesState}
@@ -301,7 +286,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
                   id={selectedPaymethodGateway}
                   title='Apple pay'
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'google_pay' && (
@@ -321,7 +305,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
                   id={selectedPaymethodGateway}
                   title='Google pay'
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'stripe_direct' && (
@@ -339,7 +322,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleChangeInput={handleChangeInput}
                   handleSaveClick={handleSaveClick}
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'paypal' && (
@@ -357,7 +339,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleChangeInput={handleChangeInput}
                   handleSaveClick={handleSaveClick}
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'paypal_express' && (
@@ -375,7 +356,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleChangeInput={handleChangeInput}
                   handleSaveClick={handleSaveClick}
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'stripe_redirect' && (
@@ -393,7 +373,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleChangeInput={handleChangeInput}
                   handleSaveClick={handleSaveClick}
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'stripe_connect' && (
@@ -411,7 +390,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleChangeStripeInput={handleChangeStripeInput}
                   handleStripeSave={handleStripeSave}
                   handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
               {selectedPaymethodGateway === 'square' && (
@@ -427,7 +405,6 @@ const BusinessPaymentMethodsUI = (props) => {
                   handleChangeBusinessPaymentState={handleChangeBusinessPaymentState}
                   businessPaymethods={businessPaymethodsState?.paymethods}
                   handleSuccessPaymethodUpdate={handleSuccessPaymethodUpdate}
-                  isDisabledFeature={isDisabledFeature}
                 />
               )}
             </>
@@ -448,23 +425,22 @@ const BusinessPaymentMethodsUI = (props) => {
                   'stripe_redirect',
                   'stripe_connect'
                 ].includes(selectedPaymethodGateway) && (
-                    <PaymentOption
-                      sitesState={sitesState}
-                      open={isEdit}
-                      onClose={() => handleCloseEdit()}
-                      businessPaymethod={selectedBusinessPaymethod}
-                      changesState={changesState}
-                      orderTypes={orderTypes}
-                      handleChangeBusinessPaymentState={handleChangeBusinessPaymentState}
-                      cleanChangesState={cleanChangesState}
-                      actionState={actionState}
-                      handleChangeSandbox={handleChangeSandbox}
-                      handleChangeInput={handleChangeInput}
-                      handleSaveClick={handleSaveClick}
-                      handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                      isDisabledFeature={isDisabledFeature}
-                    />
-                  )}
+                  <PaymentOption
+                    sitesState={sitesState}
+                    open={isEdit}
+                    onClose={() => handleCloseEdit()}
+                    businessPaymethod={selectedBusinessPaymethod}
+                    changesState={changesState}
+                    orderTypes={orderTypes}
+                    handleChangeBusinessPaymentState={handleChangeBusinessPaymentState}
+                    cleanChangesState={cleanChangesState}
+                    actionState={actionState}
+                    handleChangeSandbox={handleChangeSandbox}
+                    handleChangeInput={handleChangeInput}
+                    handleSaveClick={handleSaveClick}
+                    handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
+                  />
+                )}
                 {selectedPaymethodGateway === 'stripe_direct' && (
                   <PaymentOptionStripeDirect
                     sitesState={sitesState}
@@ -480,7 +456,6 @@ const BusinessPaymentMethodsUI = (props) => {
                     handleChangeInput={handleChangeInput}
                     handleSaveClick={handleSaveClick}
                     handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                    isDisabledFeature={isDisabledFeature}
                   />
                 )}
                 {selectedPaymethodGateway === 'paypal' && (
@@ -498,7 +473,6 @@ const BusinessPaymentMethodsUI = (props) => {
                     handleChangeInput={handleChangeInput}
                     handleSaveClick={handleSaveClick}
                     handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                    isDisabledFeature={isDisabledFeature}
                   />
                 )}
                 {selectedPaymethodGateway === 'paypal_express' && (
@@ -516,7 +490,6 @@ const BusinessPaymentMethodsUI = (props) => {
                     handleChangeInput={handleChangeInput}
                     handleSaveClick={handleSaveClick}
                     handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                    isDisabledFeature={isDisabledFeature}
                   />
                 )}
                 {selectedPaymethodGateway === 'stripe_redirect' && (
@@ -534,7 +507,6 @@ const BusinessPaymentMethodsUI = (props) => {
                     handleChangeInput={handleChangeInput}
                     handleSaveClick={handleSaveClick}
                     handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                    isDisabledFeature={isDisabledFeature}
                   />
                 )}
                 {selectedPaymethodGateway === 'stripe_connect' && (
@@ -553,7 +525,6 @@ const BusinessPaymentMethodsUI = (props) => {
                     handleChangeStripeInput={handleChangeStripeInput}
                     handleStripeSave={handleStripeSave}
                     handleDeletePaymethod={handleDeleteBusinessPaymethodOption}
-                    isDisabledFeature={isDisabledFeature}
                   />
                 )}
                 {selectedPaymethodGateway === 'square' && (
@@ -569,7 +540,6 @@ const BusinessPaymentMethodsUI = (props) => {
                     handleChangeBusinessPaymentState={handleChangeBusinessPaymentState}
                     businessPaymethods={businessPaymethodsState?.paymethods}
                     handleSuccessPaymethodUpdate={handleSuccessPaymethodUpdate}
-                    isDisabledFeature={isDisabledFeature}
                   />
                 )}
               </Modal>

package/src/components/Stores/BusinessProductAddForm/index.js

@@ -52,7 +52,7 @@ const BusinessProductAddFormUI = (props) => {
 
   const typeList = [
     { value: 'item', content: <Option>{t('ITEM', 'Item')}</Option> },
-    // { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
+    { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
   ]
 
   const durationList = [

package/src/components/Stores/BusinessesListingHeader/index.js

@@ -73,13 +73,13 @@ export const BusinessesListingHeader = (props) => {
         >
           {t('ADD_NEW_STORE', 'Add new store')}
         </Button>
-        {/* <Button
+        <Button
           color='lightPrimary'
           borderRadius='8px'
           onClick={() => handleOpenSync()}
         >
           {t('SYNC', 'Sync')}
-        </Button> */}
+        </Button>
         <SearchBar
           isCustomLayout
           lazyLoad

package/src/components/Stores/ImportersList/index.js

@@ -27,8 +27,7 @@ export const ImportersList = (props) => {
     handleDeleteImporter,
     selectedImporter,
     setSelectedImporter,
-    handleEditImporter,
-    isDisabledFeature
+    handleEditImporter
   } = props
   const [, t] = useLanguage()
   const theme = useTheme()
@@ -47,7 +46,7 @@ export const ImportersList = (props) => {
   }
 
   return (
-    <ImportListContainer isDisabledFeature={isDisabledFeature}>
+    <ImportListContainer>
       <ImportersTableWrapper>
         <ImpotersTable>
           <thead>

package/src/components/Stores/ImportersList/styles.js

@@ -1,15 +1,7 @@
 import styled, { css } from 'styled-components'
 import { darken } from 'polished'
 
-export const ImportListContainer = styled.div`
-  ${({ isDisabledFeature }) => isDisabledFeature && css`
-    cursor: not-allowed;
-    opacity: 0.5;
-    > div {
-      pointer-events: none;
-    }
-  `}
-`
+export const ImportListContainer = styled.div``
 export const ImportersTableWrapper = styled.div`
 `
 

package/src/components/Stores/ImportersListing/index.js

@@ -1,8 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import {
   useLanguage,
-  useConfig,
-  useSession,
   ImporterListing as ImportersListingController
 } from 'ordering-components-admin-external'
 
@@ -13,7 +11,6 @@ import { ImporterForm } from '../ImporterForm'
 import { ImporterJobForm } from '../ImporterJobForm'
 import { ImporterHelpContent } from '../ImporterHelpContent'
 import { SideBar, Modal } from '../../Shared'
-import { DisabledFeatureAlert } from '../../DisabledFeatureAlert'
 
 import {
   ImportersListingContainer,
@@ -33,9 +30,6 @@ export const ImportersListingUI = (props) => {
     handleSuccessUpdateImporter
   } = props
   const [, t] = useLanguage()
-  const [{ configs }] = useConfig()
-  const [{ user }] = useSession()
-  const featureName = 'massive_importer'
   const [openNewImporter, setOpenNewImporter] = useState(false)
   const [openImporterHelp, setOpenImporterHelp] = useState(false)
   const [openImportCsv, setOpenImportCsv] = useState(false)
@@ -43,7 +37,6 @@ export const ImportersListingUI = (props) => {
   const [selectedImporterJob, setSelectedImporterJob] = useState({})
   const [importJobFormMoveDistance, setImportJobFormMoveDistance] = useState(0)
   const [openMappingDetails, setOpenMappingDetails] = useState(false)
-  const [isDisabledFeature, setIsDisabledFeature] = useState(false)
 
   const addNewImporter = () => {
     setSelectedImporter({})
@@ -70,14 +63,6 @@ export const ImportersListingUI = (props) => {
     setExtraOpen && setExtraOpen(openNewImporter)
   }, [openNewImporter])
 
-  useEffect(() => {
-    if (configs && Object.keys(configs).length > 0 && user) {
-      if (!Object.keys(configs).includes(featureName) && user?.level === 0) {
-        setIsDisabledFeature(true)
-      }
-    }
-  }, [configs])
-
   return (
     <>
       <ImportersListingContainer>
@@ -87,7 +72,6 @@ export const ImportersListingUI = (props) => {
             <IconButton
               color='primary'
               onClick={() => setOpenImporterHelp(true)}
-              disabled={isDisabledFeature}
             >
               <InfoCircle />
             </IconButton>
@@ -97,7 +81,6 @@ export const ImportersListingUI = (props) => {
               color='lightPrimary'
               borderRadius='5px'
               onClick={() => addNewImporter()}
-              disabled={isDisabledFeature}
             >
               {t('ADD_IMPORTER', 'Add importer')}
             </Button>
@@ -112,9 +95,7 @@ export const ImportersListingUI = (props) => {
           selectedImporter={selectedImporter}
           setSelectedImporter={setSelectedImporter}
           handleEditImporter={handleEditImporter}
-          isDisabledFeature={isDisabledFeature}
         />
-        {isDisabledFeature && (<DisabledFeatureAlert />)}
         {openNewImporter && (
           <SideBar
             isBorderShow={!openMappingDetails}

package/src/components/Stores/PaymentOption/index.js

@@ -9,7 +9,6 @@ import { useTheme } from 'styled-components'
 import { ThreeDots, XLg } from 'react-bootstrap-icons'
 import { Dropdown, DropdownButton } from 'react-bootstrap'
 import { Confirm } from '../../Shared'
-import { DisabledFeatureAlert } from '../../DisabledFeatureAlert'
 
 import {
   Container,
@@ -32,8 +31,7 @@ export const PaymentOption = (props) => {
     actionState,
     handleSaveClick,
     businessPaymethod,
-    handleDeletePaymethod,
-    isDisabledFeature
+    handleDeletePaymethod
   } = props
 
   const theme = useTheme()
@@ -153,8 +151,7 @@ export const PaymentOption = (props) => {
           sitesState?.sites.map(site => (
             <TabOption
               key={site.id}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'sites', value: site.id })}
-              isDisabledFeature={isDisabledFeature}
+              onClick={() => setPaymethodInfo({ key: 'sites', value: site.id })}
             >
               {(changesState?.sites ?? businessPaymethod?.sites?.map(s => s.id))?.includes(site.id) ? (
                 <RiCheckboxFill className='fill' />
@@ -170,8 +167,7 @@ export const PaymentOption = (props) => {
           orderTypes.map(type => (
             <TabOption
               key={type.value}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
-              isDisabledFeature={isDisabledFeature}
+              onClick={() => setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
             >
               {(changesState?.allowed_order_types ?? businessPaymethod?.allowed_order_types)?.includes(type.value) ? (
                 <RiCheckboxFill className='fill' />
@@ -186,13 +182,12 @@ export const PaymentOption = (props) => {
         <Button
           borderRadius='5px'
           color='primary'
-          disabled={isDisabledFeature || actionState.loading || Object.keys(changesState).length === 0}
+          disabled={actionState.loading || Object.keys(changesState).length === 0}
           onClick={() => handleSaveClick(businessPaymethod.id)}
         >
           {actionState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save')}
         </Button>
       </Container>
-      {isDisabledFeature && (<DisabledFeatureAlert />)}
       <Confirm
         width='700px'
         title={t('WEB_APPNAME', 'Ordering')}

package/src/components/Stores/PaymentOptionMethods/index.js

@@ -8,7 +8,6 @@ import { useTheme } from 'styled-components'
 import { ThreeDots, XLg } from 'react-bootstrap-icons'
 import { Dropdown, DropdownButton } from 'react-bootstrap'
 import { Confirm } from '../../Shared'
-import { DisabledFeatureAlert } from '../../DisabledFeatureAlert'
 
 import {
   Container,
@@ -38,8 +37,7 @@ export const PaymentOptionMethods = (props) => {
     businessPaymethod,
     handleDeletePaymethod,
     id,
-    title,
-    isDisabledFeature
+    title
   } = props
 
   const theme = useTheme()
@@ -225,8 +223,7 @@ export const PaymentOptionMethods = (props) => {
           sitesState?.sites.map(site => (
             <TabOption
               key={site.id}
-              isDisabledFeature={isDisabledFeature}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'sites', value: site.id })}
+              onClick={() => setPaymethodInfo({ key: 'sites', value: site.id })}
             >
               {(changesState?.sites ?? businessPaymethod?.sites?.map(s => s.id))?.includes(site.id) ? (
                 <RiCheckboxFill className='fill' />
@@ -242,8 +239,7 @@ export const PaymentOptionMethods = (props) => {
           orderTypes.map(type => (
             <TabOption
               key={type.value}
-              isDisabledFeature={isDisabledFeature}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
+              onClick={() => setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
             >
               {(changesState?.allowed_order_types ?? businessPaymethod?.allowed_order_types)?.includes(type.value) ? (
                 <RiCheckboxFill className='fill' />
@@ -264,7 +260,6 @@ export const PaymentOptionMethods = (props) => {
           {actionState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save')}
         </Button>
       </Container>
-      {(isDisabledFeature && (paymentTabs === 1 || paymentTabs === 2)) && (<DisabledFeatureAlert />)}
       <Confirm
         width='700px'
         title={t('WEB_APPNAME', 'Ordering')}

package/src/components/Stores/PaymentOptionPaypal/index.js

@@ -8,7 +8,6 @@ import { useTheme } from 'styled-components'
 import { ThreeDots, XLg } from 'react-bootstrap-icons'
 import { Dropdown, DropdownButton } from 'react-bootstrap'
 import { Confirm } from '../../Shared'
-import { DisabledFeatureAlert } from '../../DisabledFeatureAlert'
 
 import {
   Container,
@@ -36,8 +35,7 @@ export const PaymentOptionPaypal = (props) => {
     handleSaveClick,
     businessPaymethod,
     handleChangeBusinessPaymentState,
-    handleDeletePaymethod,
-    isDisabledFeature
+    handleDeletePaymethod
   } = props
 
   const theme = useTheme()
@@ -225,8 +223,7 @@ export const PaymentOptionPaypal = (props) => {
           sitesState?.sites.map(site => (
             <TabOption
               key={site.id}
-              isDisabledFeature={isDisabledFeature}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'sites', value: site.id })}
+              onClick={() => setPaymethodInfo({ key: 'sites', value: site.id })}
             >
               {(changesState?.sites ?? businessPaymethod?.sites?.map(s => s.id))?.includes(site.id) ? (
                 <RiCheckboxFill className='fill' />
@@ -242,8 +239,7 @@ export const PaymentOptionPaypal = (props) => {
           orderTypes.map(type => (
             <TabOption
               key={type.value}
-              isDisabledFeature={isDisabledFeature}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
+              onClick={() => setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
             >
               {(changesState?.allowed_order_types ?? businessPaymethod?.allowed_order_types)?.includes(type.value) ? (
                 <RiCheckboxFill className='fill' />
@@ -264,7 +260,6 @@ export const PaymentOptionPaypal = (props) => {
           {actionState.loading ? t('LOADING', 'Loading') : t('SAVE', 'Save')}
         </Button>
       </Container>
-      {(isDisabledFeature && (paymentTabs === 1 || paymentTabs === 2)) && (<DisabledFeatureAlert />)}
       <Confirm
         width='700px'
         title={t('WEB_APPNAME', 'Ordering')}

package/src/components/Stores/PaymentOptionSquare/index.js

@@ -11,7 +11,6 @@ import { TabOption, TabOptionName } from '../PaymentOptionStripeDirect/styles'
 import RiCheckboxBlankLine from '@meronex/icons/ri/RiCheckboxBlankLine'
 import RiCheckboxFill from '@meronex/icons/ri/RiCheckboxFill'
 import SiSquare from '@meronex/icons/si/SiSquare'
-import { DisabledFeatureAlert } from '../../DisabledFeatureAlert'
 
 import {
   Container,
@@ -41,8 +40,7 @@ const PaymentOptionSquareUI = (props) => {
     handleSavePaymethod,
     handleChangeDataInput,
     handleChangeSanboxDataInput,
-    handleChangeSandbox,
-    isDisabledFeature
+    handleChangeSandbox
   } = props
 
   const theme = useTheme()
@@ -249,8 +247,7 @@ const PaymentOptionSquareUI = (props) => {
           sitesState?.sites.map(site => (
             <TabOption
               key={site.id}
-              isDisabledFeature={isDisabledFeature}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'sites', value: site.id })}
+              onClick={() => setPaymethodInfo({ key: 'sites', value: site.id })}
             >
               {(changesState?.sites ?? businessPaymethod?.sites?.map(s => s.id))?.includes(site.id) ? (
                 <RiCheckboxFill className='fill' />
@@ -265,8 +262,7 @@ const PaymentOptionSquareUI = (props) => {
           orderTypes.map(type => (
             <TabOption
               key={type.value}
-              isDisabledFeature={isDisabledFeature}
-              onClick={() => !isDisabledFeature && setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
+              onClick={() => setPaymethodInfo({ key: 'allowed_order_types', value: type.value })}
             >
               {(changesState?.allowed_order_types ?? businessPaymethod?.allowed_order_types)?.includes(type.value) ? (
                 <RiCheckboxFill className='fill' />
@@ -299,7 +295,6 @@ const PaymentOptionSquareUI = (props) => {
           closeOnBackdrop={false}
         />
       </Container>
-      {(isDisabledFeature && (paymentTabs === 1 || paymentTabs === 2)) && (<DisabledFeatureAlert />)}
     </>
   )
 }