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

Apply tax rule when selecting category #53332

Merged
merged 27 commits into from
Dec 19, 2024
Merged

Apply tax rule when selecting category #53332

Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/components/CategoryPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import RadioListItem from './SelectionList/RadioListItem';
import type {ListItem} from './SelectionList/types';

type CategoryPickerProps = {
policyID: string;
policyID: string | undefined;
selectedCategory?: string;
onSubmit: (item: ListItem) => void;
};
Expand Down
82 changes: 51 additions & 31 deletions src/components/MoneyRequestConfirmationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@ function MoneyRequestConfirmationList({
shouldPlaySound = true,
isConfirmed,
}: MoneyRequestConfirmationListProps) {
const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID ?? '-1'}`);
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID ?? '-1'}`);
const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID ?? '-1'}`);
const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID ?? '-1'}`);
const [defaultMileageRate] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID ?? '-1'}`, {
const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`);
const [defaultMileageRate] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`, {
selector: (selectedPolicy) => DistanceRequestUtils.getDefaultMileageRate(selectedPolicy),
});
const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID ?? '-1'}`);
const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`);
const [lastSelectedDistanceRates] = useOnyx(ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES);
const [currencyList] = useOnyx(ONYXKEYS.CURRENCY_LIST);

Expand All @@ -202,17 +202,22 @@ function MoneyRequestConfirmationList({
const isTypeInvoice = iouType === CONST.IOU.TYPE.INVOICE;
const isScanRequest = useMemo(() => TransactionUtils.isScanRequest(transaction), [transaction]);

const transactionID = transaction?.transactionID ?? '-1';
const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '-1';
const transactionID = transaction?.transactionID;
const customUnitRateID = TransactionUtils.getRateID(transaction);

useEffect(() => {
if ((customUnitRateID && customUnitRateID !== '-1') || !isDistanceRequest) {
if (customUnitRateID !== '-1' || !isDistanceRequest || !transactionID || !policy?.id) {
return;
}

const defaultRate = defaultMileageRate?.customUnitRateID ?? '';
const lastSelectedRate = lastSelectedDistanceRates?.[policy?.id ?? ''] ?? defaultRate;
const defaultRate = defaultMileageRate?.customUnitRateID;
const lastSelectedRate = lastSelectedDistanceRates?.[policy.id] ?? defaultRate;
const rateID = lastSelectedRate;

if (!rateID) {
return;
}

IOU.setCustomUnitRateID(transactionID, rateID);
}, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, transactionID, isDistanceRequest]);

Expand Down Expand Up @@ -242,6 +247,7 @@ function MoneyRequestConfirmationList({
if (
!shouldShowTax ||
!transaction ||
!transactionID ||
(transaction.taxCode &&
previousTransactionModifiedCurrency === transaction.modifiedCurrency &&
previousTransactionCurrency === transaction.currency &&
Expand Down Expand Up @@ -296,7 +302,12 @@ function MoneyRequestConfirmationList({
return true;
}

if (!participant.isInvoiceRoom && !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1)) {
if (
!participant.isInvoiceRoom &&
!participant.isPolicyExpenseChat &&
!participant.isSelfDM &&
ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? CONST.DEFAULT_NUMBER_ID)
) {
return true;
}

Expand Down Expand Up @@ -325,7 +336,7 @@ function MoneyRequestConfirmationList({
if (isFirstUpdatedDistanceAmount.current) {
return;
}
if (!isDistanceRequest) {
if (!isDistanceRequest || !transactionID) {
return;
}
const amount = DistanceRequestUtils.getDistanceRequestAmount(distance, unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate ?? 0);
Expand All @@ -334,15 +345,15 @@ function MoneyRequestConfirmationList({
}, [distance, rate, unit, transactionID, currency, isDistanceRequest]);

useEffect(() => {
if (!shouldCalculateDistanceAmount) {
if (!shouldCalculateDistanceAmount || !transactionID) {
return;
}

const amount = distanceRequestAmount;
IOU.setMoneyRequestAmount(transactionID, amount, currency ?? '');

// If it's a split request among individuals, set the split shares
const participantAccountIDs: number[] = selectedParticipantsProp.map((participant) => participant.accountID ?? -1);
const participantAccountIDs: number[] = selectedParticipantsProp.map((participant) => participant.accountID ?? CONST.DEFAULT_NUMBER_ID);
if (isTypeSplit && !isPolicyExpenseChat && amount && transaction?.currency) {
IOU.setSplitShares(transaction, amount, currency, participantAccountIDs);
}
Expand All @@ -364,20 +375,25 @@ function MoneyRequestConfirmationList({
return;
}

let taxableAmount: number;
let taxCode: string;
let taxableAmount: number | undefined;
let taxCode: string | undefined;
if (isDistanceRequest) {
const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
taxCode = customUnitRate?.attributes?.taxRateExternalID ?? '';
taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, distance);
if (customUnitRateID) {
const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
taxCode = customUnitRate?.attributes?.taxRateExternalID;
taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, distance);
}
} else {
taxableAmount = transaction.amount ?? 0;
taxCode = transaction.taxCode ?? TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
}
const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxCode) ?? '';
const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency);
const taxAmountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount.toString()));
IOU.setMoneyRequestTaxAmount(transaction.transactionID ?? '', taxAmountInSmallestCurrencyUnits);

if (taxCode && taxableAmount) {
const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxCode) ?? '';
const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency);
const taxAmountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount.toString()));
IOU.setMoneyRequestTaxAmount(transaction.transactionID, taxAmountInSmallestCurrencyUnits);
}
}, [
policy,
shouldShowTax,
Expand Down Expand Up @@ -522,7 +538,7 @@ function MoneyRequestConfirmationList({
rightElement: (
<MoneyRequestAmountInput
autoGrow={false}
amount={transaction?.splitShares?.[participantOption.accountID ?? -1]?.amount}
amount={transaction?.splitShares?.[participantOption.accountID ?? CONST.DEFAULT_NUMBER_ID]?.amount}
currency={iouCurrencyCode}
prefixCharacter={currencySymbol}
disableKeyboard={false}
Expand All @@ -535,7 +551,7 @@ function MoneyRequestConfirmationList({
containerStyle={[styles.textInputContainer]}
touchableInputWrapperStyle={[styles.ml3]}
onFormatAmount={CurrencyUtils.convertToDisplayStringWithoutCurrency}
onAmountChange={(value: string) => onSplitShareChange(participantOption.accountID ?? -1, Number(value))}
onAmountChange={(value: string) => onSplitShareChange(participantOption.accountID ?? CONST.DEFAULT_NUMBER_ID, Number(value))}
maxLength={formattedTotalAmount.length}
contentWidth={formattedTotalAmount.length * 8}
/>
Expand Down Expand Up @@ -637,7 +653,7 @@ function MoneyRequestConfirmationList({
}, [isTypeSplit, translate, payeePersonalDetails, getSplitSectionHeader, splitParticipants, selectedParticipants]);

useEffect(() => {
if (!isDistanceRequest || isMovingTransactionFromTrackExpense) {
if (!isDistanceRequest || isMovingTransactionFromTrackExpense || !transactionID) {
return;
}

Expand Down Expand Up @@ -669,16 +685,20 @@ function MoneyRequestConfirmationList({
// Auto select the category if there is only one enabled category and it is required
useEffect(() => {
const enabledCategories = Object.values(policyCategories ?? {}).filter((category) => category.enabled);
if (iouCategory || !shouldShowCategories || enabledCategories.length !== 1 || !isCategoryRequired) {
if (!transactionID || 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(() => {
if (!transactionID) {
return;
}

let updatedTagsString = TransactionUtils.getTag(transaction);
policyTagLists.forEach((tagList, index) => {
const isTagListRequired = tagList.required ?? false;
Expand Down Expand Up @@ -721,7 +741,7 @@ function MoneyRequestConfirmationList({
*/
const confirm = useCallback(
(paymentMethod: PaymentMethodType | undefined) => {
if (routeError) {
if (!!routeError || !transactionID) {
return;
}
if (iouType === CONST.IOU.TYPE.INVOICE && !hasInvoicingDetails(policy)) {
Expand Down
Loading
Loading