ordering-ui-admin-external 1.3.1 → 1.3.3

package/src/components/Stores/PaymentOptionStripeDirect/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 PaymentOptionStripeDirect = (props) => {
     handleChangeInput,
     handleSaveClick,
     businessPaymethod,
-    handleDeletePaymethod,
-    isDisabledFeature
+    handleDeletePaymethod
   } = props
 
   const theme = useTheme()
@@ -223,8 +221,7 @@ export const PaymentOptionStripeDirect = (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' />
@@ -240,8 +237,7 @@ export const PaymentOptionStripeDirect = (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' />
@@ -262,7 +258,6 @@ export const PaymentOptionStripeDirect = (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/PaymentOptionStripeDirect/styles.js

@@ -89,14 +89,6 @@ export const TabOption = styled.div`
       color: ${props => props.theme.colors.primary};
     }
   }
-
-  ${({ isDisabledFeature }) => isDisabledFeature && css`
-      cursor: not-allowed;
-      opacity: 0.4;
-      &:hover {
-        background-color: ${props => props.theme.colors.white};
-      }
-  `}
 `
 
 export const TabOptionName = styled.span`

package/src/components/Stores/PaymethodOptionPaypalExpress/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 PaymethodOptionPaypalExpress = (props) => {
     businessPaymethod,
     orderTypes,
     handleChangeBusinessPaymentState,
-    handleDeletePaymethod,
-    isDisabledFeature
+    handleDeletePaymethod
   } = props
 
   const theme = useTheme()
@@ -205,8 +203,7 @@ export const PaymethodOptionPaypalExpress = (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' />
@@ -222,8 +219,7 @@ export const PaymethodOptionPaypalExpress = (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' />
@@ -244,7 +240,6 @@ export const PaymethodOptionPaypalExpress = (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/PaymethodOptionStripeConnect/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,
@@ -39,8 +38,7 @@ export const PaymethodOptionStripeConnect = (props) => {
     businessPaymethod,
     orderTypes,
     handleChangeBusinessPaymentState,
-    handleDeletePaymethod,
-    isDisabledFeature
+    handleDeletePaymethod
   } = props
 
   const theme = useTheme()
@@ -249,8 +247,7 @@ export const PaymethodOptionStripeConnect = (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' />
@@ -266,8 +263,7 @@ export const PaymethodOptionStripeConnect = (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' />
@@ -288,7 +284,6 @@ export const PaymethodOptionStripeConnect = (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/PaymethodOptionStripeRedirect/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 PaymethodOptionStripeRedirect = (props) => {
     businessPaymethod,
     orderTypes,
     handleChangeBusinessPaymentState,
-    handleDeletePaymethod,
-    isDisabledFeature
+    handleDeletePaymethod
   } = props
 
   const theme = useTheme()
@@ -223,8 +221,7 @@ export const PaymethodOptionStripeRedirect = (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' />
@@ -240,8 +237,7 @@ export const PaymethodOptionStripeRedirect = (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' />
@@ -262,7 +258,6 @@ export const PaymethodOptionStripeRedirect = (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')}