Remove hardcoded billing and shipping objects #2813
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import React, { Component } from "react"; | |
| import PropTypes from "prop-types"; | ||
| import moment from "moment"; | ||
| import { Badge, ClickToCopy } from "@reactioncommerce/reaction-ui"; | ||
| import { getOrderRiskBadge, getOrderRiskStatus, getBillingInfo, getShippingInfo } from "../helpers"; | ||
|
|
||
| class OrderSummary extends Component { | ||
| static propTypes = { | ||
|
|
@@ -15,7 +15,8 @@ class OrderSummary extends Component { | |
| } | ||
|
|
||
| badgeStatus() { | ||
| const order = this.props.order; | ||
| const orderStatus = order && order.workflow && order.workflow.status; | ||
|
|
||
| if (orderStatus === "new") { | ||
| return "info"; | ||
|
|
@@ -44,12 +45,18 @@ class OrderSummary extends Component { | |
|
|
||
| render() { | ||
| const { dateFormat, tracking, order, profileShippingAddress, printableLabels } = this.props; | ||
| const paymentMethod = getBillingInfo(order).paymentMethod; | ||
| const invoice = getBillingInfo(order).invoice; | ||
| const shipmentMethod = getShippingInfo(order).shipmentMethod; | ||
| const orderRisk = getOrderRiskStatus(order); | ||
|
|
||
| return ( | ||
| <div> | ||
| <div | ||
| className="order-summary-form-group bg-info" | ||
| style={{ lineHeight: 3, marginTop: -15, marginRight: -15, marginLeft: -15 }} | ||
| > | ||
| <strong style={{ marginLeft: 15 }}>{profileShippingAddress && profileShippingAddress.fullName}</strong> | ||
| <div className="invoice-details" style={{ marginRight: 15, position: "relative" }}> | ||
| {order.email} | ||
| </div> | ||
|
|
@@ -60,8 +67,8 @@ class OrderSummary extends Component { | |
| <div style={{ marginBottom: 4 }}> | ||
| <Badge | ||
| badgeSize="large" | ||
| i18nKeyLabel={`cartDrawer.${order && order.workflow && order.workflow.status}`} | ||
| label={order && order.workflow && order.workflow.status} | ||
| status={this.badgeStatus()} | ||
| /> | ||
| {orderRisk && | ||
|
|
@@ -97,28 +104,28 @@ class OrderSummary extends Component { | |
| <div className="order-summary-form-group"> | ||
| <strong data-i18n="order.processor">Processor</strong> | ||
| <div className="invoice-details"> | ||
| {paymentMethod && paymentMethod.processor} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong data-i18n="order.payment">Payment</strong> | ||
| <div className="invoice-details"> | ||
| {paymentMethod && paymentMethod.storedCard} ({invoice && invoice.total}) | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong data-i18n="order.transaction">Transaction</strong> | ||
| <div className="invoice-details"> | ||
| {paymentMethod && paymentMethod.transactionId} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong data-i18n="orderShipping.carrier">Carrier</strong> | ||
| <div className="invoice-details"> | ||
| { shipmentMethod && shipmentMethod.carrier} - {shipmentMethod && shipmentMethod.label} | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
@@ -149,15 +156,24 @@ class OrderSummary extends Component { | |
| <div className="order-summary-form-group"> | ||
| <strong data-i18n="orderShipping.shipTo">Ship to</strong> | ||
| <div className="invoice-details"> | ||
| <strong>Phone: </strong>{profileShippingAddress && profileShippingAddress.phone} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div style={{ marginTop: 4 }}> | ||
| <span>{profileShippingAddress && profileShippingAddress.fullName}</span> | ||
| <br/> | ||
| <span>{profileShippingAddress && profileShippingAddress.address1}</span> | ||
| {profileShippingAddress && profileShippingAddress.address2 && | ||
| <span><br/>{profileShippingAddress.address2}</span> | ||
| } | ||
| <br/> | ||
| <span> | ||
| {profileShippingAddress && profileShippingAddress.city}, | ||
| {profileShippingAddress && profileShippingAddress.region}, | ||
|
There was a problem hiding this comment. I'm actually more curious about the need for There was a problem hiding this comment. @spencern I added the But if I did this:
then I wouldn't have to change the line/add |
||
| {profileShippingAddress && profileShippingAddress.country} | ||
| {profileShippingAddress && profileShippingAddress.postal} | ||
| </span> | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
||
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
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This works. 👍
You could have setup
profileShippingAddressto pass an empty object if undefined and then just usedprofileShippingAddress.propertyeverywhere, but that's not necessarily better, just different. Not blocking.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this makes sense. Avoids having to repeat
profileShippingAddress &&in a lot of places.