feat(shareAccount): implement terms page for share account. (#2531)

sam-arth07 · web-flow · commit fae0221823d9 · 2025-11-10T18:56:01.000+05:30
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repository/ShareAccountRepository.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repository/ShareAccountRepository.kt
@@ -15,5 +15,5 @@ import kotlinx.coroutines.flow.Flow
 
 interface ShareAccountRepository {
 
-    fun getShareTemplate(clientId: Int): Flow<DataState<ShareTemplate>>
+    fun getShareTemplate(clientId: Int, productId: Int?): Flow<DataState<ShareTemplate>>
 }
diff --git a/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/ShareAccountRepositoryImpl.kt b/core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/ShareAccountRepositoryImpl.kt
@@ -20,7 +20,7 @@ class ShareAccountRepositoryImpl(
     private val dataManagerShare: DataManagerShare,
 ) : ShareAccountRepository {
 
-    override fun getShareTemplate(clientId: Int): Flow<DataState<ShareTemplate>> {
-        return dataManagerShare.getShareTemplate(clientId).asDataStateFlow()
+    override fun getShareTemplate(clientId: Int, productId: Int?): Flow<DataState<ShareTemplate>> {
+        return dataManagerShare.getShareTemplate(clientId, productId).asDataStateFlow()
     }
 }
diff --git a/core/designsystem/src/commonMain/kotlin/com/mifos/core/designsystem/component/MifosOutlinedTextField.kt b/core/designsystem/src/commonMain/kotlin/com/mifos/core/designsystem/component/MifosOutlinedTextField.kt
@@ -368,6 +368,7 @@ fun MifosDatePickerTextField(
         .fillMaxWidth()
         .clip(DesignToken.shapes.medium),
     label: String? = null,
+    errorMessage: String? = null,
     openDatePicker: () -> Unit,
 ) {
     OutlinedTextField(
@@ -398,6 +399,16 @@ fun MifosDatePickerTextField(
                 Icon(imageVector = Icons.Default.CalendarMonth, null)
             }
         },
+        isError = errorMessage != null,
+        supportingText = errorMessage?.let {
+            {
+                Text(
+                    text = it,
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        },
     )
 }
 
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerShare.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerShare.kt
@@ -17,6 +17,6 @@ class DataManagerShare(
     private val baseApiManager: BaseApiManager,
 ) {
 
-    fun getShareTemplate(clientId: Int): Flow<ShareTemplate> =
-        baseApiManager.shareAccountService.shareProductTemplate(clientId)
+    fun getShareTemplate(clientId: Int, productId: Int?): Flow<ShareTemplate> =
+        baseApiManager.shareAccountService.shareProductTemplate(clientId, productId)
 }
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ProductOption.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ProductOption.kt
@@ -9,20 +9,34 @@
  */
 package com.mifos.core.network.model.share
 
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ProductOption(
-    @SerialName("id")
     val id: Int,
 
-    @SerialName("name")
     val name: String,
 
-    @SerialName("shortName")
     val shortName: String,
 
-    @SerialName("totalShares")
     val totalShares: Int,
+
+    val currency: ProductCurrency? = null,
+
+    val unitPrice: Double? = null,
+)
+
+@Serializable
+data class ProductCurrency(
+    val code: String,
+
+    val name: String,
+
+    val decimalPlaces: Int? = null,
+
+    val displaySymbol: String? = null,
+
+    val nameCode: String? = null,
+
+    val displayLabel: String? = null,
 )
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareTemplate.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareTemplate.kt
@@ -9,17 +9,46 @@
  */
 package com.mifos.core.network.model.share
 
+import com.mifos.core.model.objects.template.client.Currency
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ShareTemplate(
-    @SerialName("clientId")
     val clientId: Int,
 
-    @SerialName(value = "clientName")
     val clientName: String,
 
-    @SerialName("productOptions")
+    val currency: Currency? = null,
+
+    val currentMarketPrice: Double? = null,
+
     val productOptions: List<ProductOption> = emptyList(),
+
+    @SerialName("clientSavingsAccounts")
+    val savingsAccountOptions: List<SavingsAccountOption>? = emptyList(),
+
+    val lockinPeriodFrequencyTypeOptions: List<FrequencyTypeOption>? = emptyList(),
+
+    val minimumActivePeriodFrequencyTypeOptions: List<FrequencyTypeOption>? = emptyList(),
+)
+
+@Serializable
+data class SavingsAccountOption(
+    val id: Int,
+
+    val accountNo: String,
+
+    val savingsProductName: String? = null,
+
+    val savingsProductId: Int? = null,
+)
+
+@Serializable
+data class FrequencyTypeOption(
+    val id: Int,
+
+    val code: String,
+
+    val value: String,
 )
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/services/ShareAccountService.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/services/ShareAccountService.kt
@@ -20,5 +20,6 @@ interface ShareAccountService {
     @GET("accounts/" + APIEndPoint.SHARE + "/template")
     fun shareProductTemplate(
         @Query("clientId") clientId: Int,
+        @Query("productId") productId: Int?,
     ): Flow<ShareTemplate>
 }
diff --git a/feature/client/src/commonMain/composeResources/values/strings.xml b/feature/client/src/commonMain/composeResources/values/strings.xml
@@ -539,21 +539,33 @@
     <string name="title_new_fixed_deposit_account">New Fixed Deposit Account</string>
 
     <!-- Create Share Account -->
-    <string name="share_account_details">Details</string>
-    <string name="share_account_terms">Terms</string>
-    <string name="share_account_charges">Charges</string>
-    <string name="share_account_preview">Preview</string>
-    <string name="share_account_back">Back</string>
-    <string name="share_account_next">Next</string>
-
-    <string name="share_account_detail_product_name">Product Name*</string>
-    <string name="share_account_detail_submission_date">Submission Date*</string>
-    <string name="share_account_detail_external_id">External Id</string>
-    <string name="share_account_detail_date_select">Select</string>
-    <string name="share_account_detail_date_cancel">Cancel</string>
+    <string name="feature_share_account_details">Details</string>
+    <string name="feature_share_account_terms">Terms</string>
+    <string name="feature_share_account_charges">Charges</string>
+    <string name="feature_share_account_preview">Preview</string>
+    <string name="feature_share_account_back">Back</string>
+    <string name="feature_share_account_next">Next</string>
+
+    <string name="feature_share_account_detail_product_name">Product Name*</string>
+    <string name="feature_share_account_detail_submission_date">Submission Date*</string>
+    <string name="feature_share_account_detail_external_id">External Id</string>
+    <string name="feature_share_account_detail_date_select">Select</string>
+    <string name="feature_share_account_detail_date_cancel">Cancel</string>
+
+    <string name="feature_share_account_terms_currency">Currency</string>
+    <string name="feature_share_account_terms_current_price">Current Price</string>
+    <string name="feature_share_account_terms_total_shares">Total Number of Shares</string>
+    <string name="feature_share_account_terms_default_savings_account">Default Savings Account</string>
+    <string name="feature_share_account_terms_application_date">Application Date</string>
+    <string name="feature_share_account_terms_allow_dividends">Allow dividends for inactive clients</string>
+    <string name="feature_share_account_terms_min_active_period">Minimum Active Period</string>
+    <string name="feature_share_account_terms_frequency">Frequency</string>
+    <string name="feature_share_account_terms_type">Type</string>
+    <string name="feature_share_account_terms_lock_in_period">Lock-in Period</string>
+
 
     <!-- Handle Error-->
-    <string name="field_empty">This field cannot be empty</string>
+    <string name="feature_share_account_field_empty">This field cannot be empty</string>
 
     <!-- Charges -->
     <string name="charges_update">Update</string>
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountScreen.kt
@@ -10,10 +10,10 @@
 package com.mifos.feature.client.createShareAccount
 
 import androidclient.feature.client.generated.resources.Res
-import androidclient.feature.client.generated.resources.share_account_charges
-import androidclient.feature.client.generated.resources.share_account_details
-import androidclient.feature.client.generated.resources.share_account_preview
-import androidclient.feature.client.generated.resources.share_account_terms
+import androidclient.feature.client.generated.resources.feature_share_account_charges
+import androidclient.feature.client.generated.resources.feature_share_account_details
+import androidclient.feature.client.generated.resources.feature_share_account_preview
+import androidclient.feature.client.generated.resources.feature_share_account_terms
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -71,23 +71,24 @@ private fun CreateShareAccountContent(
     navController: NavController,
 ) {
     val steps = listOf(
-        Step(name = stringResource(Res.string.share_account_details)) {
+        Step(name = stringResource(Res.string.feature_share_account_details)) {
             DetailsPage(
                 state = state,
                 onAction = onAction,
             )
         },
-        Step(name = stringResource(Res.string.share_account_terms)) {
+        Step(name = stringResource(Res.string.feature_share_account_terms)) {
             TermsPage(
-                onNext = { onAction(ShareAccountAction.NextStep) },
+                state = state,
+                onAction = onAction,
             )
         },
-        Step(name = stringResource(Res.string.share_account_charges)) {
+        Step(name = stringResource(Res.string.feature_share_account_charges)) {
             ChargesPage(
                 onNext = { onAction(ShareAccountAction.NextStep) },
             )
         },
-        Step(name = stringResource(Res.string.share_account_preview)) {
+        Step(name = stringResource(Res.string.feature_share_account_preview)) {
             PreviewPage(
                 onNext = { onAction(ShareAccountAction.Finish) },
             )
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountViewModel.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/CreateShareAccountViewModel.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/DetailsPage.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/DetailsPage.kt
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/TermsPage.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/createShareAccount/pages/TermsPage.kt

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ import kotlinx.coroutines.flow.Flow`
`15`	`15`
`16`	`16`	`interface ShareAccountRepository {`
`17`	`17`
`18`		`- fun getShareTemplate(clientId: Int): Flow<DataState<ShareTemplate>>`
	`18`	`+ fun getShareTemplate(clientId: Int, productId: Int?): Flow<DataState<ShareTemplate>>`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ShareAccountRepositoryImpl(`
`20`	`20`	`private val dataManagerShare: DataManagerShare,`
`21`	`21`	`) : ShareAccountRepository {`
`22`	`22`
`23`		`- override fun getShareTemplate(clientId: Int): Flow<DataState<ShareTemplate>> {`
`24`		`- return dataManagerShare.getShareTemplate(clientId).asDataStateFlow()`
	`23`	`+ override fun getShareTemplate(clientId: Int, productId: Int?): Flow<DataState<ShareTemplate>> {`
	`24`	`+ return dataManagerShare.getShareTemplate(clientId, productId).asDataStateFlow()`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ class DataManagerShare(`
`17`	`17`	`private val baseApiManager: BaseApiManager,`
`18`	`18`	`) {`
`19`	`19`
`20`		`- fun getShareTemplate(clientId: Int): Flow<ShareTemplate> =`
`21`		`- baseApiManager.shareAccountService.shareProductTemplate(clientId)`
	`20`	`+ fun getShareTemplate(clientId: Int, productId: Int?): Flow<ShareTemplate> =`
	`21`	`+ baseApiManager.shareAccountService.shareProductTemplate(clientId, productId)`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ interface ShareAccountService {`
`20`	`20`	`@GET("accounts/" + APIEndPoint.SHARE + "/template")`
`21`	`21`	`fun shareProductTemplate(`
`22`	`22`	`@Query("clientId") clientId: Int,`
	`23`	`+ @Query("productId") productId: Int?,`
`23`	`24`	`): Flow<ShareTemplate>`
`24`	`25`	`}`