order: fixing

This commit is contained in:
2026-01-02 05:28:46 +03:00
parent f1ae1568a8
commit b33bae562d
9 changed files with 462 additions and 797 deletions

View File

@@ -167,6 +167,7 @@
"customizable": "قابل للتخصيص"
},
"cart": {
"addSpecialRequestOptional": "إضافة طلب خاص (اختياري)",
"continueToGiftDetails": "متابعة إلى تفاصيل الهدية",
"continueToGiftDetailsDescription": "يرجى إدخال تفاصيل المستلم والمرسل لمتابعة.",
"leaveANoteHere": "أي تعليمات خاصة لطلبك..",

View File

@@ -179,6 +179,7 @@
"customizable": "Customizable"
},
"cart": {
"addSpecialRequestOptional": "Add Special Request (Optional)",
"continueToGiftDetails": "Continue to Gift Details",
"continueToGiftDetailsDescription": "Please fill in the details of the gift recipient and sender to continue.",
"leaveANoteHere": "Leave a note here..",

View File

@@ -16,7 +16,7 @@ const InvoiceIcon = ({ className, onClick }: InvoiceIconType) => {
>
<path
d="M7.83317 7.41504H3.83317M5.1665 10.0817H3.83317M9.1665 4.74837H3.83317M11.8332 4.61504V11.5484C11.8332 12.6685 11.8332 13.2285 11.6152 13.6564C11.4234 14.0327 11.1175 14.3386 10.7412 14.5304C10.3133 14.7484 9.75328 14.7484 8.63317 14.7484H4.3665C3.2464 14.7484 2.68635 14.7484 2.25852 14.5304C1.8822 14.3386 1.57624 14.0327 1.38449 13.6564C1.1665 13.2285 1.1665 12.6685 1.1665 11.5484V4.61504C1.1665 3.49493 1.1665 2.93488 1.38449 2.50706C1.57624 2.13073 1.8822 1.82477 2.25852 1.63303C2.68635 1.41504 3.2464 1.41504 4.3665 1.41504H8.63317C9.75328 1.41504 10.3133 1.41504 10.7412 1.63303C11.1175 1.82477 11.4234 2.13073 11.6152 2.50706C11.8332 2.93488 11.8332 3.49493 11.8332 4.61504Z"
stroke="#666666"
stroke="#333333"
strokeLinecap="round"
strokeLinejoin="round"
/>

View File

@@ -17,7 +17,7 @@ const TimeIcon = ({ className, onClick }: TimeIconType) => {
<g clipPath="url(#clip0_2448_7814)">
<path
d="M8.50016 4.08171V8.08171L11.1668 9.41504M15.1668 8.08171C15.1668 11.7636 12.1821 14.7484 8.50016 14.7484C4.81826 14.7484 1.8335 11.7636 1.8335 8.08171C1.8335 4.39981 4.81826 1.41504 8.50016 1.41504C12.1821 1.41504 15.1668 4.39981 15.1668 8.08171Z"
stroke="#666666"
stroke="#333333"
strokeLinecap="round"
strokeLinejoin="round"
/>

View File

@@ -29,7 +29,7 @@ export default function SpecialRequestCard() {
return (
<>
<ProInputCard
title={t("cart.specialRequest")}
title={t("cart.addSpecialRequestOptional")}
dividerStyle={{ margin: "5px 0 0 0" }}
>
<Form.Item name="specialRequest" style={{ marginTop: 12 }}>

View File

@@ -112,7 +112,17 @@ export default function Stepper({ statuses = [] }: StepperProps) {
{steps.map((step, index) => (
<Fragment key={`label-${step.key}`}>
<Col>
<ProText type={step.isPending ? "secondary" : undefined}>
<ProText
style={{
fontWeight: 400,
fontStyle: "Regular",
fontSize: 14,
lineHeight: "140%",
letterSpacing: "0%",
textAlign: "center",
color: step.isPending ? "#99A2AE" : "#333333",
}}
>
{step.label}
</ProText>
</Col>

View File

@@ -322,27 +322,62 @@ export default function OrderPage() {
</Tooltip>
</Flex>
) : (
<div style={{margin: "56px 0"}}>
<OrderDishIcon className={styles.orderDishIcon} />
</div>
)}
<div>
<ProTitle
level={5}
style={{
fontWeight: 600,
fontSize: "18px",
fontWeight: 500,
fontStyle: "Medium",
fontSize: 18,
lineHeight: "140%",
letterSpacing: "0%",
marginBottom: "0.75rem",
color: "#333333",
}}
>
{t("order.inProgressOrder")} (1)
</ProTitle>
<div style={{ display: "flex", flexDirection: "row", gap: 8 }}>
<div
style={{
display: "flex",
flexDirection: "row",
gap: 8,
}}
>
<InvoiceIcon className={styles.invoiceIcon} />
<ProText type="secondary" style={{ fontSize: "14px" }}>
<ProText
type="secondary"
style={{
fontWeight: 400,
fontStyle: "Regular",
fontSize: 14,
lineHeight: "140%",
letterSpacing: "0%",
textAlign: "center",
color: "#333333",
}}
>
#{orderDetails?.order.id}
</ProText>
<TimeIcon className={styles.timeIcon} />
<ProText type="secondary" style={{ fontSize: "14px" }}>
<ProText
type="secondary"
style={{
fontWeight: 400,
fontStyle: "Regular",
fontSize: 14,
lineHeight: "140%",
letterSpacing: "0%",
textAlign: "center",
color: "#333333",
}}
>
ordered :- Today -{" "}
{dayjs(orderDetails?.status[0]?.pivot?.created_at).format(
"h:mm A",