Last active
August 29, 2018 16:36
-
-
Save alloy/1140d14e4b1f487fb207e997b9ec9283 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Apps/Order/Components/ShippingAndPaymentReview.tsx b/src/Apps/Order/Components/ShippingAndPaymentReview.tsx | |
index d3a8530b..a0a0c5af 100644 | |
--- a/src/Apps/Order/Components/ShippingAndPaymentReview.tsx | |
+++ b/src/Apps/Order/Components/ShippingAndPaymentReview.tsx | |
@@ -22,7 +22,11 @@ export const ShippingAndPaymentReview = ({ | |
onChangeShipping(): void | |
} & FlexProps) => ( | |
<Flex flexDirection="column" {...others}> | |
- {__typename === "Pickup" ? ( | |
+ {__typename === "Ship" ? ( | |
+ <StepSummaryItem onChange={onChangeShipping} title="Shipping address"> | |
+ <ShippingAddress {...address as ShippingAddressProps} /> | |
+ </StepSummaryItem> | |
+ ) : ( | |
<StepSummaryItem | |
onChange={onChangeShipping} | |
title={<>Pick up ({lineItems.edges[0].node.artwork.shippingOrigin})</>} | |
@@ -32,10 +36,6 @@ export const ShippingAndPaymentReview = ({ | |
within 2 business days to handle pickup logistics. | |
</Sans> | |
</StepSummaryItem> | |
- ) : ( | |
- <StepSummaryItem onChange={onChangeShipping} title="Shipping address"> | |
- <ShippingAddress {...address as ShippingAddressProps} /> | |
- </StepSummaryItem> | |
)} | |
<StepSummaryItem onChange={onChangePayment} title="Payment method"> | |
<CreditCardDetails {...creditCard} /> | |
@@ -49,9 +49,6 @@ export const ShippingAndPaymentReviewFragmentContainer = createFragmentContainer | |
fragment ShippingAndPaymentReview_order on Order { | |
requestedFulfillment { | |
__typename | |
- ... on Pickup { | |
- fulfillmentType | |
- } | |
... on Ship { | |
name | |
addressLine1 | |
diff --git a/src/Apps/Order/Components/__stories__/ShippingAndPaymentDetails.story.tsx b/src/Apps/Order/Components/__stories__/ShippingAndPaymentDetails.story.tsx | |
index 5a7b16a1..92b7be7c 100644 | |
--- a/src/Apps/Order/Components/__stories__/ShippingAndPaymentDetails.story.tsx | |
+++ b/src/Apps/Order/Components/__stories__/ShippingAndPaymentDetails.story.tsx | |
@@ -71,8 +71,7 @@ storiesOf("Apps/Order Page/Components", module).add( | |
order={{ | |
...order, | |
requestedFulfillment: { | |
- __typename: "Pickup", | |
- fulfillmentType: "pickup", | |
+ __typename: "%other", | |
}, | |
}} | |
/> | |
diff --git a/src/__generated__/ShippingAndPaymentReview_order.graphql.ts b/src/__generated__/ShippingAndPaymentReview_order.graphql.ts | |
index 22a591b9..27823b90 100644 | |
--- a/src/__generated__/ShippingAndPaymentReview_order.graphql.ts | |
+++ b/src/__generated__/ShippingAndPaymentReview_order.graphql.ts | |
@@ -5,9 +5,6 @@ declare const _ShippingAndPaymentReview_order$ref: unique symbol; | |
export type ShippingAndPaymentReview_order$ref = typeof _ShippingAndPaymentReview_order$ref; | |
export type ShippingAndPaymentReview_order = { | |
readonly requestedFulfillment: ({ | |
- readonly __typename: "Pickup"; | |
- readonly fulfillmentType: string | null; | |
- } | { | |
readonly __typename: "Ship"; | |
readonly name: string | null; | |
readonly addressLine1: string | null; | |
@@ -125,19 +122,6 @@ return { | |
"storageKey": null | |
} | |
] | |
- }, | |
- { | |
- "kind": "InlineFragment", | |
- "type": "Pickup", | |
- "selections": [ | |
- { | |
- "kind": "ScalarField", | |
- "alias": null, | |
- "name": "fulfillmentType", | |
- "args": null, | |
- "storageKey": null | |
- } | |
- ] | |
} | |
] | |
}, | |
@@ -238,5 +222,5 @@ return { | |
] | |
}; | |
})(); | |
-(node as any).hash = 'ff8b0587a4fd62eac9130a404316ab12'; | |
+(node as any).hash = '5cedddcabb93383a1e506b265d4468b9'; | |
export default node; | |
diff --git a/src/__generated__/routes_ReviewQuery.graphql.ts b/src/__generated__/routes_ReviewQuery.graphql.ts | |
index c9783cdf..6462a079 100644 | |
--- a/src/__generated__/routes_ReviewQuery.graphql.ts | |
+++ b/src/__generated__/routes_ReviewQuery.graphql.ts | |
@@ -108,9 +108,6 @@ fragment TransactionSummary_order on Order { | |
fragment ShippingAndPaymentReview_order on Order { | |
requestedFulfillment { | |
__typename | |
- ... on Pickup { | |
- fulfillmentType | |
- } | |
... on Ship { | |
name | |
addressLine1 | |
@@ -208,7 +205,7 @@ return { | |
"operationKind": "query", | |
"name": "routes_ReviewQuery", | |
"id": null, | |
- "text": "query routes_ReviewQuery(\n $orderID: String!\n) {\n order(id: $orderID) {\n ...Review_order\n __id: id\n }\n}\n\nfragment Review_order on Order {\n id\n lineItems {\n edges {\n node {\n artwork {\n id\n ...ItemReview_artwork\n __id\n }\n __id: id\n }\n }\n }\n ...TransactionSummary_order\n ...ShippingAndPaymentReview_order\n __id: id\n}\n\nfragment ItemReview_artwork on Artwork {\n artist_names\n title\n date\n medium\n dimensions {\n in\n cm\n }\n attribution_class {\n short_description\n }\n image {\n resized(width: 185) {\n url\n }\n }\n __id\n}\n\nfragment TransactionSummary_order on Order {\n shippingTotal\n taxTotal\n itemsTotal\n buyerTotal\n seller {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_transactionSummary: resized(width: 55) {\n url\n }\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment ShippingAndPaymentReview_order on Order {\n requestedFulfillment {\n __typename\n ... on Pickup {\n fulfillmentType\n }\n ... on Ship {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id: id\n }\n }\n }\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id: id\n}\n", | |
+ "text": "query routes_ReviewQuery(\n $orderID: String!\n) {\n order(id: $orderID) {\n ...Review_order\n __id: id\n }\n}\n\nfragment Review_order on Order {\n id\n lineItems {\n edges {\n node {\n artwork {\n id\n ...ItemReview_artwork\n __id\n }\n __id: id\n }\n }\n }\n ...TransactionSummary_order\n ...ShippingAndPaymentReview_order\n __id: id\n}\n\nfragment ItemReview_artwork on Artwork {\n artist_names\n title\n date\n medium\n dimensions {\n in\n cm\n }\n attribution_class {\n short_description\n }\n image {\n resized(width: 185) {\n url\n }\n }\n __id\n}\n\nfragment TransactionSummary_order on Order {\n shippingTotal\n taxTotal\n itemsTotal\n buyerTotal\n seller {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_transactionSummary: resized(width: 55) {\n url\n }\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment ShippingAndPaymentReview_order on Order {\n requestedFulfillment {\n __typename\n ... on Ship {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id: id\n }\n }\n }\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id: id\n}\n", | |
"metadata": {}, | |
"fragment": { | |
"kind": "Fragment", | |
@@ -521,19 +518,6 @@ return { | |
"storageKey": null | |
} | |
] | |
- }, | |
- { | |
- "kind": "InlineFragment", | |
- "type": "Pickup", | |
- "selections": [ | |
- { | |
- "kind": "ScalarField", | |
- "alias": null, | |
- "name": "fulfillmentType", | |
- "args": null, | |
- "storageKey": null | |
- } | |
- ] | |
} | |
] | |
}, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment