diff --git a/src/assets/locals/ar.json b/src/assets/locals/ar.json index 2e91ab6..54fd449 100644 --- a/src/assets/locals/ar.json +++ b/src/assets/locals/ar.json @@ -377,7 +377,10 @@ "howWasYourExperienceWithFascanoRestaurant": "كيف كانت تجربتك مع مطعم فاسكانو؟", "rateOrder": "تقييم الطلب", "submitRating": "إرسال التقييم", - "pleaseLoginToAllowRating": "يرجى تسجيل الدخول لتمكين التقييم" + "pleaseLoginToAllowRating": "يرجى تسجيل الدخول لتمكين التقييم", + "remainingTime": "الوقت المتبقي", + "sec": "ثانية", + "min": "دقيقة" }, "orderTypes": { "dine-in": "في المطعم", diff --git a/src/assets/locals/en.json b/src/assets/locals/en.json index 739c623..efb1a0a 100644 --- a/src/assets/locals/en.json +++ b/src/assets/locals/en.json @@ -388,7 +388,10 @@ "howWasYourExperienceWithFascanoRestaurant": "How was your experience with Fascano Restaurant?", "rateOrder": "Rate Order", "submitRating": "Submit Rating", - "pleaseLoginToAllowRating": "Please login to allow rating" + "pleaseLoginToAllowRating": "Please login to allow rating", + "remainingTime": "Remaining Time", + "sec": "Sec", + "min": "Min" }, "orderTypes": { "dine-in": "Dine In", diff --git a/src/pages/order/page.tsx b/src/pages/order/page.tsx index e4cd706..e6e3ebe 100644 --- a/src/pages/order/page.tsx +++ b/src/pages/order/page.tsx @@ -101,10 +101,11 @@ export default function OrderPage() { const remaining = Math.max(0, totalSeconds - elapsedSeconds); setRemainingSeconds(remaining); + // Calculate progress as remaining time percentage (starts at 100%, decreases to 0%) const percent = totalSeconds > 0 - ? Math.min(100, Math.max(0, (elapsedSeconds / totalSeconds) * 100)) - : 0; + ? Math.min(100, Math.max(0, (remaining / totalSeconds) * 100)) + : 100; setProgressPercent(percent); }; @@ -118,11 +119,100 @@ export default function OrderPage() { orderDetails?.status, ]); - // Format remaining time as MM:SS - const formatTimer = (totalSeconds: number): string => { + // Format remaining time with Min and Sec labels + const formatTimer = (totalSeconds: number) => { const mins = Math.floor(totalSeconds / 60); const secs = Math.floor(totalSeconds % 60); - return `${mins.toString().padStart(2, "0")}:${secs.toString().padStart(2, "0")}`; + return ( +