From 47e9adb85b6eedc59960bd4846878a2f15098a5f Mon Sep 17 00:00:00 2001 From: Mikko Koski Date: Fri, 30 Jun 2017 12:14:39 +0300 Subject: [PATCH] Update line item code keywords --- .../BookingBreakdown/BookingBreakdown.example.js | 16 ++++++++-------- .../BookingBreakdown/BookingBreakdown.js | 4 ++-- .../BookingBreakdown/BookingBreakdown.test.js | 8 ++++---- .../__snapshots__/OrderDetailsPanel.test.js.snap | 4 ++-- .../__snapshots__/SaleDetailsPanel.test.js.snap | 4 ++-- .../__snapshots__/InboxPage.test.js.snap | 16 ++++++++-------- .../__snapshots__/OrderPage.test.js.snap | 4 ++-- .../SalePage/__snapshots__/SalePage.test.js.snap | 4 ++-- src/util/test-data.js | 4 ++-- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/components/BookingBreakdown/BookingBreakdown.example.js b/src/components/BookingBreakdown/BookingBreakdown.example.js index 3050038c..d578b693 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.example.js +++ b/src/components/BookingBreakdown/BookingBreakdown.example.js @@ -10,7 +10,7 @@ export const Checkout = { userRole: 'customer', lineItems: [ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), unitPrice: new types.Money(4500, 'USD'), lineTotal: new types.Money(9000, 'USD'), @@ -28,7 +28,7 @@ export const CustomerOrder = { userRole: 'customer', lineItems: [ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), unitPrice: new types.Money(4500, 'USD'), lineTotal: new types.Money(9000, 'USD'), @@ -46,13 +46,13 @@ export const ProviderSale = { userRole: 'provider', lineItems: [ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), unitPrice: new types.Money(4500, 'USD'), lineTotal: new types.Money(9000, 'USD'), }, { - code: 'line-item.commission/provider', + code: 'line-item/provider-commission', unitPrice: new types.Money(-2000, 'USD'), lineTotal: new types.Money(-2000, 'USD'), }, @@ -69,13 +69,13 @@ export const ProviderSaleZeroCommission = { userRole: 'provider', lineItems: [ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), unitPrice: new types.Money(4500, 'USD'), lineTotal: new types.Money(9000, 'USD'), }, { - code: 'line-item.commission/provider', + code: 'line-item/provider-commission', unitPrice: new types.Money(0, 'USD'), lineTotal: new types.Money(0, 'USD'), }, @@ -92,13 +92,13 @@ export const ProviderSaleSingleNight = { userRole: 'provider', lineItems: [ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(1), unitPrice: new types.Money(4500, 'USD'), lineTotal: new types.Money(4500, 'USD'), }, { - code: 'line-item.commission/provider', + code: 'line-item/provider-commission', unitPrice: new types.Money(-2000, 'USD'), lineTotal: new types.Money(-2000, 'USD'), }, diff --git a/src/components/BookingBreakdown/BookingBreakdown.js b/src/components/BookingBreakdown/BookingBreakdown.js index 4c910317..295e4a25 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.js +++ b/src/components/BookingBreakdown/BookingBreakdown.js @@ -58,8 +58,8 @@ export const BookingBreakdownComponent = props => { /> ); - const nightPurchase = lineItems.find(item => item.code === 'line-item.purchase/night'); - const providerCommission = lineItems.find(item => item.code === 'line-item.commission/provider'); + const nightPurchase = lineItems.find(item => item.code === 'line-item/night'); + const providerCommission = lineItems.find(item => item.code === 'line-item/provider-commission'); const nightCount = nightPurchase.quantity.toFixed(); const nightCountMessage = ( diff --git a/src/components/BookingBreakdown/BookingBreakdown.test.js b/src/components/BookingBreakdown/BookingBreakdown.test.js index de17e1ca..9d42041a 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.test.js +++ b/src/components/BookingBreakdown/BookingBreakdown.test.js @@ -15,7 +15,7 @@ describe('BookingBreakdown', () => { userRole="customer" lineItems={[ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), lineTotal: new types.Money(2000, 'USD'), unitPrice: new types.Money(1000, 'USD'), @@ -36,7 +36,7 @@ describe('BookingBreakdown', () => { payinTotal={new types.Money(2000, 'USD')} lineItems={[ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), lineTotal: new types.Money(2000, 'USD'), unitPrice: new types.Money(1000, 'USD'), @@ -58,13 +58,13 @@ describe('BookingBreakdown', () => { userRole="provider" lineItems={[ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(2), lineTotal: new types.Money(2000, 'USD'), unitPrice: new types.Money(1000, 'USD'), }, { - code: 'line-item.commission/provider', + code: 'line-item/provider-commission', lineTotal: new types.Money(-200, 'USD'), unitPrice: new types.Money(-200, 'USD'), }, diff --git a/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap b/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap index 7d67ee13..37c2fe32 100644 --- a/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap +++ b/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap @@ -50,7 +50,7 @@ exports[`OrderDetailsPanel matches snapshot 1`] = ` lineItems={ Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 16500, "currency": "USD", @@ -62,7 +62,7 @@ exports[`OrderDetailsPanel matches snapshot 1`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", diff --git a/src/components/SaleDetailsPanel/__snapshots__/SaleDetailsPanel.test.js.snap b/src/components/SaleDetailsPanel/__snapshots__/SaleDetailsPanel.test.js.snap index 91dec9bc..63bd0907 100644 --- a/src/components/SaleDetailsPanel/__snapshots__/SaleDetailsPanel.test.js.snap +++ b/src/components/SaleDetailsPanel/__snapshots__/SaleDetailsPanel.test.js.snap @@ -49,7 +49,7 @@ exports[`SaleDetailsPanel matches snapshot 1`] = ` lineItems={ Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 16500, "currency": "USD", @@ -61,7 +61,7 @@ exports[`SaleDetailsPanel matches snapshot 1`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -1000, "currency": "USD", diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap index 06c9e018..7713fd9f 100644 --- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap +++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap @@ -54,7 +54,7 @@ exports[`InboxPage matches snapshot 1`] = ` "lastTransitionedAt": 2017-01-15T00:00:00.000Z, "lineItems": Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 1000, "currency": "USD", @@ -66,7 +66,7 @@ exports[`InboxPage matches snapshot 1`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", @@ -131,7 +131,7 @@ exports[`InboxPage matches snapshot 1`] = ` "lastTransitionedAt": 2016-01-15T00:00:00.000Z, "lineItems": Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 1000, "currency": "USD", @@ -143,7 +143,7 @@ exports[`InboxPage matches snapshot 1`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", @@ -285,7 +285,7 @@ exports[`InboxPage matches snapshot 3`] = ` "lastTransitionedAt": 2017-01-15T00:00:00.000Z, "lineItems": Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 1000, "currency": "USD", @@ -297,7 +297,7 @@ exports[`InboxPage matches snapshot 3`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", @@ -362,7 +362,7 @@ exports[`InboxPage matches snapshot 3`] = ` "lastTransitionedAt": 2016-01-15T00:00:00.000Z, "lineItems": Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 1000, "currency": "USD", @@ -374,7 +374,7 @@ exports[`InboxPage matches snapshot 3`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", diff --git a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap index ab2ca05b..bb96dc31 100644 --- a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap +++ b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap @@ -12,7 +12,7 @@ exports[`OrderPage matches snapshot 1`] = ` "lastTransitionedAt": 2017-06-01T00:00:00.000Z, "lineItems": Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 1000, "currency": "USD", @@ -24,7 +24,7 @@ exports[`OrderPage matches snapshot 1`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", diff --git a/src/containers/SalePage/__snapshots__/SalePage.test.js.snap b/src/containers/SalePage/__snapshots__/SalePage.test.js.snap index 123396a1..64a864bb 100644 --- a/src/containers/SalePage/__snapshots__/SalePage.test.js.snap +++ b/src/containers/SalePage/__snapshots__/SalePage.test.js.snap @@ -13,7 +13,7 @@ exports[`SalePage matches snapshot 1`] = ` "lastTransitionedAt": 2017-06-01T00:00:00.000Z, "lineItems": Array [ Object { - "code": "line-item.purchase/night", + "code": "line-item/night", "lineTotal": Money { "amount": 1000, "currency": "USD", @@ -25,7 +25,7 @@ exports[`SalePage matches snapshot 1`] = ` }, }, Object { - "code": "line-item.commission/provider", + "code": "line-item/provider-commission", "lineTotal": Money { "amount": -100, "currency": "USD", diff --git a/src/util/test-data.js b/src/util/test-data.js index 80e26f98..a39f6cee 100644 --- a/src/util/test-data.js +++ b/src/util/test-data.js @@ -94,13 +94,13 @@ export const createTransaction = options => { payoutTotal: new Money(total.amount - commission.amount, total.currency), lineItems: [ { - code: 'line-item.purchase/night', + code: 'line-item/night', quantity: new Decimal(nightCount), unitPrice: new Money(total.amount / nightCount, total.currency), lineTotal: total, }, { - code: 'line-item.commission/provider', + code: 'line-item/provider-commission', unitPrice: new Money(commission.amount * -1, commission.currency), lineTotal: new Money(commission.amount * -1, commission.currency), },