Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tax fields for distance requests #42342

Merged
merged 9 commits into from
May 29, 2024
Merged

Add tax fields for distance requests #42342

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d662517
Add tax fields for distance requests
narefyev91 May 17, 2024
94e2642
use correct tax checks
narefyev91 May 17, 2024
98a4c4d
remove not needed fields
narefyev91 May 17, 2024
92dd601
update
narefyev91 May 20, 2024
ae991aa
update after c+ review
narefyev91 May 20, 2024
46958e6
updates after review
narefyev91 May 22, 2024
c33f821
updates after review
narefyev91 May 22, 2024
0011a9b
updates after review
narefyev91 May 22, 2024
80d29bd
updates after review
narefyev91 May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/components/MoneyRequestConfirmationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,13 @@ function MoneyRequestConfirmationList({

const canUpdateSenderWorkspace = useMemo(() => PolicyUtils.canSendInvoice(allPolicies) && !!transaction?.isFromGlobalCreate, [allPolicies, transaction?.isFromGlobalCreate]);

const canModifyTaxFields = !isReadOnly && !isDistanceRequest;

// A flag for showing the tags field
// TODO: remove the !isTypeInvoice from this condition after BE supports tags for invoices: https://github.com/Expensify/App/issues/41281
const shouldShowTags = useMemo(() => isPolicyExpenseChat && OptionsListUtils.hasEnabledTags(policyTagLists) && !isTypeInvoice, [isPolicyExpenseChat, policyTagLists, isTypeInvoice]);

// A flag for showing tax rate
// TODO: remove the !isTypeInvoice from this condition after BE supports tax for invoices: https://github.com/Expensify/App/issues/41281
const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy) && !isTypeInvoice;
const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest) && !isTypeInvoice;

// A flag for showing the billable field
const shouldShowBillable = policy?.disabledFields?.defaultBillable === false;
Expand Down Expand Up @@ -1023,14 +1023,14 @@ function MoneyRequestConfirmationList({
item: (
<MenuItemWithTopDescription
key={`${taxRates?.name}${taxRateTitle}`}
shouldShowRightIcon={!isReadOnly}
shouldShowRightIcon={canModifyTaxFields}
title={taxRateTitle}
description={taxRates?.name}
style={[styles.moneyRequestMenuItem]}
titleStyle={styles.flex1}
onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
disabled={didConfirm}
interactive={!isReadOnly}
interactive={canModifyTaxFields}
/>
),
shouldShow: shouldShowTax,
Expand All @@ -1040,14 +1040,14 @@ function MoneyRequestConfirmationList({
item: (
<MenuItemWithTopDescription
key={`${taxRates?.name}${formattedTaxAmount}`}
shouldShowRightIcon={!isReadOnly}
shouldShowRightIcon={canModifyTaxFields}
title={formattedTaxAmount}
description={translate('iou.taxAmount')}
style={[styles.moneyRequestMenuItem]}
titleStyle={styles.flex1}
onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
disabled={didConfirm}
interactive={!isReadOnly}
interactive={canModifyTaxFields}
/>
),
shouldShow: shouldShowTax,
Expand Down
13 changes: 7 additions & 6 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ function MoneyRequestView({

// Used for non-restricted fields such as: description, category, tag, billable, etc.
const canEdit = ReportUtils.canEditMoneyRequest(parentReportAction);
const canEditTaxFields = canEdit && !isDistanceRequest;

const canEditAmount = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.AMOUNT);
const canEditMerchant = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.MERCHANT);
const canEditDate = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DATE);
Expand Down Expand Up @@ -170,8 +172,7 @@ function MoneyRequestView({
const shouldShowTag = isPolicyExpenseChat && (transactionTag || OptionsListUtils.hasEnabledTags(policyTagLists));
const shouldShowBillable = isPolicyExpenseChat && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true));

// A flag for showing tax rate
const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy);
const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest);

const {getViolationsForField} = useViolations(transactionViolations ?? []);
const hasViolations = useCallback(
Expand Down Expand Up @@ -504,8 +505,8 @@ function MoneyRequestView({
<MenuItemWithTopDescription
title={taxRateTitle ?? ''}
description={taxRatesDescription}
interactive={canEdit}
shouldShowRightIcon={canEdit}
interactive={canEditTaxFields}
shouldShowRightIcon={canEditTaxFields}
titleStyle={styles.flex1}
onPress={() =>
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
Expand All @@ -521,8 +522,8 @@ function MoneyRequestView({
<MenuItemWithTopDescription
title={formattedTaxAmount ? formattedTaxAmount.toString() : ''}
description={translate('iou.taxAmount')}
interactive={canEdit}
shouldShowRightIcon={canEdit}
interactive={canEditTaxFields}
shouldShowRightIcon={canEditTaxFields}
titleStyle={styles.flex1}
onPress={() =>
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
Expand Down
9 changes: 7 additions & 2 deletions src/libs/PolicyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,13 @@ function isPaidGroupPolicy(policy: OnyxEntry<Policy> | EmptyObject): boolean {
return policy?.type === CONST.POLICY.TYPE.TEAM || policy?.type === CONST.POLICY.TYPE.CORPORATE;
}

function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>): boolean {
return (isPolicyExpenseChat && (policy?.tax?.trackingEnabled ?? policy?.isTaxTrackingEnabled)) ?? false;
function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>, isDistanceRequest: boolean): boolean {
const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
const customUnitID = distanceUnit?.customUnitID ?? 0;
const isPolicyTaxTrackingEnabled = isPolicyExpenseChat && policy?.tax?.trackingEnabled;
const isTaxEnabledForDistance = isPolicyTaxTrackingEnabled && policy?.customUnits?.[customUnitID]?.attributes?.taxEnabled;

return !!(isDistanceRequest ? isTaxEnabledForDistance : isPolicyTaxTrackingEnabled);
}

/**
Expand Down
20 changes: 20 additions & 0 deletions src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as IOU from '@libs/actions/IOU';
import * as CurrencyUtils from '@libs/CurrencyUtils';
import type {MileageRate} from '@libs/DistanceRequestUtils';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import Navigation from '@libs/Navigation/Navigation';
import {isTaxTrackingEnabled} from '@libs/PolicyUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -37,6 +40,7 @@ type IOURequestStepDistanceRateProps = IOURequestStepDistanceRateOnyxProps &

function IOURequestStepDistanceRate({
policy,
report,
route: {
params: {backTo, transactionID},
},
Expand All @@ -45,6 +49,11 @@ function IOURequestStepDistanceRate({
}: IOURequestStepDistanceRateProps) {
const styles = useThemeStyles();
const {translate, toLocaleDigit} = useLocalize();
const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
const customUnitID = distanceUnit?.customUnitID;
const isPolicyExpenseChat = ReportUtils.isReportInGroupPolicy(report);
const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest);

const lastSelectedRateID = TransactionUtils.getRateID(transaction) ?? '';

Expand All @@ -69,6 +78,17 @@ function IOURequestStepDistanceRate({
const initiallyFocusedOption = sections.find((item) => item.isSelected)?.keyForList;

function selectDistanceRate(customUnitRateID: string) {
let taxAmount;
let taxRateExternalID;
if (transaction?.amount && policy?.customUnits && customUnitID && shouldShowTax) {
const taxClaimablePercentage = policy?.customUnits[customUnitID].rates[customUnitRateID].attributes?.taxClaimablePercentage ?? 0;
taxRateExternalID = policy?.customUnits[customUnitID].rates[customUnitRateID].attributes?.taxRateExternalID ?? '';
MonilBhavsar marked this conversation as resolved.
Show resolved Hide resolved
const taxableAmount = -1 * transaction.amount * taxClaimablePercentage;
const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxRateExternalID) ?? '';
taxAmount = CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount));
MonilBhavsar marked this conversation as resolved.
Show resolved Hide resolved
MonilBhavsar marked this conversation as resolved.
Show resolved Hide resolved
IOU.setMoneyRequestTaxAmount(transactionID, taxAmount, true);
IOU.setMoneyRequestTaxRate(transactionID, taxRateExternalID);
}
IOU.updateDistanceRequestRate(transactionID, customUnitRateID, policy?.id ?? '');
navigateBack();
}
Expand Down
7 changes: 7 additions & 0 deletions src/types/onyx/Policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import type {WorkspaceTravelSettings} from './TravelSettings';

type Unit = 'mi' | 'km';

type TaxRateAttributes = {
taxClaimablePercentage?: number;
taxRateExternalID?: string;
};

type Rate = OnyxCommon.OnyxValueWithOfflineFeedback<{
name?: string;
rate?: number;
Expand All @@ -15,10 +20,12 @@ type Rate = OnyxCommon.OnyxValueWithOfflineFeedback<{
enabled?: boolean;
errors?: OnyxCommon.Errors;
errorFields?: OnyxCommon.ErrorFields;
attributes?: TaxRateAttributes;
}>;

type Attributes = {
unit: Unit;
taxEnabled?: boolean;
};

type CustomUnit = OnyxCommon.OnyxValueWithOfflineFeedback<{
Expand Down
Loading