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

Use payinTotal and payoutTotal instead of total and commission

Browse source
This commit is contained in:
Mikko Koski 2017-06-29 13:50:11 +03:00 • committed by Vesa Luusua
parent 99947e4019
commit 804d2672cd
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/OrderDetailsPanel/OrderDetailsPanel.js
View file

@ -15,7 +15,7 @@ const breakdown = transaction => {
const bookingStart = booking.attributes.start;
const bookingEnd = booking.attributes.end;
const unitPrice = listing.attributes.price;
const totalPrice = tx.attributes.total;
const totalPrice = tx.attributes.payinTotal;
if (!bookingStart || !bookingEnd || !unitPrice || !totalPrice) {
return null;

22
src/components/SaleDetailsPanel/SaleDetailsPanel.js
View file

@ -15,19 +15,19 @@ import css from './SaleDetailsPanel.css';
// TODO: This is a temporary function to calculate the booking
// price. This should be removed when the API supports dry-runs and we
// can take the total price from the transaction itself.
const estimatedProviderTotalPrice = (customerTotalPrice, commission) => {
const estimatedCommission = (customerTotalPrice, providerTotalPrice) => {
const { subUnitDivisor, currency } = config.currencyConfig;
if (customerTotalPrice.currency !== currency || commission.currency !== currency) {
if (customerTotalPrice.currency !== currency || providerTotalPrice.currency !== currency) {
throw new Error('Transaction total or commission currency does not match marketplace currency');
}
const numericCustomerTotalPrice = convertMoneyToNumber(customerTotalPrice, subUnitDivisor);
const numericCommission = convertMoneyToNumber(commission, subUnitDivisor);
const numericTotalPrice = new Decimal(numericCustomerTotalPrice)
.minus(numericCommission)
const numericProviderTotalPrice = convertMoneyToNumber(providerTotalPrice, subUnitDivisor);
const numericCommission = new Decimal(numericProviderTotalPrice)
.minus(numericCustomerTotalPrice)
.toNumber();
return new types.Money(convertUnitToSubUnit(numericTotalPrice, subUnitDivisor), currency);
return new types.Money(convertUnitToSubUnit(numericCommission, subUnitDivisor), currency);
};
const breakdown = transaction => {
@ -37,14 +37,14 @@ const breakdown = transaction => {
const bookingStart = booking.attributes.start;
const bookingEnd = booking.attributes.end;
const unitPrice = listing.attributes.price;
const customerTotalPrice = tx.attributes.total;
const commission = tx.attributes.commission;
const customerTotalPrice = tx.attributes.payinTotal;
const providerTotalPrice = tx.attributes.payoutTotal;
if (!bookingStart || !bookingEnd || !unitPrice || !customerTotalPrice || !commission) {
if (!bookingStart || !bookingEnd || !unitPrice || !customerTotalPrice || !providerTotalPrice) {
return null;
}
const totalPrice = estimatedProviderTotalPrice(customerTotalPrice, commission);
const commission = estimatedCommission(customerTotalPrice, providerTotalPrice);
return (
<BookingBreakdown
@ -52,7 +52,7 @@ const breakdown = transaction => {
bookingStart={bookingStart}
bookingEnd={bookingEnd}
unitPrice={unitPrice}
totalPrice={totalPrice}
totalPrice={providerTotalPrice}
commission={commission}
/>
);

4
src/util/propTypes.js
View file

@ -147,12 +147,12 @@ export const transaction = shape({
id: uuid.isRequired,
type: value('transaction').isRequired,
attributes: shape({
commission: money.isRequired,
createdAt: instanceOf(Date).isRequired,
lastTransitionedAt: instanceOf(Date).isRequired,
lastTransition: string,
state: oneOf(TX_STATES).isRequired,
total: money.isRequired,
payinTotal: money.isRequired,
payoutTotal: money.isRequired,
}),
booking,
listing,