Merge branch 'dev' into staging
This commit is contained in:
commit
5e3fc9a9d3
@ -33,11 +33,11 @@ export default function Rib() {
|
||||
setFileName("");
|
||||
setKey("");
|
||||
}
|
||||
}, [officeUid]);
|
||||
}, [key]);
|
||||
|
||||
useEffect(() => {
|
||||
fetchData();
|
||||
}, [officeUid]);
|
||||
}, [fetchData, officeUid]);
|
||||
|
||||
function downloadFile() {
|
||||
if (!fileBlob) return;
|
||||
|
@ -11,7 +11,7 @@ import Subscriptions from "@Front/Api/LeCoffreApi/Admin/Subscriptions/Subscripti
|
||||
|
||||
export default function SubscriptionManageCollaborators() {
|
||||
const [subscription, setSubscription] = useState<Subscription | null>(null);
|
||||
const [availableCollaborators, setAvailableCollaborators] = useState<User[]>([
|
||||
const [availableCollaborators, _setAvailableCollaborators] = useState<User[]>([
|
||||
{
|
||||
created_at: new Date("2021-09-29T14:00:00.000Z"),
|
||||
uid: "1",
|
||||
|
@ -10,15 +10,19 @@ import JwtService from "@Front/Services/JwtService/JwtService";
|
||||
import Subscriptions from "@Front/Api/LeCoffreApi/Admin/Subscriptions/Subscriptions";
|
||||
import SubscribeCheckoutTicket, { EPaymentFrequency } from "../Components/SubscribeCheckoutTicket";
|
||||
import { EForfeitType } from "../SubscriptionFacturation";
|
||||
import Stripe from "@Front/Api/LeCoffreApi/Admin/Stripe/Stripe";
|
||||
|
||||
export default function SubscriptionError() {
|
||||
const [subscription, setSubscription] = useState<Subscription | null>(null);
|
||||
const [customer, setCustomer] = useState<any | null>(null);
|
||||
|
||||
const loadSubscription = useCallback(async () => {
|
||||
const jwt = JwtService.getInstance().decodeJwt();
|
||||
const subscription = await Subscriptions.getInstance().get({ where: { office: { uid: jwt?.office_Id } } });
|
||||
if (!subscription[0]) return;
|
||||
setSubscription(subscription[0]);
|
||||
const customer = await Stripe.getInstance().getCustomerBySubscriptionId(subscription[0].stripe_subscription_id!);
|
||||
setCustomer(customer);
|
||||
}, []);
|
||||
|
||||
const getFrequency = useCallback(() => {
|
||||
@ -37,7 +41,7 @@ export default function SubscriptionError() {
|
||||
|
||||
return (
|
||||
<DefaultTemplate title="Erreur à la souscription">
|
||||
{subscription && (
|
||||
{subscription && customer && (
|
||||
<div className={classes["root"]}>
|
||||
<div className={classes["left"]}>
|
||||
<div className={classes["title"]}>
|
||||
@ -56,7 +60,7 @@ export default function SubscriptionError() {
|
||||
</div>
|
||||
<div className={classes["separator"]} />
|
||||
<div className={classes["client-infos"]}>
|
||||
<SubscriptionClientInfos />
|
||||
<SubscriptionClientInfos customer={customer} />
|
||||
</div>
|
||||
<div className={classes["separator"]} />
|
||||
<Button>Réessayer le paiement</Button>
|
||||
|
Loading…
x
Reference in New Issue
Block a user