Skip to content

Commit

Permalink
Merge pull request #44138 from kubabutkiewicz/feat/request-refund
Browse files Browse the repository at this point in the history
  • Loading branch information
blimpich authored Jul 2, 2024
2 parents 1795254 + 5377600 commit 519d096
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 28 deletions.
7 changes: 7 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3530,6 +3530,13 @@ export default {
changeCurrency: 'Change payment currency',
cardNotFound: 'No payment card added',
retryPaymentButton: 'Retry payment',
requestRefund: 'Request refund',
requestRefundModal: {
phrase1: 'Getting a refund is easy, just downgrade your account before your next billing date and you’ll receive a refund.',
phrase2:
'Heads up: Downgrading your account means your workspace(s) will be deleted. This action can’t be undone, but you can always create a new workspace if you change your mind.',
confirm: 'Delete workspace(s) and downgrade',
},
viewPaymentHistory: 'View payment history',
},
yourPlan: {
Expand Down
7 changes: 7 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4032,6 +4032,13 @@ export default {
changeCurrency: 'Cambiar moneda de pago',
cardNotFound: 'No se ha añadido ninguna tarjeta de pago',
retryPaymentButton: 'Reintentar el pago',
requestRefund: 'Solicitar reembolso',
requestRefundModal: {
phrase1: 'Obtener un reembolso es fácil, simplemente baja tu cuenta de categoría antes de la próxima fecha de facturación y recibirás un reembolso.',
phrase2:
'Atención: Bajar tu cuenta de categoría significa que tu(s) espacio(s) de trabajo será(n) eliminado(s). Esta acción no se puede deshacer, pero siempre puedes crear un nuevo espacio de trabajo si cambias de opinión.',
confirm: 'Eliminar y degradar',
},
viewPaymentHistory: 'Ver historial de pagos',
},
yourPlan: {
Expand Down
2 changes: 2 additions & 0 deletions src/libs/API/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ const WRITE_COMMANDS = {
UPDATE_SUBSCRIPTION_AUTO_RENEW: 'UpdateSubscriptionAutoRenew',
UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY: 'UpdateSubscriptionAddNewUsersAutomatically',
UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize',
REQUEST_REFUND: 'User_RefundPurchase',
UPDATE_NETSUITE_SUBSIDIARY: 'UpdateNetSuiteSubsidiary',
UPDATE_NETSUITE_EXPORTER: 'UpdateNetSuiteExporter',
UPDATE_NETSUITE_EXPORT_DATE: 'UpdateNetSuiteExportDate',
Expand Down Expand Up @@ -475,6 +476,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW]: Parameters.UpdateSubscriptionAutoRenewParams;
[WRITE_COMMANDS.UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY]: Parameters.UpdateSubscriptionAddNewUsersAutomaticallyParams;
[WRITE_COMMANDS.UPDATE_SUBSCRIPTION_SIZE]: Parameters.UpdateSubscriptionSizeParams;
[WRITE_COMMANDS.REQUEST_REFUND]: null;
[WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT]: Parameters.ConnectPolicyToSageIntacctParams;

// Netsuite parameters
Expand Down
5 changes: 5 additions & 0 deletions src/libs/actions/User.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,10 @@ function dismissTrackTrainingModal() {
});
}

function requestRefund() {
API.write(WRITE_COMMANDS.REQUEST_REFUND, null);
}

export {
clearFocusModeNotification,
closeAccount,
Expand Down Expand Up @@ -1053,4 +1057,5 @@ export {
clearCustomStatus,
updateDraftCustomStatus,
clearDraftCustomStatus,
requestRefund,
};
97 changes: 69 additions & 28 deletions src/pages/settings/Subscription/CardSection/CardSection.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import React, {useMemo} from 'react';
import React, {useCallback, useMemo, useState} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import ConfirmModal from '@components/ConfirmModal';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import MenuItem from '@components/MenuItem';
import Section from '@components/Section';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as User from '@libs/actions/User';
import DateUtils from '@libs/DateUtils';
import Navigation from '@libs/Navigation/Navigation';
import CONST from '@src/CONST';
Expand All @@ -22,17 +25,26 @@ import CardSectionDataEmpty from './CardSectionDataEmpty';
import CardSectionUtils from './utils';

function CardSection() {
const [isRequestRefundModalVisible, setIsRequestRefundModalVisible] = useState(false);
const {translate, preferredLocale} = useLocalize();
const styles = useThemeStyles();
const theme = useTheme();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
const subscriptionPlan = useSubscriptionPlan();
const [network] = useOnyx(ONYXKEYS.NETWORK);

const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);

const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard?.accountData?.cardMonth, preferredLocale]);

const requestRefund = useCallback(() => {
User.requestRefund();
setIsRequestRefundModalVisible(false);
Navigation.resetToHome();
}, []);

const billingStatus = CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData?.cardNumber ?? '');

const nextPaymentDate = !isEmptyObject(privateSubscription) ? CardSectionUtils.getNextBillingDate() : undefined;
Expand All @@ -55,17 +67,17 @@ function CardSection() {
}

return (
<Section
title={translate('subscription.cardSection.title')}
subtitle={sectionSubtitle}
isCentralPane
titleStyles={styles.textStrong}
subtitleMuted
banner={BillingBanner}
>
<View style={[styles.mt8, styles.mb3, styles.flexRow]}>
{!isEmptyObject(defaultCard?.accountData) && (
<>
<>
<Section
title={translate('subscription.cardSection.title')}
subtitle={sectionSubtitle}
isCentralPane
titleStyles={styles.textStrong}
subtitleMuted
banner={BillingBanner}
>
<View style={[styles.mt8, styles.mb3, styles.flexRow]}>
{!isEmptyObject(defaultCard?.accountData) && (
<View style={[styles.flexRow, styles.flex1, styles.gap3]}>
<Icon
src={Expensicons.CreditCard}
Expand All @@ -83,26 +95,55 @@ function CardSection() {
})}
</Text>
</View>
<CardSectionActions />
</View>
<CardSectionActions />
</>
)}
)}
</View>

{isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}
</View>
{!!account?.hasPurchases && (
<MenuItem
shouldShowRightIcon
icon={Expensicons.History}
iconStyles={[]}
wrapperStyle={styles.sectionMenuItemTopDescription}
style={styles.mt5}
title={translate('subscription.cardSection.viewPaymentHistory')}
titleStyle={styles.textStrong}
onPress={() => Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.SEARCH.TAB.ALL))}
hoverAndPressStyle={styles.hoveredComponentBG}
{!!account?.hasPurchases && (
<MenuItem
shouldShowRightIcon
icon={Expensicons.History}
wrapperStyle={styles.sectionMenuItemTopDescription}
title={translate('subscription.cardSection.viewPaymentHistory')}
titleStyle={styles.textStrong}
style={styles.mt5}
onPress={() => Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.SEARCH.TAB.ALL))}
hoverAndPressStyle={styles.hoveredComponentBG}
/>
)}
{!!(subscriptionPlan && account?.isEligibleForRefund) && (
<MenuItem
shouldShowRightIcon
icon={Expensicons.Bill}
wrapperStyle={styles.sectionMenuItemTopDescription}
title={translate('subscription.cardSection.requestRefund')}
titleStyle={styles.textStrong}
disabled={network?.isOffline}
onPress={() => setIsRequestRefundModalVisible(true)}
/>
)}
</Section>

{account?.isEligibleForRefund && (
<ConfirmModal
title={translate('subscription.cardSection.requestRefund')}
isVisible={isRequestRefundModalVisible}
onConfirm={requestRefund}
onCancel={() => setIsRequestRefundModalVisible(false)}
prompt={
<>
<Text style={styles.mb4}>{translate('subscription.cardSection.requestRefundModal.phrase1')}</Text>
<Text>{translate('subscription.cardSection.requestRefundModal.phrase2')}</Text>
</>
}
confirmText={translate('subscription.cardSection.requestRefundModal.confirm')}
cancelText={translate('common.cancel')}
danger
/>
)}
</Section>
</>
);
}

Expand Down
3 changes: 3 additions & 0 deletions src/types/onyx/Account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ type Account = {
/** Indicates whether the user can downgrade current subscription plan */
canDowngrade?: boolean;

/** Indicates whether the user can downgrade current subscription plan */
isEligibleForRefund?: boolean;

/** Indicates whether the user has at least one previous purchase */
hasPurchases?: boolean;
};
Expand Down

0 comments on commit 519d096

Please sign in to comment.