From 135a6dab7ed9e68e137550eabbd8598401eaa345 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 14:27:20 +0200 Subject: [PATCH 01/16] Transition ref rename: preauthorize -> request --- .../ActivityFeed/ActivityFeed.example.js | 8 ++--- src/components/ActivityFeed/ActivityFeed.js | 6 ++-- .../BookingBreakdown.example.js | 8 ++--- .../BookingBreakdown/BookingBreakdown.test.js | 6 ++-- .../TransactionPanel.helpers.js | 10 +++--- .../TransactionPanel/TransactionPanel.js | 7 ++-- .../TransactionPanel/TransactionPanel.test.js | 10 +++--- .../BookingDatesForm/BookingDatesForm.js | 6 ++-- .../BookingDatesForm/BookingDatesForm.test.js | 4 +-- .../CheckoutPage/CheckoutPage.duck.js | 6 ++-- src/containers/InboxPage/InboxPage.js | 4 +-- src/containers/InboxPage/InboxPage.test.js | 10 +++--- .../TransactionPage/TransactionPage.test.js | 6 ++-- src/ducks/user.duck.js | 4 +-- src/util/test-data.js | 6 ++-- src/util/types.js | 33 ++++++++----------- 16 files changed, 64 insertions(+), 70 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index 93856ac1..77491271 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -9,13 +9,13 @@ import { createReview, } from '../../util/test-data'; import { + TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_PREAUTHORIZE, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -83,7 +83,7 @@ export const WithTransitions = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 10)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 12)), @@ -120,7 +120,7 @@ export const WithMessagesTransitionsAndReviews = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 10)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 12)), @@ -257,7 +257,7 @@ class PagedFeed extends Component { const trans1 = createTxTransition({ at: dates[0], by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }); const trans2 = createTxTransition({ at: dates[2], diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 4603ad88..4d4c3962 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -7,6 +7,7 @@ import { Avatar, InlineTextButton, ReviewRating } from '../../components'; import { formatDate } from '../../util/dates'; import { ensureTransaction, ensureUser, ensureListing, userDisplayName } from '../../util/data'; import { + TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, @@ -14,7 +15,6 @@ import { TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_PREAUTHORIZE, TX_TRANSITION_PREAUTHORIZE_ENQUIRY, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, @@ -87,7 +87,7 @@ Review.propTypes = { // should be rendered in he ActivityFeed const shouldRenderTransition = transition => { return [ - TX_TRANSITION_PREAUTHORIZE, + TRANSITION_REQUEST, TX_TRANSITION_PREAUTHORIZE_ENQUIRY, TX_TRANSITION_ACCEPT, TX_TRANSITION_DECLINE, @@ -137,7 +137,7 @@ const resolveTransitionMessage = ( const deliveredState = lastTransition === TX_TRANSITION_MARK_DELIVERED; switch (currentTransition) { - case TX_TRANSITION_PREAUTHORIZE: + case TRANSITION_REQUEST: case TX_TRANSITION_PREAUTHORIZE_ENQUIRY: return isOwnTransition ? ( diff --git a/src/components/BookingBreakdown/BookingBreakdown.example.js b/src/components/BookingBreakdown/BookingBreakdown.example.js index ca1074ce..c871f6c1 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.example.js +++ b/src/components/BookingBreakdown/BookingBreakdown.example.js @@ -3,13 +3,13 @@ import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, + TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_PREAUTHORIZE, } from '../../util/types'; import config from '../../config'; import BookingBreakdown from './BookingBreakdown'; @@ -34,12 +34,12 @@ const exampleTransaction = params => { attributes: { createdAt: created, lastTransitionedAt: created, - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, transitions: [ { at: created, by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }, ], @@ -206,7 +206,7 @@ export const ProviderSalePreauthorized = { userRole: 'provider', unitType: LINE_ITEM_NIGHT, transaction: exampleTransaction({ - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, payinTotal: new Money(4500, CURRENCY), payoutTotal: new Money(2500, CURRENCY), lineItems: [ diff --git a/src/components/BookingBreakdown/BookingBreakdown.test.js b/src/components/BookingBreakdown/BookingBreakdown.test.js index c2f7b214..7d5cc002 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.test.js +++ b/src/components/BookingBreakdown/BookingBreakdown.test.js @@ -5,9 +5,9 @@ import { renderDeep } from '../../util/test-helpers'; import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_NIGHT, + TRANSITION_REQUEST, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_CANCEL, - TX_TRANSITION_PREAUTHORIZE, } from '../../util/types'; import { BookingBreakdownComponent } from './BookingBreakdown'; @@ -21,12 +21,12 @@ const exampleTransaction = params => { attributes: { createdAt: created, lastTransitionedAt: created, - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, transitions: [ { at: created, by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }, ], diff --git a/src/components/TransactionPanel/TransactionPanel.helpers.js b/src/components/TransactionPanel/TransactionPanel.helpers.js index 12320f52..ac1c2ebd 100644 --- a/src/components/TransactionPanel/TransactionPanel.helpers.js +++ b/src/components/TransactionPanel/TransactionPanel.helpers.js @@ -9,7 +9,7 @@ import { txIsDeclined, txIsDelivered, txIsEnquired, - txIsPreauthorized, + txIsRequested, txIsReviewed, } from '../../util/types'; import { userDisplayName } from '../../util/data'; @@ -212,7 +212,7 @@ export const OrderTitle = props => { ); - } else if (txIsPreauthorized(transaction)) { + } else if (txIsRequested(transaction)) { return (

@@ -292,7 +292,7 @@ export const OrderMessage = props => { } = props; const classes = classNames(rootClassName || css.transactionInfoMessage, className); - if (!listingDeleted && txIsPreauthorized(transaction)) { + if (!listingDeleted && txIsRequested(transaction)) { return (

@@ -331,7 +331,7 @@ export const SaleTitle = props => { />

); - } else if (txIsPreauthorized(transaction)) { + } else if (txIsRequested(transaction)) { return (

{ } = props; const classes = classNames(rootClassName || css.transactionInfoMessage, className); - if (!isCustomerBanned && txIsPreauthorized(transaction)) { + if (!isCustomerBanned && txIsRequested(transaction)) { return (

diff --git a/src/components/TransactionPanel/TransactionPanel.js b/src/components/TransactionPanel/TransactionPanel.js index 20a642b7..030d1271 100644 --- a/src/components/TransactionPanel/TransactionPanel.js +++ b/src/components/TransactionPanel/TransactionPanel.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import { txIsEnquired, txIsPreauthorized, propTypes } from '../../util/types'; +import { txIsEnquired, txIsRequested, propTypes } from '../../util/types'; import { ensureListing, ensureTransaction, ensureUser } from '../../util/data'; import { isMobileSafari } from '../../util/userAgent'; import { AvatarMedium, AvatarLarge, ResponsiveImage, ReviewModal } from '../../components'; @@ -139,8 +139,7 @@ export class TransactionPanelComponent extends Component { const listingDeleted = listingLoaded && currentListing.attributes.deleted; const customerLoaded = !!currentCustomer.id; const isCustomerBanned = customerLoaded && currentCustomer.attributes.banned; - const canShowSaleButtons = - isProvider && txIsPreauthorized(currentTransaction) && !isCustomerBanned; + const canShowSaleButtons = isProvider && txIsRequested(currentTransaction) && !isCustomerBanned; const isProviderLoaded = !!currentProvider.id; const isProviderBanned = isProviderLoaded && currentProvider.attributes.banned; const canShowBookButton = isCustomer && txIsEnquired(currentTransaction) && !isProviderBanned; @@ -208,7 +207,7 @@ export class TransactionPanelComponent extends Component { this.isMobSaf && this.state.sendMessageFormFocused, }); - const showInfoMessage = listingDeleted || (!listingDeleted && txIsPreauthorized(transaction)); // !!orderInfoMessage; + const showInfoMessage = listingDeleted || (!listingDeleted && txIsRequested(transaction)); // !!orderInfoMessage; const feedContainerClasses = classNames(css.feedContainer, { [css.feedContainerWithInfoAbove]: showInfoMessage, diff --git a/src/components/TransactionPanel/TransactionPanel.test.js b/src/components/TransactionPanel/TransactionPanel.test.js index 685c91ee..757b9f8b 100644 --- a/src/components/TransactionPanel/TransactionPanel.test.js +++ b/src/components/TransactionPanel/TransactionPanel.test.js @@ -12,13 +12,13 @@ import { import { renderShallow } from '../../util/test-helpers'; import { fakeIntl } from '../../util/test-data'; import { + TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCELED, TX_TRANSITION_DECLINE, TX_TRANSITION_ENQUIRE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_PREAUTHORIZE, } from '../../util/types'; import { BreakdownMaybe } from './TransactionPanel.helpers'; import { TransactionPanelComponent } from './TransactionPanel'; @@ -48,7 +48,7 @@ describe('TransactionPanel - Sale', () => { const txPreauthorized = createTransaction({ id: 'sale-preauthorized', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, ...baseTxAttrs, }); @@ -167,7 +167,7 @@ describe('TransactionPanel - Sale', () => { it('renders correct total price', () => { const transaction = createTransaction({ id: 'sale-tx', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, total: new Money(16500, 'USD'), commission: new Money(1000, 'USD'), booking: createBooking('booking1', { @@ -213,7 +213,7 @@ describe('TransactionPanel - Order', () => { const txPreauthorized = createTransaction({ id: 'order-preauthorized', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, ...baseTxAttrs, }); @@ -334,7 +334,7 @@ describe('TransactionPanel - Order', () => { it('renders correct total price', () => { const tx = createTransaction({ id: 'order-tx', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, total: new Money(16500, 'USD'), booking: createBooking('booking1', { start: new Date(Date.UTC(2017, 5, 10)), diff --git a/src/containers/BookingDatesForm/BookingDatesForm.js b/src/containers/BookingDatesForm/BookingDatesForm.js index fb4e46a0..451180c5 100644 --- a/src/containers/BookingDatesForm/BookingDatesForm.js +++ b/src/containers/BookingDatesForm/BookingDatesForm.js @@ -14,8 +14,8 @@ import { unitDivisor, convertMoneyToNumber, convertUnitToSubUnit } from '../../u import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, + TRANSITION_REQUEST, TX_TRANSITION_ACTOR_CUSTOMER, - TX_TRANSITION_PREAUTHORIZE, propTypes, } from '../../util/types'; import config from '../../config'; @@ -51,7 +51,7 @@ const estimatedTransaction = (unitType, bookingStart, bookingEnd, unitPrice) => attributes: { createdAt: now, lastTransitionedAt: now, - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, payinTotal: totalPrice, payoutTotal: totalPrice, lineItems: [ @@ -68,7 +68,7 @@ const estimatedTransaction = (unitType, bookingStart, bookingEnd, unitPrice) => { at: now, by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }, ], }, diff --git a/src/containers/BookingDatesForm/BookingDatesForm.test.js b/src/containers/BookingDatesForm/BookingDatesForm.test.js index f9ea0533..2e04148f 100644 --- a/src/containers/BookingDatesForm/BookingDatesForm.test.js +++ b/src/containers/BookingDatesForm/BookingDatesForm.test.js @@ -4,7 +4,7 @@ import Decimal from 'decimal.js'; import { types as sdkTypes } from '../../util/sdkLoader'; import { renderShallow } from '../../util/test-helpers'; import { fakeIntl, fakeFormProps } from '../../util/test-data'; -import { LINE_ITEM_NIGHT, TX_TRANSITION_PREAUTHORIZE } from '../../util/types'; +import { LINE_ITEM_NIGHT, TRANSITION_REQUEST } from '../../util/types'; import { BookingBreakdown } from '../../components'; import { BookingDatesFormComponent } from './BookingDatesForm'; @@ -51,7 +51,7 @@ describe('BookingDatesForm', () => { expect(userRole).toEqual('customer'); expect(booking.attributes.start).toEqual(startDate); expect(booking.attributes.end).toEqual(endDate); - expect(transaction.attributes.lastTransition).toEqual(TX_TRANSITION_PREAUTHORIZE); + expect(transaction.attributes.lastTransition).toEqual(TRANSITION_REQUEST); expect(transaction.attributes.payinTotal).toEqual(new Money(2198, 'USD')); expect(transaction.attributes.payoutTotal).toEqual(new Money(2198, 'USD')); expect(transaction.attributes.lineItems).toEqual([ diff --git a/src/containers/CheckoutPage/CheckoutPage.duck.js b/src/containers/CheckoutPage/CheckoutPage.duck.js index d7b32e3c..71d57d95 100644 --- a/src/containers/CheckoutPage/CheckoutPage.duck.js +++ b/src/containers/CheckoutPage/CheckoutPage.duck.js @@ -1,7 +1,7 @@ import { pick } from 'lodash'; import { updatedEntities, denormalisedEntities } from '../../util/data'; import { storableError } from '../../util/errors'; -import { TX_TRANSITION_PREAUTHORIZE } from '../../util/types'; +import { TRANSITION_REQUEST } from '../../util/types'; import * as log from '../../util/log'; import { fetchCurrentUserHasOrdersSuccess } from '../../ducks/user.duck'; @@ -107,7 +107,7 @@ export const speculateTransactionError = e => ({ export const initiateOrder = (orderParams, initialMessage) => (dispatch, getState, sdk) => { dispatch(initiateOrderRequest()); const bodyParams = { - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, params: orderParams, }; return sdk.transactions @@ -161,7 +161,7 @@ export const speculateTransaction = (listingId, bookingStart, bookingEnd) => ( ) => { dispatch(speculateTransactionRequest()); const bodyParams = { - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, params: { listingId, bookingStart, diff --git a/src/containers/InboxPage/InboxPage.js b/src/containers/InboxPage/InboxPage.js index f60c68d9..0922da62 100644 --- a/src/containers/InboxPage/InboxPage.js +++ b/src/containers/InboxPage/InboxPage.js @@ -13,7 +13,7 @@ import { txIsDeclinedOrAutodeclined, txIsDelivered, txIsEnquired, - txIsPreauthorized, + txIsRequested, txIsReviewed, propTypes, } from '../../util/types'; @@ -156,7 +156,7 @@ export const InboxItem = props => { const otherUserDisplayName = userDisplayName(otherUser, bannedUserDisplayName); const stateData = txState(intl, tx, isOrder); - const isSaleNotification = !isOrder && txIsPreauthorized(tx); + const isSaleNotification = !isOrder && txIsRequested(tx); const rowNotificationDot = isSaleNotification ?

: null; const lastTransitionedAt = formatDate(intl, tx.attributes.lastTransitionedAt); diff --git a/src/containers/InboxPage/InboxPage.test.js b/src/containers/InboxPage/InboxPage.test.js index d31a07d7..484beb8a 100644 --- a/src/containers/InboxPage/InboxPage.test.js +++ b/src/containers/InboxPage/InboxPage.test.js @@ -10,7 +10,7 @@ import { } from '../../util/test-data'; import { InboxPageComponent, InboxItem } from './InboxPage'; import routeConfiguration from '../../routeConfiguration'; -import { LINE_ITEM_NIGHT, TX_TRANSITION_PREAUTHORIZE } from '../../util/types'; +import { LINE_ITEM_NIGHT, TRANSITION_REQUEST } from '../../util/types'; const noop = () => null; @@ -49,7 +49,7 @@ describe('InboxPage', () => { transactions: [ createTransaction({ id: 'order-1', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, customer, provider, lastTransitionedAt: new Date(Date.UTC(2017, 0, 15)), @@ -57,7 +57,7 @@ describe('InboxPage', () => { }), createTransaction({ id: 'order-2', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, customer, provider, lastTransitionedAt: new Date(Date.UTC(2016, 0, 15)), @@ -103,7 +103,7 @@ describe('InboxPage', () => { transactions: [ createTransaction({ id: 'sale-1', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, customer, provider, lastTransitionedAt: new Date(Date.UTC(2017, 0, 15)), @@ -111,7 +111,7 @@ describe('InboxPage', () => { }), createTransaction({ id: 'sale-2', - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, customer, provider, lastTransitionedAt: new Date(Date.UTC(2016, 0, 15)), diff --git a/src/containers/TransactionPage/TransactionPage.test.js b/src/containers/TransactionPage/TransactionPage.test.js index 984d359a..e62e6d3c 100644 --- a/src/containers/TransactionPage/TransactionPage.test.js +++ b/src/containers/TransactionPage/TransactionPage.test.js @@ -8,7 +8,7 @@ import { fakeIntl, } from '../../util/test-data'; import { renderShallow } from '../../util/test-helpers'; -import { TX_TRANSITION_PREAUTHORIZE } from '../../util/types'; +import { TRANSITION_REQUEST } from '../../util/types'; import { TransactionPageComponent } from './TransactionPage'; const noop = () => null; @@ -18,7 +18,7 @@ describe('TransactionPage - Sale', () => { const txId = 'tx-sale-1'; const transaction = createTransaction({ id: txId, - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, booking: createBooking('booking1', { start: new Date(Date.UTC(2017, 5, 10)), end: new Date(Date.UTC(2017, 5, 13)), @@ -60,7 +60,7 @@ describe('TransactionPage - Order', () => { const txId = 'tx-order-1'; const transaction = createTransaction({ id: txId, - lastTransition: TX_TRANSITION_PREAUTHORIZE, + lastTransition: TRANSITION_REQUEST, booking: createBooking('booking1', { start: new Date(Date.UTC(2017, 5, 10)), end: new Date(Date.UTC(2017, 5, 13)), diff --git a/src/ducks/user.duck.js b/src/ducks/user.duck.js index 666ec28c..b0b01ec9 100644 --- a/src/ducks/user.duck.js +++ b/src/ducks/user.duck.js @@ -1,6 +1,6 @@ import { updatedEntities, denormalisedEntities } from '../util/data'; import { storableError } from '../util/errors'; -import { TX_TRANSITION_PREAUTHORIZE, TX_TRANSITION_PREAUTHORIZE_ENQUIRY } from '../util/types'; +import { TRANSITION_REQUEST, TX_TRANSITION_PREAUTHORIZE_ENQUIRY } from '../util/types'; import * as log from '../util/log'; import { authInfo } from './Auth.duck'; @@ -311,7 +311,7 @@ export const fetchCurrentUserNotifications = () => (dispatch, getState, sdk) => const apiQueryParams = { only: 'sale', - last_transitions: [TX_TRANSITION_PREAUTHORIZE, TX_TRANSITION_PREAUTHORIZE_ENQUIRY], + last_transitions: [TRANSITION_REQUEST, TX_TRANSITION_PREAUTHORIZE_ENQUIRY], page: 1, per_page: NOTIFICATION_PAGE_SIZE, }; diff --git a/src/util/test-data.js b/src/util/test-data.js index cd4b0e1e..b96bfe90 100644 --- a/src/util/test-data.js +++ b/src/util/test-data.js @@ -2,10 +2,10 @@ import Decimal from 'decimal.js'; import { types as sdkTypes } from './sdkLoader'; import { nightsBetween } from '../util/dates'; import { + TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_PREAUTHORIZE, } from '../util/types'; const { UUID, LatLng, Money } = sdkTypes; @@ -96,7 +96,7 @@ export const createTxTransition = options => { return { at: new Date(Date.UTC(2017, 4, 1)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, ...options, }; }; @@ -117,7 +117,7 @@ export const createTransaction = options => { createTxTransition({ at: new Date(Date.UTC(2017, 4, 1)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_PREAUTHORIZE, + transition: TRANSITION_REQUEST, }), createTxTransition({ at: new Date(Date.UTC(2017, 5, 1)), diff --git a/src/util/types.js b/src/util/types.js index 4bbb5c4d..a11e78ec 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -160,12 +160,9 @@ propTypes.booking = shape({ }), }); -// When the customer requests a booking, a transaction is created. The -// initial state is preauthorized that is transitioned with the -// initial preauthorize transition. The customer can see this -// transaction in the OrderPage that is linked from the InboxPage. The -// provider sees the transaction in the SalePage. -export const TX_TRANSITION_PREAUTHORIZE = 'transition/preauthorize'; +// When a customer makes a booking to a listing, a transaction is +// created with the initial request transition. +export const TRANSITION_REQUEST = 'transition/preauthorize'; // A customer can also initiate a transaction with an enquiry, and // then transition that by preauthorization. @@ -201,21 +198,21 @@ export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = 'transition/auto-complete-without-reviews'; export const TX_TRANSITIONS = [ - TX_TRANSITION_ENQUIRE, - TX_TRANSITION_PREAUTHORIZE_ENQUIRY, - TX_TRANSITION_PREAUTHORIZE, + TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, - TX_TRANSITION_DECLINE, + TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, + TX_TRANSITION_DECLINE, + TX_TRANSITION_ENQUIRE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, + TX_TRANSITION_PREAUTHORIZE_ENQUIRY, + TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, + TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, + TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ]; // Roles of actors that perform transaction transitions @@ -235,11 +232,9 @@ const txLastTransition = tx => ensureTransaction(tx).attributes.lastTransition; export const txIsEnquired = tx => txLastTransition(tx) === TX_TRANSITION_ENQUIRE; -export const txIsPreauthorized = tx => { +export const txIsRequested = tx => { const transition = txLastTransition(tx); - return ( - transition === TX_TRANSITION_PREAUTHORIZE || transition === TX_TRANSITION_PREAUTHORIZE_ENQUIRY - ); + return transition === TRANSITION_REQUEST || transition === TX_TRANSITION_PREAUTHORIZE_ENQUIRY; }; export const txIsAccepted = tx => txLastTransition(tx) === TX_TRANSITION_ACCEPT; From b6532d8ee644218298e5bc34e23485a2de5586c9 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 14:33:14 +0200 Subject: [PATCH 02/16] Transition ref rename: preauthorize enquiry -> request after enquiry --- src/components/ActivityFeed/ActivityFeed.js | 12 ++++++------ src/ducks/user.duck.js | 4 ++-- src/util/types.js | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 4d4c3962..709483f3 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -8,6 +8,7 @@ import { formatDate } from '../../util/dates'; import { ensureTransaction, ensureUser, ensureListing, userDisplayName } from '../../util/data'; import { TRANSITION_REQUEST, + TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, @@ -15,7 +16,6 @@ import { TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_PREAUTHORIZE_ENQUIRY, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -88,16 +88,16 @@ Review.propTypes = { const shouldRenderTransition = transition => { return [ TRANSITION_REQUEST, - TX_TRANSITION_PREAUTHORIZE_ENQUIRY, + TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, - TX_TRANSITION_DECLINE, TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, + TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, + TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; @@ -138,7 +138,7 @@ const resolveTransitionMessage = ( switch (currentTransition) { case TRANSITION_REQUEST: - case TX_TRANSITION_PREAUTHORIZE_ENQUIRY: + case TRANSITION_REQUEST_AFTER_ENQUIRY: return isOwnTransition ? ( ) : ( diff --git a/src/ducks/user.duck.js b/src/ducks/user.duck.js index b0b01ec9..3449b9bb 100644 --- a/src/ducks/user.duck.js +++ b/src/ducks/user.duck.js @@ -1,6 +1,6 @@ import { updatedEntities, denormalisedEntities } from '../util/data'; import { storableError } from '../util/errors'; -import { TRANSITION_REQUEST, TX_TRANSITION_PREAUTHORIZE_ENQUIRY } from '../util/types'; +import { TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY } from '../util/types'; import * as log from '../util/log'; import { authInfo } from './Auth.duck'; @@ -311,7 +311,7 @@ export const fetchCurrentUserNotifications = () => (dispatch, getState, sdk) => const apiQueryParams = { only: 'sale', - last_transitions: [TRANSITION_REQUEST, TX_TRANSITION_PREAUTHORIZE_ENQUIRY], + last_transitions: [TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY], page: 1, per_page: NOTIFICATION_PAGE_SIZE, }; diff --git a/src/util/types.js b/src/util/types.js index a11e78ec..28fb0162 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -165,9 +165,9 @@ propTypes.booking = shape({ export const TRANSITION_REQUEST = 'transition/preauthorize'; // A customer can also initiate a transaction with an enquiry, and -// then transition that by preauthorization. +// then transition that with a request. export const TX_TRANSITION_ENQUIRE = 'transition/enquire'; -export const TX_TRANSITION_PREAUTHORIZE_ENQUIRY = 'transition/preauthorize-enquiry'; +export const TRANSITION_REQUEST_AFTER_ENQUIRY = 'transition/preauthorize-enquiry'; // When the provider accepts or declines a transaction from the // SalePage, it is transitioned with the accept or decline transition. @@ -199,6 +199,7 @@ export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = export const TX_TRANSITIONS = [ TRANSITION_REQUEST, + TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, TX_TRANSITION_AUTO_DECLINE, @@ -208,7 +209,6 @@ export const TX_TRANSITIONS = [ TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_PREAUTHORIZE_ENQUIRY, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -234,7 +234,7 @@ export const txIsEnquired = tx => txLastTransition(tx) === TX_TRANSITION_ENQUIRE export const txIsRequested = tx => { const transition = txLastTransition(tx); - return transition === TRANSITION_REQUEST || transition === TX_TRANSITION_PREAUTHORIZE_ENQUIRY; + return transition === TRANSITION_REQUEST || transition === TRANSITION_REQUEST_AFTER_ENQUIRY; }; export const txIsAccepted = tx => txLastTransition(tx) === TX_TRANSITION_ACCEPT; From bf9ba730c9e982b27220c84876d81fd90bc9fb99 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 14:35:34 +0200 Subject: [PATCH 03/16] Transition ref rename: remove TX_ prefix --- src/components/TransactionPanel/TransactionPanel.test.js | 6 +++--- src/containers/ListingPage/ListingPage.duck.js | 4 ++-- src/util/types.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/TransactionPanel/TransactionPanel.test.js b/src/components/TransactionPanel/TransactionPanel.test.js index 757b9f8b..c6a84980 100644 --- a/src/components/TransactionPanel/TransactionPanel.test.js +++ b/src/components/TransactionPanel/TransactionPanel.test.js @@ -12,12 +12,12 @@ import { import { renderShallow } from '../../util/test-helpers'; import { fakeIntl } from '../../util/test-data'; import { + TRANSITION_ENQUIRE, TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCELED, TX_TRANSITION_DECLINE, - TX_TRANSITION_ENQUIRE, TX_TRANSITION_MARK_DELIVERED, } from '../../util/types'; import { BreakdownMaybe } from './TransactionPanel.helpers'; @@ -42,7 +42,7 @@ describe('TransactionPanel - Sale', () => { const txEnquired = createTransaction({ id: 'sale-enquired', - lastTransition: TX_TRANSITION_ENQUIRE, + lastTransition: TRANSITION_ENQUIRE, ...baseTxAttrs, }); @@ -207,7 +207,7 @@ describe('TransactionPanel - Order', () => { const txEnquired = createTransaction({ id: 'order-enquired', - lastTransition: TX_TRANSITION_ENQUIRE, + lastTransition: TRANSITION_ENQUIRE, ...baseTxAttrs, }); diff --git a/src/containers/ListingPage/ListingPage.duck.js b/src/containers/ListingPage/ListingPage.duck.js index f6311069..6c6b9d88 100644 --- a/src/containers/ListingPage/ListingPage.duck.js +++ b/src/containers/ListingPage/ListingPage.duck.js @@ -3,7 +3,7 @@ import { types as sdkTypes } from '../../util/sdkLoader'; import { storableError } from '../../util/errors'; import { addMarketplaceEntities } from '../../ducks/marketplaceData.duck'; import { updatedEntities, denormalisedEntities } from '../../util/data'; -import { TX_TRANSITION_ENQUIRE } from '../../util/types'; +import { TRANSITION_ENQUIRE } from '../../util/types'; import { fetchCurrentUser } from '../../ducks/user.duck'; const { UUID } = sdkTypes; @@ -130,7 +130,7 @@ export const fetchReviews = listingId => (dispatch, getState, sdk) => { export const sendEnquiry = (listingId, message) => (dispatch, getState, sdk) => { dispatch(sendEnquiryRequest()); const bodyParams = { - transition: TX_TRANSITION_ENQUIRE, + transition: TRANSITION_ENQUIRE, params: { listingId }, }; return sdk.transactions diff --git a/src/util/types.js b/src/util/types.js index 28fb0162..13fb33b5 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -166,7 +166,7 @@ export const TRANSITION_REQUEST = 'transition/preauthorize'; // A customer can also initiate a transaction with an enquiry, and // then transition that with a request. -export const TX_TRANSITION_ENQUIRE = 'transition/enquire'; +export const TRANSITION_ENQUIRE = 'transition/enquire'; export const TRANSITION_REQUEST_AFTER_ENQUIRY = 'transition/preauthorize-enquiry'; // When the provider accepts or declines a transaction from the @@ -198,6 +198,7 @@ export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = 'transition/auto-complete-without-reviews'; export const TX_TRANSITIONS = [ + TRANSITION_ENQUIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, @@ -205,7 +206,6 @@ export const TX_TRANSITIONS = [ TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, - TX_TRANSITION_ENQUIRE, TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, @@ -230,7 +230,7 @@ export const TX_TRANSITION_ACTORS = [ const txLastTransition = tx => ensureTransaction(tx).attributes.lastTransition; -export const txIsEnquired = tx => txLastTransition(tx) === TX_TRANSITION_ENQUIRE; +export const txIsEnquired = tx => txLastTransition(tx) === TRANSITION_ENQUIRE; export const txIsRequested = tx => { const transition = txLastTransition(tx); From c249491152c10b47c4c48f1db57f0d237960994d Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 14:42:48 +0200 Subject: [PATCH 04/16] Transition ref rename: auto decline -> expire --- src/components/ActivityFeed/ActivityFeed.js | 6 +++--- .../BookingBreakdown/BookingBreakdown.example.js | 4 ++-- .../TransactionPanel/TransactionPanel.helpers.js | 6 +++--- .../TransactionPanel/TransactionPanel.test.js | 6 +++--- src/util/types.js | 11 +++++------ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 709483f3..403e4d88 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -7,12 +7,12 @@ import { Avatar, InlineTextButton, ReviewRating } from '../../components'; import { formatDate } from '../../util/dates'; import { ensureTransaction, ensureUser, ensureListing, userDisplayName } from '../../util/data'; import { + TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, @@ -87,10 +87,10 @@ Review.propTypes = { // should be rendered in he ActivityFeed const shouldRenderTransition = transition => { return [ + TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, - TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, @@ -159,7 +159,7 @@ const resolveTransitionMessage = ( ) : ( ); - case TX_TRANSITION_AUTO_DECLINE: + case TRANSITION_EXPIRE: return ownRole === TX_TRANSITION_ACTOR_PROVIDER ? ( ) : ( diff --git a/src/components/BookingBreakdown/BookingBreakdown.example.js b/src/components/BookingBreakdown/BookingBreakdown.example.js index c871f6c1..4f605aec 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.example.js +++ b/src/components/BookingBreakdown/BookingBreakdown.example.js @@ -3,10 +3,10 @@ import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, + TRANSITION_EXPIRE, TRANSITION_REQUEST, TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, - TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, @@ -308,7 +308,7 @@ export const ProviderSaleAutoDeclined = { userRole: 'provider', unitType: LINE_ITEM_NIGHT, transaction: exampleTransaction({ - lastTransition: TX_TRANSITION_AUTO_DECLINE, + lastTransition: TRANSITION_EXPIRE, payinTotal: new Money(4500, CURRENCY), payoutTotal: new Money(2500, CURRENCY), lineItems: [ diff --git a/src/components/TransactionPanel/TransactionPanel.helpers.js b/src/components/TransactionPanel/TransactionPanel.helpers.js index ac1c2ebd..a5c50832 100644 --- a/src/components/TransactionPanel/TransactionPanel.helpers.js +++ b/src/components/TransactionPanel/TransactionPanel.helpers.js @@ -4,11 +4,11 @@ import classNames from 'classnames'; import { txHasFirstReview, txIsAccepted, - txIsAutodeclined, txIsCanceled, txIsDeclined, txIsDelivered, txIsEnquired, + txIsExpired, txIsRequested, txIsReviewed, } from '../../util/types'; @@ -245,7 +245,7 @@ export const OrderTitle = props => { />

); - } else if (txIsAutodeclined(transaction)) { + } else if (txIsExpired(transaction)) { return (

{ />

); - } else if (txIsAutodeclined(transaction)) { + } else if (txIsExpired(transaction)) { return (

{ const txAutoDeclined = createTransaction({ id: 'sale-autodeclined', - lastTransition: TX_TRANSITION_AUTO_DECLINE, + lastTransition: TRANSITION_EXPIRE, ...baseTxAttrs, }); @@ -231,7 +231,7 @@ describe('TransactionPanel - Order', () => { const txAutoDeclined = createTransaction({ id: 'order-autodeclined', - lastTransition: TX_TRANSITION_AUTO_DECLINE, + lastTransition: TRANSITION_EXPIRE, ...baseTxAttrs, }); diff --git a/src/util/types.js b/src/util/types.js index 13fb33b5..58529637 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -174,9 +174,8 @@ export const TRANSITION_REQUEST_AFTER_ENQUIRY = 'transition/preauthorize-enquiry export const TX_TRANSITION_ACCEPT = 'transition/accept'; export const TX_TRANSITION_DECLINE = 'transition/decline'; -// If the backend automatically declines the transaction, it is -// transitioned with the auto-decline transition. -export const TX_TRANSITION_AUTO_DECLINE = 'transition/auto-decline'; +// The backend automatically expire the transaction. +export const TRANSITION_EXPIRE = 'transition/auto-decline'; // Admin can also cancel the transition. export const TX_TRANSITION_CANCEL = 'transition/cancel'; @@ -199,11 +198,11 @@ export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = export const TX_TRANSITIONS = [ TRANSITION_ENQUIRE, + TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACCEPT, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, - TX_TRANSITION_AUTO_DECLINE, TX_TRANSITION_CANCEL, TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, @@ -241,9 +240,9 @@ export const txIsAccepted = tx => txLastTransition(tx) === TX_TRANSITION_ACCEPT; export const txIsDeclined = tx => txLastTransition(tx) === TX_TRANSITION_DECLINE; -export const txIsAutodeclined = tx => txLastTransition(tx) === TX_TRANSITION_AUTO_DECLINE; +export const txIsExpired = tx => txLastTransition(tx) === TRANSITION_EXPIRE; -export const txIsDeclinedOrAutodeclined = tx => txIsDeclined(tx) || txIsAutodeclined(tx); +export const txIsDeclinedOrAutodeclined = tx => txIsDeclined(tx) || txIsExpired(tx); export const txIsCanceled = tx => txLastTransition(tx) === TX_TRANSITION_CANCEL; From 6a84e89459195f474b93f57e33ac7d46a5744857 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 14:48:46 +0200 Subject: [PATCH 05/16] Transition ref rename: remove TX_ prefix --- .../ActivityFeed/ActivityFeed.example.js | 12 ++++++------ src/components/ActivityFeed/ActivityFeed.js | 18 +++++++++--------- .../BookingBreakdown.example.js | 12 ++++++------ .../BookingBreakdown/BookingBreakdown.test.js | 4 ++-- .../TransactionPanel/TransactionPanel.test.js | 18 +++++++++--------- .../TransactionPage/TransactionPage.duck.js | 12 ++++++------ src/util/test-data.js | 6 +++--- src/util/types.js | 18 +++++++++--------- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index 77491271..ae4f4b9b 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -9,12 +9,12 @@ import { createReview, } from '../../util/test-data'; import { + TRANSITION_ACCEPT, + TRANSITION_DECLINE, TRANSITION_REQUEST, - TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, - TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, @@ -88,7 +88,7 @@ export const WithTransitions = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 12)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_ACCEPT, + transition: TRANSITION_ACCEPT, }), // this should not be visible in the feed createTxTransition({ @@ -125,12 +125,12 @@ export const WithMessagesTransitionsAndReviews = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 12)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_ACCEPT, + transition: TRANSITION_ACCEPT, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 10, 33)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_DECLINE, + transition: TRANSITION_DECLINE, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 10, 34)), @@ -262,7 +262,7 @@ class PagedFeed extends Component { const trans2 = createTxTransition({ at: dates[2], by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_ACCEPT, + transition: TRANSITION_ACCEPT, }); // Last transition timestamp is interleaved between the last two diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 403e4d88..968eb671 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -7,14 +7,14 @@ import { Avatar, InlineTextButton, ReviewRating } from '../../components'; import { formatDate } from '../../util/dates'; import { ensureTransaction, ensureUser, ensureListing, userDisplayName } from '../../util/data'; import { + TRANSITION_ACCEPT, + TRANSITION_CANCEL, + TRANSITION_DECLINE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, - TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_CANCEL, - TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, @@ -87,12 +87,12 @@ Review.propTypes = { // should be rendered in he ActivityFeed const shouldRenderTransition = transition => { return [ + TRANSITION_ACCEPT, + TRANSITION_CANCEL, + TRANSITION_DECLINE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, - TX_TRANSITION_ACCEPT, - TX_TRANSITION_CANCEL, - TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, @@ -147,13 +147,13 @@ const resolveTransitionMessage = ( values={{ displayName, listingTitle }} /> ); - case TX_TRANSITION_ACCEPT: + case TRANSITION_ACCEPT: return isOwnTransition ? ( ) : ( ); - case TX_TRANSITION_DECLINE: + case TRANSITION_DECLINE: return isOwnTransition ? ( ) : ( @@ -165,7 +165,7 @@ const resolveTransitionMessage = ( ) : ( ); - case TX_TRANSITION_CANCEL: + case TRANSITION_CANCEL: return ; case TX_TRANSITION_MARK_DELIVERED: // Show the leave a review link if the state is delivered or diff --git a/src/components/BookingBreakdown/BookingBreakdown.example.js b/src/components/BookingBreakdown/BookingBreakdown.example.js index 4f605aec..dd44e00a 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.example.js +++ b/src/components/BookingBreakdown/BookingBreakdown.example.js @@ -3,12 +3,12 @@ import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, + TRANSITION_ACCEPT, + TRANSITION_CANCEL, + TRANSITION_DECLINE, TRANSITION_EXPIRE, TRANSITION_REQUEST, - TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, - TX_TRANSITION_CANCEL, - TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, } from '../../util/types'; import config from '../../config'; @@ -240,7 +240,7 @@ export const ProviderSaleAccepted = { userRole: 'provider', unitType: LINE_ITEM_NIGHT, transaction: exampleTransaction({ - lastTransition: TX_TRANSITION_ACCEPT, + lastTransition: TRANSITION_ACCEPT, payinTotal: new Money(4500, CURRENCY), payoutTotal: new Money(2500, CURRENCY), lineItems: [ @@ -274,7 +274,7 @@ export const ProviderSaleDeclined = { userRole: 'provider', unitType: LINE_ITEM_NIGHT, transaction: exampleTransaction({ - lastTransition: TX_TRANSITION_DECLINE, + lastTransition: TRANSITION_DECLINE, payinTotal: new Money(4500, CURRENCY), payoutTotal: new Money(2500, CURRENCY), lineItems: [ @@ -376,7 +376,7 @@ export const ProviderSaleCanceled = { userRole: 'provider', unitType: LINE_ITEM_NIGHT, transaction: exampleTransaction({ - lastTransition: TX_TRANSITION_CANCEL, + lastTransition: TRANSITION_CANCEL, payinTotal: new Money(0, CURRENCY), payoutTotal: new Money(0, CURRENCY), lineItems: [ diff --git a/src/components/BookingBreakdown/BookingBreakdown.test.js b/src/components/BookingBreakdown/BookingBreakdown.test.js index 7d5cc002..bcef62dd 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.test.js +++ b/src/components/BookingBreakdown/BookingBreakdown.test.js @@ -5,9 +5,9 @@ import { renderDeep } from '../../util/test-helpers'; import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_NIGHT, + TRANSITION_CANCEL, TRANSITION_REQUEST, TX_TRANSITION_ACTOR_CUSTOMER, - TX_TRANSITION_CANCEL, } from '../../util/types'; import { BookingBreakdownComponent } from './BookingBreakdown'; @@ -136,7 +136,7 @@ describe('BookingBreakdown', () => { userRole="provider" unitType={LINE_ITEM_NIGHT} transaction={exampleTransaction({ - lastTransition: TX_TRANSITION_CANCEL, + lastTransition: TRANSITION_CANCEL, payinTotal: new Money(0, 'USD'), payoutTotal: new Money(0, 'USD'), lineItems: [ diff --git a/src/components/TransactionPanel/TransactionPanel.test.js b/src/components/TransactionPanel/TransactionPanel.test.js index 6ad276c1..eb4aa16d 100644 --- a/src/components/TransactionPanel/TransactionPanel.test.js +++ b/src/components/TransactionPanel/TransactionPanel.test.js @@ -12,12 +12,12 @@ import { import { renderShallow } from '../../util/test-helpers'; import { fakeIntl } from '../../util/test-data'; import { + TRANSITION_ACCEPT, + TRANSITION_CANCELED, + TRANSITION_DECLINE, TRANSITION_ENQUIRE, TRANSITION_EXPIRE, TRANSITION_REQUEST, - TX_TRANSITION_ACCEPT, - TX_TRANSITION_CANCELED, - TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, } from '../../util/types'; import { BreakdownMaybe } from './TransactionPanel.helpers'; @@ -54,13 +54,13 @@ describe('TransactionPanel - Sale', () => { const txAccepted = createTransaction({ id: 'sale-accepted', - lastTransition: TX_TRANSITION_ACCEPT, + lastTransition: TRANSITION_ACCEPT, ...baseTxAttrs, }); const txDeclined = createTransaction({ id: 'sale-declined', - lastTransition: TX_TRANSITION_DECLINE, + lastTransition: TRANSITION_DECLINE, ...baseTxAttrs, }); @@ -72,7 +72,7 @@ describe('TransactionPanel - Sale', () => { const txCanceled = createTransaction({ id: 'sale-canceled', - lastTransition: TX_TRANSITION_CANCELED, + lastTransition: TRANSITION_CANCELED, ...baseTxAttrs, }); @@ -219,13 +219,13 @@ describe('TransactionPanel - Order', () => { const txAccepted = createTransaction({ id: 'order-accepted', - lastTransition: TX_TRANSITION_ACCEPT, + lastTransition: TRANSITION_ACCEPT, ...baseTxAttrs, }); const txDeclined = createTransaction({ id: 'order-declined', - lastTransition: TX_TRANSITION_DECLINE, + lastTransition: TRANSITION_DECLINE, ...baseTxAttrs, }); @@ -237,7 +237,7 @@ describe('TransactionPanel - Order', () => { const txCanceled = createTransaction({ id: 'order-canceled', - lastTransition: TX_TRANSITION_CANCELED, + lastTransition: TRANSITION_CANCELED, ...baseTxAttrs, }); diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index b36b8df2..0be6e4e5 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -2,8 +2,8 @@ import { pick } from 'lodash'; import { types as sdkTypes } from '../../util/sdkLoader'; import { isTransactionsTransitionInvalidTransition, storableError } from '../../util/errors'; import { - TX_TRANSITION_ACCEPT, - TX_TRANSITION_DECLINE, + TRANSITION_ACCEPT, + TRANSITION_DECLINE, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -254,7 +254,7 @@ export const acceptSale = id => (dispatch, getState, sdk) => { dispatch(acceptSaleRequest()); return sdk.transactions - .transition({ id, transition: TX_TRANSITION_ACCEPT, params: {} }, { expand: true }) + .transition({ id, transition: TRANSITION_ACCEPT, params: {} }, { expand: true }) .then(response => { dispatch(addMarketplaceEntities(response)); dispatch(acceptSaleSuccess()); @@ -265,7 +265,7 @@ export const acceptSale = id => (dispatch, getState, sdk) => { dispatch(acceptSaleError(storableError(e))); log.error(e, 'accept-sale-failed', { txId: id, - transition: TX_TRANSITION_ACCEPT, + transition: TRANSITION_ACCEPT, }); throw e; }); @@ -278,7 +278,7 @@ export const declineSale = id => (dispatch, getState, sdk) => { dispatch(declineSaleRequest()); return sdk.transactions - .transition({ id, transition: TX_TRANSITION_DECLINE, params: {} }, { expand: true }) + .transition({ id, transition: TRANSITION_DECLINE, params: {} }, { expand: true }) .then(response => { dispatch(addMarketplaceEntities(response)); dispatch(declineSaleSuccess()); @@ -289,7 +289,7 @@ export const declineSale = id => (dispatch, getState, sdk) => { dispatch(declineSaleError(storableError(e))); log.error(e, 'reject-sale-failed', { txId: id, - transition: TX_TRANSITION_DECLINE, + transition: TRANSITION_DECLINE, }); throw e; }); diff --git a/src/util/test-data.js b/src/util/test-data.js index b96bfe90..ae0caaa1 100644 --- a/src/util/test-data.js +++ b/src/util/test-data.js @@ -2,8 +2,8 @@ import Decimal from 'decimal.js'; import { types as sdkTypes } from './sdkLoader'; import { nightsBetween } from '../util/dates'; import { + TRANSITION_ACCEPT, TRANSITION_REQUEST, - TX_TRANSITION_ACCEPT, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, } from '../util/types'; @@ -104,7 +104,7 @@ export const createTxTransition = options => { export const createTransaction = options => { const { id, - lastTransition = TX_TRANSITION_ACCEPT, + lastTransition = TRANSITION_ACCEPT, total = new Money(1000, 'USD'), commission = new Money(100, 'USD'), booking = null, @@ -122,7 +122,7 @@ export const createTransaction = options => { createTxTransition({ at: new Date(Date.UTC(2017, 5, 1)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_ACCEPT, + transition: TRANSITION_ACCEPT, }), ], } = options; diff --git a/src/util/types.js b/src/util/types.js index 58529637..c810a9e5 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -171,14 +171,14 @@ export const TRANSITION_REQUEST_AFTER_ENQUIRY = 'transition/preauthorize-enquiry // When the provider accepts or declines a transaction from the // SalePage, it is transitioned with the accept or decline transition. -export const TX_TRANSITION_ACCEPT = 'transition/accept'; -export const TX_TRANSITION_DECLINE = 'transition/decline'; +export const TRANSITION_ACCEPT = 'transition/accept'; +export const TRANSITION_DECLINE = 'transition/decline'; // The backend automatically expire the transaction. export const TRANSITION_EXPIRE = 'transition/auto-decline'; // Admin can also cancel the transition. -export const TX_TRANSITION_CANCEL = 'transition/cancel'; +export const TRANSITION_CANCEL = 'transition/cancel'; // If the is marked as delivered in the backend, it is transitioned // with the mark-delivered transition. @@ -197,14 +197,14 @@ export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = 'transition/auto-complete-without-reviews'; export const TX_TRANSITIONS = [ + TRANSITION_ACCEPT, + TRANSITION_CANCEL, + TRANSITION_DECLINE, TRANSITION_ENQUIRE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, - TX_TRANSITION_ACCEPT, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, - TX_TRANSITION_CANCEL, - TX_TRANSITION_DECLINE, TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, @@ -236,15 +236,15 @@ export const txIsRequested = tx => { return transition === TRANSITION_REQUEST || transition === TRANSITION_REQUEST_AFTER_ENQUIRY; }; -export const txIsAccepted = tx => txLastTransition(tx) === TX_TRANSITION_ACCEPT; +export const txIsAccepted = tx => txLastTransition(tx) === TRANSITION_ACCEPT; -export const txIsDeclined = tx => txLastTransition(tx) === TX_TRANSITION_DECLINE; +export const txIsDeclined = tx => txLastTransition(tx) === TRANSITION_DECLINE; export const txIsExpired = tx => txLastTransition(tx) === TRANSITION_EXPIRE; export const txIsDeclinedOrAutodeclined = tx => txIsDeclined(tx) || txIsExpired(tx); -export const txIsCanceled = tx => txLastTransition(tx) === TX_TRANSITION_CANCEL; +export const txIsCanceled = tx => txLastTransition(tx) === TRANSITION_CANCEL; export const txIsDelivered = tx => txLastTransition(tx) === TX_TRANSITION_MARK_DELIVERED; From 0b77b9070b205f7ca272d74905fb4b61935a7bae Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:05:41 +0200 Subject: [PATCH 06/16] Transition ref rename: mark delivered -> complete --- src/components/ActivityFeed/ActivityFeed.example.js | 8 ++++---- src/components/ActivityFeed/ActivityFeed.js | 8 ++++---- .../BookingBreakdown/BookingBreakdown.example.js | 4 ++-- src/components/BookingBreakdown/BookingBreakdown.js | 4 ++-- .../TransactionPanel/TransactionPanel.helpers.js | 6 +++--- src/components/TransactionPanel/TransactionPanel.test.js | 6 +++--- src/containers/InboxPage/InboxPage.js | 4 ++-- src/util/types.js | 9 ++++----- 8 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index ae4f4b9b..bbae17fc 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -10,12 +10,12 @@ import { } from '../../util/test-data'; import { TRANSITION_ACCEPT, + TRANSITION_COMPLETE, TRANSITION_DECLINE, TRANSITION_REQUEST, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, - TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -135,7 +135,7 @@ export const WithMessagesTransitionsAndReviews = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 10, 34)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_MARK_DELIVERED, + transition: TRANSITION_COMPLETE, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 11, 34)), @@ -270,7 +270,7 @@ class PagedFeed extends Component { const trans3 = createTxTransition({ at: dates[5], by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_MARK_DELIVERED, + transition: TRANSITION_COMPLETE, }); // First message timestamp is interleaved between the first two @@ -283,7 +283,7 @@ class PagedFeed extends Component { const transaction = createTransaction({ id: 'tx1', - lastTransition: TX_TRANSITION_MARK_DELIVERED, + lastTransition: TRANSITION_COMPLETE, lastTransitionedAt: dates[5], transitions: [trans1, trans2, trans3], listing: createListing('listing'), diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 968eb671..3697dfcd 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -9,13 +9,13 @@ import { ensureTransaction, ensureUser, ensureListing, userDisplayName } from '. import { TRANSITION_ACCEPT, TRANSITION_CANCEL, + TRANSITION_COMPLETE, TRANSITION_DECLINE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -89,11 +89,11 @@ const shouldRenderTransition = transition => { return [ TRANSITION_ACCEPT, TRANSITION_CANCEL, + TRANSITION_COMPLETE, TRANSITION_DECLINE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, - TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -134,7 +134,7 @@ const resolveTransitionMessage = ( const isOwnTransition = transition.by === ownRole; const currentTransition = transition.transition; const displayName = otherUsersName; - const deliveredState = lastTransition === TX_TRANSITION_MARK_DELIVERED; + const deliveredState = lastTransition === TRANSITION_COMPLETE; switch (currentTransition) { case TRANSITION_REQUEST: @@ -167,7 +167,7 @@ const resolveTransitionMessage = ( ); case TRANSITION_CANCEL: return ; - case TX_TRANSITION_MARK_DELIVERED: + case TRANSITION_COMPLETE: // Show the leave a review link if the state is delivered or // if current user is not the first to leave a review const reviewLink = diff --git a/src/components/BookingBreakdown/BookingBreakdown.example.js b/src/components/BookingBreakdown/BookingBreakdown.example.js index dd44e00a..33405317 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.example.js +++ b/src/components/BookingBreakdown/BookingBreakdown.example.js @@ -5,11 +5,11 @@ import { LINE_ITEM_NIGHT, TRANSITION_ACCEPT, TRANSITION_CANCEL, + TRANSITION_COMPLETE, TRANSITION_DECLINE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TX_TRANSITION_ACTOR_CUSTOMER, - TX_TRANSITION_MARK_DELIVERED, } from '../../util/types'; import config from '../../config'; import BookingBreakdown from './BookingBreakdown'; @@ -342,7 +342,7 @@ export const ProviderSaleDelivered = { userRole: 'provider', unitType: LINE_ITEM_NIGHT, transaction: exampleTransaction({ - lastTransition: TX_TRANSITION_MARK_DELIVERED, + lastTransition: TRANSITION_COMPLETE, payinTotal: new Money(4500, CURRENCY), payoutTotal: new Money(2500, CURRENCY), lineItems: [ diff --git a/src/components/BookingBreakdown/BookingBreakdown.js b/src/components/BookingBreakdown/BookingBreakdown.js index 1ffd412d..bb289556 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.js +++ b/src/components/BookingBreakdown/BookingBreakdown.js @@ -13,8 +13,8 @@ import { LINE_ITEM_NIGHT, LINE_ITEM_PROVIDER_COMMISSION, txIsCanceled, + txIsCompleted, txIsDeclinedOrAutodeclined, - txIsDelivered, propTypes, } from '../../util/types'; import { daysBetween } from '../../util/dates'; @@ -216,7 +216,7 @@ export const BookingBreakdownComponent = props => { const classes = classNames(rootClassName || css.root, className); let providerTotalMessageId = 'BookingBreakdown.providerTotalDefault'; - if (txIsDelivered(transaction)) { + if (txIsCompleted(transaction)) { providerTotalMessageId = 'BookingBreakdown.providerTotalDelivered'; } else if (txIsDeclinedOrAutodeclined(transaction)) { providerTotalMessageId = 'BookingBreakdown.providerTotalDeclined'; diff --git a/src/components/TransactionPanel/TransactionPanel.helpers.js b/src/components/TransactionPanel/TransactionPanel.helpers.js index a5c50832..9022d32b 100644 --- a/src/components/TransactionPanel/TransactionPanel.helpers.js +++ b/src/components/TransactionPanel/TransactionPanel.helpers.js @@ -5,8 +5,8 @@ import { txHasFirstReview, txIsAccepted, txIsCanceled, + txIsCompleted, txIsDeclined, - txIsDelivered, txIsEnquired, txIsExpired, txIsRequested, @@ -264,7 +264,7 @@ export const OrderTitle = props => {

); } else if ( - txIsDelivered(transaction) || + txIsCompleted(transaction) || txHasFirstReview(transaction) || txIsReviewed(transaction) ) { @@ -377,7 +377,7 @@ export const SaleTitle = props => { ); } else if ( - txIsDelivered(transaction) || + txIsCompleted(transaction) || txHasFirstReview(transaction) || txIsReviewed(transaction) ) { diff --git a/src/components/TransactionPanel/TransactionPanel.test.js b/src/components/TransactionPanel/TransactionPanel.test.js index eb4aa16d..da6c67d8 100644 --- a/src/components/TransactionPanel/TransactionPanel.test.js +++ b/src/components/TransactionPanel/TransactionPanel.test.js @@ -14,11 +14,11 @@ import { fakeIntl } from '../../util/test-data'; import { TRANSITION_ACCEPT, TRANSITION_CANCELED, + TRANSITION_COMPLETE, TRANSITION_DECLINE, TRANSITION_ENQUIRE, TRANSITION_EXPIRE, TRANSITION_REQUEST, - TX_TRANSITION_MARK_DELIVERED, } from '../../util/types'; import { BreakdownMaybe } from './TransactionPanel.helpers'; import { TransactionPanelComponent } from './TransactionPanel'; @@ -78,7 +78,7 @@ describe('TransactionPanel - Sale', () => { const txDelivered = createTransaction({ id: 'sale-delivered', - lastTransition: TX_TRANSITION_MARK_DELIVERED, + lastTransition: TRANSITION_COMPLETE, ...baseTxAttrs, }); @@ -243,7 +243,7 @@ describe('TransactionPanel - Order', () => { const txDelivered = createTransaction({ id: 'order-delivered', - lastTransition: TX_TRANSITION_MARK_DELIVERED, + lastTransition: TRANSITION_COMPLETE, ...baseTxAttrs, }); diff --git a/src/containers/InboxPage/InboxPage.js b/src/containers/InboxPage/InboxPage.js index 0922da62..7808f31f 100644 --- a/src/containers/InboxPage/InboxPage.js +++ b/src/containers/InboxPage/InboxPage.js @@ -10,8 +10,8 @@ import { txHasFirstReview, txIsAccepted, txIsCanceled, + txIsCompleted, txIsDeclinedOrAutodeclined, - txIsDelivered, txIsEnquired, txIsRequested, txIsReviewed, @@ -87,7 +87,7 @@ const txState = (intl, tx, isOrder) => { id: 'InboxPage.stateCanceled', }), }; - } else if (txIsDelivered(tx) || txHasFirstReview(tx) || txIsReviewed(tx)) { + } else if (txIsCompleted(tx) || txHasFirstReview(tx) || txIsReviewed(tx)) { return { nameClassName: css.nameDelivered, bookingClassName: css.bookingDelivered, diff --git a/src/util/types.js b/src/util/types.js index c810a9e5..0640d2c8 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -180,9 +180,8 @@ export const TRANSITION_EXPIRE = 'transition/auto-decline'; // Admin can also cancel the transition. export const TRANSITION_CANCEL = 'transition/cancel'; -// If the is marked as delivered in the backend, it is transitioned -// with the mark-delivered transition. -export const TX_TRANSITION_MARK_DELIVERED = 'transition/mark-delivered'; +// The backend will mark the transaction completed. +export const TRANSITION_COMPLETE = 'transition/mark-delivered'; // Review transitions // Reviews are given through transaction transitions. @@ -199,13 +198,13 @@ export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = export const TX_TRANSITIONS = [ TRANSITION_ACCEPT, TRANSITION_CANCEL, + TRANSITION_COMPLETE, TRANSITION_DECLINE, TRANSITION_ENQUIRE, TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, - TX_TRANSITION_MARK_DELIVERED, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, @@ -246,7 +245,7 @@ export const txIsDeclinedOrAutodeclined = tx => txIsDeclined(tx) || txIsExpired( export const txIsCanceled = tx => txLastTransition(tx) === TRANSITION_CANCEL; -export const txIsDelivered = tx => txLastTransition(tx) === TX_TRANSITION_MARK_DELIVERED; +export const txIsCompleted = tx => txLastTransition(tx) === TRANSITION_COMPLETE; export const txHasFirstReview = tx => firstReviewTransitions.includes(txLastTransition(tx)); From 8dde64e19451a65e53618e1cb0d843ff59b122e2 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:10:10 +0200 Subject: [PATCH 07/16] Transition ref rename: auto-complete without reviews -> expire review period --- src/components/ActivityFeed/ActivityFeed.example.js | 4 ++-- src/util/types.js | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index bbae17fc..0112bc5b 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -12,10 +12,10 @@ import { TRANSITION_ACCEPT, TRANSITION_COMPLETE, TRANSITION_DECLINE, + TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, @@ -94,7 +94,7 @@ export const WithTransitions = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 16, 8, 12)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, + transition: TRANSITION_EXPIRE_REVIEW_PERIOD, }), ], }), diff --git a/src/util/types.js b/src/util/types.js index 0640d2c8..5b21a868 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -192,8 +192,7 @@ export const TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST = 'transition/review-by-cust export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; -export const TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS = - 'transition/auto-complete-without-reviews'; +export const TRANSITION_EXPIRE_REVIEW_PERIOD = 'transition/auto-complete-without-reviews'; export const TX_TRANSITIONS = [ TRANSITION_ACCEPT, @@ -202,9 +201,9 @@ export const TX_TRANSITIONS = [ TRANSITION_DECLINE, TRANSITION_ENQUIRE, TRANSITION_EXPIRE, + TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, - TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, @@ -267,11 +266,11 @@ const firstReviewTransitions = [ // reviews are completed export const areReviewsCompleted = transition => { return [ - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + TRANSITION_EXPIRE_REVIEW_PERIOD, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_AUTO_COMPLETE_WITHOUT_REVIEWS, + TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; From 0032c7645b7d10c764d6c89a86578db25912ccd8 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:12:46 +0200 Subject: [PATCH 08/16] Rename txIsDeclinedOrAutodeclined to txIsDeclinedOrExpired --- src/components/BookingBreakdown/BookingBreakdown.js | 4 ++-- src/containers/InboxPage/InboxPage.js | 4 ++-- src/util/types.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/BookingBreakdown/BookingBreakdown.js b/src/components/BookingBreakdown/BookingBreakdown.js index bb289556..776c0b43 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.js +++ b/src/components/BookingBreakdown/BookingBreakdown.js @@ -14,7 +14,7 @@ import { LINE_ITEM_PROVIDER_COMMISSION, txIsCanceled, txIsCompleted, - txIsDeclinedOrAutodeclined, + txIsDeclinedOrExpired, propTypes, } from '../../util/types'; import { daysBetween } from '../../util/dates'; @@ -218,7 +218,7 @@ export const BookingBreakdownComponent = props => { let providerTotalMessageId = 'BookingBreakdown.providerTotalDefault'; if (txIsCompleted(transaction)) { providerTotalMessageId = 'BookingBreakdown.providerTotalDelivered'; - } else if (txIsDeclinedOrAutodeclined(transaction)) { + } else if (txIsDeclinedOrExpired(transaction)) { providerTotalMessageId = 'BookingBreakdown.providerTotalDeclined'; } else if (txIsCanceled(transaction)) { providerTotalMessageId = 'BookingBreakdown.providerTotalCanceled'; diff --git a/src/containers/InboxPage/InboxPage.js b/src/containers/InboxPage/InboxPage.js index 7808f31f..9df8d24f 100644 --- a/src/containers/InboxPage/InboxPage.js +++ b/src/containers/InboxPage/InboxPage.js @@ -11,7 +11,7 @@ import { txIsAccepted, txIsCanceled, txIsCompleted, - txIsDeclinedOrAutodeclined, + txIsDeclinedOrExpired, txIsEnquired, txIsRequested, txIsReviewed, @@ -67,7 +67,7 @@ const txState = (intl, tx, isOrder) => { id: 'InboxPage.stateAccepted', }), }; - } else if (txIsDeclinedOrAutodeclined(tx)) { + } else if (txIsDeclinedOrExpired(tx)) { return { nameClassName: css.nameDeclined, bookingClassName: css.bookingDeclined, diff --git a/src/util/types.js b/src/util/types.js index 5b21a868..26bff45b 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -240,7 +240,7 @@ export const txIsDeclined = tx => txLastTransition(tx) === TRANSITION_DECLINE; export const txIsExpired = tx => txLastTransition(tx) === TRANSITION_EXPIRE; -export const txIsDeclinedOrAutodeclined = tx => txIsDeclined(tx) || txIsExpired(tx); +export const txIsDeclinedOrExpired = tx => txIsDeclined(tx) || txIsExpired(tx); export const txIsCanceled = tx => txLastTransition(tx) === TRANSITION_CANCEL; From 0f94ef1625b0b263fb2183e74ae797e5122035d6 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:19:33 +0200 Subject: [PATCH 09/16] Transition ref rename: review by provider first -> review 1 by provider --- .../ActivityFeed/ActivityFeed.example.js | 4 ++-- src/components/ActivityFeed/ActivityFeed.js | 14 +++++++------- .../TransactionPage/TransactionPage.duck.js | 8 +++----- src/util/types.js | 6 +++--- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index 0112bc5b..e74a962e 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -14,11 +14,11 @@ import { TRANSITION_DECLINE, TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, } from '../../util/types'; import ActivityFeed from './ActivityFeed'; @@ -140,7 +140,7 @@ export const WithMessagesTransitionsAndReviews = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 11, 34)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, + transition: TRANSITION_REVIEW_1_BY_PROVIDER, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 12, 34)), diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 3697dfcd..17abc87b 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -14,11 +14,11 @@ import { TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, areReviewsCompleted, propTypes, @@ -94,9 +94,9 @@ const shouldRenderTransition = transition => { TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; @@ -105,10 +105,10 @@ const shouldRenderTransition = transition => { // given tx transition. const isReviewTransition = transition => { return [ - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; @@ -116,7 +116,7 @@ const hasUserLeftAReviewFirst = (userRole, lastTransition) => { return ( (lastTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST && userRole === TX_TRANSITION_ACTOR_CUSTOMER) || - (lastTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST && + (lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER && userRole === TX_TRANSITION_ACTOR_PROVIDER) || areReviewsCompleted(lastTransition) ); @@ -178,7 +178,7 @@ const resolveTransitionMessage = ( ) : null; return ; - case TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST: + case TRANSITION_REVIEW_1_BY_PROVIDER: case TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST: if (isOwnTransition) { return ; @@ -268,7 +268,7 @@ const Transition = props => { currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST || currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND; const providerReview = - currentTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST || + currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER || currentTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND; if (customerReview) { const review = reviewByAuthorId(currentTransaction, customer.id); diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index 0be6e4e5..e4d30cef 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -4,9 +4,9 @@ import { isTransactionsTransitionInvalidTransition, storableError } from '../../ import { TRANSITION_ACCEPT, TRANSITION_DECLINE, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, } from '../../util/types'; import * as log from '../../util/log'; @@ -406,9 +406,7 @@ const sendReviewAsSecond = (id, params, role, dispatch, sdk) => { // by calling sendReviewAsSecond(). const sendReviewAsFirst = (id, params, role, dispatch, sdk) => { const transition = - role === CUSTOMER - ? TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST - : TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST; + role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST : TRANSITION_REVIEW_1_BY_PROVIDER; const include = REVIEW_TX_INCLUDES; return sdk.transactions @@ -437,7 +435,7 @@ export const sendReview = (role, tx, reviewRating, reviewContent) => (dispatch, const txStateOtherPartyFirst = role === CUSTOMER - ? tx.attributes.lastTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST + ? tx.attributes.lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER : tx.attributes.lastTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST; dispatch(sendReviewRequest()); diff --git a/src/util/types.js b/src/util/types.js index 26bff45b..281dfeba 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -186,7 +186,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered'; // Review transitions // Reviews are given through transaction transitions. // Either party (provider or customer) can be the first to give a review. -export const TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST = 'transition/review-by-provider-first'; +export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; export const TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND = 'transition/review-by-provider-second'; export const TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST = 'transition/review-by-customer-first'; export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; @@ -204,11 +204,11 @@ export const TX_TRANSITIONS = [ TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ]; @@ -258,7 +258,7 @@ propTypes.txTransition = shape({ }); const firstReviewTransitions = [ - TX_TRANSITION_REVIEW_BY_PROVIDER_FIRST, + TRANSITION_REVIEW_1_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, ]; From f58ccf6a72cecf659649e30d94f4925c29e60193 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:26:17 +0200 Subject: [PATCH 10/16] Transition ref rename: review by provider second -> review 2 by provider --- src/components/ActivityFeed/ActivityFeed.example.js | 6 +++--- src/components/ActivityFeed/ActivityFeed.js | 10 +++++----- src/containers/TransactionPage/TransactionPage.duck.js | 6 ++---- src/util/types.js | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index e74a962e..b160430c 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -15,11 +15,11 @@ import { TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, } from '../../util/types'; import ActivityFeed from './ActivityFeed'; @@ -211,7 +211,7 @@ export const WithAReviewFromBothUsers = { { author: createUser('user2'), subject: createUser('user1') } ), ], - lastTransition: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, + lastTransition: TRANSITION_REVIEW_2_BY_PROVIDER, transitions: [ createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 10)), @@ -221,7 +221,7 @@ export const WithAReviewFromBothUsers = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 10, 8, 10)), by: TX_TRANSITION_ACTOR_PROVIDER, - transition: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, + transition: TRANSITION_REVIEW_2_BY_PROVIDER, }), ], }), diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 17abc87b..9db51f1f 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -15,11 +15,11 @@ import { TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, areReviewsCompleted, propTypes, } from '../../util/types'; @@ -95,9 +95,9 @@ const shouldRenderTransition = transition => { TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; @@ -106,9 +106,9 @@ const shouldRenderTransition = transition => { const isReviewTransition = transition => { return [ TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; @@ -197,7 +197,7 @@ const resolveTransitionMessage = ( /> ); } - case TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND: + case TRANSITION_REVIEW_2_BY_PROVIDER: case TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND: if (isOwnTransition) { return ; @@ -269,7 +269,7 @@ const Transition = props => { currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND; const providerReview = currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER || - currentTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND; + currentTransition === TRANSITION_REVIEW_2_BY_PROVIDER; if (customerReview) { const review = reviewByAuthorId(currentTransaction, customer.id); reviewComponent = ( diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index e4d30cef..7632c79c 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -5,9 +5,9 @@ import { TRANSITION_ACCEPT, TRANSITION_DECLINE, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, } from '../../util/types'; import * as log from '../../util/log'; import { updatedEntities, denormalisedEntities } from '../../util/data'; @@ -377,9 +377,7 @@ const REVIEW_TX_INCLUDES = ['reviews', 'reviews.author', 'reviews.subject']; // TX_TRANSITION_REVIEW_BY__SECOND const sendReviewAsSecond = (id, params, role, dispatch, sdk) => { const transition = - role === CUSTOMER - ? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND - : TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND; + role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND : TRANSITION_REVIEW_2_BY_PROVIDER; const include = REVIEW_TX_INCLUDES; diff --git a/src/util/types.js b/src/util/types.js index 281dfeba..6f95622c 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -187,7 +187,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered'; // Reviews are given through transaction transitions. // Either party (provider or customer) can be the first to give a review. export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; -export const TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND = 'transition/review-by-provider-second'; +export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; export const TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST = 'transition/review-by-customer-first'; export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; @@ -205,11 +205,11 @@ export const TX_TRANSITIONS = [ TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ]; // Roles of actors that perform transaction transitions @@ -267,10 +267,10 @@ const firstReviewTransitions = [ export const areReviewsCompleted = transition => { return [ TRANSITION_EXPIRE_REVIEW_PERIOD, + TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, - TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND, ].includes(transition); }; From 217bd92bfc05c0713d61ba413f30256aac009c43 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:30:52 +0200 Subject: [PATCH 11/16] Transition ref rename: review by customer first -> review 1 by customer --- src/components/ActivityFeed/ActivityFeed.example.js | 4 ++-- src/components/ActivityFeed/ActivityFeed.js | 12 ++++++------ .../TransactionPage/TransactionPage.duck.js | 6 +++--- src/util/types.js | 9 +++------ 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index b160430c..f216b34d 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -14,11 +14,11 @@ import { TRANSITION_DECLINE, TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, + TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, } from '../../util/types'; import ActivityFeed from './ActivityFeed'; @@ -216,7 +216,7 @@ export const WithAReviewFromBothUsers = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 10)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, + transition: TRANSITION_REVIEW_1_BY_CUSTOMER, }), createTxTransition({ at: new Date(Date.UTC(2017, 10, 10, 8, 10)), diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 9db51f1f..035f046e 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -14,11 +14,11 @@ import { TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, + TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, areReviewsCompleted, propTypes, @@ -94,9 +94,9 @@ const shouldRenderTransition = transition => { TRANSITION_EXPIRE, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, + TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; @@ -105,16 +105,16 @@ const shouldRenderTransition = transition => { // given tx transition. const isReviewTransition = transition => { return [ + TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; const hasUserLeftAReviewFirst = (userRole, lastTransition) => { return ( - (lastTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST && + (lastTransition === TRANSITION_REVIEW_1_BY_CUSTOMER && userRole === TX_TRANSITION_ACTOR_CUSTOMER) || (lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER && userRole === TX_TRANSITION_ACTOR_PROVIDER) || @@ -179,7 +179,7 @@ const resolveTransitionMessage = ( return ; case TRANSITION_REVIEW_1_BY_PROVIDER: - case TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST: + case TRANSITION_REVIEW_1_BY_CUSTOMER: if (isOwnTransition) { return ; } else { @@ -265,7 +265,7 @@ const Transition = props => { if (isReviewTransition(currentTransition) && areReviewsCompleted(lastTransition)) { const customerReview = - currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST || + currentTransition === TRANSITION_REVIEW_1_BY_CUSTOMER || currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND; const providerReview = currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER || diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index 7632c79c..755f0e87 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -4,9 +4,9 @@ import { isTransactionsTransitionInvalidTransition, storableError } from '../../ import { TRANSITION_ACCEPT, TRANSITION_DECLINE, + TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, } from '../../util/types'; import * as log from '../../util/log'; @@ -404,7 +404,7 @@ const sendReviewAsSecond = (id, params, role, dispatch, sdk) => { // by calling sendReviewAsSecond(). const sendReviewAsFirst = (id, params, role, dispatch, sdk) => { const transition = - role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST : TRANSITION_REVIEW_1_BY_PROVIDER; + role === CUSTOMER ? TRANSITION_REVIEW_1_BY_CUSTOMER : TRANSITION_REVIEW_1_BY_PROVIDER; const include = REVIEW_TX_INCLUDES; return sdk.transactions @@ -434,7 +434,7 @@ export const sendReview = (role, tx, reviewRating, reviewContent) => (dispatch, const txStateOtherPartyFirst = role === CUSTOMER ? tx.attributes.lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER - : tx.attributes.lastTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST; + : tx.attributes.lastTransition === TRANSITION_REVIEW_1_BY_CUSTOMER; dispatch(sendReviewRequest()); diff --git a/src/util/types.js b/src/util/types.js index 6f95622c..4f2b45ff 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -188,7 +188,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered'; // Either party (provider or customer) can be the first to give a review. export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; -export const TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST = 'transition/review-by-customer-first'; +export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first'; export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; @@ -204,11 +204,11 @@ export const TX_TRANSITIONS = [ TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, + TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ]; @@ -257,10 +257,7 @@ propTypes.txTransition = shape({ transition: oneOf(TX_TRANSITIONS).isRequired, }); -const firstReviewTransitions = [ - TRANSITION_REVIEW_1_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, -]; +const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER]; // Check if tx transition is followed by a state where // reviews are completed From 3210cd8938bb929b56fc90fe2cf6313b8ca15b6a Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:35:35 +0200 Subject: [PATCH 12/16] Transition ref rename: review by customer second -> review 2 by customer --- src/components/ActivityFeed/ActivityFeed.example.js | 6 +++--- src/components/ActivityFeed/ActivityFeed.js | 10 +++++----- src/containers/TransactionPage/TransactionPage.duck.js | 4 ++-- src/util/types.js | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index f216b34d..81679255 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -16,10 +16,10 @@ import { TRANSITION_REQUEST, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, } from '../../util/types'; import ActivityFeed from './ActivityFeed'; @@ -115,7 +115,7 @@ export const WithMessagesTransitionsAndReviews = { customer: createUser('user1'), provider: createUser('user2'), listing: createListing('Listing'), - lastTransition: TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + lastTransition: TRANSITION_REVIEW_2_BY_CUSTOMER, transitions: [ createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 10)), @@ -145,7 +145,7 @@ export const WithMessagesTransitionsAndReviews = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 12, 34)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + transition: TRANSITION_REVIEW_2_BY_CUSTOMER, }), ], reviews: [ diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 035f046e..18af5eae 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -16,10 +16,10 @@ import { TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, areReviewsCompleted, propTypes, } from '../../util/types'; @@ -96,8 +96,8 @@ const shouldRenderTransition = transition => { TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; @@ -107,8 +107,8 @@ const isReviewTransition = transition => { return [ TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; @@ -198,7 +198,7 @@ const resolveTransitionMessage = ( ); } case TRANSITION_REVIEW_2_BY_PROVIDER: - case TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND: + case TRANSITION_REVIEW_2_BY_CUSTOMER: if (isOwnTransition) { return ; } else { @@ -266,7 +266,7 @@ const Transition = props => { if (isReviewTransition(currentTransition) && areReviewsCompleted(lastTransition)) { const customerReview = currentTransition === TRANSITION_REVIEW_1_BY_CUSTOMER || - currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND; + currentTransition === TRANSITION_REVIEW_2_BY_CUSTOMER; const providerReview = currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER || currentTransition === TRANSITION_REVIEW_2_BY_PROVIDER; diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index 755f0e87..069bb552 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -6,8 +6,8 @@ import { TRANSITION_DECLINE, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, } from '../../util/types'; import * as log from '../../util/log'; import { updatedEntities, denormalisedEntities } from '../../util/data'; @@ -377,7 +377,7 @@ const REVIEW_TX_INCLUDES = ['reviews', 'reviews.author', 'reviews.subject']; // TX_TRANSITION_REVIEW_BY__SECOND const sendReviewAsSecond = (id, params, role, dispatch, sdk) => { const transition = - role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND : TRANSITION_REVIEW_2_BY_PROVIDER; + role === CUSTOMER ? TRANSITION_REVIEW_2_BY_CUSTOMER : TRANSITION_REVIEW_2_BY_PROVIDER; const include = REVIEW_TX_INCLUDES; diff --git a/src/util/types.js b/src/util/types.js index 4f2b45ff..70526487 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -189,7 +189,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered'; export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first'; -export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; +export const TRANSITION_REVIEW_2_BY_CUSTOMER = 'transition/review-by-customer-second'; export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; export const TRANSITION_EXPIRE_REVIEW_PERIOD = 'transition/auto-complete-without-reviews'; @@ -206,10 +206,10 @@ export const TX_TRANSITIONS = [ TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ]; // Roles of actors that perform transaction transitions @@ -264,10 +264,10 @@ const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVI export const areReviewsCompleted = transition => { return [ TRANSITION_EXPIRE_REVIEW_PERIOD, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; From 5dc5af7e5eed10d365caaf217fb04f4ffa8e000c Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:38:11 +0200 Subject: [PATCH 13/16] Transition ref rename: mark reviewed by customer -> expire customer review period --- src/util/types.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/types.js b/src/util/types.js index 70526487..549d78d2 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -190,7 +190,7 @@ export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-fi export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first'; export const TRANSITION_REVIEW_2_BY_CUSTOMER = 'transition/review-by-customer-second'; -export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; +export const TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD = 'transition/mark-reviewed-by-customer'; export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; export const TRANSITION_EXPIRE_REVIEW_PERIOD = 'transition/auto-complete-without-reviews'; @@ -201,6 +201,7 @@ export const TX_TRANSITIONS = [ TRANSITION_DECLINE, TRANSITION_ENQUIRE, TRANSITION_EXPIRE, + TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD, TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, @@ -208,7 +209,6 @@ export const TX_TRANSITIONS = [ TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, ]; @@ -263,10 +263,10 @@ const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVI // reviews are completed export const areReviewsCompleted = transition => { return [ + TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD, TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, ].includes(transition); }; From 6ed23949b044cf9e87d000bc2cc9dad604dec5c8 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:40:35 +0200 Subject: [PATCH 14/16] Transition ref rename: mark reviewed by provider -> expire provider review period --- src/util/types.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/types.js b/src/util/types.js index 549d78d2..41d53cd0 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -191,7 +191,7 @@ export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-se export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first'; export const TRANSITION_REVIEW_2_BY_CUSTOMER = 'transition/review-by-customer-second'; export const TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD = 'transition/mark-reviewed-by-customer'; -export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; +export const TRANSITION_EXPIRE_PROVIDER_REVIEW_PERIOD = 'transition/mark-reviewed-by-provider'; export const TRANSITION_EXPIRE_REVIEW_PERIOD = 'transition/auto-complete-without-reviews'; export const TX_TRANSITIONS = [ @@ -202,6 +202,7 @@ export const TX_TRANSITIONS = [ TRANSITION_ENQUIRE, TRANSITION_EXPIRE, TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD, + TRANSITION_EXPIRE_PROVIDER_REVIEW_PERIOD, TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY, @@ -209,7 +210,6 @@ export const TX_TRANSITIONS = [ TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, ]; // Roles of actors that perform transaction transitions @@ -264,10 +264,10 @@ const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVI export const areReviewsCompleted = transition => { return [ TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD, + TRANSITION_EXPIRE_PROVIDER_REVIEW_PERIOD, TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, ].includes(transition); }; From 66d859a77eb47a3c4d5b5f84c4983002c2b74236 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Thu, 11 Jan 2018 15:42:41 +0200 Subject: [PATCH 15/16] Rename propTypes.txTransition to propTypes.transition --- src/components/ActivityFeed/ActivityFeed.js | 2 +- src/util/types.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 18af5eae..7514b6ad 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -300,7 +300,7 @@ const Transition = props => { }; Transition.propTypes = { - transition: propTypes.txTransition.isRequired, + transition: propTypes.transition.isRequired, transaction: propTypes.transaction.isRequired, currentUser: propTypes.currentUser.isRequired, intl: intlShape.isRequired, diff --git a/src/util/types.js b/src/util/types.js index 41d53cd0..1d3bf893 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -250,8 +250,7 @@ export const txHasFirstReview = tx => firstReviewTransitions.includes(txLastTran export const txIsReviewed = tx => areReviewsCompleted(txLastTransition(tx)); -// TODO: rename to `transition` -propTypes.txTransition = shape({ +propTypes.transition = shape({ at: instanceOf(Date).isRequired, by: oneOf(TX_TRANSITION_ACTORS).isRequired, transition: oneOf(TX_TRANSITIONS).isRequired, @@ -324,7 +323,7 @@ propTypes.transaction = shape({ reversal: bool.isRequired, }) ).isRequired, - transitions: arrayOf(propTypes.txTransition).isRequired, + transitions: arrayOf(propTypes.transition).isRequired, }), booking: propTypes.booking, listing: propTypes.listing, From 5a52ccbc1fda23ba406eb7d80fd2e4146a418259 Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Fri, 12 Jan 2018 09:04:34 +0200 Subject: [PATCH 16/16] Improve transition docs --- .../TransactionPage/TransactionPage.duck.js | 4 ++-- src/util/types.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index 069bb552..ea007131 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -374,7 +374,7 @@ export const sendMessage = (txId, message) => (dispatch, getState, sdk) => { const REVIEW_TX_INCLUDES = ['reviews', 'reviews.author', 'reviews.subject']; // If other party has already sent a review, we need to make transition to -// TX_TRANSITION_REVIEW_BY__SECOND +// TRANSITION_REVIEW_2_BY_ const sendReviewAsSecond = (id, params, role, dispatch, sdk) => { const transition = role === CUSTOMER ? TRANSITION_REVIEW_2_BY_CUSTOMER : TRANSITION_REVIEW_2_BY_PROVIDER; @@ -398,7 +398,7 @@ const sendReviewAsSecond = (id, params, role, dispatch, sdk) => { }; // If other party has not yet sent a review, we need to make transition to -// TX_TRANSITION_REVIEW_BY__FIRST +// TRANSITION_REVIEW_1_BY_ // However, the other party might have made the review after previous data synch point. // So, error is likely to happen and then we must try another state transition // by calling sendReviewAsSecond(). diff --git a/src/util/types.js b/src/util/types.js index 1d3bf893..f08978a4 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -183,9 +183,9 @@ export const TRANSITION_CANCEL = 'transition/cancel'; // The backend will mark the transaction completed. export const TRANSITION_COMPLETE = 'transition/mark-delivered'; -// Review transitions -// Reviews are given through transaction transitions. -// Either party (provider or customer) can be the first to give a review. +// Reviews are given through transaction transitions. Review 1 can be +// by provider or customer, and review 2 will be the other party of +// the transaction. export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first'; @@ -194,7 +194,7 @@ export const TRANSITION_EXPIRE_CUSTOMER_REVIEW_PERIOD = 'transition/mark-reviewe export const TRANSITION_EXPIRE_PROVIDER_REVIEW_PERIOD = 'transition/mark-reviewed-by-provider'; export const TRANSITION_EXPIRE_REVIEW_PERIOD = 'transition/auto-complete-without-reviews'; -export const TX_TRANSITIONS = [ +export const TRANSITIONS = [ TRANSITION_ACCEPT, TRANSITION_CANCEL, TRANSITION_COMPLETE, @@ -253,7 +253,7 @@ export const txIsReviewed = tx => areReviewsCompleted(txLastTransition(tx)); propTypes.transition = shape({ at: instanceOf(Date).isRequired, by: oneOf(TX_TRANSITION_ACTORS).isRequired, - transition: oneOf(TX_TRANSITIONS).isRequired, + transition: oneOf(TRANSITIONS).isRequired, }); const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER]; @@ -306,7 +306,7 @@ propTypes.transaction = shape({ attributes: shape({ createdAt: instanceOf(Date).isRequired, lastTransitionedAt: instanceOf(Date).isRequired, - lastTransition: oneOf(TX_TRANSITIONS).isRequired, + lastTransition: oneOf(TRANSITIONS).isRequired, // An enquiry won't need a total sum nor a booking so these are // optional.