From 06e257093c7359d74db5726817d06954094ce78d Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 30 Jan 2025 12:23:59 +0100 Subject: [PATCH 1/4] Add billable to params --- src/libs/API/parameters/CreatePerDiemRequestParams.ts | 1 + src/libs/actions/IOU.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libs/API/parameters/CreatePerDiemRequestParams.ts b/src/libs/API/parameters/CreatePerDiemRequestParams.ts index 61740fbd0a37..3332b71cebe4 100644 --- a/src/libs/API/parameters/CreatePerDiemRequestParams.ts +++ b/src/libs/API/parameters/CreatePerDiemRequestParams.ts @@ -19,6 +19,7 @@ type CreatePerDiemRequestParams = { reportPreviewReportActionID: string; transactionThreadReportID: string; createdReportActionIDForThread: string | undefined; + billable: boolean; }; export default CreatePerDiemRequestParams; diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 3c86ce947742..5d520f663d21 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4489,6 +4489,7 @@ function submitPerDiemExpense(submitPerDiemExpenseInformation: PerDiemExpenseInf tag, transactionThreadReportID, createdReportActionIDForThread, + billable, }; API.write(WRITE_COMMANDS.CREATE_PER_DIEM_REQUEST, parameters, onyxData); From 23fa4a43dc2c360079d468192a83d9997ed71a39 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 30 Jan 2025 12:26:40 +0100 Subject: [PATCH 2/4] Pass billable --- src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index a54c882259c8..0b25bafd48ea 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -312,6 +312,7 @@ function IOURequestStepConfirmation({ category: transaction.category, tag: transaction.tag, customUnit: transaction.comment?.customUnit, + billable: transaction.billable, }, }); }, From 4228a75800ab3c5834c9941c31cc211b2d9969d2 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 30 Jan 2025 12:29:22 +0100 Subject: [PATCH 3/4] better params --- src/libs/API/parameters/CreatePerDiemRequestParams.ts | 2 +- src/libs/actions/IOU.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/API/parameters/CreatePerDiemRequestParams.ts b/src/libs/API/parameters/CreatePerDiemRequestParams.ts index 3332b71cebe4..b2fe0b541cc5 100644 --- a/src/libs/API/parameters/CreatePerDiemRequestParams.ts +++ b/src/libs/API/parameters/CreatePerDiemRequestParams.ts @@ -19,7 +19,7 @@ type CreatePerDiemRequestParams = { reportPreviewReportActionID: string; transactionThreadReportID: string; createdReportActionIDForThread: string | undefined; - billable: boolean; + billable?: boolean; }; export default CreatePerDiemRequestParams; diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 5d520f663d21..15a79b7bb27e 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -333,6 +333,7 @@ type PerDiemExpenseTransactionParams = { tag?: string; created: string; customUnit: TransactionCustomUnit; + billable?: boolean; }; type RequestMoneyPolicyParams = { From 515ef9a669faf0adc989849697f8e3ec6ea01bc1 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 30 Jan 2025 12:53:13 +0100 Subject: [PATCH 4/4] pass billable back correctly --- src/libs/actions/IOU.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 15a79b7bb27e..6c2c553dd722 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -200,6 +200,7 @@ type MoneyRequestInformation = { transactionThreadReportID: string; createdReportActionIDForThread: string | undefined; onyxData: OnyxData; + billable?: boolean; }; type TrackExpenseInformation = { @@ -2787,7 +2788,7 @@ function getPerDiemExpenseInformation(perDiemExpenseInformation: PerDiemExpenseI const {parentChatReport, transactionParams, participantParams, policyParams = {}, moneyRequestReportID = ''} = perDiemExpenseInformation; const {payeeAccountID = userAccountID, payeeEmail = currentUserEmail, participant} = participantParams; const {policy, policyCategories, policyTagList} = policyParams; - const {comment = '', currency, created, category, tag, customUnit} = transactionParams; + const {comment = '', currency, created, category, tag, customUnit, billable} = transactionParams; const amount = computePerDiemExpenseAmount(customUnit); const merchant = computePerDiemExpenseMerchant(customUnit, policy); @@ -2862,6 +2863,7 @@ function getPerDiemExpenseInformation(perDiemExpenseInformation: PerDiemExpenseI merchant, tag, customUnit, + billable, pendingFields: {subRates: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}, }, }); @@ -2981,6 +2983,7 @@ function getPerDiemExpenseInformation(perDiemExpenseInformation: PerDiemExpenseI successData, failureData, }, + billable, }; } @@ -4460,6 +4463,7 @@ function submitPerDiemExpense(submitPerDiemExpenseInformation: PerDiemExpenseInf transactionThreadReportID, createdReportActionIDForThread, onyxData, + billable, } = getPerDiemExpenseInformation({ parentChatReport: currentChatReport, participantParams,