Commit 1fa57da3 authored by Andrey Kizimov's avatar Andrey Kizimov

Merge branch '54855-m' into 'master'

Resolve #54855 "M"

See merge request !28
parents caeecf30 fd1d6878
Pipeline #24870 passed with stages
in 4 minutes and 2 seconds
......@@ -70,6 +70,14 @@ class ResultsFlight extends React.Component<Props> {
{showPricePrefix && <span className="flight-summary-price__amount-prefix">{i18n('utils-pre-from')}</span>}
<Price currency={currency} rates={rates} withPlus={currentLegId !== 0} price={price}/>
{flight.moneyWallFirstPayment && !showPricePrefix && currentLegId === 0 && (
<span className="flight-summary-price__amount__moneyWall">
{i18n('results-flight-moneyWall_1')}
<Price currency={currency} rates={rates} price={flight.moneyWallFirstPayment}/>
{i18n('results-flight-moneyWall_2')}
</span>
)}
</div>
{price.amount < 0 && (
......@@ -92,6 +100,13 @@ class ResultsFlight extends React.Component<Props> {
<div className="flight-summary__action">
<div className="flight-summary-buy" onClick={this.onAction}>{buttonText}</div>
{this.props.isProMode && <div className="flight-summary-service">{flight.service}</div>}
{totalPrice && flight.moneyWallFirstPayment && (
<div className="flight-summary-moneyWall">
{i18n('results-flight-moneyWall_1')}
<Price currency={currency} rates={rates} price={flight.moneyWallFirstPayment}/>
{i18n('results-flight-moneyWall_2')}
</div>
)}
</div>
</div>
);
......
......@@ -526,6 +526,17 @@
}
}
&__moneyWall {
.price {
font-size: 0.8rem;
margin: 0 3px;
}
.price-currency {
font-size: 12px;
}
}
&_profitable {
.price {
&-amount,
......@@ -624,6 +635,18 @@
height: 18px;
}
}
&-moneyWall {
font-size: 12px;
text-transform: none;
text-align: center;
padding-top: 3px;
.price {
font-size: 12px;
margin: 0 3px;
}
}
}
&-details {
......
......@@ -37,6 +37,8 @@
"results-flight-operatingCompany": "Flight is provided by",
"results-flight-operatingCompanies": "Flight is provided by",
"results-flight-nextDayArrival": "Arriving at: [%-date-%]",
"results-flight-moneyWall_1": "or",
"results-flight-moneyWall_2": "in month",
"results-flight-priceDetails__passengerType_ADT": "Adult",
"results-flight-priceDetails__passengerType_CLD": "Child",
......
......@@ -37,6 +37,8 @@
"results-flight-operatingCompany": "Выполняет",
"results-flight-operatingCompanies": "Выполняют",
"results-flight-nextDayArrival": "Прибытие: [%-date-%]",
"results-flight-moneyWall_1": "или",
"results-flight-moneyWall_2": "в мес.",
"results-flight-priceDetails__passengerType_ADT": "Взрослый",
"results-flight-priceDetails__passengerType_CLD": "Детский",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment