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

Transition ref rename: auto decline -> expire

Browse source
This commit is contained in:
Kimmo Puputti 2018-01-11 14:42:48 +02:00
parent bf9ba730c9
commit c249491152
5 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/ActivityFeed/ActivityFeed.js
View file

@ -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 = (
) : (
<FormattedMessage id="ActivityFeed.transitionDecline" />
);
case TX_TRANSITION_AUTO_DECLINE:
case TRANSITION_EXPIRE:
return ownRole === TX_TRANSITION_ACTOR_PROVIDER ? (
<FormattedMessage id="ActivityFeed.ownTransitionAutoDecline" />
) : (

4
src/components/BookingBreakdown/BookingBreakdown.example.js
View file

@ -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: [

6
src/components/TransactionPanel/TransactionPanel.helpers.js
View file

@ -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 => {
/>
</h1>
);
} else if (txIsAutodeclined(transaction)) {
} else if (txIsExpired(transaction)) {
return (
<h1 className={classes}>
<FormattedMessage
@ -358,7 +358,7 @@ export const SaleTitle = props => {
/>
</h1>
);
} else if (txIsAutodeclined(transaction)) {
} else if (txIsExpired(transaction)) {
return (
<h1 className={classes}>
<FormattedMessage

6
src/components/TransactionPanel/TransactionPanel.test.js
View file

@ -13,9 +13,9 @@ import { renderShallow } from '../../util/test-helpers';
import { fakeIntl } from '../../util/test-data';
import {
TRANSITION_ENQUIRE,
TRANSITION_EXPIRE,
TRANSITION_REQUEST,
TX_TRANSITION_ACCEPT,
TX_TRANSITION_AUTO_DECLINE,
TX_TRANSITION_CANCELED,
TX_TRANSITION_DECLINE,
TX_TRANSITION_MARK_DELIVERED,
@ -66,7 +66,7 @@ describe('TransactionPanel - Sale', () => {
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,
});

11
src/util/types.js
View file

@ -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;