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

Merge pull request #649 from sharetribe/fix-inbox-enquiries

Browse source 
BookingInfoMaybe as a helper component to fix Enquiry state
This commit is contained in:
Vesa Luusua 2018-01-16 13:50:41 +02:00 • committed by GitHub
commit 4ee9302ae1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/containers/InboxPage/InboxPage.js
View file

@ -143,6 +143,33 @@ const bookingData = (unitType, tx, isOrder, intl) => {
return { bookingStart, bookingEnd, price, isSingleDay };
};
// Functional component as internal helper to print BookingInfo if that is needed
const BookingInfoMaybe = props => {
const { bookingClassName, isOrder, intl, tx, unitType } = props;
const isEnquiry = txIsEnquired(tx);
if (isEnquiry) {
return null;
}
const { bookingStart, bookingEnd, price, isSingleDay } = bookingData(unitType, tx, isOrder, intl);
const dateInfo = isSingleDay ? bookingStart.short : `${bookingStart.short} - ${bookingEnd.short}`;
return (
<div className={classNames(css.bookingInfo, bookingClassName)}>
{dateInfo}
<span className={css.itemPrice}>{price}</span>
</div>
);
};
BookingInfoMaybe.propTypes = {
intl: intlShape.isRequired,
isOrder: bool.isRequired,
tx: propTypes.transaction.isRequired,
unitType: propTypes.bookingUnitType.isRequired,
};
export const InboxItem = props => {
const { unitType, type, tx, intl } = props;
const { customer, provider } = tx;
@ -160,12 +187,6 @@ export const InboxItem = props => {
const rowNotificationDot = isSaleNotification ? <div className={css.notificationDot} /> : null;
const lastTransitionedAt = formatDate(intl, tx.attributes.lastTransitionedAt);
const isEnquiry = txIsEnquired(tx);
const { bookingStart, bookingEnd, price, isSingleDay } = isEnquiry
? {}
: bookingData(unitType, tx, isOrder, intl);
const dateInfo = isSingleDay ? bookingStart.short : `${bookingStart.short} - ${bookingEnd.short}`;
const linkClasses = classNames(css.itemLink, {
[css.bannedUserLink]: isOtherUserBanned,
});
@ -185,12 +206,13 @@ export const InboxItem = props => {
<div className={classNames(css.itemUsername, stateData.nameClassName)}>
{otherUserDisplayName}
</div>
{!isEnquiry ? (
<div className={classNames(css.bookingInfo, stateData.bookingClassName)}>
{dateInfo}
<span className={css.itemPrice}>{price}</span>
</div>
) : null}
<BookingInfoMaybe
bookingClassName={stateData.bookingClassName}
intl={intl}
isOrder={isOrder}
tx={tx}
unitType={unitType}
/>
</div>
<div className={css.itemState}>
<div className={classNames(css.stateName, stateData.stateClassName)}>