Skip to content

address invoices issue part1 #1

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

Merged
getusha merged 3 commits into from
Apr 29, 2025
Merged

address invoices issue part1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9044315
address invoices issue part1
hungvu193 Apr 24, 2025
cd72682
fix comment
hungvu193 Apr 28, 2025
c9d6844
add intent to pay
hungvu193 Apr 28, 2025
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
121 changes: 63 additions & 58 deletions src/components/SettlementButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {approveMoneyRequest, savePreferredPaymentMethod as savePreferredPaymentM
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {LastPaymentMethodType, Policy} from '@src/types/onyx';
import type {BankAccount, LastPaymentMethodType, Policy} from '@src/types/onyx';
import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
Expand Down Expand Up @@ -115,6 +115,8 @@ function SettlementButton({
const hasSinglePolicy = !policy && activeAdminPolicies.length === 1;
const hasMultiplePolicies = !policy && activeAdminPolicies.length > 1;
const lastPaymentMethodRef = useRef(lastPaymentMethod);
const formattedPaymentMethods = formatPaymentMethods(bankAccountList, fundList, styles);
const hasIntentToPay = formattedPaymentMethods.length === 1 && !lastPaymentMethod;

useEffect(() => {
if (isLoadingLastPaymentMethod) {
Expand All @@ -128,12 +130,22 @@ function SettlementButton({
const shouldShowPaywithExpensifyOption = !shouldHidePaymentOptions;
const shouldShowPayElsewhereOption = !shouldHidePaymentOptions && !isInvoiceReport;

function getPaymentSubitems(payAsBusiness: boolean) {
return formattedPaymentMethods.map((formattedPaymentMethod) => ({
Comment thread
hungvu193 marked this conversation as resolved.
text: formattedPaymentMethod?.title ?? '',
description: formattedPaymentMethod?.description ?? '',
icon: formattedPaymentMethod?.icon,
shouldUpdateSelectedIndex: true,
onSelected: () => {
onPress(CONST.IOU.PAYMENT_TYPE.EXPENSIFY, payAsBusiness, formattedPaymentMethod.methodID, formattedPaymentMethod.accountType, undefined);
},
}));
}

function getLatestBankAccountItem() {
if (!hasVBBA(policy?.id)) {
return;
}

const formattedPaymentMethods = formatPaymentMethods(bankAccountList, fundList ?? {}, styles);
const policyBankAccounts = formattedPaymentMethods.filter((method) => method.methodID === policy?.achAccount?.bankAccountID);

return policyBankAccounts.map((formattedPaymentMethod) => ({
Expand Down Expand Up @@ -251,53 +263,10 @@ function SettlementButton({
}

if (isInvoiceReport) {
const formattedPaymentMethods = formatPaymentMethods(bankAccountList, fundList, styles);
const isCurrencySupported = isCurrencySupportedForDirectReimbursement(currency as CurrencyType);
const getPaymentSubitems = (payAsBusiness: boolean) =>
formattedPaymentMethods.map((formattedPaymentMethod) => ({
text: formattedPaymentMethod?.title ?? '',
description: formattedPaymentMethod?.description ?? '',
icon: formattedPaymentMethod?.icon,
shouldUpdateSelectedIndex: true,
onSelected: () => {
onPress(CONST.IOU.PAYMENT_TYPE.EXPENSIFY, payAsBusiness, formattedPaymentMethod.methodID, formattedPaymentMethod.accountType, undefined);
},
}));

if (isIndividualInvoiceRoomUtil(chatReport)) {
buttonOptions.push({
text: translate('iou.settlePersonal', {formattedAmount}),
icon: Expensicons.User,
value: lastPaymentMethod ?? CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
backButtonText: translate('iou.individual'),
subMenuItems: [
...(isCurrencySupported ? getPaymentSubitems(false) : []),
{
text: translate('workspace.invoices.paymentMethods.addBankAccount'),
icon: Expensicons.Bank,
onSelected: () => Navigation.navigate(addBankAccountRoute),
},
{
text: translate('iou.payElsewhere', {formattedAmount: ''}),
icon: Expensicons.Cash,
value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
shouldUpdateSelectedIndex: true,
onSelected: () => {
onPress(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, undefined, undefined);
savePreferredPaymentMethod(policyIDKey, CONST.IOU.PAYMENT_TYPE.ELSEWHERE);
},
},
],
});
}

buttonOptions.push({
text: translate('iou.settleBusiness', {formattedAmount}),
icon: Expensicons.Building,
value: lastPaymentMethod ?? CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
backButtonText: translate('iou.business'),
subMenuItems: [
...(isCurrencySupported ? getPaymentSubitems(true) : []),
const getInvoicesOptions = (payAsBusiness: boolean) => {
return [
...(isCurrencySupported ? getPaymentSubitems(payAsBusiness) : []),
{
text: translate('workspace.invoices.paymentMethods.addBankAccount'),
icon: Expensicons.Bank,
Expand All @@ -309,12 +278,32 @@ function SettlementButton({
value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
shouldUpdateSelectedIndex: true,
onSelected: () => {
onPress(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, true);
onPress(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, payAsBusiness, undefined);
savePreferredPaymentMethod(policyIDKey, CONST.IOU.PAYMENT_TYPE.ELSEWHERE);
},
},
],
});
];
};

if (isIndividualInvoiceRoomUtil(chatReport)) {
buttonOptions.push({
text: translate('iou.settlePersonal', {formattedAmount}),
icon: Expensicons.User,
value: hasIntentToPay ? CONST.IOU.PAYMENT_TYPE.EXPENSIFY : lastPaymentMethod ?? CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
backButtonText: translate('iou.individual'),
subMenuItems: getInvoicesOptions(false),
});
buttonOptions.push({
text: translate('iou.settleBusiness', {formattedAmount}),
icon: Expensicons.Building,
value: hasIntentToPay ? CONST.IOU.PAYMENT_TYPE.EXPENSIFY : lastPaymentMethod ?? CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
backButtonText: translate('iou.business'),
subMenuItems: getInvoicesOptions(true),
});
} else {
// If there is pay as business option, we should show the submenu items instead.
buttonOptions.push(...getInvoicesOptions(true));
}
}

if (shouldShowApproveButton) {
Expand Down Expand Up @@ -361,6 +350,19 @@ function SettlementButton({
return;
}
if (isInvoiceReport) {
// if user has intent to pay, we should get the only bank account information to pay the invoice.
if (hasIntentToPay) {
const currentBankInformation = formattedPaymentMethods.at(0) as BankAccount;
onPress(
CONST.IOU.PAYMENT_TYPE.EXPENSIFY,
currentBankInformation.accountType !== CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT,
currentBankInformation.methodID,
currentBankInformation.accountType,
undefined,
);
return;
}

const isBusinessInvoice = isBusinessInvoiceRoom(chatReport);
if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.ELSEWHERE) {
onPress(iouPaymentType, isBusinessInvoice);
Expand Down Expand Up @@ -427,13 +429,14 @@ function SettlementButton({
return lastPaymentPolicy.name;
}

if (lastPaymentMethod === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
if (isBusinessInvoiceRoom(chatReport) && bankAccount) {
return translate('iou.invoiceBussinessBank', {lastFour: bankAccount?.accountData?.accountNumber?.slice(-4) ?? ''});
if (lastPaymentMethod === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || hasIntentToPay) {
const bankAccountToDisplay = hasIntentToPay ? (formattedPaymentMethods.at(0) as BankAccount) : bankAccount;
if (isBusinessInvoiceRoom(chatReport) && bankAccountToDisplay) {
return translate('iou.invoiceBussinessBank', {lastFour: bankAccountToDisplay?.accountData?.accountNumber?.slice(-4) ?? ''});
}

if (isIndividualInvoiceRoomUtil(chatReport) && bankAccount) {
return translate('iou.invoicePersonalBank', {lastFour: bankAccount?.accountData?.accountNumber?.slice(-4) ?? ''});
if (isIndividualInvoiceRoomUtil(chatReport) && bankAccountToDisplay) {
return translate('iou.invoicePersonalBank', {lastFour: bankAccountToDisplay?.accountData?.accountNumber?.slice(-4) ?? ''});
}

return translate('common.wallet');
Expand All @@ -453,6 +456,8 @@ function SettlementButton({
const customText = getCustomText();
const secondlineText = getSecondLineText();

const shouldUseSplitButton = hasPreferredPaymentMethod || !!lastPaymentPolicy || (!!bankAccount && isExpenseReportUtil(iouReport)) || (isInvoiceReport && hasIntentToPay);

return (
<KYCWall
onSuccessfulKYC={(paymentType) => onPress(paymentType, undefined, undefined)}
Expand All @@ -475,7 +480,7 @@ function SettlementButton({
shouldAlwaysShowDropdownMenu={isInvoiceReport}
customText={customText}
menuHeaderText={isInvoiceReport ? translate('workspace.invoices.paymentMethods.chooseInvoiceMethod') : undefined}
isSplitButton={hasPreferredPaymentMethod || !!lastPaymentPolicy || (!!bankAccount && isExpenseReportUtil(iouReport))}
isSplitButton={shouldUseSplitButton}
isDisabled={isDisabled}
isLoading={isLoading}
defaultSelectedIndex={lastPaymentPolicy ? paymentButtonOptions.findIndex((option) => option.value === lastPaymentPolicy.id) : 0}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8487,7 +8487,7 @@ function getPayMoneyRequestParams(
const optimisticLastPaymentMethod = {
[iouReport.policyID]: {
lastUsed: paymentMethodType,
...(isInvoiceReport ? {Invoice: {name: paymentMethodType, bankAccountID}} : {}),
...(isInvoiceReport ? {invoice: {name: paymentMethodType, bankAccountID}} : {}),
},
};

Expand Down
6 changes: 3 additions & 3 deletions src/types/onyx/LastPaymentMethod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ type LastPaymentMethodType = {
/** The default last payment method */
lastUsed: string;
/** The lastPaymentMethod of an IOU */
Iou: string;
Comment thread
hungvu193 marked this conversation as resolved.
iou: string;
/** The lastPaymentMethod of an Expense */
Expense: string;
expense: string;
/** The lastPaymentMethod of an Invoice */
Invoice: string | PaymentInformation;
invoice: string | PaymentInformation;
};

/** Record of last payment methods, indexed by policy id */
Expand Down