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

Use updated BookingBreakdown component

Browse source
This commit is contained in:
Jenni Nurmi 2019-09-13 11:01:47 +03:00
parent 770a487c4d
commit 6e40507ea8
4 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/TransactionPanel/BreakdownMaybe.js
View file

@ -1,7 +1,7 @@
import React from 'react';
import { FormattedMessage } from '../../util/reactIntl';
import classNames from 'classnames';
import config from '../../config';
import { DATE_TYPE_DATE } from '../../util/types';
import { BookingBreakdown } from '../../components';
import css from './TransactionPanel.css';
@ -16,15 +16,13 @@ const BreakdownMaybe = props => {
return loaded ? (
<div className={classes}>
<h3 className={css.bookingBreakdownTitle}>
<FormattedMessage id="TransactionPanel.bookingBreakdownTitle" />
</h3>
<BookingBreakdown
className={breakdownClasses}
userRole={transactionRole}
unitType={config.bookingUnitType}
transaction={transaction}
booking={transaction.booking}
dateType={DATE_TYPE_DATE}
/>
</div>
) : null;

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

@ -8,7 +8,7 @@ import classNames from 'classnames';
import config from '../../config';
import routeConfiguration from '../../routeConfiguration';
import { pathByRouteName, findRouteByRouteName } from '../../util/routes';
import { propTypes, LINE_ITEM_NIGHT, LINE_ITEM_DAY } from '../../util/types';
import { propTypes, LINE_ITEM_NIGHT, LINE_ITEM_DAY, DATE_TYPE_DATE } from '../../util/types';
import {
ensureListing,
ensureCurrentUser,
@ -586,6 +586,7 @@ export class CheckoutPageComponent extends Component {
unitType={config.bookingUnitType}
transaction={tx}
booking={txBooking}
dateType={DATE_TYPE_DATE}
/>
) : null;
@ -769,9 +770,6 @@ export class CheckoutPageComponent extends Component {
</div>
<div className={css.priceBreakdownContainer}>
<h3 className={css.priceBreakdownTitle}>
<FormattedMessage id="CheckoutPage.priceBreakdownTitle" />
</h3>
{speculateTransactionErrorMessage}
{breakdown}
</div>
@ -837,9 +835,6 @@ export class CheckoutPageComponent extends Component {
<h2 className={css.detailsTitle}>{listingTitle}</h2>
<p className={css.detailsSubtitle}>{detailsSubTitle}</p>
</div>
<h3 className={css.bookingBreakdownTitle}>
<FormattedMessage id="CheckoutPage.priceBreakdownTitle" />
</h3>
{speculateTransactionErrorMessage}
{breakdown}
</div>

15
src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
View file

@ -77,14 +77,7 @@ exports[`CheckoutPage matches snapshot 1`] = `
/>
</div>
</div>
<div>
<h3>
<FormattedMessage
id="CheckoutPage.priceBreakdownTitle"
values={Object {}}
/>
</h3>
</div>
<div />
<section>
<injectIntl(StripePaymentForm)
authorDisplayName="author display name"
@ -154,12 +147,6 @@ exports[`CheckoutPage matches snapshot 1`] = `
55 CheckoutPage.perNight
</p>
</div>
<h3>
<FormattedMessage
id="CheckoutPage.priceBreakdownTitle"
values={Object {}}
/>
</h3>
</div>
</div>
</Page>

3
src/forms/BookingDatesForm/EstimatedBreakdownMaybe.js
View file

@ -31,7 +31,7 @@ import Decimal from 'decimal.js';
import { types as sdkTypes } from '../../util/sdkLoader';
import { dateFromLocalToAPI, nightsBetween, daysBetween } from '../../util/dates';
import { TRANSITION_REQUEST_PAYMENT, TX_TRANSITION_ACTOR_CUSTOMER } from '../../util/transaction';
import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, LINE_ITEM_UNITS } from '../../util/types';
import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, LINE_ITEM_UNITS, DATE_TYPE_DATE } from '../../util/types';
import { unitDivisor, convertMoneyToNumber, convertUnitToSubUnit } from '../../util/currency';
import { BookingBreakdown } from '../../components';
@ -136,6 +136,7 @@ const EstimatedBreakdownMaybe = props => {
unitType={unitType}
transaction={tx}
booking={tx.booking}
dateType={DATE_TYPE_DATE}
/>
);
};