From 117e81b5cba46cd37fb29d0e00495e6735e7e584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= <c.pronzola@tuta.io>
Date: Mon, 18 Jul 2022 01:14:28 +0400
Subject: [PATCH] Change payment method order & add new asso link

---
 components/soutyen/payment-method.js | 44 ++++++++++++++--------------
 pages/index.js                       | 11 +++++--
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/components/soutyen/payment-method.js b/components/soutyen/payment-method.js
index aa76ac9..32f4834 100644
--- a/components/soutyen/payment-method.js
+++ b/components/soutyen/payment-method.js
@@ -79,12 +79,31 @@ export default function PaymentMethod({isLoading, paymentMethod, setPaymentMetho
     <Box sx={{width: '100%'}}>
       <Box sx={{borderBottom: 1, borderColor: 'divider'}}>
         <Tabs scrollButtons allowScrollButtonsMobile value={paymentMethod} aria-label='basic tabs example' variant='fullWidth' onChange={handleChange}>
-          <Tab wrapped label='Carte bancaire' {...a11yProps(0)} />
+          <Tab wrapped label='Adhésion' {...a11yProps(0)} />
           <Tab wrapped label='PayPal / Liberapay' {...a11yProps(1)} />
-          <Tab wrapped label='Adhésion' {...a11yProps(2)} />
+          <Tab wrapped label='Carte bancaire' {...a11yProps(2)} />
         </Tabs>
       </Box>
       <TabPanel value={paymentMethod} index={0}>
+        <Button size='large' variant='outlined' onClick={() => window.open('https://asso.oki.re/public/members/new.php', '_blank')}>
+          Cliquez ici pour adhérer à l’association OKi
+        </Button>
+      </TabPanel>
+      <TabPanel value={paymentMethod} index={1}>
+        <Grid container rowSpacing={1}>
+          <Grid item md={6} xs={12}>
+            <Button variant='outlined' size='large' endIcon={<Liberapay />} onClick={() => window.open(`https://liberapay.com/${LIBERAPAY_DONATE}/donate`, '_blank')}>
+              Faire un don via Liberapay
+            </Button>
+          </Grid>
+          <Grid item md={6} xs={12}>
+            <Button variant='outlined' size='large' endIcon={<Paypal />} onClick={() => window.open(`https://www.paypal.com/donate/?hosted_button_id=${PAYPAL_ID}`, '_blank')}>
+              Faire un don via PayPal
+            </Button>
+          </Grid>
+        </Grid>
+      </TabPanel>
+      <TabPanel value={paymentMethod} index={2}>
         <Button size='large' variant='outlined' onClick={handleClickOpen}>
           Faire un don par carte bancaire
         </Button>
@@ -106,7 +125,7 @@ export default function PaymentMethod({isLoading, paymentMethod, setPaymentMetho
           setError={setError}
           isLoading={isLoading}
         >
-          {clientSecret && validMontant && paymentMethod === 0 && (
+          {clientSecret && validMontant && paymentMethod === 2 && (
             <Elements options={options} stripe={stripePromise}>
               <CheckoutForm
                 prices={prices}
@@ -119,25 +138,6 @@ export default function PaymentMethod({isLoading, paymentMethod, setPaymentMetho
           )}
         </StripeDialog>
       </TabPanel>
-      <TabPanel value={paymentMethod} index={1}>
-        <Grid container rowSpacing={1}>
-          <Grid item md={6} xs={12}>
-            <Button variant='outlined' size='large' endIcon={<Paypal />} onClick={() => window.open(`https://www.paypal.com/donate/?hosted_button_id=${PAYPAL_ID}`, '_blank')}>
-              Faire un don via PayPal
-            </Button>
-          </Grid>
-          <Grid item md={6} xs={12}>
-            <Button variant='outlined' size='large' endIcon={<Liberapay />} onClick={() => window.open(`https://liberapay.com/${LIBERAPAY_DONATE}/donate`, '_blank')}>
-              Faire un don via Liberapay
-            </Button>
-          </Grid>
-        </Grid>
-      </TabPanel>
-      <TabPanel value={paymentMethod} index={2}>
-        <Button size='large' variant='outlined' onClick={() => window.open('https://www.helloasso.com/associations/organisation-ka-internationale/adhesions/adhesion-oki', '_blank')}>
-          Cliquez ici pour adhérer à #OKi via HelloAsso
-        </Button>
-      </TabPanel>
     </Box>
   )
 }
diff --git a/pages/index.js b/pages/index.js
index fd0bc9b..edc1747 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -70,9 +70,16 @@ export default function Home({errorCode, errorMessage, stats}) {
             </Typography>
           </Container>
           <Container align='center'>
-            <Button variant='outlined' size='large' onClick={() => window.open('https://o-k-i.net', '_blank')}>
-              <strong>Fédiverse ➡️ o-k-i.net</strong> <OpenInNewIcon fontSize='small' />
+          <Box sx={{marginBottom: 2}}>
+            <Button variant='outlined' onClick={() => window.open('https://asso.oki.re/public/members/new.php', '_blank')}>
+              <strong>Adhérez à l’association #OKi</strong> <OpenInNewIcon fontSize='small' />
             </Button>
+          </Box>
+          <Box>
+            <Button variant='outlined' onClick={() => window.open('https://o-k-i.net', '_blank')}>
+              <strong>#OKi sur le Fédiverse ➡️ o-k-i.net</strong> <OpenInNewIcon fontSize='small' />
+            </Button>
+          </Box>
           </Container>
         </Box>
         <Container sx={{flexGrow: 100}}>