Skip to content

Commit

Permalink
Use updated BookingBreakdown component
Browse files Browse the repository at this point in the history
  • Loading branch information
OtterleyW committed Sep 13, 2019
1 parent 0b6cdda commit 4419875
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 26 deletions.
6 changes: 2 additions & 4 deletions src/components/TransactionPanel/BreakdownMaybe.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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;
Expand Down
9 changes: 2 additions & 7 deletions src/containers/CheckoutPage/CheckoutPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -586,6 +586,7 @@ export class CheckoutPageComponent extends Component {
unitType={config.bookingUnitType}
transaction={tx}
booking={txBooking}
dateType={DATE_TYPE_DATE}
/>
) : null;

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/forms/BookingDatesForm/EstimatedBreakdownMaybe.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -136,6 +136,7 @@ const EstimatedBreakdownMaybe = props => {
unitType={unitType}
transaction={tx}
booking={tx.booking}
dateType={DATE_TYPE_DATE}
/>
);
};
Expand Down

0 comments on commit 4419875

Please sign in to comment.