Action bar - order and payment [last subscription cycle] #163
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -43,11 +43,75 @@ defineMessages({ | |
| changePaymentButton: { | ||
| id: 'details-page.action-bar.button.changePayment', | ||
| }, | ||
| orderDispatchedLabel: { | ||
| id: 'details-page.action-bar.label.orderDispatched', | ||
| }, | ||
| orderDeliveryDateBody: { | ||
| id: 'details-page.action-bar.text.orderDeliveryDate', | ||
| }, | ||
| orderDeliveryDetailBody: { | ||
| id: 'details-page.action-bar.text.orderDeliveryDetail', | ||
| }, | ||
| trackOrderButton: { | ||
| id: 'details-page.action-bar.button.trackOrder', | ||
| }, | ||
| viewOrderButton: { | ||
| id: 'details-page.action-bar.button.viewOrder', | ||
| }, | ||
| nextPurchaseLabel: { | ||
| id: 'details-page.action-bar.label.nextPurchase', | ||
| }, | ||
| nextPurchaseText: { | ||
| id: 'details-page.action-bar.text.nextPurchase', | ||
| }, | ||
| nextPurchaseButton: { | ||
| id: 'details-page.action-bar.button.nextPurchase', | ||
| }, | ||
| printBankSlipLabel: { | ||
| id: 'details-page.action-bar.label.printBankSlip', | ||
| }, | ||
| printBankSlipText: { | ||
| id: 'details-page.action-bar.text.printBankSlip', | ||
| }, | ||
| printBankSlipButton: { | ||
| id: 'details-page.action-bar.button.printBankSlip', | ||
| }, | ||
| }) | ||
|
|
||
| class ActionBarContainer extends Component<Props> { | ||
| private calculateDaysUntilSpecificDate = (specificDate: string) => { | ||
| const today = new Date() | ||
| const diffTime = Math.abs(+new Date(specificDate) - +today) | ||
| const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)) | ||
|
|
||
| return diffDays | ||
| } | ||
|
|
||
| private getOrderDispatchedAction = ( | ||
| deliveryDate: string | undefined, | ||
| trackingUrl: string | undefined | ||
| ) => { | ||
| const orderDispatchedBody = deliveryDate | ||
| ? 'orderDeliveryDate' | ||
| : 'orderDeliveryDetail' | ||
| const orderDispatchedButton = trackingUrl ? 'trackOrder' : 'viewOrder' | ||
|
|
||
| return { body: orderDispatchedBody, button: orderDispatchedButton } | ||
| } | ||
|
|
||
| private getSuggestedAction = () => { | ||
| const { | ||
| status, | ||
| address, | ||
| isSkipped, | ||
| payment, | ||
| orderStatus, | ||
| orderDeliveryDate, | ||
| orderTrackingUrl, | ||
| nextPurchaseDate, | ||
| bankSlipUrl, | ||
| onUpdateAction, | ||
| } = this.props | ||
|
|
||
| let action: SubscriptionAction | null = null | ||
| let buttonVariation: 'primary' | 'secondary' = 'primary' | ||
|
|
@@ -57,11 +121,18 @@ class ActionBarContainer extends Component<Props> { | |
| action = 'restore' | ||
| } else if (!address) { | ||
| action = 'changeAddress' | ||
| } else if (!payment || orderStatus === 'payment-denied') { | ||
| action = 'changePayment' | ||
| } else if (isSkipped) { | ||
| action = 'unskip' | ||
| buttonVariation = 'secondary' | ||
| } else if (!!orderDeliveryDate || !!orderTrackingUrl) { | ||
| action = 'orderDispatched' | ||
| } else if (bankSlipUrl) { | ||
| action = 'printBankSlip' | ||
| } else if (nextPurchaseDate) { | ||
| action = 'nextPurchase' | ||
| buttonVariation = 'secondary' | ||
| } | ||
|
|
||
| if (action === 'changeAddress' || action === 'changePayment') { | ||
|
|
@@ -71,7 +142,15 @@ class ActionBarContainer extends Component<Props> { | |
| let onClick | ||
| if ( | ||
| action && | ||
| [ | ||
| 'restore', | ||
| 'unskip', | ||
| 'changeAddress', | ||
| 'changePayment', | ||
| 'orderDispatched', | ||
| 'nextPurchase', | ||
| 'printBankSlip', | ||
| ].includes(action) | ||
| ) { | ||
| onClick = () => onUpdateAction(action as SubscriptionAction) | ||
| } | ||
|
|
@@ -97,12 +176,30 @@ class ActionBarContainer extends Component<Props> { | |
| displayDanger ? 'c-danger fw5' : 'c-muted-1' | ||
| }`} | ||
| > | ||
| <FormattedMessage | ||
| id={`details-page.action-bar.label.${action}`} | ||
| values={{ | ||
| numberOfDaysNextPurchase: | ||
| this.props.nextPurchaseDate && | ||
| this.calculateDaysUntilSpecificDate( | ||
| this.props.nextPurchaseDate | ||
| ), | ||
| }} | ||
| /> | ||
| </div> | ||
| <div className="flex items-center flex-wrap justify-between"> | ||
| <div className="t-heading-4 w-100 w-60-ns"> | ||
| <FormattedMessage | ||
| id={ | ||
| action === 'orderDispatched' | ||
| ? `details-page.action-bar.text.${ | ||
| this.getOrderDispatchedAction( | ||
| this.props.orderDeliveryDate, | ||
| this.props.orderTrackingUrl | ||
| ).body | ||
| }` | ||
| : `details-page.action-bar.text.${action}` | ||
| } | ||
| values={{ | ||
| day: ( | ||
| <FormattedDate | ||
|
|
@@ -111,13 +208,35 @@ class ActionBarContainer extends Component<Props> { | |
| day="2-digit" | ||
| /> | ||
| ), | ||
| nextPurchaseDate: ( | ||
| <FormattedDate | ||
| value={this.props.nextPurchaseDate} | ||
| month="long" | ||
| day="2-digit" | ||
| weekday="long" | ||
| /> | ||
| ), | ||
| numberOfDaysNextDelivery: | ||
| this.props.orderDeliveryDate && | ||
| this.calculateDaysUntilSpecificDate( | ||
| this.props.orderDeliveryDate | ||
| ), | ||
| }} | ||
| /> | ||
| </div> | ||
| <div className="mw5-ns w-100 mt4 w-40-ns mt0-ns pl0 pl6-ns"> | ||
| <Button variation={buttonVariation} onClick={onClick} block> | ||
| <FormattedMessage | ||
| id={ | ||
| action === 'orderDispatched' | ||
| ? `details-page.action-bar.button.${ | ||
| this.getOrderDispatchedAction( | ||
| this.props.orderDeliveryDate, | ||
| this.props.orderTrackingUrl | ||
| ).button | ||
| }` | ||
| : `details-page.action-bar.button.${action}` | ||
| } | ||
| /> | ||
| </Button> | ||
| </div> | ||
|
|
@@ -134,6 +253,10 @@ type Props = { | |
| nextPurchaseDate: string | ||
| address: Subscription['shippingAddress'] | ||
| payment: Subscription['purchaseSettings']['paymentMethod'] | ||
| orderStatus: string | undefined | ||
| orderDeliveryDate: string | undefined | ||
| orderTrackingUrl: string | undefined | ||
| bankSlipUrl: string | undefined | ||
|
Comment on lines
+256
to
+259
Contributor
There was a problem hiding this comment. Maybe passing the full order to this guy is a better approach instead of multiple props.
Contributor
Author
There was a problem hiding this comment. checking DetailsPage, the there are conditions in some parameters.. do you think it's better this way or passes the entire subscription object to handle it inside the action bar? |
||
| onUpdateAction: (action: SubscriptionAction) => void | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.