Update templates/combined_summary.html

templates/combined_summary.html

@@ -590,9 +590,10 @@
     <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('') }}">
 
-        <div id="orderConfirmationSection" class="section bg-white shadow-sm rounded-xl p-6 mb-6 order-confirmed {% if delivery_time_seconds is none or delivery_time_seconds == '' %}hidden{% endif %}" role="alert">
+        <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>
             <p class="text-center text-gray-600 mt-2">Estimated delivery time: <span id="countdownTimer"></span></p>
         </div>
@@ -658,7 +659,7 @@
                         {% elif next_tier == "Gold" %}
                         <li class="flex items-center">
                             <span class="text-2xl mr-3">🏷️</span>
-                            <span class="text-gray-700">15% discount on next purchase</span>
+                            <span class="text-700">15% discount on next purchase</span>
                         </li>
                         <li class="flex items-center">
                             <span class="text-2xl mr-3">🍰</span>
@@ -1046,7 +1047,7 @@
 
             let remainingSeconds = parseInt(deliveryTimeInput.value, 10);
 
-            // Only start timer if delivery time is provided and valid
+            // Check if delivery time is a valid number and greater than 0
             if (!isNaN(remainingSeconds) && remainingSeconds > 0) {
                 orderConfirmationSection.classList.remove('hidden'); // Ensure it's visible for a new order
 
@@ -1054,22 +1055,36 @@
                     const minutes = Math.floor(remainingSeconds / 60);
                     const seconds = remainingSeconds % 60;
 
-                    countdownTimerSpan.textContent = `${minutes}m ${seconds}s`;
+                    // Pad seconds with a leading zero if less than 10
+                    const paddedSeconds = seconds < 10 ? '0' + seconds : seconds;
+
+                    countdownTimerSpan.textContent = `${minutes}m ${paddedSeconds}s`;
 
                     remainingSeconds--;
 
                     if (remainingSeconds < 0) {
                         clearInterval(timerInterval);
                         countdownTimerSpan.textContent = 'Delivered!';
-                        // Optionally hide the confirmation section after a short delay
+                        // 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
+                        */
                     }
                 }, 1000);
             } else {
-                 // If no valid delivery time, hide the confirmation section
-                orderConfirmationSection.classList.add('hidden');
+                 // 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
+                 }
             }
         }