Implement New Share Account Charges Step (#2545)

Author: Arinyadav1

core/common/src/commonMain/kotlin/com/mifos/core/common/utils/ServerConfig.kt

@@ -31,7 +31,7 @@ data class ServerConfig(
             endPoint = "tt.mifos.community",
             apiPath = "/fineract-provider/api/v1/",
             port = "80",
-            tenant = "default",
+            tenant = "dev",
         )
 
         val LOCALHOST = ServerConfig(

core/network/src/commonMain/kotlin/com/mifos/core/network/model/share/ShareTemplate.kt

@@ -9,6 +9,10 @@
  */
 package com.mifos.core.network.model.share
 
+import com.mifos.core.model.objects.template.client.ChargeAppliesTo
+import com.mifos.core.model.objects.template.client.ChargeCalculationType
+import com.mifos.core.model.objects.template.client.ChargePaymentMode
+import com.mifos.core.model.objects.template.client.ChargeTimeType
 import com.mifos.core.model.objects.template.client.Currency
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -25,6 +29,8 @@ data class ShareTemplate(
 
     val productOptions: List<ProductOption> = emptyList(),
 
+    val chargeOptions: List<ChargeOptions> = emptyList(),
+
     @SerialName("clientSavingsAccounts")
     val savingsAccountOptions: List<SavingsAccountOption>? = emptyList(),
 
@@ -52,3 +58,17 @@ data class FrequencyTypeOption(
 
     val value: String,
 )
+
+@Serializable
+data class ChargeOptions(
+    val id: Int? = null,
+    val name: String? = null,
+    val active: Boolean? = null,
+    val penalty: Boolean? = null,
+    val currency: Currency? = null,
+    val amount: Double? = null,
+    val chargeTimeType: ChargeTimeType? = null,
+    val chargeAppliesTo: ChargeAppliesTo? = null,
+    val chargeCalculationType: ChargeCalculationType? = null,
+    val chargePaymentMode: ChargePaymentMode? = null,
+)

core/ui/src/commonMain/kotlin/com/mifos/core/ui/components/AddChargeDialog.kt

@@ -50,9 +50,9 @@ fun AddChargeBottomSheet(
     title: String,
     confirmText: String,
     dismissText: String,
-    showDatePicker: Boolean,
+    showDatePicker: Boolean = false,
     selectedChargeName: String,
-    selectedDate: String,
+    selectedDate: String? = null,
     chargeAmount: String,
     chargeType: String,
     chargeCollectedOn: String,
@@ -109,13 +109,15 @@ fun AddChargeBottomSheet(
                     label = stringResource(Res.string.name),
                 )
 
-                MifosDatePickerTextField(
-                    value = selectedDate,
-                    label = stringResource(Res.string.date),
-                    openDatePicker = { onDatePick(true) },
-                )
+                if (selectedDate != null) {
+                    MifosDatePickerTextField(
+                        value = selectedDate,
+                        label = stringResource(Res.string.date),
+                        openDatePicker = { onDatePick(true) },
+                    )
 
-                Spacer(Modifier.height(DesignToken.padding.large))
+                    Spacer(Modifier.height(DesignToken.padding.large))
+                }
 
                 MifosOutlinedTextField(
                     value = chargeAmount,
@@ -161,7 +163,7 @@ fun AddChargeBottomSheet(
                     secondBtnText = confirmText,
                     onFirstBtnClick = onDismiss,
                     onSecondBtnClick = onConfirm,
-                    isSecondButtonEnabled = chargeAmount.isNotEmpty() && chargeType.isNotEmpty() && amountError.isNullOrEmpty(),
+                    isSecondButtonEnabled = chargeAmount.isNotEmpty() && amountError.isNullOrEmpty(),
                 )
             }
         },

core/ui/src/commonMain/kotlin/com/mifos/core/ui/components/MifosActionsListingCardComponent.kt

@@ -602,7 +602,7 @@ fun MifosActionsShareListingComponent(
 fun MifosActionsChargeListingComponent(
     chargeTitle: String,
     type: String,
-    date: String,
+    date: String? = null,
     collectedOn: String,
     amount: String,
     menuList: List<Actions> = listOf<Actions>(
@@ -645,11 +645,15 @@ fun MifosActionsChargeListingComponent(
                             text = type,
                         ),
                     )
-                    PrintTextUtil(
-                        TextUtil(
-                            text = date,
-                        ),
-                    )
+                    if (
+                        date != null
+                    ) {
+                        PrintTextUtil(
+                            TextUtil(
+                                text = date,
+                            ),
+                        )
+                    }
                 }
                 Row(
                     verticalAlignment = Alignment.CenterVertically,

feature/client/src/commonMain/composeResources/values/strings.xml

@@ -569,6 +569,19 @@
     <string name="feature_share_account_terms_type">Type</string>
     <string name="feature_share_account_terms_lock_in_period">Lock-in Period</string>
 
+    <string name="feature_share_account_charge">Charge</string>
+    <string name="feature_share_account_charge_add_new">Add New</string>
+    <string name="feature_share_account_charge_view">View</string>
+    <string name="feature_share_account_charge_active_charge">Active Charge</string>
+    <string name="feature_share_account_charge_add_new_charge">Add New Charge</string>
+    <string name="feature_share_account_charge_date">Date</string>
+    <string name="feature_share_account_charge_type">Type</string>
+    <string name="feature_share_account_charge_collected_on">Collected On</string>
+    <string name="feature_share_account_charge_view_charges">View Charges</string>
+    <string name="feature_share_account_charge_edit_charge">Edit Charge</string>
+    <string name="feature_share_account_charge_add">Add</string>
+    <string name="feature_share_account_charge_btn_add_new">Add</string>
+
 
     <!-- Handle Error-->
     <string name="feature_share_account_field_empty">This field cannot be empty</string>