From 3107310d24f317282e8904d8f2cefa17682e2d28 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 23 Apr 2024 11:19:38 +0200 Subject: [PATCH 1/2] :sparkles: Redirect to new subscription if has no subscription --- .../Header/BurgerMenu/BurgerModal/index.tsx | 40 ++++++++++++------- .../DesignSystem/Header/Navigation/index.tsx | 39 +++++++++--------- .../Layouts/LoginCallback/index.tsx | 10 +++++ 3 files changed, 57 insertions(+), 32 deletions(-) diff --git a/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx b/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx index 410eb642..40406928 100644 --- a/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx +++ b/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx @@ -6,6 +6,7 @@ import NavigationLink from "../../NavigationLink"; import classes from "./classes.module.scss"; import { AppRuleActions, AppRuleNames } from "@Front/Api/Entities/rule"; import BurgerModalSubmenu from "./BurgerModalSubmenu"; +import Rules, { RulesMode } from "@Front/Components/Elements/Rules"; type IProps = { isOpen: boolean; @@ -21,20 +22,31 @@ export default class BurgerModal extends React.Component { <>
- - -
+ + <> + + +
+ + - - - {/* */} + ]}> + <> + + + + Date: Tue, 23 Apr 2024 11:47:52 +0200 Subject: [PATCH 2/2] :sparkles: new popup --- .../SubscriptionFacturation/index.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx b/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx index 4095f2da..47f76ac0 100644 --- a/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx +++ b/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx @@ -31,7 +31,7 @@ export default function SubscriptionFacturation() { const { close: closeCancelSubscription, isOpen: isCancelSubscriptionOpen } = useOpenable(); const { close: closeConfirmation, isOpen: isConfirmationOpen } = useOpenable(); - + const { close: closeConfirmationRemoveSeats, isOpen: isConfirmationRemoveSeatsOpen, open: openConfirmationRemoveSeats } = useOpenable(); // const cancelSubscription = useCallback(() => { // closeCancelSubscription(); // openConfirmation(); @@ -160,7 +160,7 @@ export default function SubscriptionFacturation() { href={ Module.getInstance().get().modules.pages.Subscription.pages.Manage.pages.Standard.props.path }> */} - {/* */} @@ -294,6 +294,21 @@ export default function SubscriptionFacturation() {
+ + +
+ + En cas de suppression de sièges, les derniers comptes ajoutés seront concernés. Vous pouvez réattribuer les sièges + que vous avez dans votre page sur la page "Gérer mes attributions”. + +
+
); }