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

Fix session store handling for enquired tx

Browse source
This commit is contained in:
Hannu Lyytikainen 2018-12-18 12:09:38 +02:00
parent 4f21f3a214
commit ad6fc6346b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/containers/CheckoutPage/CheckoutPage.js
View file

@ -150,7 +150,6 @@ export class CheckoutPageComponent extends Component {
sendOrderRequest,
sendOrderRequestAfterEnquiry,
speculatedTransaction,
enquiredTransaction,
dispatch,
} = this.props;
@ -164,7 +163,9 @@ export class CheckoutPageComponent extends Component {
bookingEnd: speculatedTransaction.booking.attributes.end,
};
// if an enquired transactioni is available, use that as basis
const enquiredTransaction = this.state.pageData.enquiredTransaction;
// if an enquired transaction is available, use that as basis
// otherwise initiate a new transaction
const initiateRequest = enquiredTransaction
? sendOrderRequestAfterEnquiry(enquiredTransaction.id, requestParams)
@ -201,7 +202,6 @@ export class CheckoutPageComponent extends Component {
speculateTransactionInProgress,
speculateTransactionError,
speculatedTransaction,
enquiredTransaction,
initiateOrderError,
intl,
params,
@ -220,7 +220,7 @@ export class CheckoutPageComponent extends Component {
const isLoading = !this.state.dataLoaded || speculateTransactionInProgress;
const { listing, bookingDates } = this.state.pageData;
const { listing, bookingDates, enquiredTransaction } = this.state.pageData;
const currentTransaction = ensureTransaction(speculatedTransaction, {}, null);
const currentBooking = ensureBooking(currentTransaction.booking);
const currentListing = ensureListing(listing);

2
src/containers/CheckoutPage/CheckoutPageSessionHelpers.js
View file

@ -53,7 +53,7 @@ export const isValidEnquiredTransaction = transaction => {
const props = {
id: id => id instanceof UUID,
attributes: v => {
return typeof v === 'string' && v.lastTransition === TRANSITION_ENQUIRE;
return typeof v === 'object' && v.lastTransition === TRANSITION_ENQUIRE;
},
};
return validateProperties(transaction, props);