Fix - Correction du reset cart et de l'affichage du cart success

sheaft-app · Jun 10, 2021 · 9612ecf · 9612ecf
1 parent 2a7e6ad
commit 9612ecf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/routes/cart/CartCheckout.svelte b/src/routes/cart/CartCheckout.svelte
@@ -141,12 +141,14 @@
 						if (result.secureModeNeeded && result.secureModeRedirectURL) {
 							window.location = result.secureModeRedirectURL;
 						} else {
+							let orderId = $cart.userCurrentOrder;
 							await cart.reset();
+
 							await routerInstance.goTo({
 								Path: CartRoutes.Success.Path,
 								Params: {
 									Query: {
-										id: $cart.userCurrentOrder,
+										id: orderId,
 									},
 								},
 							});

diff --git a/src/routes/cart/CartSuccess.svelte b/src/routes/cart/CartSuccess.svelte
@@ -75,17 +75,6 @@
 							pour chaque mise à jour.
 						</p>
 					{/if}
-
-					{#if !order.purchaseOrders || order.purchaseOrders.length < 1}
-						<ul>
-							{#each order.deliveries as delivery}
-								<li>
-									<strong>{delivery.deliveryMode.producer.name}</strong> prévue pour le
-									<strong>{new Date(delivery.expectedDelivery.expectedDeliveryDate).toLocaleDateString()}</strong>.
-								</li>
-							{/each}
-						</ul>
-					{/if}
 					<p class="text-xl font-semibold mb-2 mt-6">Besoin d'une information ?</p>
 					<p>
 						Vous voulez savoir où en est votre commande ? Vous avez oublié où aller la chercher ? À quelle heure ? Vous
@@ -125,6 +114,18 @@
 						</a>
 					</div>
 				{/each}
+			{:else}
+				{#if order.deliveries.length > 1}
+					<p class="text-xl mb-2 font-semibold mt-6">Vos commandes</p>
+				{:else}
+					<p class="text-xl mb-2 font-semibold mt-6">Votre commande</p>
+				{/if}
+				{#each order.deliveries as delivery}
+					<div class="mb-1">
+						- {delivery.deliveryMode.producer.name} prévue pour le
+						<strong>{new Date(delivery.expectedDelivery.expectedDeliveryDate).toLocaleDateString()}</strong>.
+					</div>
+				{/each}
 			{/if}
 		</div>
 	{/if}

diff --git a/src/stores/cart.js b/src/stores/cart.js
@@ -382,7 +382,7 @@ const store = () => {
 			methods.clearStorage();
 
 			update((state) => {
-				state.isInitializing = true;
+				state.isInitializing = false;
 				state.isSaving = false;
 				state.products = [];
 				state.selectedDeliveries = [];