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

Merge pull request #852 from sharetribe/fix-checkoutpage-anonymous-booking-dates

Browse source 
CheckoutPage: selected booking dates should be available after login
This commit is contained in:
Vesa Luusua 2018-06-25 16:21:51 +03:00 • committed by GitHub
commit 68a3737fa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -14,9 +14,11 @@ way to update this template, but currently, we follow a pattern:
## Upcoming version
* [fix] Improve slug creation (slashes were breaking rendering in some environments)
[#850](https://github.com/sharetribe/flex-template-web/pull/850)
[#850](https://github.com/sharetribe/flex-template-web/pull/850)
* [fix] Anonymous user should see contact link on UserCard
[#851](https://github.com/sharetribe/flex-template-web/pull/851)
[#851](https://github.com/sharetribe/flex-template-web/pull/851)
* [fix] Persisting booking request details across authentication
[#852](https://github.com/sharetribe/flex-template-web/pull/852)
## v1.0.0

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

@ -75,13 +75,17 @@ export class CheckoutPageComponent extends Component {
const { bookingData, bookingDates, listing, fetchSpeculatedTransaction, history } = this.props;
// Browser's back navigation should not rewrite data in session store.
// Action is 'POP' on both history.back() and page refresh cases.
const hasNavigatedThroughLink = history.action === 'PUSH';
// Action is 'PUSH' when user has directed through a link
// Action is 'REPLACE' when user has directed through login/signup process
const hasNavigatedThroughLink = history.action === 'PUSH' || history.action === 'REPLACE';
const hasDataInProps = !!(bookingData && bookingDates && listing) && hasNavigatedThroughLink;
if (hasDataInProps) {
// Store data only if data is passed through props and user has navigated through a link.
storeData(bookingData, bookingDates, listing, STORAGE_KEY);
}
// NOTE: stored data can be empty if user has already successfully completed transaction.
const pageData = hasDataInProps
? { bookingData, bookingDates, listing }
: storedData(STORAGE_KEY);