From 40100d6badbf690109661b27b79f8965f9587b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Sun, 6 Mar 2022 10:11:31 +0400 Subject: [PATCH] Edit soutyen page --- pages/soutyen.js | 90 ++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 60 deletions(-) diff --git a/pages/soutyen.js b/pages/soutyen.js index cc45f1e..7e1214b 100644 --- a/pages/soutyen.js +++ b/pages/soutyen.js @@ -1,27 +1,17 @@ import {useEffect, useState, forwardRef, useRef} from 'react' import {useRouter} from 'next/router' import PropTypes from 'prop-types' -import {loadStripe} from '@stripe/stripe-js' -import {Elements} from '@stripe/react-stripe-js' -import {Box, Container, Typography, Snackbar, LinearProgress, Paper} from '@mui/material' +import {Box, Container, Typography, Snackbar, Paper} from '@mui/material' import MuiAlert from '@mui/material/Alert' import axios from 'axios' import HeadLayout from '../components/head-layout' -import CheckoutForm from '../components/soutyen/checkout-form' -import Presantasyon from '../components/soutyen/presantasyon' -import Don from '../components/soutyen/don' import PaymentMethod from '../components/soutyen/payment-method' import Footer from '../components/footer' - -import {appearance} from '../lib/utils/stripe-style' +import Presantasyon from '../components/soutyen/presantasyon' const SITE_URL = process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3001' -const stripePromise = loadStripe( - process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY -) - const Alert = forwardRef(function Alert(props, ref) { return }) @@ -31,7 +21,7 @@ export default function Soutyen({prices, paymentStatus}) { const scrollEvent = useRef(null) const [clientSecret, setClientSecret] = useState(null) const [paymentIntent, setPaymentIntent] = useState(null) - const [isPaypal, setIsPaypal] = useState(true) + const [paymentMethod, setPaymentMethod] = useState(0) const [selectedMontant, setSelectedMontant] = useState(null) const [validMontant, setValidMontant] = useState(null) const [success, setSuccess] = useState(null) @@ -45,11 +35,6 @@ export default function Soutyen({prices, paymentStatus}) { scrollEvent.current?.scrollIntoView({behavior: 'smooth', block: 'end', inline: 'nearest'}) } - const options = { - clientSecret, - appearance, - } - useEffect(() => { const getClientSecret = async () => { try { @@ -80,11 +65,14 @@ export default function Soutyen({prices, paymentStatus}) { } useEffect(() => { - if (isPaypal) { + if (paymentMethod !== 2) { + setClientEmail('') + setClientSecret(null) setSelectedMontant(null) setValidMontant(null) + setIsLoading(false) } - }, [isPaypal, setSelectedMontant, setValidMontant]) + }, [paymentMethod]) useEffect(() => { if (paymentStatus) { @@ -131,10 +119,10 @@ export default function Soutyen({prices, paymentStatus}) { useEffect(() => {}, [router.query.payment_intent]) useEffect(() => { - if (!isPaypal || validMontant) { + if (paymentMethod === 2 || validMontant) { scrollToBottom() } - }, [isPaypal, validMontant]) + }, [paymentMethod, validMontant]) useEffect(() => { if (payementIsReady) { @@ -159,46 +147,28 @@ export default function Soutyen({prices, paymentStatus}) { - - Faire un don - - + - - {isLoading && ( - - - - )} - - {clientSecret && validMontant && !isPaypal && ( - - - - )}