Skip to content

feat(client): add transfer fund option for overpaid loan accounts #2675

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
niyajali merged 15 commits into from
May 22, 2026
Merged

feat(client): add transfer fund option for overpaid loan accounts #2675

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9490d16
implement fund transfer feature for loan accounts and refactor naviga…
Arinyadav1 May 6, 2026
fb6758e
make AccountTransferRequest fields nullable and update AmountTransfer…
Arinyadav1 May 7, 2026
cf466ea
update fetchInitialTemplate to include null check for fromClientId
Arinyadav1 May 7, 2026
9193a12
remove unused fromAccountTypeName property from AmountTransferState
Arinyadav1 May 7, 2026
b76d13f
refactor ClientLoanAccounts to handle nullable loan IDs and improve e…
Arinyadav1 May 7, 2026
dc4e532
refactor AmountTransferViewModel to use internal actions for handling…
Arinyadav1 May 7, 2026
9d43bb4
Merge branch 'development' into transfer-fund-action
biplab1 May 8, 2026
98896d5
refactor AmountTransferViewModel coroutines and extract ClientsAccoun…
Arinyadav1 May 8, 2026
d86ab34
refactor ClientLoanAccountsScreen to use modular components and impro…
Arinyadav1 May 9, 2026
469b629
Merge branch 'development' into transfer-fund-action
Arinyadav1 May 12, 2026
e2c65df
Merge branch 'development' into transfer-fund-action
Arinyadav1 May 12, 2026
f3edeae
add `send_money` vector resource and update `TransferFund` action to …
Arinyadav1 May 14, 2026
b1081e0
move `send_money` vector resource to `core:ui` and update `ClientLoan…
Arinyadav1 May 17, 2026
908e6cf
Merge branch 'dev' into transfer-fund-action
niyajali May 22, 2026
ffce602
Merge branch 'dev' into transfer-fund-action
niyajali May 22, 2026
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
3 changes: 3 additions & 0 deletions core/designsystem/src/commonMain/kotlin/com/mifos/core/designsystem/icon/MifosIcons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import androidx.compose.material.icons.outlined.ContentCopy
import androidx.compose.material.icons.outlined.CurrencyExchange
import androidx.compose.material.icons.outlined.DateRange
import androidx.compose.material.icons.outlined.DeleteOutline
import androidx.compose.material.icons.outlined.Directions
import androidx.compose.material.icons.outlined.DocumentScanner
import androidx.compose.material.icons.outlined.Draw
import androidx.compose.material.icons.outlined.EventRepeat
Expand Down Expand Up @@ -252,4 +253,6 @@ object MifosIcons {
val Copy = Icons.Outlined.ContentCopy
val Currency = Icons.Outlined.CurrencyExchange
val Camera = Icons.Outlined.Camera

val TransferFund = Icons.Outlined.Directions
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
}
Comment thread
Arinyadav1 marked this conversation as resolved.
26 changes: 13 additions & 13 deletions ...nMain/kotlin/com/mifos/core/model/objects/account/loan/transfer/AccountTransferRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ import kotlinx.serialization.Serializable
*/
@Serializable
data class AccountTransferRequest(
val fromOfficeId: Int,
val fromClientId: Int,
val fromAccountType: Int,
val fromAccountId: Int,
val toOfficeId: Int,
val toClientId: Int,
val toAccountType: Int,
val toAccountId: Int,
val transferDate: String,
val transferAmount: Double,
val transferDescription: String,
val dateFormat: String,
val locale: String,
val fromOfficeId: Int? = null,
val fromClientId: Int? = null,
val fromAccountType: Int? = null,
val fromAccountId: Int? = null,
val toOfficeId: Int? = null,
val toClientId: Int? = null,
val toAccountType: Int? = null,
val toAccountId: Int? = null,
val transferDate: String? = null,
val transferAmount: Double? = null,
val transferDescription: String? = null,
val dateFormat: String? = null,
val locale: String? = null,
)
Comment thread
Arinyadav1 marked this conversation as resolved.
1 change: 1 addition & 0 deletions core/ui/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<string name="core_ui_pay_outstanding_amount">Pay Outstanding Amount</string>
<string name="core_ui_edit">Edit</string>
<string name="core_ui_delete">Delete</string>
<string name="core_ui_transfer_fund">Transfer Fund</string>
Comment thread
Arinyadav1 marked this conversation as resolved.

<!-- Mifos Note -->
<string name="core_ui_note_createdBy">Created By:</string>
Expand Down
3 changes: 3 additions & 0 deletions ...ui/src/commonMain/kotlin/com/mifos/core/ui/components/MifosActionsListingCardComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import androidclient.core.ui.generated.resources.core_ui_quantity
import androidclient.core.ui.generated.resources.core_ui_status
import androidclient.core.ui.generated.resources.core_ui_total_collateral_value
import androidclient.core.ui.generated.resources.core_ui_total_value
import androidclient.core.ui.generated.resources.core_ui_transfer_fund
import androidclient.core.ui.generated.resources.core_ui_type
import androidclient.core.ui.generated.resources.core_ui_upload_again
import androidclient.core.ui.generated.resources.core_ui_view_account
Expand Down Expand Up @@ -826,6 +827,8 @@ sealed class Actions(open val icon: ImageVector, open val text: StringResource)
Actions(icon, Res.string.core_ui_edit)
data class Delete(override val icon: ImageVector = MifosIcons.DeleteDocument) :
Actions(icon, Res.string.core_ui_delete)
data class TransferFund(override val icon: ImageVector = MifosIcons.TransferFund) :
Actions(icon, Res.string.core_ui_transfer_fund)
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
}

@Composable
Expand Down
2 changes: 2 additions & 0 deletions .../commonMain/kotlin/com/mifos/feature/client/clientLoanAccounts/ClientLoanAccountsRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ fun NavGraphBuilder.clientLoanAccountsDestination(
navController: NavController,
navigateToViewAccount: (Int) -> Unit,
navigateToMakeRepayment: (Int) -> Unit,
navigateToTransferFund: (Int) -> Unit,
createAccount: (Int, String) -> Unit,
) {
composable<ClientLoanAccountsRoute> {
Expand All @@ -32,6 +33,7 @@ fun NavGraphBuilder.clientLoanAccountsDestination(
viewAccount = navigateToViewAccount,
makeRepayment = navigateToMakeRepayment,
navController = navController,
transferFund = navigateToTransferFund,
createAccount = { clientId, accountNo -> createAccount(clientId, accountNo) },
)
}
Expand Down
202 changes: 109 additions & 93 deletions ...commonMain/kotlin/com/mifos/feature/client/clientLoanAccounts/ClientLoanAccountsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ internal fun ClientLoanAccountsScreenRoute(
navigateBack: () -> Unit,
makeRepayment: (Int) -> Unit,
viewAccount: (Int) -> Unit,
transferFund: (Int) -> Unit,
navController: NavController,
createAccount: (Int, String) -> Unit,
viewModel: ClientLoanAccountsViewModel = koinViewModel(),
Expand All @@ -97,6 +98,7 @@ internal fun ClientLoanAccountsScreenRoute(
ClientLoanAccountsEvent.NavigateBack -> navigateBack()
is ClientLoanAccountsEvent.ViewAccount -> viewAccount(event.id)
is ClientLoanAccountsEvent.AddAccount -> createAccount(event.clientId, event.accountNo)
is ClientLoanAccountsEvent.TransferFund -> transferFund(event.loanId)
}
}

Expand Down Expand Up @@ -131,17 +133,15 @@ private fun ClientLoanAccountsScreen(
onAction: (ClientLoanAccountsAction) -> Unit,
) {
Column(
modifier = modifier
.fillMaxSize(),
modifier = modifier.fillMaxSize(),
) {
MifosBreadcrumbNavBar(navController)

when (state.isLoading) {
true -> MifosProgressIndicator()
false -> {
Column(
modifier = Modifier.fillMaxSize()
.padding(horizontal = KptTheme.spacing.md),
modifier = Modifier.fillMaxSize().padding(horizontal = KptTheme.spacing.md),
) {
ClientsAccountHeader(
totalItem = state.loanAccounts.size.toString(),
Expand All @@ -167,93 +167,113 @@ private fun ClientLoanAccountsScreen(

Spacer(modifier = Modifier.height(KptTheme.spacing.md))

if (state.loanAccounts.isEmpty()) {
MifosEmptyCard(
msg = stringResource(Res.string.feature_loan_account_empty_list_message),
isButtonPresent = true,
onClick = { onAction.invoke(ClientLoanAccountsAction.AddAccount) },
ClientsAccountShowCard(
onAction = onAction,
state = state,
)
}
}
}
}
}

@Composable
private fun ClientsAccountShowCard(
state: ClientLoanAccountsState,
modifier: Modifier = Modifier,
onAction: (ClientLoanAccountsAction) -> Unit,
) {
if (state.loanAccounts.isEmpty()) {
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
MifosEmptyCard(
msg = stringResource(Res.string.feature_loan_account_empty_list_message),
isButtonPresent = true,
onClick = { onAction.invoke(ClientLoanAccountsAction.AddAccount) },
)
} else {
LazyColumn {
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
items(state.loanAccounts) { loan ->
val symbol = loan.currency?.displaySymbol ?: ""
MifosActionsLoanListingComponent(
accountNo = (
loan.accountNo ?: stringResource(
Res.string.client_loan_accounts_not_available,
)
),
loanProduct = loan.productName
?: stringResource(Res.string.client_loan_accounts_not_available),
originalLoan = symbol + (
(
loan.originalLoan
?: stringResource(Res.string.client_loan_accounts_not_available)
).toString()
),
amountPaid = symbol + (
(
if (loan.status?.pendingApproval == true) {
stringResource(Res.string.client_loan_accounts_not_available)
} else {
(loan.amountPaid ?: 0.0).toString()
}
)
),
loanBalance = symbol + (
(
if (loan.status?.pendingApproval == true) {
stringResource(Res.string.client_loan_accounts_not_available)
} else {
(loan.loanBalance ?: 0.0).toString()
}
)
),
type = loan.loanType?.value
?: stringResource(Res.string.client_loan_accounts_not_available),
status = loan.status?.value
?: stringResource(Res.string.client_loan_accounts_not_available),
// TODO check if we need to add other options as well, such as disburse and all
// currently didn't add it cuz its not in the UI design
menuList = buildList {
add(
Actions.ViewAccount(
vectorResource(Res.drawable.wallet),
),
)
} else {
LazyColumn {
items(state.loanAccounts) { loan ->
val symbol = loan.currency?.displaySymbol ?: ""
MifosActionsLoanListingComponent(
accountNo = (
loan.accountNo ?: stringResource(
Res.string.client_loan_accounts_not_available,
)
),
loanProduct = loan.productName ?: stringResource(Res.string.client_loan_accounts_not_available),
originalLoan = symbol + (
(loan.originalLoan ?: stringResource(Res.string.client_loan_accounts_not_available)).toString()
),
amountPaid = symbol + (
(
if (loan.status?.pendingApproval == true) {
stringResource(Res.string.client_loan_accounts_not_available)
} else {
(
loan.amountPaid
?: 0.0
).toString()
}
)
),
loanBalance = symbol + (
(
if (loan.status?.pendingApproval == true) {
stringResource(Res.string.client_loan_accounts_not_available)
} else {
(
loan.loanBalance
?: 0.0
).toString()
}
)
),
type = loan.loanType?.value ?: stringResource(Res.string.client_loan_accounts_not_available),
status = loan.status?.value ?: stringResource(Res.string.client_loan_accounts_not_available),
// TODO check if we need to add other options as well, such as disburse and all
// currently didn't add it cuz its not in the UI design
menuList = when {
loan.status?.active == true -> {
listOf(
Actions.ViewAccount(
vectorResource(Res.drawable.wallet),
),
Actions.MakeRepayment(
vectorResource(Res.drawable.cash_bundel),
),
)
}

else -> {
listOf(
Actions.ViewAccount(
vectorResource(Res.drawable.wallet),
),
)
}
},
onActionClicked = { actions ->
when (actions) {
is Actions.ViewAccount -> onAction(
ClientLoanAccountsAction.ViewAccount(loan.id ?: 0),
)
is Actions.MakeRepayment -> onAction(
ClientLoanAccountsAction.MakeRepayment(loan.id ?: 0),
)
when {
loan.status?.active == true -> add(
Actions.MakeRepayment(
vectorResource(Res.drawable.cash_bundel),
),
)

else -> null
}
},
)
loan.status?.overpaid == true -> add(
Actions.TransferFund(),
)
}
},
onActionClicked = { actions ->
when (actions) {
is Actions.ViewAccount -> onAction(
ClientLoanAccountsAction.ViewAccount(loan.id),
)

Spacer(modifier = Modifier.height(KptTheme.spacing.sm))
}
is Actions.MakeRepayment -> onAction(
ClientLoanAccountsAction.MakeRepayment(
loan.id,
),
)

is Actions.TransferFund -> onAction(
ClientLoanAccountsAction.TransferFund(
loanId = loan.id,
),
)

else -> null
}
}
}
},
)

Spacer(modifier = Modifier.height(KptTheme.spacing.sm))
}
}
}
Expand Down Expand Up @@ -317,11 +337,9 @@ private fun ClientsAccountHeader(

if (isFilterActive) {
Box(
modifier = Modifier
.align(Alignment.TopEnd)
modifier = Modifier.align(Alignment.TopEnd)
.padding(top = DesignToken.padding.medium, end = KptTheme.spacing.md)
.size(DesignToken.sizes.iconMinyMiny)
.clip(CircleShape)
.size(DesignToken.sizes.iconMinyMiny).clip(CircleShape)
.background(KptTheme.colorScheme.error),
)
}
Expand Down Expand Up @@ -377,9 +395,7 @@ private fun FilterBottomSheet(
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier
.fillMaxWidth()
.padding(DesignToken.padding.medium),
modifier = Modifier.fillMaxWidth().padding(DesignToken.padding.medium),
) {
Text(
text = stringResource(Res.string.feature_client_filters),
Expand Down
Loading
Loading