6 Commits

Author SHA1 Message Date
balvarez
2df974371c Merge branch 'release/1.1.2'
All checks were successful
DitesLeEnChanson/site/pipeline/tag This commit looks good
2026-01-03 21:31:42 +01:00
balvarez
31bdef2407 version 1.1.2 2026-01-03 21:31:30 +01:00
balvarez
f0109b703a adaptation api 2026-01-03 21:31:03 +01:00
balvarez
50921780a9 Merge tag '1.1.1' into develop
1.1.1
2026-01-03 21:20:07 +01:00
balvarez
7487efd9dc Merge branch 'release/1.1.1'
All checks were successful
DitesLeEnChanson/site/pipeline/tag This commit looks good
2026-01-03 21:19:58 +01:00
balvarez
460ac07f0f env 2026-01-03 21:19:43 +01:00
5 changed files with 8 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
VITE_STRIPE_PUBLISHABLE_KEY=pk_live_51RPSGmEPL3QASpovp8Q6p8ehNMW7TzSrOaV6zvPE1OtflMFN5jChQBEj5kr84wontlLOe8uiHyJBiCduzxIZwj5A00DIEVs31n #VITE_STRIPE_PUBLISHABLE_KEY=pk_live_51RPSGmEPL3QASpovp8Q6p8ehNMW7TzSrOaV6zvPE1OtflMFN5jChQBEj5kr84wontlLOe8uiHyJBiCduzxIZwj5A00DIEVs31n
# VITE_STRIPE_PUBLISHABLE_KEY=pk_test_51RPSH1ERAUBjYKpgbz4GjZjDtI24rqfBky5SO6AwdBfZaqNmFN0zQSxx0Z1wfFKtKXIZXfx5IOQSt2ularULIsto00frDMNi03 VITE_STRIPE_PUBLISHABLE_KEY=pk_test_51RPSH1ERAUBjYKpgbz4GjZjDtI24rqfBky5SO6AwdBfZaqNmFN0zQSxx0Z1wfFKtKXIZXfx5IOQSt2ularULIsto00frDMNi03
VITE_API_URL=https://api.ditesleenchanson.fr VITE_API_URL=https://api.ditesleenchanson.fr

View File

@@ -1,7 +1,7 @@
{ {
"name": "web-app", "name": "web-app",
"type": "module", "type": "module",
"version": "1.1.0", "version": "1.1.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite --host :: --port 3000", "dev": "vite --host :: --port 3000",

View File

@@ -87,13 +87,14 @@ export const api = {
/** /**
* Confirme une commande et envoie les emails * Confirme une commande et envoie les emails
*/ */
async confirmOrder(orderData, sessionId) { async confirmOrder(orderData, sessionId, orderId = null) {
try { try {
const data = await apiRequest('/orders/confirm', { const data = await apiRequest('/orders/confirm', {
method: 'POST', method: 'POST',
body: { body: {
orderData, orderData,
sessionId, sessionId,
orderId,
}, },
}); });
return { data, error: null }; return { data, error: null };

View File

@@ -11,6 +11,7 @@ import React, { useEffect, useState } from 'react';
const [orderDetails, setOrderDetails] = useState(null); const [orderDetails, setOrderDetails] = useState(null);
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const sessionId = searchParams.get('session_id'); const sessionId = searchParams.get('session_id');
const orderId = searchParams.get('order_id');
const { toast } = useToast(); const { toast } = useToast();
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [mainStatus, setMainStatus] = useState({ type: 'info', message: 'Traitement en cours...' }); const [mainStatus, setMainStatus] = useState({ type: 'info', message: 'Traitement en cours...' });
@@ -77,7 +78,7 @@ import React, { useEffect, useState } from 'react';
sessionStorage.setItem(processedKey, 'true'); sessionStorage.setItem(processedKey, 'true');
try { try {
const { data: functionResponse, error: functionError } = await api.orders.confirmOrder(orderDataForDB, sessionId); const { data: functionResponse, error: functionError } = await api.orders.confirmOrder(orderDataForDB, sessionId, orderId);
if (functionError) { if (functionError) {
console.error("API error:", functionError); console.error("API error:", functionError);

View File

@@ -182,7 +182,7 @@ const OrderPage = () => {
orderData: orderDataForDB, orderData: orderDataForDB,
quantity: 1, quantity: 1,
customerEmail: formData.email, customerEmail: formData.email,
successUrl: `${window.location.origin}/confirmation?session_id={CHECKOUT_SESSION_ID}`, successUrl: `${window.location.origin}/confirmation`,
cancelUrl: `${window.location.origin}/commander`, cancelUrl: `${window.location.origin}/commander`,
}); });