|
@@ -64,8 +64,8 @@ export default function CancelOrFailure({
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- return (<div className="flex max-w-300 mx-auto items-start">
|
|
|
|
|
- <div className="flex-initial w-164 mr-16">
|
|
|
|
|
|
|
+ return (<div className="flex items-start justify-between max-w-312 mx-auto px-6">
|
|
|
|
|
+ <div className="flex-initial w-164 mr-4">
|
|
|
<div className="box-border w-full">
|
|
<div className="box-border w-full">
|
|
|
{paymentStatus === 'failure' &&
|
|
{paymentStatus === 'failure' &&
|
|
|
<>
|
|
<>
|
|
@@ -115,9 +115,9 @@ export default function CancelOrFailure({
|
|
|
</div>
|
|
</div>
|
|
|
<div className="box-border w-full mt-6">
|
|
<div className="box-border w-full mt-6">
|
|
|
<h4 className="text-ly-20 font-medium">Order Information</h4>
|
|
<h4 className="text-ly-20 font-medium">Order Information</h4>
|
|
|
- <div className="mt-6 flex justify-between">
|
|
|
|
|
- <div className="text-ly-14 flex-none">Ship to:</div>
|
|
|
|
|
- <div className="w-117.5 text-ly-14 leading-ly-20 text-[#666666] flex-none">
|
|
|
|
|
|
|
+ <div className="mt-6 flex justify-between gap-6">
|
|
|
|
|
+ <div className="text-ly-14 flex-none w-35.5">Ship to:</div>
|
|
|
|
|
+ <div className="text-ly-14 leading-ly-20 text-[#666666] flex-1">
|
|
|
{
|
|
{
|
|
|
shippingAddress.firstName
|
|
shippingAddress.firstName
|
|
|
+ ' ' + shippingAddress.lastName
|
|
+ ' ' + shippingAddress.lastName
|
|
@@ -130,33 +130,33 @@ export default function CancelOrFailure({
|
|
|
}
|
|
}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div className="mt-4 flex justify-between">
|
|
|
|
|
- <div className="text-ly-14 flex-none">Order number:</div>
|
|
|
|
|
- <div className="w-117.5 text-ly-14 leading-ly-20 text-[#666666] flex-none">
|
|
|
|
|
|
|
+ <div className="mt-4 flex justify-between gap-6">
|
|
|
|
|
+ <div className="text-ly-14 flex-none w-35.5">Order number:</div>
|
|
|
|
|
+ <div className="text-ly-14 leading-ly-20 text-[#666666] flex-1">
|
|
|
{orderDetailRes?._id}
|
|
{orderDetailRes?._id}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div className="mt-4 flex justify-between">
|
|
|
|
|
- <div className="text-ly-14 flex-none">Status:</div>
|
|
|
|
|
- <div className="w-117.5 text-ly-14 leading-ly-20 text-[#666666] flex-none capitalize">
|
|
|
|
|
|
|
+ <div className="mt-4 flex justify-between gap-6">
|
|
|
|
|
+ <div className="text-ly-14 flex-none w-35.5">Status:</div>
|
|
|
|
|
+ <div className="text-ly-14 leading-ly-20 text-[#666666] flex-1 capitalize">
|
|
|
{orderDetailRes?.status}
|
|
{orderDetailRes?.status}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div className="mt-4 flex justify-between">
|
|
|
|
|
- <div className="text-ly-14 flex-none">Order date:</div>
|
|
|
|
|
- <div className="w-117.5 text-ly-14 leading-ly-20 text-[#666666] flex-none">
|
|
|
|
|
|
|
+ <div className="mt-4 flex justify-between gap-6">
|
|
|
|
|
+ <div className="text-ly-14 flex-none w-35.5">Order date:</div>
|
|
|
|
|
+ <div className="text-ly-14 leading-ly-20 text-[#666666] flex-1">
|
|
|
{orderCreatedAt}
|
|
{orderCreatedAt}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div className="mt-4 flex justify-between">
|
|
|
|
|
- <div className="text-ly-14 flex-none">Shipping method:</div>
|
|
|
|
|
- <div className="w-117.5 text-ly-14 leading-ly-20 text-[#666666] flex-none">
|
|
|
|
|
|
|
+ <div className="mt-4 flex justify-between gap-6">
|
|
|
|
|
+ <div className="text-ly-14 flex-none w-35.5">Shipping method:</div>
|
|
|
|
|
+ <div className="text-ly-14 leading-ly-20 text-[#666666] flex-1">
|
|
|
{orderDetailRes?.shippingTitle}
|
|
{orderDetailRes?.shippingTitle}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div className="mt-4 flex justify-between">
|
|
|
|
|
- <div className="text-ly-14 flex-none">Payment method:</div>
|
|
|
|
|
- <div className="w-117.5 text-ly-14 leading-ly-20 text-[#666666] flex-none">
|
|
|
|
|
|
|
+ <div className="mt-4 flex justify-between gap-6">
|
|
|
|
|
+ <div className="text-ly-14 flex-none w-35.5">Payment method:</div>
|
|
|
|
|
+ <div className="text-ly-14 leading-ly-20 text-[#666666] flex-1">
|
|
|
{orderDetailRes?.payment?.methodTitle}
|
|
{orderDetailRes?.payment?.methodTitle}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -164,20 +164,20 @@ export default function CancelOrFailure({
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <div className="flex-none box-border w-120 border-1 p-4">
|
|
|
|
|
|
|
+ <div className="flex-initial box-border w-120 border-1 p-4">
|
|
|
<h3 className="text-ly-20">My Bag({orderDetailRes.totalQtyOrdered})</h3>
|
|
<h3 className="text-ly-20">My Bag({orderDetailRes.totalQtyOrdered})</h3>
|
|
|
<div className="box-border w-full max-h-130 overflow-y-auto scrollbar-thin scrollbar-thumb-gray-200">
|
|
<div className="box-border w-full max-h-130 overflow-y-auto scrollbar-thin scrollbar-thumb-gray-200">
|
|
|
{productItems.map((product) => {
|
|
{productItems.map((product) => {
|
|
|
const baseImage = JSON.parse(product.baseImage);
|
|
const baseImage = JSON.parse(product.baseImage);
|
|
|
return (
|
|
return (
|
|
|
<div key={product.id} className="w-full flex gap-2 mt-4 pt-4 border-t-1 border-[#f0f0f0]">
|
|
<div key={product.id} className="w-full flex gap-2 mt-4 pt-4 border-t-1 border-[#f0f0f0]">
|
|
|
- <div className="relative w-33 h-44 flex-none">
|
|
|
|
|
|
|
+ <div className="relative w-33 h-44 flex-initial">
|
|
|
<Image className="object-cover" fill
|
|
<Image className="object-cover" fill
|
|
|
src={baseImage.medium_image_url}
|
|
src={baseImage.medium_image_url}
|
|
|
alt={product.name}
|
|
alt={product.name}
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
- <div className="flex-initial w-77 flex flex-col justify-between">
|
|
|
|
|
|
|
+ <div className="flex-1 flex flex-col justify-between">
|
|
|
<div>
|
|
<div>
|
|
|
<p className="text-ly-14 leading-ly-20 line-clamp-2">
|
|
<p className="text-ly-14 leading-ly-20 line-clamp-2">
|
|
|
{product.name}
|
|
{product.name}
|