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.

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

Apply tax rule when selecting category #53332

Merged
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b4c8b46
apply tax rule when selecting category
bernhardoj Nov 30, 2024
622fe8b
remove log
bernhardoj Nov 30, 2024
438ad04
lint
bernhardoj Nov 30, 2024
cd23f5f
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 4, 2024
4f4a302
fix tax amount is negative
bernhardoj Dec 6, 2024
e5634e0
prettier
bernhardoj Dec 6, 2024
fcafe6a
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 6, 2024
4bce5ff
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 12, 2024
f4e043d
update the tax when updating the category
bernhardoj Dec 13, 2024
7f8defc
added test
bernhardoj Dec 13, 2024
46746ba
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 13, 2024
d0f9f65
remove unused import
bernhardoj Dec 13, 2024
91ac31c
simplify code
bernhardoj Dec 13, 2024
d407a92
uncomment
bernhardoj Dec 13, 2024
c1eb97d
lint
bernhardoj Dec 13, 2024
e56425d
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 17, 2024
e61e858
update comment
bernhardoj Dec 17, 2024
7ab89a2
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 17, 2024
ba14c49
lint
bernhardoj Dec 17, 2024
8d98c50
more lint
bernhardoj Dec 17, 2024
7cec392
more lint
bernhardoj Dec 17, 2024
2c2e070
more lint
bernhardoj Dec 17, 2024
d39b47b
fix type
bernhardoj Dec 17, 2024
07d9ef8
more lint
bernhardoj Dec 17, 2024
5df0ed9
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 19, 2024
4de5bae
prettier
bernhardoj Dec 19, 2024
1e1031f
Merge branch 'main' into fix/53220-apply-tax-rule-for-category
bernhardoj Dec 19, 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
4 changes: 2 additions & 2 deletions src/components/MoneyRequestConfirmationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -672,10 +672,10 @@ function MoneyRequestConfirmationList({
if (iouCategory || !shouldShowCategories || enabledCategories.length !== 1 || !isCategoryRequired) {
return;
}
IOU.setMoneyRequestCategory(transactionID, enabledCategories.at(0)?.name ?? '');
IOU.setMoneyRequestCategory(transactionID, enabledCategories.at(0)?.name ?? '', policy?.id);
// Keep 'transaction' out to ensure that we autoselect the option only once
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [shouldShowCategories, policyCategories, isCategoryRequired]);
}, [shouldShowCategories, policyCategories, isCategoryRequired, policy?.id]);

// Auto select the tag if there is only one enabled tag and it is required
useEffect(() => {
Expand Down
21 changes: 20 additions & 1 deletion src/libs/TransactionUtils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import type {ValueOf} from 'type-fest';
import {getPolicyCategoriesData} from '@libs/actions/Policy/Category';
import {getPolicyTagsData} from '@libs/actions/Policy/Tag';
import type {TransactionMergeParams} from '@libs/API/parameters';
import {getCurrencyDecimals} from '@libs/CurrencyUtils';
import {getCategoryDefaultTaxRate} from '@libs/CategoryUtils';
import {convertToBackendAmount, getCurrencyDecimals} from '@libs/CurrencyUtils';
import DateUtils from '@libs/DateUtils';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import {toLocaleDigit} from '@libs/LocaleDigitUtils';
Expand Down Expand Up @@ -1239,6 +1240,23 @@ function buildTransactionsMergeParams(reviewDuplicates: OnyxEntry<ReviewDuplicat
};
}

function getCategoryTaxCodeAndAmount(category: string, transaction: OnyxEntry<Transaction>, policy: OnyxEntry<Policy>) {
const taxRules = policy?.rules?.expenseRules?.filter((rule) => rule.tax);
if (!taxRules || taxRules?.length === 0) {
return {categoryTaxCode: undefined, categoryTaxAmount: undefined};
}

const categoryTaxCode = getCategoryDefaultTaxRate(taxRules, category, policy?.taxRates?.defaultExternalID);
const categoryTaxPercentage = getTaxValue(policy, transaction, categoryTaxCode ?? '');
let categoryTaxAmount;

if (categoryTaxPercentage) {
categoryTaxAmount = convertToBackendAmount(calculateTaxAmount(categoryTaxPercentage, getAmount(transaction), getCurrency(transaction)));
}

return {categoryTaxCode, categoryTaxAmount};
}

export {
buildOptimisticTransaction,
calculateTaxAmount,
Expand Down Expand Up @@ -1323,6 +1341,7 @@ export {
hasReceiptSource,
shouldShowAttendees,
getFormattedPostedDate,
getCategoryTaxCodeAndAmount,
};

export type {TransactionChanges};
34 changes: 31 additions & 3 deletions src/libs/actions/IOU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,19 @@ function setMoneyRequestPendingFields(transactionID: string, pendingFields: Onyx
Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {pendingFields});
}

function setMoneyRequestCategory(transactionID: string, category: string) {
function setMoneyRequestCategory(transactionID: string, category: string, policyID?: string) {
Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {category});
if (!policyID) {
setMoneyRequestTaxRate(transactionID, '');
setMoneyRequestTaxAmount(transactionID, null);
return;
}
const transaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`];
const {categoryTaxCode, categoryTaxAmount} = TransactionUtils.getCategoryTaxCodeAndAmount(category, transaction, PolicyUtils.getPolicy(policyID));
if (categoryTaxCode && categoryTaxAmount !== undefined) {
setMoneyRequestTaxRate(transactionID, categoryTaxCode);
setMoneyRequestTaxAmount(transactionID, categoryTaxAmount);
}
}

function setMoneyRequestTag(transactionID: string, tag: string) {
Expand Down Expand Up @@ -3400,9 +3411,17 @@ function updateMoneyRequestCategory(
policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
) {
const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
const {categoryTaxCode, categoryTaxAmount} = TransactionUtils.getCategoryTaxCodeAndAmount(category, transaction, policy);
const transactionChanges: TransactionChanges = {
category,
...(categoryTaxCode &&
categoryTaxAmount !== undefined && {
taxCode: categoryTaxCode,
taxAmount: categoryTaxAmount,
}),
};

const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_CATEGORY, params, onyxData);
}
Expand Down Expand Up @@ -5327,17 +5346,26 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
Report.notifyNewAction(chatReportID, sessionAccountID);
}

function setDraftSplitTransaction(transactionID: string, transactionChanges: TransactionChanges = {}) {
function setDraftSplitTransaction(transactionID: string, transactionChanges: TransactionChanges = {}, policy?: OnyxEntry<OnyxTypes.Policy>) {
const newTransactionChanges = {...transactionChanges};
let draftSplitTransaction = allDraftSplitTransactions[`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`];

if (!draftSplitTransaction) {
draftSplitTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
}

if (transactionChanges.category) {
const {categoryTaxCode, categoryTaxAmount} = TransactionUtils.getCategoryTaxCodeAndAmount(transactionChanges.category, draftSplitTransaction, policy);
if (categoryTaxCode && categoryTaxAmount !== undefined) {
newTransactionChanges.taxCode = categoryTaxCode;
newTransactionChanges.taxAmount = categoryTaxAmount;
}
}

const updatedTransaction = draftSplitTransaction
? TransactionUtils.getUpdatedTransaction({
transaction: draftSplitTransaction,
transactionChanges,
transactionChanges: newTransactionChanges,
isFromExpenseReport: false,
shouldUpdateReceiptState: false,
})
Expand Down
7 changes: 4 additions & 3 deletions src/pages/iou/request/step/IOURequestStepCategory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ function IOURequestStepCategory({
const {translate} = useLocalize();
const isEditing = action === CONST.IOU.ACTION.EDIT;
const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
const transactionCategory = ReportUtils.getTransactionDetails(isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction)?.category;
const currentTransaction = isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction;
const transactionCategory = ReportUtils.getTransactionDetails(currentTransaction)?.category;

// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const reportAction = reportActions?.[report?.parentReportActionID || reportActionID] ?? null;
Expand Down Expand Up @@ -113,7 +114,7 @@ function IOURequestStepCategory({
if (transaction) {
// In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
if (isEditingSplitBill) {
IOU.setDraftSplitTransaction(transaction.transactionID, {category: updatedCategory});
IOU.setDraftSplitTransaction(transaction.transactionID, {category: updatedCategory}, policy);
navigateBack();
return;
}
Expand All @@ -125,7 +126,7 @@ function IOURequestStepCategory({
}
}

IOU.setMoneyRequestCategory(transactionID, updatedCategory);
IOU.setMoneyRequestCategory(transactionID, updatedCategory, policy?.id);

if (action === CONST.IOU.ACTION.CATEGORIZE) {
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report?.reportID ?? '-1'));
Expand Down
8 changes: 4 additions & 4 deletions src/pages/iou/request/step/IOURequestStepConfirmation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ function IOURequestStepConfirmation({
return;
}
if (policyCategories?.[transaction.category] && !policyCategories[transaction.category].enabled) {
IOU.setMoneyRequestCategory(transactionID, '');
IOU.setMoneyRequestCategory(transactionID, '', policy?.id);
}
}, [policyCategories, transaction?.category, transactionID]);
}, [policy?.id, policyCategories, transaction?.category, transactionID]);

const policyDistance = Object.values(policy?.customUnits ?? {}).find((customUnit) => customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
const defaultCategory = policyDistance?.defaultCategory ?? '';
Expand All @@ -167,10 +167,10 @@ function IOURequestStepConfirmation({
if (requestType !== CONST.IOU.REQUEST_TYPE.DISTANCE || !!transaction?.category) {
return;
}
IOU.setMoneyRequestCategory(transactionID, defaultCategory);
IOU.setMoneyRequestCategory(transactionID, defaultCategory, policy?.id);
// Prevent resetting to default when unselect category
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [transactionID, requestType, defaultCategory]);
}, [transactionID, requestType, defaultCategory, policy?.id]);

const navigateBack = useCallback(() => {
// If the action is categorize and there's no policies other than personal one, we simply call goBack(), i.e: dismiss the whole flow together
Expand Down
Loading
Loading