maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-26 06:47:17 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

TransactionPage: savePaymentMethodFailed flag added

Browse source
This commit is contained in:
Vesa Luusua 2019-08-14 18:04:11 +03:00 • committed by Jenni Nurmi
parent a62674f187
commit 519ec667da
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/containers/TransactionPage/TransactionPage.duck.js
View file

@ -80,6 +80,7 @@ const initialState = {
oldestMessagePageFetched: 0,
messages: [],
initialMessageFailedToTransaction: null,
savePaymentMethodFailed: false,
sendMessageInProgress: false,
sendMessageError: null,
sendReviewInProgress: false,

12
src/containers/TransactionPage/TransactionPage.js
View file

@ -46,6 +46,7 @@ export const TransactionPageComponent = props => {
const {
currentUser,
initialMessageFailedToTransaction,
savePaymentMethodFailed,
fetchMessagesError,
fetchMessagesInProgress,
totalMessagePages,
@ -105,7 +106,11 @@ export const TransactionPageComponent = props => {
};
// If payment is pending, redirect to CheckoutPage
if (txIsPaymentPending(currentTransaction) && isCustomerRole) {
if (
txIsPaymentPending(currentTransaction) &&
isCustomerRole &&
currentTransaction.attributes.lineItems
) {
const currentBooking = ensureListing(currentTransaction.booking);
const initialValues = {
@ -217,6 +222,7 @@ export const TransactionPageComponent = props => {
oldestMessagePageFetched={oldestMessagePageFetched}
messages={messages}
initialMessageFailed={initialMessageFailed}
savePaymentMethodFailed={savePaymentMethodFailed}
fetchMessagesError={fetchMessagesError}
sendMessageInProgress={sendMessageInProgress}
sendMessageError={sendMessageError}
@ -270,6 +276,7 @@ TransactionPageComponent.defaultProps = {
transaction: null,
fetchMessagesError: null,
initialMessageFailedToTransaction: null,
savePaymentMethodFailed: false,
sendMessageError: null,
timeSlots: null,
fetchTimeSlotsError: null,
@ -295,6 +302,7 @@ TransactionPageComponent.propTypes = {
oldestMessagePageFetched: number.isRequired,
messages: arrayOf(propTypes.message).isRequired,
initialMessageFailedToTransaction: propTypes.uuid,
savePaymentMethodFailed: bool,
sendMessageInProgress: bool.isRequired,
sendMessageError: propTypes.error,
onShowMoreMessages: func.isRequired,
@ -330,6 +338,7 @@ const mapStateToProps = state => {
oldestMessagePageFetched,
messages,
initialMessageFailedToTransaction,
savePaymentMethodFailed,
sendMessageInProgress,
sendMessageError,
sendReviewInProgress,
@ -358,6 +367,7 @@ const mapStateToProps = state => {
oldestMessagePageFetched,
messages,
initialMessageFailedToTransaction,
savePaymentMethodFailed,
sendMessageInProgress,
sendMessageError,
sendReviewInProgress,

2
src/containers/TransactionPage/__snapshots__/TransactionPage.test.js.snap
View file

@ -58,6 +58,7 @@ exports[`TransactionPage - Order matches snapshot 1`] = `
onSendMessage={[Function]}
onShowMoreMessages={[Function]}
onSubmitBookingRequest={[Function]}
savePaymentMethodFailed={false}
sendMessageError={null}
sendMessageInProgress={false}
timeSlots={null}
@ -280,6 +281,7 @@ exports[`TransactionPage - Sale matches snapshot 1`] = `
onSendMessage={[Function]}
onShowMoreMessages={[Function]}
onSubmitBookingRequest={[Function]}
savePaymentMethodFailed={false}
sendMessageError={null}
sendMessageInProgress={false}
timeSlots={null}