Update templates/combined_summary.html

templates/combined_summary.html

@@ -590,8 +590,9 @@
     <div class="container mx-auto p-6 pt-2">
         <!-- Order Confirmation -->
         <!-- Added a hidden input to store delivery time in seconds -->
-        <!-- Pass delivery_time_seconds from Flask for a NEW order -->
-        <input type="hidden" id="deliveryTimeSeconds" value="{{ delivery_time_seconds | default('') }}">
+        <!-- Pass delivery_time_seconds from Flask for a NEW order (e.g., 1800 for 30 mins) -->
+        <!-- Pass 0 or None from Flask for a completed/past order -->
+        <input type="hidden" id="deliveryTimeSeconds" value="{{ delivery_time_seconds | default('0') }}">
 
         <div id="orderConfirmationSection" class="section bg-white shadow-sm rounded-xl p-6 mb-6 order-confirmed" role="alert">
             <h1 class="text-center text-2xl font-bold text-orange-500">Order Confirmed!</h1>
@@ -659,7 +660,7 @@
                         {% elif next_tier == "Gold" %}
                         <li class="flex items-center">
                             <span class="text-2xl mr-3">🏷️</span>
-                            <span class="text-700">15% discount on next purchase</span>
+                            <span class="text-gray-700">15% discount on next purchase</span>
                         </li>
                         <li class="flex items-center">
                             <span class="text-2xl mr-3">🍰</span>
@@ -1047,9 +1048,10 @@
 
             let remainingSeconds = parseInt(deliveryTimeInput.value, 10);
 
-            // Check if delivery time is a valid number and greater than 0
+            // Check if delivery time is a valid positive number
             if (!isNaN(remainingSeconds) && remainingSeconds > 0) {
-                orderConfirmationSection.classList.remove('hidden'); // Ensure it's visible for a new order
+                // Show the section and start the timer
+                orderConfirmationSection.classList.remove('hidden');
 
                 const timerInterval = setInterval(() => {
                     const minutes = Math.floor(remainingSeconds / 60);
@@ -1065,26 +1067,14 @@
                     if (remainingSeconds < 0) {
                         clearInterval(timerInterval);
                         countdownTimerSpan.textContent = 'Delivered!';
-                        // You can optionally hide the section here if you prefer,
-                        // but your request implied showing "Delivered!" after completion.
-                        // If you want to hide it automatically after completion, uncomment:
-                        /*
-                        setTimeout(() => {
-                            orderConfirmationSection.classList.add('hidden');
-                        }, 3000); // Hide after 3 seconds
-                        */
+                        // Keep the section visible to show the "Delivered!" message
                     }
                 }, 1000);
             } else {
-                 // If no valid delivery time (e.g., page load for past orders or timer finished)
-                 // Check if the delivery time was 0 or less, indicating completion
-                 if (isNaN(remainingSeconds) || remainingSeconds <= 0) {
-                     countdownTimerSpan.textContent = 'Delivered!';
-                     orderConfirmationSection.classList.remove('hidden'); // Show "Delivered!" message
-                 } else {
-                     // This case shouldn't happen if backend sends valid data for new orders
-                     orderConfirmationSection.classList.add('hidden'); // Hide if no valid time at all
-                 }
+                 // If no valid positive delivery time (0 or less, or not provided)
+                 // Assume the order is delivered or this is a past order view
+                 countdownTimerSpan.textContent = 'Delivered!';
+                 orderConfirmationSection.classList.remove('hidden'); // Show the "Delivered!" message
             }
         }