Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#trivial add data attrs for order form steps #5672

Merged
merged 1 commit into from
May 28, 2020
Merged

#trivial add data attrs for order form steps #5672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/v2/Apps/Order/Routes/Payment/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { ReactStripeElements } from "react-stripe-elements"
import createLogger from "v2/Utils/logger"
import { Media } from "v2/Utils/Responsive"

import { Button, Col, Flex, Row, Spacer } from "@artsy/palette"
import { Button, Col, Flex, Row, Spacer, Box } from "@artsy/palette"
import {
PaymentPicker,
PaymentPickerFragmentContainer,
Expand Down Expand Up @@ -114,7 +114,7 @@ export class PaymentRoute extends Component<PaymentProps, PaymentState> {
const isLoading = isGettingCreditCardId || isCommittingMutation

return (
<>
<Box data-test="orderPayment">
<HorizontalPadding px={[0, 4]}>
<Row>
<Col>
Expand Down Expand Up @@ -170,7 +170,7 @@ export class PaymentRoute extends Component<PaymentProps, PaymentState> {
}
/>
</HorizontalPadding>
</>
</Box>
)
}
setOrderPayment(variables: PaymentRouteSetOrderPaymentMutation["variables"]) {
Expand Down
17 changes: 13 additions & 4 deletions src/v2/Apps/Order/Routes/Review/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
import { Button, Col, Flex, Join, Message, Row, Spacer } from "@artsy/palette"
import {
Button,
Col,
Flex,
Join,
Message,
Row,
Spacer,
Box,
} from "@artsy/palette"
import { Review_order } from "v2/__generated__/Review_order.graphql"
import { ReviewSubmitOfferOrderMutation } from "v2/__generated__/ReviewSubmitOfferOrderMutation.graphql"
import { ReviewSubmitOrderMutation } from "v2/__generated__/ReviewSubmitOrderMutation.graphql"
Expand Down Expand Up @@ -85,7 +94,7 @@ export class ReviewRoute extends Component<ReviewProps, ReviewState> {
this.props.order.mode === "BUY"
? (await this.submitBuyOrder()).commerceSubmitOrder.orderOrError
: (await this.submitOffer(setupIntentId)).commerceSubmitOrderWithOffer
.orderOrError
.orderOrError

if (orderOrError.error) {
this.handleSubmitError(orderOrError.error)
Expand Down Expand Up @@ -327,7 +336,7 @@ export class ReviewRoute extends Component<ReviewProps, ReviewState> {
const { order, isCommittingMutation } = this.props

return (
<>
<Box data-test="orderReview">
<HorizontalPadding px={[0, 4]}>
<Row>
<Col>
Expand Down Expand Up @@ -407,7 +416,7 @@ export class ReviewRoute extends Component<ReviewProps, ReviewState> {
}
/>
</HorizontalPadding>
</>
</Box>
)
}
}
Expand Down
11 changes: 6 additions & 5 deletions src/v2/Apps/Order/Routes/Shipping/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
Row,
Sans,
Spacer,
Box,
} from "@artsy/palette"
import { Shipping_order } from "v2/__generated__/Shipping_order.graphql"
import {
Expand Down Expand Up @@ -79,16 +80,16 @@ const logger = createLogger("Order/Routes/Shipping/index.tsx")
export class ShippingRoute extends Component<ShippingProps, ShippingState> {
state: ShippingState = {
shippingOption: (this.props.order.requestedFulfillment &&
this.props.order.requestedFulfillment.__typename !== "CommerceShip"
this.props.order.requestedFulfillment.__typename !== "CommerceShip"
? "PICKUP"
: "SHIP") as CommerceOrderFulfillmentTypeEnum,
address: this.startingAddress,
addressErrors: {},
addressTouched: {},
phoneNumber:
this.props.order.requestedFulfillment &&
(this.props.order.requestedFulfillment.__typename === "CommerceShip" ||
this.props.order.requestedFulfillment.__typename === "CommercePickup")
(this.props.order.requestedFulfillment.__typename === "CommerceShip" ||
this.props.order.requestedFulfillment.__typename === "CommercePickup")
? this.props.order.requestedFulfillment.phoneNumber
: "",
phoneNumberError: "",
Expand Down Expand Up @@ -338,7 +339,7 @@ export class ShippingRoute extends Component<ShippingProps, ShippingState> {
)

return (
<>
<Box data-test="orderShipping">
<HorizontalPadding px={[0, 4]}>
<Row>
<Col>
Expand Down Expand Up @@ -460,7 +461,7 @@ export class ShippingRoute extends Component<ShippingProps, ShippingState> {
}
/>
</HorizontalPadding>
</>
</Box>
)
}
}
Expand Down