diff --git a/frontend/web/components/Blocked.js b/frontend/web/components/Blocked.js index ba3f0f597e77..99d55e793522 100644 --- a/frontend/web/components/Blocked.js +++ b/frontend/web/components/Blocked.js @@ -1,5 +1,6 @@ import React from 'react' import ConfigProvider from 'common/providers/ConfigProvider' +import Payment from 'components/modals/Payment' const Blocked = class extends React.Component { static contextTypes = { @@ -14,25 +15,50 @@ const Blocked = class extends React.Component { } render = () => ( -
-
-

Please get in touch

- Your organisation has been disabled. Please get in touch so we can - discuss enabling your account. - { - <> - {' '} - - support@flagsmith.com - - . - - } -
+
+ {!Utils.getFlagsmithHasFeature('payments_on_blocked_page') ? ( +
+

Please get in touch

+ Your organisation has been disabled. Please get in touch so we can + discuss enabling your account. + { + <> + {' '} + + support@flagsmith.com + + . + + } +
+ ) : ( +
+ { + <> +
+ +
+ + + } +
+ )}
) } diff --git a/frontend/web/components/modals/Payment.js b/frontend/web/components/modals/Payment.js index 51e8ada0a0f0..d165da15afe1 100644 --- a/frontend/web/components/modals/Payment.js +++ b/frontend/web/components/modals/Payment.js @@ -31,6 +31,9 @@ const PaymentButton = (props) => { }, success: (res) => { AppActions.updateSubscription(res) + if (this.props.isDisableAccount) { + window.location.href = `/projects` + } }, }) }} @@ -99,6 +102,20 @@ const Payment = class extends Component {
Manage Payment Plan
+ {this.props.isDisableAccountText && ( + + + {this.props.isDisableAccountText}{' '} + + support@flagsmith.com + + + + )}
@@ -122,6 +139,7 @@ const Payment = class extends Component { {plan.includes('startup') ? 'Purchased' : 'Buy'} @@ -129,6 +147,7 @@ const Payment = class extends Component { {plan.includes('startup') ? 'Purchased' : 'Buy'} @@ -329,6 +348,7 @@ const Payment = class extends Component { {plan.includes('scale-up') ? 'Purchased' : 'Buy'} @@ -336,6 +356,7 @@ const Payment = class extends Component { {plan.includes('scale-up') ? 'Purchased' : 'Buy'}