crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-25 11:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from Car-Part-Planet/core-return

Browse Source 
add core return to orders
This commit is contained in:
Teodor Raykov
2024-07-08 19:05:44 +03:00
committed by GitHub
parent 045f4b4036 6262ec1c0b
commit 9f06898207
32 changed files with 711 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/account/(orderId)/orders/[id]/page.tsx
View File

@@ -14,6 +14,9 @@ import { toPrintDate } from 'lib/utils';
import Image from 'next/image';
import Link from 'next/link';
import ActivateWarranty from 'components/orders/activate-warranty';
import OrderStatuses from 'components/orders/order-statuses';
import Divider from 'components/divider';
import { CoreReturn } from 'components/orders/core-return';
function Unfulfilled({ order }: { order: Order }) {
// Build a map of line item IDs to quantities fulfilled
@@ -222,10 +225,13 @@ export default async function OrderPage({ params }: { params: { id: string } })
</div>
</div>
<div className="flex items-start gap-2">
<OrderStatuses order={order} className="hidden flex-wrap gap-2 lg:flex" />
<OrderConfirmation order={order} />
<ActivateWarranty order={order} />
<CoreReturn order={order} />
</div>
</div>
<OrderStatuses order={order} className="my-6 flex flex-wrap gap-2 lg:hidden" />
<div className="flex items-start gap-6">
<div className="flex flex-1 flex-col gap-6">
<Fulfillments order={order} />

8
app/account/(orders)/page.tsx
View File

@@ -1,7 +1,9 @@
import { InformationCircleIcon } from '@heroicons/react/24/outline';
import Divider from 'components/divider';
import ActivateWarranty from 'components/orders/activate-warranty';
import MobileOrderActions from 'components/orders/mobile-order-actions';
import OrderConfirmation from 'components/orders/order-confirmation';
import OrderStatuses from 'components/orders/order-statuses';
import OrdersHeader from 'components/orders/orders-header';
import Price from 'components/price';
import { Button } from 'components/ui';
@@ -28,7 +30,7 @@ export default async function AccountPage() {
<h3 className="sr-only">
Order placed on <time dateTime={order.createdAt}>{order.createdAt}</time>
</h3>
<div className="flex items-center border-b border-gray-200 p-4 sm:grid sm:grid-cols-4 sm:gap-x-6 sm:p-6">
<div className="flex items-center p-4 sm:grid sm:grid-cols-4 sm:gap-x-6 sm:p-6">
<dl className="grid flex-1 grid-cols-2 gap-x-6 text-sm sm:col-span-3 sm:grid-cols-3 lg:col-span-2">
<div>
<dt className="font-medium text-gray-900">Order</dt>
@@ -66,6 +68,10 @@ export default async function AccountPage() {
<OrderConfirmation order={order} />
</div>
</div>
<div className="p-4 pt-0 sm:p-6 sm:pt-0">
<OrderStatuses order={order} className="flex flex-wrap gap-4" />
</div>
<Divider hasSpacing={false} />
<h4 className="sr-only">Items</h4>
<ul role="list" className="divide-y divide-gray-200">