implemented terms page of fixed deposit accounts Feature (#2543)

shashank-0-0 · shashank-0-0 · web-flow · commit 4a904b1d99f4 · 2025-11-19T05:36:47.000-05:00
Co-authored-by: shashank-0-0 &lt;ss068467@gmail.com&gt;
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repository/FixedDepositRepository.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repository/FixedDepositRepository.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.core.data.repository
 
 import com.mifos.core.common.utils.DataState
@@ -7,8 +16,6 @@ import kotlinx.coroutines.flow.Flow
 interface FixedDepositRepository {
     fun getFixedDepositTemplate(
         clientId: Int,
-        productId: Int?
+        productId: Int?,
     ): Flow<DataState<FixedDepositTemplate>>
-
-
-}
+}
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/FixedDepositRepositoryImpl.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/FixedDepositRepositoryImpl.kt
@@ -1,20 +1,29 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.core.data.repositoryImp
 
-
 import com.mifos.core.common.utils.DataState
 import com.mifos.core.common.utils.asDataStateFlow
 import com.mifos.core.data.repository.FixedDepositRepository
 import com.mifos.core.network.datamanager.DataManagerFixedDeposit
 import com.mifos.core.network.model.FixedDepositTemplate
 import kotlinx.coroutines.flow.Flow
 
-class FixedDepositRepositoryImpl (private val dataManagerFixedDeposit: DataManagerFixedDeposit): FixedDepositRepository{
+class FixedDepositRepositoryImpl(private val dataManagerFixedDeposit: DataManagerFixedDeposit) :
+    FixedDepositRepository {
 
-    override fun getFixedDepositTemplate(clientId: Int,productId: Int?): Flow<DataState<FixedDepositTemplate>> {
-        return dataManagerFixedDeposit.getFixedDepositTemplate(clientId,productId).asDataStateFlow()
+    override fun getFixedDepositTemplate(
+        clientId: Int,
+        productId: Int?,
+    ): Flow<DataState<FixedDepositTemplate>> {
+        return dataManagerFixedDeposit.getFixedDepositTemplate(clientId, productId)
+            .asDataStateFlow()
     }
-
-
-
-
 }
diff --git a/core/database/src/commonMain/kotlin/com/mifos/room/basemodel/APIEndPoint.kt b/core/database/src/commonMain/kotlin/com/mifos/room/basemodel/APIEndPoint.kt
@@ -42,5 +42,5 @@ object APIEndPoint {
     const val MAKER_CHECKER = "makercheckers"
     const val SHARE = "share"
 
-    const val FIXED_DEPOSIT ="fixeddepositaccounts"
+    const val FIXED_DEPOSIT = "fixeddepositaccounts"
 }
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/BaseApiManager.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/BaseApiManager.kt
@@ -33,6 +33,7 @@ import com.mifos.core.network.services.ClientService
 import com.mifos.core.network.services.CollectionSheetService
 import com.mifos.core.network.services.DataTableService
 import com.mifos.core.network.services.DocumentService
+import com.mifos.core.network.services.FixedDepositService
 import com.mifos.core.network.services.GroupService
 import com.mifos.core.network.services.LoanService
 import com.mifos.core.network.services.NoteService
@@ -44,7 +45,6 @@ import com.mifos.core.network.services.SearchService
 import com.mifos.core.network.services.ShareAccountService
 import com.mifos.core.network.services.StaffService
 import com.mifos.core.network.services.SurveyService
-import com.mifos.core.network.services.FixedDepositService
 import com.mifos.core.network.services.createCenterService
 import com.mifos.core.network.services.createChargeService
 import com.mifos.core.network.services.createCheckerInboxService
@@ -53,14 +53,14 @@ import com.mifos.core.network.services.createClientService
 import com.mifos.core.network.services.createCollectionSheetService
 import com.mifos.core.network.services.createDataTableService
 import com.mifos.core.network.services.createDocumentService
+import com.mifos.core.network.services.createFixedDepositService
 import com.mifos.core.network.services.createGroupService
 import com.mifos.core.network.services.createLoanService
 import com.mifos.core.network.services.createNoteService
 import com.mifos.core.network.services.createOfficeService
 import com.mifos.core.network.services.createRecurringAccountService
 import com.mifos.core.network.services.createRunReportsService
 import com.mifos.core.network.services.createSavingsAccountService
-import com.mifos.core.network.services.createFixedDepositService
 import com.mifos.core.network.services.createSearchService
 import com.mifos.core.network.services.createShareAccountService
 import com.mifos.core.network.services.createStaffService
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerFixedDeposit.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerFixedDeposit.kt
@@ -1,12 +1,20 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.core.network.datamanager
 
 import com.mifos.core.network.BaseApiManager
 import com.mifos.core.network.model.FixedDepositTemplate
 import kotlinx.coroutines.flow.Flow
 
-class DataManagerFixedDeposit (private val baseApiManager: BaseApiManager){
+class DataManagerFixedDeposit(private val baseApiManager: BaseApiManager) {
 
-    fun getFixedDepositTemplate(clientId:Int,productId: Int?): Flow<FixedDepositTemplate> =
-        baseApiManager.fixedDepositService.fixedDepositProductTemplate(clientId,productId)
-
-}
+    fun getFixedDepositTemplate(clientId: Int, productId: Int?): Flow<FixedDepositTemplate> =
+        baseApiManager.fixedDepositService.fixedDepositProductTemplate(clientId, productId)
+}
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt
@@ -19,9 +19,9 @@ import com.mifos.core.network.datamanager.DataManagerClient
 import com.mifos.core.network.datamanager.DataManagerCollectionSheet
 import com.mifos.core.network.datamanager.DataManagerDataTable
 import com.mifos.core.network.datamanager.DataManagerDocument
+import com.mifos.core.network.datamanager.DataManagerFixedDeposit
 import com.mifos.core.network.datamanager.DataManagerGroups
 import com.mifos.core.network.datamanager.DataManagerIdentifiers
-import com.mifos.core.network.datamanager.DataManagerFixedDeposit
 import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.core.network.datamanager.DataManagerNote
 import com.mifos.core.network.datamanager.DataManagerOffices
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/FixedDepositProductOption.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/FixedDepositProductOption.kt
@@ -1,6 +1,14 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.core.network.model
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,4 +22,4 @@ data class FixedDepositProductOption(
 
     @SerialName("withHoldTax")
     val withHoldTax: Boolean? = null,
-)
+)
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/FixedDepositTemplate.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/FixedDepositTemplate.kt
@@ -1,24 +1,55 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.core.network.model
 
 import com.mifos.core.model.objects.account.saving.FieldOfficerOptions
-import com.mifos.core.model.utils.IgnoredOnParcel
+import com.mifos.core.model.objects.template.recurring.Currency
+import com.mifos.core.model.objects.template.recurring.interest.InterestCalculationDaysInYearTypeOption
+import com.mifos.core.model.objects.template.recurring.interest.InterestCalculationTypeOption
+import com.mifos.core.model.objects.template.recurring.interest.InterestCompoundingPeriodTypeOption
+import com.mifos.core.model.objects.template.recurring.interest.InterestPostingPeriodTypeOption
+import com.mifos.core.model.objects.template.recurring.period.PeriodFrequencyTypeOption
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-
-
 @Serializable
 data class FixedDepositTemplate(
+
     @SerialName("clientId")
     val clientId: Int? = null,
 
     @SerialName(value = "clientName")
     val clientName: String? = null,
 
+    @SerialName(value = "currency")
+    val currency: Currency? = null,
+
     @SerialName("productOptions")
     val productOptions: List<FixedDepositProductOption>? = null,
 
     @SerialName("fieldOfficerOptions")
     val fieldOfficerOptions: List<FieldOfficerOptions>? = null,
 
-)
+    @SerialName("periodFrequencyTypeOptions")
+    val periodFrequencyTypeOptions: List<PeriodFrequencyTypeOption>? = null,
+
+    @SerialName("interestCompoundingPeriodTypeOptions")
+    val interestCompoundingPeriodTypeOptions: List<InterestCompoundingPeriodTypeOption>? = null,
+
+    @SerialName("interestPostingPeriodTypeOptions")
+    val interestPostingPeriodTypeOptions: List<InterestPostingPeriodTypeOption>? = null,
+
+    @SerialName("interestCalculationDaysInYearTypeOptions")
+    val interestCalculationDaysInYearTypeOptions: List<InterestCalculationDaysInYearTypeOption>? = null,
+
+    @SerialName("interestCalculationTypeOptions")
+    val interestCalculationTypeOptions: List<InterestCalculationTypeOption>? = null,
+
+)
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/services/FixedDepositService.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/services/FixedDepositService.kt
@@ -1,26 +1,25 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.core.network.services
 
 import com.mifos.core.network.model.FixedDepositTemplate
 import com.mifos.room.basemodel.APIEndPoint
-import de.jensklingenberg.ktorfit.http.Query
 import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.Query
 import kotlinx.coroutines.flow.Flow
 
-
-
-
-
-
 interface FixedDepositService {
 
-    @GET( APIEndPoint.FIXED_DEPOSIT + "/template")
+    @GET(APIEndPoint.FIXED_DEPOSIT + "/template")
     fun fixedDepositProductTemplate(
         @Query("clientId") clientId: Int,
         @Query("productId") productId: Int?,
     ): Flow<FixedDepositTemplate>
 }
-
-
-
-
-
diff --git a/feature/client/src/commonMain/composeResources/values/strings.xml b/feature/client/src/commonMain/composeResources/values/strings.xml
@@ -578,4 +578,14 @@
     <string name="charges_view_charges">View Charges</string>
     <string name="charges_client_update_not_support_error_msg">Updating client charges is not supported. Please delete the existing charge and create a new one.</string>
 
+    <string name="feature_fixed_deposit_deposit_amount">Deposit Amount</string>
+    <string name="feature_fixed_deposit_deposit_period_type">Deposit Period Type</string>
+    <string name="feature_fixed_interest_compounding">Interest Compounding</string>
+    <string name="feature_fixed_interest_compounding_period">Interest Compounding Period</string>
+    <string name="feature_fixed_interest_posting_period">Interest Posting Period</string>
+    <string name="feature_fixed_interest_calculated_using">Interest Calculated Using</string>
+    <string name="feature_fixed_days_in_year">Days in year</string>
+    <string name="feature_fixed_deposit_terms_page">Terms</string>
+    <string name="feature_fixed_deposit_deposit_period">Deposit Period</string>
+
 </resources>
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt
@@ -76,7 +76,6 @@ import com.mifos.feature.client.documentPreviewScreen.createDocumentPreviewRoute
 import com.mifos.feature.client.documentPreviewScreen.navigateToDocumentPreviewRoute
 import com.mifos.feature.client.fixedDepositAccount.clientFixedDepositAccountDestination
 import com.mifos.feature.client.fixedDepositAccount.navigateToFixedDepositAccountRoute
-import com.mifos.feature.client.newFixedDepositAccount.createFixedDepositAccountRoute
 import com.mifos.feature.client.newFixedDepositAccount.createFixedDepositAccountDestination
 import com.mifos.feature.client.newFixedDepositAccount.navigateToCreateFixedDepositRoute
 import com.mifos.feature.client.recurringDepositAccount.clientRecurringDepositAccountDestination
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountRoute.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountRoute.kt
@@ -15,24 +15,22 @@ import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
 
 @Serializable
-
-data class createFixedDepositAccountRoute(
+data class CreateFixedDepositAccountRoute(
     val clientId: Int,
 )
 
-
-
 fun NavGraphBuilder.createFixedDepositAccountDestination(navController: NavController) {
-    composable<createFixedDepositAccountRoute> {
+    composable<CreateFixedDepositAccountRoute> {
         CreateFixedDepositAccountScreen(
             onNavigateBack = navController::popBackStack,
             onFinish = {},
             navController = navController,
         )
     }
 }
+
 fun NavController.navigateToCreateFixedDepositRoute(clientId: Int) {
     this.navigate(
-        createFixedDepositAccountRoute(clientId=clientId)
+        CreateFixedDepositAccountRoute(clientId = clientId),
     )
 }
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountScreen.kt
@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.mifos.core.designsystem.component.MifosScaffold
 import com.mifos.core.ui.components.MifosBreadcrumbNavBar
@@ -79,7 +78,8 @@ private fun FixedDepositAccountScaffold(
             },
             Step(name = stringResource(Res.string.step_terms)) {
                 TermsPage(
-                    onNext = { onAction(NewFixedDepositAccountAction.OnNextPress) },
+                    state = newFixedDepositAccountState,
+                    onAction = onAction,
                 )
             },
 
@@ -132,10 +132,9 @@ private fun FixedDepositAccountScaffold(
                         modifier = Modifier
                             .fillMaxWidth(),
 
-                        )
+                    )
                 }
             }
         }
-
     }
 }
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountViewmodel.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountViewmodel.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/pages/DetailsPage.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/pages/DetailsPage.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/pages/TermsPage.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/newFixedDepositAccount/pages/TermsPage.kt

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,5 @@ object APIEndPoint {`
`42`	`42`	`const val MAKER_CHECKER = "makercheckers"`
`43`	`43`	`const val SHARE = "share"`
`44`	`44`
`45`		`- const val FIXED_DEPOSIT ="fixeddepositaccounts"`
	`45`	`+ const val FIXED_DEPOSIT = "fixeddepositaccounts"`
`46`	`46`	`}`