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

Add enquiry prop type handling

Browse source
This commit is contained in:
Kimmo Puputti 2017-12-14 15:38:37 +02:00
parent 0cb35faae7
commit 45dd9d9455
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ Review.propTypes = {
const shouldRenderTransition = transition => {
return [
propTypes.TX_TRANSITION_PREAUTHORIZE,
propTypes.TX_TRANSITION_PREAUTHORIZE_ENQUIRY,
propTypes.TX_TRANSITION_ACCEPT,
propTypes.TX_TRANSITION_DECLINE,
propTypes.TX_TRANSITION_AUTO_DECLINE,
@ -121,6 +122,7 @@ const resolveTransitionMessage = (
switch (currentTransition) {
case propTypes.TX_TRANSITION_PREAUTHORIZE:
case propTypes.TX_TRANSITION_PREAUTHORIZE_ENQUIRY:
return isOwnTransition ? (
<FormattedMessage id="ActivityFeed.ownTransitionRequest" values={{ listingTitle }} />
) : (

4
src/ducks/user.duck.js
View file

@ -1,6 +1,6 @@
import { updatedEntities, denormalisedEntities } from '../util/data';
import { storableError } from '../util/errors';
import { TX_TRANSITION_PREAUTHORIZE } from '../util/propTypes';
import { TX_TRANSITION_PREAUTHORIZE, TX_TRANSITION_PREAUTHORIZE_ENQUIRY } from '../util/propTypes';
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],
last_transitions: [TX_TRANSITION_PREAUTHORIZE, TX_TRANSITION_PREAUTHORIZE_ENQUIRY],
page: 1,
per_page: NOTIFICATION_PAGE_SIZE,
};

14
src/util/propTypes.js
View file

@ -147,6 +147,11 @@ export const booking = shape({
// provider sees the transaction in the SalePage.
export const TX_TRANSITION_PREAUTHORIZE = 'transition/preauthorize';
// A customer can also initiate a transaction with an enquiry, and
// then transition that by preauthorization.
export const TX_TRANSITION_ENQUIRE = 'transition/enquire';
export const TX_TRANSITION_PREAUTHORIZE_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';
@ -176,6 +181,8 @@ 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,
TX_TRANSITION_ACCEPT,
TX_TRANSITION_DECLINE,
@ -206,7 +213,12 @@ export const TX_TRANSITION_ACTORS = [
const txLastTransition = tx => ensureTransaction(tx).attributes.lastTransition;
export const txIsPreauthorized = tx => txLastTransition(tx) === TX_TRANSITION_PREAUTHORIZE;
export const txIsPreauthorized = tx => {
const transition = txLastTransition(tx);
return (
transition === TX_TRANSITION_PREAUTHORIZE || transition === TX_TRANSITION_PREAUTHORIZE_ENQUIRY
);
};
export const txIsAccepted = tx => txLastTransition(tx) === TX_TRANSITION_ACCEPT;