fix(admin-ui): Fix use of expand parameter on order page (#3383)
* Create cuddly-seahorses-thank.md * add integration tests * revert back from master to develop * fix expand * add new integration test * add missing default relations * add missing refunds relation * re work * fix tests * init * fix order page according to fixes to expand * expand shipping on returns * Create .changeset/cuddly-beers-tease.md --------- Co-authored-by: Adrien de Peretti <adrien.deperetti@gmail.com> Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
47d3440766
commit
d0d11307d2
@@ -5,7 +5,6 @@ import React, { useState } from "react"
|
||||
import RegisterClaimMenu from "../../../domain/orders/details/claim/register-claim-menu"
|
||||
import ReturnMenu from "../../../domain/orders/details/returns"
|
||||
import SwapMenu from "../../../domain/orders/details/swap/create"
|
||||
import { orderReturnableFields } from "../../../domain/orders/details/utils/order-returnable-fields"
|
||||
import useOrdersExpandParam from "../../../domain/orders/details/utils/use-admin-expand-paramter"
|
||||
import {
|
||||
ClaimEvent,
|
||||
@@ -63,7 +62,6 @@ const Timeline: React.FC<TimelineProps> = ({ orderId }) => {
|
||||
const createNote = useAdminCreateNote()
|
||||
const { order } = useAdminOrder(orderId, {
|
||||
expand: orderRelations,
|
||||
fields: orderReturnableFields,
|
||||
})
|
||||
|
||||
const [showRequestReturn, setShowRequestReturn] = useState(false)
|
||||
@@ -112,8 +110,8 @@ const Timeline: React.FC<TimelineProps> = ({ orderId }) => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="h-full w-5/12 rounded-rounded border border-grey-20 bg-grey-0">
|
||||
<div className="border-b border-grey-20 py-large px-xlarge">
|
||||
<div className="rounded-rounded border-grey-20 bg-grey-0 h-full w-5/12 border">
|
||||
<div className="border-grey-20 py-large px-xlarge border-b">
|
||||
<div className="flex items-center justify-between">
|
||||
<h3 className="inter-xlarge-semibold">Timeline</h3>
|
||||
<div
|
||||
|
||||
Reference in New Issue
Block a user