Added customer's billing and shipping data to paypal checkout fields
This commit is contained in:
@@ -34,13 +34,25 @@ const OrderSummary = ({ orderData, loading, order }) => {
|
||||
<DataList.ItemValue>{orderData.wc_order_id}</DataList.ItemValue>
|
||||
</DataList.Item>
|
||||
{ order.billing !== undefined && <>
|
||||
{/*<DataList.Item pt="4">*/}
|
||||
{/* <DataList.ItemLabel>First Name</DataList.ItemLabel>*/}
|
||||
{/* <DataList.ItemValue>{order.billing.first_name}</DataList.ItemValue>*/}
|
||||
{/*</DataList.Item>*/}
|
||||
{/*<DataList.Item pt="4">*/}
|
||||
{/* <DataList.ItemLabel>Last Name</DataList.ItemLabel>*/}
|
||||
{/* <DataList.ItemValue>{order.billing.last_name}</DataList.ItemValue>*/}
|
||||
{/*</DataList.Item>*/}
|
||||
<DataList.Item pt="4">
|
||||
<DataList.ItemLabel>First Name</DataList.ItemLabel>
|
||||
<DataList.ItemValue>{order.billing.first_name}</DataList.ItemValue>
|
||||
</DataList.Item>
|
||||
<DataList.Item pt="4">
|
||||
<DataList.ItemLabel>Last Name</DataList.ItemLabel>
|
||||
<DataList.ItemValue>{order.billing.last_name}</DataList.ItemValue>
|
||||
<DataList.ItemLabel>Shipping details</DataList.ItemLabel>
|
||||
<DataList.ItemValue>
|
||||
{order.shipping.first_name} {order.shipping.last_name}<br />
|
||||
{order.shipping.address_1}
|
||||
{order.shipping.address_2 && `, ${order.shipping.address_2}`}
|
||||
{`, ${order.shipping.city}`}
|
||||
{`, ${order.shipping.postcode}`}
|
||||
{order.shipping.state && `, ${order.shipping.state}`}
|
||||
{`, ${order.shipping.country}`}
|
||||
</DataList.ItemValue>
|
||||
</DataList.Item>
|
||||
<DataList.Item pt="4">
|
||||
<DataList.ItemLabel>E-mail</DataList.ItemLabel>
|
||||
|
||||
@@ -170,7 +170,7 @@ const Payment = () => {
|
||||
|
||||
return (
|
||||
<div>
|
||||
<Heading as="h1" fontSize="2xl" textAlign="center" mb="10">Secure Payment with PayPal</Heading>
|
||||
<Heading as="h1" fontSize="2xl" textAlign="center" mb="10">Secure Payment with PayPal or Credit/Debit Card</Heading>
|
||||
{order.length === 0 ?
|
||||
<Center>
|
||||
<EmptyState.Root>
|
||||
@@ -248,8 +248,7 @@ const Payment = () => {
|
||||
<Timeline.Title textStyle="sm">Estimated Delivery Date</Timeline.Title>
|
||||
<Timeline.Description>{getDateAfterDays(10)}</Timeline.Description>
|
||||
<Text textStyle="sm">
|
||||
We will shipp your product via <strong>FedEx</strong> and it should
|
||||
arrive within 7-10 business days.
|
||||
We will ship our products via <strong>FedEx</strong> or any other <strong>Express Courier</strong> and it should arrive within 7-10 business days.
|
||||
</Text>
|
||||
</Timeline.Content>
|
||||
</Timeline.Item>
|
||||
|
||||
Reference in New Issue
Block a user