artin/mobile-wallet
1
0
Fork 0
mirror of https://github.com/openMF/mobile-wallet.git synced 2026-02-06 13:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: model clean up

Browse Source
This commit is contained in:
Rajan Maurya 2024-02-29 09:34:03 +05:30 committed by Rajan Maurya
parent db15451a43
commit dcdbc91aed
63 changed files with 470 additions and 623 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/model/src/main/java/com/mifos/mobilewallet/model/domain/Account.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@ -13,4 +12,4 @@ data class Account(
var id: Long=0L,
var productId: Long=0L,
var currency: Currency,
) : Parcelable
) : Parcelable

3
core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@ -15,4 +14,4 @@ data class BankAccountDetails(
var upiPin: String?=null
) : Parcelable {
constructor() : this("", "", "", "", "", false, "")
}
}

1
core/model/src/main/java/com/mifos/mobilewallet/model/domain/Currency.kt
View File

@ -3,7 +3,6 @@ package com.mifos.mobilewallet.model.domain
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@Parcelize
data class Currency(
var code: String,

1
core/model/src/main/java/com/mifos/mobilewallet/model/domain/NewAccount.kt
View File

@ -1,7 +1,6 @@
package com.mifos.mobilewallet.model.domain
import java.util.Date
data class NewAccount(
var clientId: Int,
var productId: String? = null,

5
core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@ -9,6 +8,4 @@ data class NotificationPayload(
var title: String? = null,
var body: String? = null,
var timestamp: String? = null
) : Parcelable {
constructor() : this("", "", "")
}
) : Parcelable

4
core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt
View File

@ -1,10 +1,8 @@
package com.mifos.mobilewallet.model.domain
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@Parcelize
data class SearchResult(
var resultId: Int = 0,
@ -12,4 +10,4 @@ data class SearchResult(
var resultType: String
) : Parcelable {
constructor() : this(0, "", "")
}
}

19
core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt
View File

@ -1,9 +1,6 @@
package com.mifos.mobilewallet.model.domain
import android.os.Parcel
import android.os.Parcelable
import com.mifos.mobilewallet.model.domain.Currency
import com.mifos.mobilewallet.model.domain.TransactionType
import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail
import kotlinx.parcelize.Parcelize
@ -19,5 +16,17 @@ data class Transaction(
var transferId: Long = 0,
var transferDetail: TransferDetail = TransferDetail(),
var receiptId: String? = null
) : Parcelable {
constructor() : this("", 0, 0, 0.0, "", Currency(), TransactionType.OTHER, 0, TransferDetail(), "")}
) : Parcelable {
constructor() : this(
"",
0,
0,
0.0,
"",
Currency(),
TransactionType.OTHER,
0,
TransferDetail(),
""
)
}

1
core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/Client.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain.client
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize

5
core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain.twofactor
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@ -9,7 +8,5 @@ data class AccessToken(
var token: String? = null,
var validFrom: Long? = null,
var validTo: Long? = null
) : Parcelable{
constructor(): this("", 0L, 0L)
}
) : Parcelable

5
core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain.twofactor
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@ -8,6 +7,4 @@ import kotlinx.parcelize.Parcelize
data class DeliveryMethod(
var name: String?,
var target: String?
) : Parcelable{
constructor() : this("", "")
}
) : Parcelable

3
core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityClients.kt
View File

@ -1,8 +1,5 @@
package com.mifos.mobilewallet.model.domain.user
/**
* Created by ankur on 25/June/2018
*/
data class UpdateUserEntityClients(
var clients: ArrayList<Int>
)

3
core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityEmail.kt
View File

@ -1,8 +1,5 @@
package com.mifos.mobilewallet.model.domain.user
/**
* Created by ankur on 27/June/2018
*/
data class UpdateUserEntityEmail(
var email: String?
)

11
core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityPassword.kt
View File

@ -1,12 +1,5 @@
package com.mifos.mobilewallet.model.domain.user
/**
* Created by ankur on 27/June/2018
*/
class UpdateUserEntityPassword(private val password: String) {
private val repeatPassword: String
init {
repeatPassword = password
}
data class UpdateUserEntityPassword(val password: String) {
val repeatPassword: String = password
}

1
core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.domain.user
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize

27
core/model/src/main/java/com/mifos/mobilewallet/model/entity/Invoice.kt
View File

@ -1,43 +1,40 @@
package com.mifos.mobilewallet.model.entity
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
/**
* Created by ankur on 07/June/2018
*/
@Parcelize
data class Invoice (
data class Invoice(
@SerializedName("consumerId")
var consumerId: String?=null,
var consumerId: String? = null,
@SerializedName("consumerName")
var consumerName: String?=null,
var consumerName: String? = null,
@SerializedName("amount")
var amount: Double=0.0,
var amount: Double = 0.0,
@SerializedName("itemsBought")
var itemsBought: String?=null,
var itemsBought: String? = null,
@SerializedName("status")
var status: Long=0L,
var status: Long = 0L,
@SerializedName("transactionId")
var transactionId: String?=null,
var transactionId: String? = null,
@SerializedName("id")
var id: Long=0L,
var id: Long = 0L,
@SerializedName("title")
var title: String?=null,
var title: String? = null,
@SerializedName("date")
var date : @RawValue MutableList<Int> = ArrayList()
var date: @RawValue MutableList<Int> = ArrayList()
): Parcelable {
) : Parcelable {
constructor() : this(null, null, 0.0, null, 0L, null, 0L, null, ArrayList())
}

9
core/model/src/main/java/com/mifos/mobilewallet/model/entity/Page.kt
View File

@ -1,11 +1,6 @@
package com.mifos.mobilewallet.model.entity
/**
* @author Rajan Maurya
*/
data class Page<T> (
data class Page<T>(
var totalFilteredRecords: Int = 0,
@JvmField
var pageItems: MutableList<T> = ArrayList()
)
)

17
core/model/src/main/java/com/mifos/mobilewallet/model/entity/Role.kt
View File

@ -1,19 +1,12 @@
package com.mifos.mobilewallet.model.entity
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
/**
* Created by ankur on 11/June/2018
*/
@Parcelize
data class Role (
var id: String?=null,
data class Role(
var id: String? = null,
@JvmField
var name: String?=null,
var description: String?=null,
): Parcelable{
constructor():this(null,null,null)
}
var name: String? = null,
var description: String? = null,
) : Parcelable

18
core/model/src/main/java/com/mifos/mobilewallet/model/entity/SearchedEntity.kt
View File

@ -1,21 +1,15 @@
package com.mifos.mobilewallet.model.entity
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@Parcelize
data class SearchedEntity (
@JvmField
data class SearchedEntity(
var entityId: Int = 0,
var entityAccountNo: String= " ",
@JvmField
var entityName: String= " ",
@JvmField
var entityType: String= " ",
var entityAccountNo: String = " ",
var entityName: String = " ",
var entityType: String = " ",
var parentId: Int = 0,
var parentName: String= " "
): Parcelable{
constructor() : this(0, "", "", "", 0, "")
}
var parentName: String = " "
) : Parcelable

15
core/model/src/main/java/com/mifos/mobilewallet/model/entity/TPTResponse.kt
View File

@ -1,17 +1,10 @@
package com.mifos.mobilewallet.model.entity
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
/**
* Created by ankur on 18/June/2018
*/
@Parcelize
data class TPTResponse (
var savingsId: String?=null,
var resourceId: String?=null,
): Parcelable{
constructor():this(null,null)
}
data class TPTResponse(
var savingsId: String? = null,
var resourceId: String? = null,
) : Parcelable

18
core/model/src/main/java/com/mifos/mobilewallet/model/entity/Timeline.kt
View File

@ -1,20 +1,10 @@
package com.mifos.mobilewallet.model.entity
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
/**
* Created by ishankhanna for mifos android-client on 09/02/14.
* Created by michaelsosnick on 1/20/17.
*/
/*
* This project is licensed under the open source MPL V2.
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
*/
@Parcelize
data class Timeline (
data class Timeline(
var submittedOnDate: List<Int?> = ArrayList(),
var submittedByUsername: String? = null,
var submittedByFirstname: String? = null,
@ -26,7 +16,7 @@ data class Timeline (
var closedOnDate: List<Int?> = ArrayList(),
var closedByUsername: String? = null,
var closedByFirstname: String? = null,
var closedByLastname: String? = null,
): Parcelable{
constructor():this(ArrayList(),"","","",ArrayList(),"","","",ArrayList(),"","","")
var closedByLastname: String? = null
) : Parcelable {
constructor() : this(ArrayList(), "", "", "", ArrayList(), "", "", "", ArrayList(), "", "", "")
}

4
core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserEntity.kt
View File

@ -1,11 +1,9 @@
package com.mifos.mobilewallet.model.entity
data class UserEntity (
@JvmField
data class UserEntity(
val userId: Long = 0,
val isAuthenticated: Boolean = false,
val userName: String? = null,
@JvmField
val base64EncodedAuthenticationKey: String? = null,
val permissions: List<String> = ArrayList()
)

25
core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserWithRole.kt
View File

@ -1,23 +1,14 @@
package com.mifos.mobilewallet.model.entity
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
/**
* Created by ankur on 11/June/2018
*/
@Parcelize
data class UserWithRole (
var id: String?=null,
var username: String?=null,
var firstname: String?=null,
var lastname: String?=null,
var email: String?=null,
@JvmField
var selectedRoles: @RawValue List<Role>?=ArrayList()
): Parcelable{
constructor():this(null,null,null,null,null,null)
}
data class UserWithRole(
var id: String? = null,
var username: String? = null,
var firstname: String? = null,
var lastname: String? = null,
var email: String? = null,
var selectedRoles: List<Role>? = ArrayList()
) : Parcelable

5
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/SavingAccountsListResponse.kt
View File

@ -2,5 +2,6 @@ package com.mifos.mobilewallet.model.entity.accounts
import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount
data class SavingAccountsListResponse (
var savingsAccounts: List<SavingAccount> = ArrayList())
data class SavingAccountsListResponse(
var savingsAccounts: List<SavingAccount> = ArrayList()
)

18
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Currency.kt
View File

@ -1,18 +1,17 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class Currency(
@JvmField
@SerializedName("code")
var code: String= " ",
var code: String = " ",
@SerializedName("name")
var name: String= " ",
var name: String = " ",
@SerializedName("decimalPlaces")
var decimalPlaces: Int? = null,
@ -20,16 +19,15 @@ data class Currency(
@SerializedName("inMultiplesOf")
var inMultiplesOf: Int? = null,
@JvmField
@SerializedName("displaySymbol")
var displaySymbol: String= " ",
var displaySymbol: String = " ",
@SerializedName("nameCode")
var nameCode: String= " ",
var nameCode: String = " ",
@JvmField
@SerializedName("displayLabel")
var displayLabel: String= " ",
var displayLabel: String = " "
) : Parcelable {
constructor() : this("", "", 0, 0, "", "", "")
constructor() : this("", "", 0, 0, "", "", "")
}

23
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentDetailData.kt
View File

@ -1,36 +1,31 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 05/03/17.
*/
@Parcelize
data class PaymentDetailData (
data class PaymentDetailData(
@SerializedName("id")
var id: Int? =null,
var id: Int? = null,
@SerializedName("paymentType")
var paymentType: PaymentType? =null,
var paymentType: PaymentType? = null,
@SerializedName("accountNumber")
var accountNumber: String? =null,
var accountNumber: String? = null,
@SerializedName("checkNumber")
var checkNumber: String? =null,
var checkNumber: String? = null,
@SerializedName("routingCode")
var routingCode: String? =null,
var routingCode: String? = null,
@JvmField
@SerializedName("receiptNumber")
var receiptNumber: String? =null,
var receiptNumber: String? = null,
@SerializedName("bankNumber")
var bankNumber: String? =null,
): Parcelable {
var bankNumber: String? = null
) : Parcelable {
constructor() : this(null, null, null, null, null, null, null)
}

14
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentType.kt
View File

@ -1,21 +1,15 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 05/03/17.
*/
@Parcelize
data class PaymentType (
data class PaymentType(
@SerializedName("id")
var id: Int?=null,
var id: Int? = null,
@SerializedName("name")
var name: String?=null,
var name: String? = null
): Parcelable {
constructor() : this(null, null)
}
) : Parcelable

9
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingAccount.kt
View File

@ -7,19 +7,16 @@ import kotlinx.parcelize.Parcelize
@Parcelize
data class SavingAccount(
@JvmField
@SerializedName("id")
var id: Long = 0L,
@JvmField
@SerializedName("accountNo")
var accountNo: String=" ",
@JvmField
@SerializedName("productName")
var productName: String= " ",
@JvmField
@SerializedName("productId")
var productId: Int=0 ,
@ -29,7 +26,6 @@ data class SavingAccount(
@SerializedName("minRequiredBalance")
var minRequiredBalance: Long = 0L,
@JvmField
@SerializedName("accountBalance")
var accountBalance: Double = 0.0,
@ -51,7 +47,6 @@ data class SavingAccount(
@SerializedName("status")
var status: Status?=null,
@JvmField
@SerializedName("currency")
var currency: Currency= Currency(),

81
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingsWithAssociations.kt
View File

@ -1,84 +1,105 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.mifos.mobilewallet.model.entity.client.DepositType
import kotlinx.parcelize.Parcelize
@Parcelize
data class SavingsWithAssociations (
data class SavingsWithAssociations(
@SerializedName("id")
var id: Long=0L,
var id: Long = 0L,
@SerializedName("accountNo")
var accountNo: String?=null,
var accountNo: String? = null,
@SerializedName("depositType")
var depositType: DepositType?=null,
var depositType: DepositType? = null,
@SerializedName("externalId")
var externalId: String=" ",
var externalId: String = " ",
@SerializedName("clientId")
var clientId: Int=0,
var clientId: Int = 0,
@SerializedName("clientName")
var clientName: String=" ",
var clientName: String = " ",
@JvmField
@SerializedName("savingsProductId")
var savingsProductId: Int?=null,
var savingsProductId: Int? = null,
@SerializedName("savingsProductName")
var savingsProductName: String?=null,
var savingsProductName: String? = null,
@SerializedName("fieldOfficerId")
var fieldOfficerId: Int?=null,
var fieldOfficerId: Int? = null,
@SerializedName("status")
var status: Status?=null,
var status: Status? = null,
@SerializedName("timeline")
var timeline: TimeLine?=null,
var timeline: TimeLine? = null,
@SerializedName("currency")
var currency: Currency?=null,
var currency: Currency? = null,
@SerializedName("nominalAnnualInterestRate")
var nominalAnnualInterestRate: Double?=null,
var nominalAnnualInterestRate: Double? = null,
@SerializedName("minRequiredOpeningBalance")
var minRequiredOpeningBalance: Double?=null,
var minRequiredOpeningBalance: Double? = null,
@SerializedName("lockinPeriodFrequency")
var lockinPeriodFrequency: Double?=null,
var lockinPeriodFrequency: Double? = null,
@SerializedName("withdrawalFeeForTransfers")
var withdrawalFeeForTransfers: Boolean?=null,
var withdrawalFeeForTransfers: Boolean? = null,
@SerializedName("allowOverdraft")
var allowOverdraft: Boolean?=null,
var allowOverdraft: Boolean? = null,
@SerializedName("enforceMinRequiredBalance")
var enforceMinRequiredBalance: Boolean?=null,
var enforceMinRequiredBalance: Boolean? = null,
@SerializedName("withHoldTax")
var withHoldTax: Boolean?=null,
var withHoldTax: Boolean? = null,
@SerializedName("lastActiveTransactionDate")
var lastActiveTransactionDate: List<Int?>?=null,
var lastActiveTransactionDate: List<Int?>? = null,
@SerializedName("isDormancyTrackingActive")
var dormancyTrackingActive: Boolean?=null,
var dormancyTrackingActive: Boolean? = null,
@SerializedName("summary")
var summary: Summary?=null,
var summary: Summary? = null,
@JvmField
@SerializedName("transactions")
var transactions: List<Transactions> = java.util.ArrayList()
): Parcelable {
constructor() : this(0L, null, null, " ", 0, " ",
null, null, 0, null, null, null, null, null, 0.0, false, false, false, null, listOf(), null, null)
var transactions: List<Transactions> = ArrayList()
) : Parcelable {
constructor() : this(
0L,
null,
null,
" ",
0,
" ",
null,
null,
0,
null,
null,
null,
null,
null,
0.0,
false,
false,
false,
null,
listOf(),
null,
null
)
}

2
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Status.kt
View File

@ -1,12 +1,12 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class Status (
@SerializedName("id")
var id: Int?=null,

28
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Summary.kt
View File

@ -1,41 +1,35 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 05/03/17.
*/
@Parcelize
data class Summary (
data class Summary(
@SerializedName("currency")
var currency: Currency?=null,
var currency: Currency? = null,
@SerializedName("totalDeposits")
var totalDeposits: Double?=null,
var totalDeposits: Double? = null,
@SerializedName("totalWithdrawals")
var totalWithdrawals: Double?=null,
var totalWithdrawals: Double? = null,
@SerializedName("totalInterestEarned")
var totalInterestEarned: Double?=null,
var totalInterestEarned: Double? = null,
@SerializedName("totalInterestPosted")
var totalInterestPosted: Double?=null,
var totalInterestPosted: Double? = null,
@SerializedName("accountBalance")
var accountBalance: Double?=null,
var accountBalance: Double? = null,
@SerializedName("totalOverdraftInterestDerived")
var totalOverdraftInterestDerived: Double?=null,
var totalOverdraftInterestDerived: Double? = null,
@SerializedName("interestNotPosted")
var interestNotPosted: Double?=null,
var interestNotPosted: Double? = null,
@SerializedName("lastInterestCalculationDate")
var lastInterestCalculationDate: List<Int?>?=null,
): Parcelable {
constructor() : this(null, null, null, null, null, null, null, null, null)
}
var lastInterestCalculationDate: List<Int?>? = null
) : Parcelable

45
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TimeLine.kt
View File

@ -1,50 +1,59 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 05/03/17.
*/
@Parcelize
data class TimeLine (
data class TimeLine(
@SerializedName("submittedOnDate")
var submittedOnDate: List<Int?> = ArrayList(),
@SerializedName("submittedByUsername")
var submittedByUsername: String?=null,
var submittedByUsername: String? = null,
@SerializedName("submittedByFirstname")
var submittedByFirstname: String?=null,
var submittedByFirstname: String? = null,
@SerializedName("submittedByLastname")
var submittedByLastname: String?=null,
var submittedByLastname: String? = null,
@SerializedName("approvedOnDate")
var approvedOnDate: List<Int?> = ArrayList(),
@SerializedName("approvedByUsername")
var approvedByUsername: String?=null,
var approvedByUsername: String? = null,
@SerializedName("approvedByFirstname")
var approvedByFirstname: String?=null,
var approvedByFirstname: String? = null,
@SerializedName("approvedByLastname")
var approvedByLastname: String?=null,
var approvedByLastname: String? = null,
@SerializedName("activatedOnDate")
var activatedOnDate: List<Int?>?=null,
var activatedOnDate: List<Int?>? = null,
@SerializedName("activatedByUsername")
var activatedByUsername: String?=null,
var activatedByUsername: String? = null,
@SerializedName("activatedByFirstname")
var activatedByFirstname: String?=null,
var activatedByFirstname: String? = null,
@SerializedName("activatedByLastname")
var activatedByLastname: String?=null,
) : Parcelable {
constructor() : this(ArrayList(), null, null, null, ArrayList(), null, null, null, null, null, null, null)
}
var activatedByLastname: String? = null
) : Parcelable {
constructor() : this(
ArrayList(),
null,
null,
null,
ArrayList(),
null,
null,
null,
null,
null,
null,
null
)
}

42
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransactionType.kt
View File

@ -1,65 +1,61 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 05/03/17.
*/
@Parcelize
data class TransactionType (
data class TransactionType(
@SerializedName("id")
var id: Int?=null,
var id: Int? = null,
@SerializedName("code")
var code: String?=null,
var code: String? = null,
@SerializedName("value")
var value: String?=null,
var value: String? = null,
@JvmField
@SerializedName("deposit")
var deposit: Boolean=false ,
var deposit: Boolean = false,
@SerializedName("dividendPayout")
var dividendPayout: Boolean=false ,
var dividendPayout: Boolean = false,
@JvmField
@SerializedName("withdrawal")
var withdrawal: Boolean=false ,
var withdrawal: Boolean = false,
@SerializedName("interestPosting")
var interestPosting: Boolean=false ,
var interestPosting: Boolean = false,
@SerializedName("feeDeduction")
var feeDeduction: Boolean=false ,
var feeDeduction: Boolean = false,
@SerializedName("initiateTransfer")
var initiateTransfer: Boolean=false ,
var initiateTransfer: Boolean = false,
@SerializedName("approveTransfer")
var approveTransfer: Boolean=false ,
var approveTransfer: Boolean = false,
@SerializedName("withdrawTransfer")
var withdrawTransfer: Boolean=false ,
var withdrawTransfer: Boolean = false,
@SerializedName("rejectTransfer")
var rejectTransfer: Boolean=false ,
var rejectTransfer: Boolean = false,
@SerializedName("overdraftInterest")
var overdraftInterest: Boolean=false ,
var overdraftInterest: Boolean = false,
@SerializedName("writtenoff")
var writtenoff: Boolean=false ,
var writtenoff: Boolean = false,
@SerializedName("overdraftFee")
var overdraftFee: Boolean=false ,
var overdraftFee: Boolean = false,
@SerializedName("withholdTax")
var withholdTax: Boolean=false ,
var withholdTax: Boolean = false,
@SerializedName("escheat")
var escheat: Boolean?=null
): Parcelable
var escheat: Boolean? = null
) : Parcelable

61
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transactions.kt
View File

@ -1,60 +1,65 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 05/03/17.
*/
@Parcelize
data class Transactions (
@JvmField
@SerializedName("id")
var id: Int?=null,
data class Transactions(
@SerializedName("id")
var id: Int? = null,
@JvmField
@SerializedName("transactionType")
var transactionType: TransactionType= TransactionType(),
var transactionType: TransactionType = TransactionType(),
@SerializedName("accountId")
var accountId: Int?=null,
var accountId: Int? = null,
@SerializedName("accountNo")
var accountNo: String?=null,
var accountNo: String? = null,
@SerializedName("date")
var date: List<Int?> = ArrayList(),
@JvmField
@SerializedName("currency")
var currency: Currency=Currency(),
var currency: Currency = Currency(),
@JvmField
@SerializedName("paymentDetailData")
var paymentDetailData: PaymentDetailData?=null,
var paymentDetailData: PaymentDetailData? = null,
@JvmField
@SerializedName("amount")
var amount: Double=0.0,
var amount: Double = 0.0,
@JvmField
@SerializedName("transfer")
var transfer: Transfer =Transfer(),
var transfer: Transfer = Transfer(),
@SerializedName("runningBalance")
var runningBalance: Double?=null,
var runningBalance: Double? = null,
@SerializedName("reversed")
var reversed: Boolean?=null,
var reversed: Boolean? = null,
@JvmField
@SerializedName("submittedOnDate")
var submittedOnDate: List<Int> = ArrayList<Int>(),
var submittedOnDate: List<Int> = ArrayList(),
@SerializedName("interestedPostedAsOn")
var interestedPostedAsOn: Boolean?=null
): Parcelable {
constructor() : this(0, TransactionType(), 0, "", ArrayList(), Currency(), PaymentDetailData(), 0.0, Transfer(), 0.0, false, ArrayList(), false)
}
var interestedPostedAsOn: Boolean? = null
) : Parcelable {
constructor() : this(
0,
TransactionType(),
0,
"",
ArrayList(),
Currency(),
PaymentDetailData(),
0.0,
Transfer(),
0.0,
false,
ArrayList(),
false
)
}

13
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transfer.kt
View File

@ -1,18 +1,13 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by ankur on 05/June/2018
*/
@Parcelize
data class Transfer (
data class Transfer(
@SerializedName("id")
var id: Long=0L,
): Parcelable
{
var id: Long = 0L,
) : Parcelable {
constructor() : this(0L)
}
}

11
core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransferDetail.kt
View File

@ -1,17 +1,15 @@
package com.mifos.mobilewallet.model.entity.accounts.savings
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.mifos.mobilewallet.model.domain.Account
import com.mifos.mobilewallet.model.domain.client.Client
import kotlinx.parcelize.Parcelize
@Parcelize
data class TransferDetail (
data class TransferDetail(
@SerializedName("id")
var id: Long=0L,
var id: Long = 0L,
@SerializedName("fromClient")
var fromClient: Client = Client(),
@ -23,8 +21,7 @@ data class TransferDetail (
var toClient: Client = Client(),
@SerializedName("toAccount")
var toAccount: SavingAccount= SavingAccount(),
): Parcelable {
var toAccount: SavingAccount = SavingAccount(),
) : Parcelable {
constructor() : this(0L, Client(), SavingAccount(), Client(), SavingAccount())
}

2
core/model/src/main/java/com/mifos/mobilewallet/model/entity/authentication/AuthenticationPayload.kt
View File

@ -10,4 +10,4 @@ class AuthenticationPayload(
val userName: String = "",
@SerializedName("password")
val password: String = ""
) : Parcelable
) : Parcelable

27
core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/Beneficiary.kt
View File

@ -1,40 +1,31 @@
package com.mifos.mobilewallet.model.entity.beneficary
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.mifos.mobilewallet.model.entity.templates.account.AccountType
import kotlinx.parcelize.Parcelize
/**
* Created by dilpreet on 14/6/17.
*/
@Parcelize
data class Beneficiary (
@JvmField
data class Beneficiary(
@SerializedName("id")
var id: Int?=null,
var id: Int? = null,
@SerializedName("name")
var name: String?=null,
var name: String? = null,
@SerializedName("officeName")
var officeName: String?=null,
var officeName: String? = null,
@SerializedName("clientName")
var clientName: String?=null,
var clientName: String? = null,
@SerializedName("accountType")
var accountType: AccountType?=null,
var accountType: AccountType? = null,
@JvmField
@SerializedName("accountNumber")
var accountNumber: String?=null,
var accountNumber: String? = null,
@JvmField
@SerializedName("transferLimit")
var transferLimit: Int=0 ,
var transferLimit: Int = 0
) : Parcelable
{
constructor():this(null,null,null,null,null,null,0)
}

22
core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryPayload.kt
View File

@ -1,37 +1,27 @@
package com.mifos.mobilewallet.model.entity.beneficary
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by dilpreet on 16/6/17.
*/
@Parcelize
data class BeneficiaryPayload(
data class BeneficiaryPayload(
var locale: String? = "en_GB",
@JvmField
@SerializedName("name")
var name: String?=null,
var name: String? = null,
@JvmField
@SerializedName("accountNumber")
var accountNumber: String?=null,
var accountNumber: String? = null,
@JvmField
@SerializedName("accountType")
var accountType: Int = 0,
@JvmField
@SerializedName("transferLimit")
var transferLimit: Int = 0,
@JvmField
@SerializedName("officeName")
var officeName: String?=null,
) : Parcelable
{
constructor():this(null,null,null,0,0,null)
var officeName: String? = null,
) : Parcelable {
constructor() : this(null, null, null, 0, 0, null)
}

6
core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryUpdatePayload.kt
View File

@ -2,14 +2,10 @@ package com.mifos.mobilewallet.model.entity.beneficary
import com.google.gson.annotations.SerializedName
/**
* Created by dilpreet on 16/6/17.
*/
data class BeneficiaryUpdatePayload (
data class BeneficiaryUpdatePayload(
@SerializedName("name")
var name: String? = null,
@JvmField
@SerializedName("transferLimit")
var transferLimit: Int = 0
)

65
core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Client.kt
View File

@ -1,25 +1,24 @@
package com.mifos.mobilewallet.model.entity.client
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.mifos.mobilewallet.model.entity.Timeline
import kotlinx.parcelize.Parcelize
@Parcelize
data class Client (
@JvmField
data class Client(
@SerializedName("id")
var id: Int = 0,
@SerializedName("accountNo")
var accountNo: String?=null,
var accountNo: String? = null,
@SerializedName("status")
private var status: Status?=null,
private var status: Status? = null,
@SerializedName("active")
private var active: Boolean?=null,
private var active: Boolean? = null,
@SerializedName("activationDate")
var activationDate: List<Int?> = ArrayList(),
@ -28,35 +27,34 @@ data class Client (
var dobDate: List<Int?> = ArrayList(),
@SerializedName("firstname")
var firstname: String?=null,
var firstname: String? = null,
@SerializedName("middlename")
var middlename: String?=null,
var middlename: String? = null,
@SerializedName("lastname")
var lastname: String?=null,
var lastname: String? = null,
@JvmField
@SerializedName("displayName")
var displayName: String?=null,
var displayName: String? = null,
@SerializedName("fullname")
var fullname: String?=null,
var fullname: String? = null,
@SerializedName("officeId")
var officeId: Int=0 ,
var officeId: Int = 0,
@SerializedName("officeName")
var officeName: String?=null,
var officeName: String? = null,
@SerializedName("staffId")
private var staffId: Int?=null,
private var staffId: Int? = null,
@SerializedName("staffName")
private var staffName: String?=null,
private var staffName: String? = null,
@SerializedName("timeline")
private var timeline: Timeline?=null,
private var timeline: Timeline? = null,
@SerializedName("imageId")
var imageId: Int = 0,
@ -64,13 +62,32 @@ data class Client (
@SerializedName("imagePresent")
var isImagePresent: Boolean = false,
@JvmField
@SerializedName("externalId")
var externalId: String ="",
var externalId: String = "",
@JvmField
@SerializedName("mobileNo")
var mobileNo: String= ""
): Parcelable {
constructor() : this(0, "", Status(), false, ArrayList(), ArrayList(), "", "", "", "", "", 0, "", 0, "", Timeline(), 0, false, "", "")
}
var mobileNo: String = ""
) : Parcelable {
constructor() : this(
0,
"",
Status(),
false,
ArrayList(),
ArrayList(),
"",
"",
"",
"",
"",
0,
"",
0,
"",
Timeline(),
0,
false,
"",
""
)
}

16
core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/ClientAccounts.kt
View File

@ -1,14 +1,13 @@
package com.mifos.mobilewallet.model.entity.client
import android.os.Parcel
import android.os.Parcelable
import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount
import kotlinx.parcelize.Parcelize
@Parcelize
data class ClientAccounts (
var savingsAccounts: List<SavingAccount> = ArrayList())
: Parcelable {
data class ClientAccounts(
var savingsAccounts: List<SavingAccount> = ArrayList()
) : Parcelable {
fun withSavingsAccounts(savingsAccounts: List<SavingAccount>): ClientAccounts {
this.savingsAccounts = savingsAccounts
@ -22,14 +21,11 @@ data class ClientAccounts (
private fun getSavingsAccounts(wantRecurring: Boolean): List<SavingAccount?> {
val result: MutableList<SavingAccount?> = ArrayList()
if (savingsAccounts != null) {
for (account in savingsAccounts!!) {
if (account!!.isRecurring() == wantRecurring) {
result.add(account)
}
for (account in savingsAccounts) {
if (account.isRecurring() == wantRecurring) {
result.add(account)
}
}
return result
}
}

19
core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Currency.kt
View File

@ -1,29 +1,28 @@
package com.mifos.mobilewallet.model.entity.client
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class Currency (
data class Currency(
@SerializedName("code")
var code: String?=null,
var code: String? = null,
@SerializedName("name")
var name: String?=null,
var name: String? = null,
@SerializedName("decimalPlaces")
var decimalPlaces: Int?=null,
var decimalPlaces: Int? = null,
@SerializedName("displaySymbol")
var displaySymbol: String?=null,
var displaySymbol: String? = null,
@SerializedName("nameCode")
var nameCode: String?=null,
var nameCode: String? = null,
@SerializedName("displayLabel")
var displayLabel: String?=null,
) : Parcelable {
var displayLabel: String? = null,
) : Parcelable {
constructor() : this(null, null, null, null, null, null)
}
}

11
core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/DepositType.kt
View File

@ -1,6 +1,5 @@
package com.mifos.mobilewallet.model.entity.client
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@ -8,14 +7,15 @@ import kotlinx.parcelize.Parcelize
@Parcelize
data class DepositType(
@SerializedName("id")
var id: Int?=null,
var id: Int? = null,
@SerializedName("code")
var code: String?=null,
var code: String? = null,
@SerializedName("value")
var value: String?=null,
) : Parcelable {
var value: String? = null
) : Parcelable {
val isRecurring: Boolean
get() = ServerTypes.RECURRING.id == id
val endpoint: String
@ -24,7 +24,6 @@ data class DepositType(
get() = ServerTypes.fromId(id!!)
enum class ServerTypes(val id: Int, val code: String, val endpoint: String) {
SAVINGS(100, "depositAccountType.savingsDeposit", "savingsaccounts"),
FIXED(200, "depositAccountType.fixedDeposit", "savingsaccounts"),

16
core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Status.kt
View File

@ -1,23 +1,19 @@
package com.mifos.mobilewallet.model.entity.client
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 22/10/16.
*/
@Parcelize
data class Status (
data class Status(
@SerializedName("id")
var id: Int?=null,
var id: Int? = null,
@SerializedName("code")
var code: String?=null,
var code: String? = null,
@SerializedName("value")
var value: String?=null,
) : Parcelable {
var value: String? = null,
) : Parcelable {
constructor() : this(null, null, null)
}
}

16
core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Type.kt
View File

@ -1,23 +1,17 @@
package com.mifos.mobilewallet.model.entity.client
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 23/02/17.
*/
@Parcelize
data class Type (
data class Type(
@SerializedName("id")
var id: Int?=null,
var id: Int? = null,
@SerializedName("code")
var code: String?=null,
var code: String? = null,
@SerializedName("value")
var value: String?=null,
) : Parcelable {
constructor() : this(null, null, null)
}
var value: String? = null,
) : Parcelable

23
core/model/src/main/java/com/mifos/mobilewallet/model/entity/kyc/KYCLevel1Details.kt
View File

@ -1,36 +1,29 @@
package com.mifos.mobilewallet.model.entity.kyc
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by ankur on 24/May/2018
*/
@Parcelize
data class KYCLevel1Details (
data class KYCLevel1Details(
@SerializedName("firstName")
var firstName: String?=null,
var firstName: String? = null,
@SerializedName("lastName")
var lastName: String?=null,
var lastName: String? = null,
@SerializedName("addressLine1")
var addressLine1: String?=null,
var addressLine1: String? = null,
@SerializedName("addressLine2")
var addressLine2: String?=null,
var addressLine2: String? = null,
@SerializedName("mobileNo")
var mobileNo: String?=null,
var mobileNo: String? = null,
@SerializedName("dob")
var dob: String?=null,
var dob: String? = null,
@SerializedName("currentLevel")
var currentLevel: String=" "
var currentLevel: String = " "
) : Parcelable
{
constructor() : this(null, null, null, null, null, null, " ")
}

29
core/model/src/main/java/com/mifos/mobilewallet/model/entity/noncore/Document.kt
View File

@ -1,25 +1,16 @@
/*
* This project is licensed under the open source MPL V2.
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
*/
package com.mifos.mobilewallet.model.entity.noncore
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
/**
* Created by ishankhanna on 02/07/14.
*/
@Parcelize
data class Document (
var id: Int =0,
var parentEntityType: String? =null,
var parentEntityId: Int =0,
var name: String? =null,
var fileName: String? =null,
var size: Long =0,
var type: String? =null,
var description: String? =null,
) : Parcelable {
constructor() : this(0, null, 0, null, null, 0, null, null)
}
data class Document(
var id: Int = 0,
var parentEntityType: String? = null,
var parentEntityId: Int = 0,
var name: String? = null,
var fileName: String? = null,
var size: Long = 0,
var type: String? = null,
var description: String? = null,
) : Parcelable

38
core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/ClientPayload.kt
View File

@ -1,53 +1,52 @@
package com.mifos.mobilewallet.model.entity.payload
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class ClientPayload (
data class ClientPayload(
@SerializedName("firstname")
var firstname: String? =null,
var firstname: String? = null,
@SerializedName("lastname")
var lastname: String? =null,
var lastname: String? = null,
@SerializedName("middlename")
var middlename: String? =null,
var middlename: String? = null,
@SerializedName("officeId")
var officeId: Int? =null,
var officeId: Int? = null,
@SerializedName("staffId")
var staffId: Int? =null,
var staffId: Int? = null,
@SerializedName("genderId")
var genderId: Int? =null,
var genderId: Int? = null,
@SerializedName("active")
var active: Boolean? =null,
var active: Boolean? = null,
@SerializedName("activationDate")
var activationDate: String? =null,
var activationDate: String? = null,
@SerializedName("submittedOnDate")
var submittedOnDate: String? =null,
var submittedOnDate: String? = null,
@SerializedName("dateOfBirth")
var dateOfBirth: String? =null,
var dateOfBirth: String? = null,
@SerializedName("mobileNo")
var mobileNo: String? =null,
var mobileNo: String? = null,
@SerializedName("externalId")
var externalId: String? =null,
var externalId: String? = null,
@SerializedName("clientTypeId")
var clientTypeId: Int? =null,
var clientTypeId: Int? = null,
@SerializedName("clientClassificationId")
var clientClassificationId: Int? =null,
var clientClassificationId: Int? = null,
@SerializedName("dateFormat")
var dateFormat: String? = "DD_MMMM_YYYY",
@ -56,8 +55,5 @@ data class ClientPayload (
var locale: String? = "en",
@SerializedName("datatables")
var datatables: List<DataTablePayload> = ArrayList(),) : Parcelable {
constructor() : this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ArrayList())
}
var datatables: List<DataTablePayload> = ArrayList()
) : Parcelable

20
core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/DataTablePayload.kt
View File

@ -1,24 +1,20 @@
package com.mifos.mobilewallet.model.entity.payload
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
@Parcelize
data class DataTablePayload (
data class DataTablePayload(
@Transient
var id: Int? =null,
var id: Int? = null,
@Transient
var clientCreationTime: Long? =null,
var clientCreationTime: Long? = null,
@Transient
var dataTableString: String? =null,
var registeredTableName: String? =null,
var applicationTableName: String? =null,
var data: @RawValue HashMap<String, Any>? =null,
):Parcelable
{
constructor():this(null,null,null,null,null,null)
}
var dataTableString: String? = null,
var registeredTableName: String? = null,
var applicationTableName: String? = null,
var data: @RawValue HashMap<String, Any>? = null
) : Parcelable

2
core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayResponse.kt
View File

@ -10,4 +10,4 @@ data class PayResponse(
data class Change(
val paymentTypeId: Int
)
)

37
core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/StandingInstructionPayload.kt
View File

@ -4,15 +4,28 @@ import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@Parcelize
data class StandingInstructionPayload(var fromOfficeId : Int, var fromClientId : Int,
var fromAccountType : Int, val name : String?,
val transferType : Int, val priority : Int,
val status : Int, var fromAccountId : Long,
var toOfficeId : Int, var toClientId : Int,
var toAccountType : Int, var toAccountId : Long,
val instructionType : Int, var amount : Double,
var validFrom : String?, val recurrenceType : Int,
val recurrenceInterval : Int, val recurrenceFrequency : Int,
val locale : String?, val dateFormat : String?,
var validTill : String?, var recurrenceOnMonthDay : String?,
val monthDayFormat : String?) : Parcelable
data class StandingInstructionPayload(
var fromOfficeId: Int,
var fromClientId: Int,
var fromAccountType: Int,
val name: String?,
val transferType: Int,
val priority: Int,
val status: Int,
var fromAccountId: Long,
var toOfficeId: Int,
var toClientId: Int,
var toAccountType: Int,
var toAccountId: Long,
val instructionType: Int,
var amount: Double,
var validFrom: String?,
val recurrenceType: Int,
val recurrenceInterval: Int,
val recurrenceFrequency: Int,
val locale: String?,
val dateFormat: String?,
var validTill: String?,
var recurrenceOnMonthDay: String?,
val monthDayFormat: String?
) : Parcelable

45
core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/TransferPayload.kt
View File

@ -1,60 +1,45 @@
package com.mifos.mobilewallet.model.entity.payload
import android.os.Parcel
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 10/03/17.
*/
@Parcelize
data class TransferPayload (
@JvmField
data class TransferPayload(
@SerializedName("fromOfficeId")
var fromOfficeId: Int? =null,
var fromOfficeId: Int? = null,
@JvmField
@SerializedName("fromClientId")
var fromClientId: Long? =null,
var fromClientId: Long? = null,
@JvmField
@SerializedName("fromAccountType")
var fromAccountType: Int? =null,
var fromAccountType: Int? = null,
@JvmField
@SerializedName("fromAccountId")
var fromAccountId: Int? =null,
var fromAccountId: Int? = null,
@JvmField
@SerializedName("toOfficeId")
var toOfficeId: Int? =null,
var toOfficeId: Int? = null,
@JvmField
@SerializedName("toClientId")
var toClientId: Long? =null,
var toClientId: Long? = null,
@JvmField
@SerializedName("toAccountType")
var toAccountType: Int? =null,
var toAccountType: Int? = null,
@JvmField
@SerializedName("toAccountId")
var toAccountId: Int? =null,
var toAccountId: Int? = null,
@JvmField
@SerializedName("transferDate")
var transferDate: String? =null,
var transferDate: String? = null,
@JvmField
@SerializedName("transferAmount")
var transferAmount: Double? =null,
var transferAmount: Double? = null,
@JvmField
@SerializedName("transferDescription")
var transferDescription: String? =null,
var transferDescription: String? = null,
var dateFormat: String? = "dd MMMM yyyy",
var locale: String? = "en"
):Parcelable {
constructor():this(null,null,null,null,null,null,null,null,null,null,null)
}
) : Parcelable {
constructor() : this(null, null, null, null, null, null, null, null, null, null, null)
}

5
core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/UpdateVpaPayload.kt
View File

@ -1,8 +1,5 @@
package com.mifos.mobilewallet.model.entity.payload
/**
* Created by naman on 19/8/17.
*/
data class UpdateVpaPayload (
data class UpdateVpaPayload(
var externalId: String? = null
)

4
core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/RegisterPayload.kt
View File

@ -2,7 +2,7 @@ package com.mifos.mobilewallet.model.entity.register
import com.google.gson.annotations.SerializedName
data class RegisterPayload (
data class RegisterPayload(
@SerializedName("username")
var username: String? = null,
@ -25,5 +25,5 @@ data class RegisterPayload (
var password: String? = null,
@SerializedName("authenticationMode")
var authenticationMode: String? = null,
var authenticationMode: String? = null
)

7
core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/UserVerify.kt
View File

@ -2,13 +2,10 @@ package com.mifos.mobilewallet.model.entity.register
import com.google.gson.annotations.SerializedName
/**
* Created by dilpreet on 31/7/17.
*/
data class UserVerify (
data class UserVerify(
@SerializedName("requestId")
var requestId: String? = null,
@SerializedName("authenticationToken")
var authenticationToken: String? = null
)
)

17
core/model/src/main/java/com/mifos/mobilewallet/model/entity/savedcards/Card.kt
View File

@ -4,26 +4,23 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by ankur on 21/May/2018
*/
@Parcelize
data class Card (
data class Card(
@SerializedName("cardNumber")
var cardNumber: String =" ",
var cardNumber: String = " ",
@SerializedName("cvv")
var cvv: String =" ",
var cvv: String = " ",
@SerializedName("expiryDate")
var expiryDate: String =" ",
var expiryDate: String = " ",
@SerializedName("firstName")
var firstName: String =" ",
var firstName: String = " ",
@SerializedName("lastName")
var lastName: String =" ",
var lastName: String = " ",
@SerializedName("id")
var id: Int = 0
): Parcelable
) : Parcelable

7
core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt
View File

@ -1,12 +1,7 @@
package com.mifos.mobilewallet.model.entity.standinginstruction
import android.os.Parcel
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
/**
* Created by Shivansh
*/
@Parcelize
data class SDIResponse(val clientId : Int, val resourceId : String?) : Parcelable
data class SDIResponse(val clientId: Int, val resourceId: String?) : Parcelable

39
core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/StandingInstruction.kt
View File

@ -7,32 +7,41 @@ import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount
import com.mifos.mobilewallet.model.entity.client.Client
import com.mifos.mobilewallet.model.entity.client.Status
/**
* Created by Devansh 08/06/2020
*/
@Parcelize
data class StandingInstruction(
val id: Long,
@SerializedName("name")
val name: String,
val name: String,
@SerializedName("fromClient")
val fromClient: Client,
val fromClient: Client,
@SerializedName("fromAccount")
val fromAccount: SavingAccount,
val fromAccount: SavingAccount,
@SerializedName("toClient")
val toClient: Client,
val toClient: Client,
@SerializedName("toAccount")
val toAccount: SavingAccount,
val toAccount: SavingAccount,
@SerializedName("status")
val status: Status,
val status: Status,
@SerializedName("amount")
var amount: Double,
var amount: Double,
@SerializedName("validFrom")
val validFrom: List<Int>,
val validFrom: List<Int>,
@SerializedName("validTill")
var validTill: List<Int>?,
var validTill: List<Int>?,
@SerializedName("recurrenceInterval")
var recurrenceInterval: Int,
var recurrenceInterval: Int,
@SerializedName("recurrenceOnMonthDay")
val recurrenceOnMonthDay: List<Int>) : Parcelable
val recurrenceOnMonthDay: List<Int>
) : Parcelable

22
core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOption.kt
View File

@ -4,33 +4,27 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 10/03/17.
*/
@Parcelize
data class AccountOption(
@SerializedName("accountId")
var accountId: Int? =null,
var accountId: Int? = null,
@SerializedName("accountNo")
var accountNo: String? =null,
var accountNo: String? = null,
@SerializedName("accountType")
var accountType: AccountType? =null,
var accountType: AccountType? = null,
@SerializedName("clientId")
var clientId: Long? =null,
var clientId: Long? = null,
@SerializedName("clientName")
var clientName: String? =null,
var clientName: String? = null,
@SerializedName("officeId")
var officeId: Int? =null,
var officeId: Int? = null,
@SerializedName("officeName")
var officeName: String? =null,
) : Parcelable
{
constructor() : this(null, null, null, null, null, null, null)
}
var officeName: String? = null,
) : Parcelable

11
core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOptionsTemplate.kt
View File

@ -4,17 +4,10 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 10/03/17.
*/
@Parcelize
data class AccountOptionsTemplate (
data class AccountOptionsTemplate(
var fromAccountOptions: List<AccountOption>? = ArrayList(),
@SerializedName("toAccountOptions")
var toAccountOptions: List<AccountOption>? = ArrayList()
)
: Parcelable
{
constructor() : this(ArrayList(), ArrayList())
}
) : Parcelable

15
core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountType.kt
View File

@ -4,19 +4,14 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by Rajan Maurya on 10/03/17.
*/
@Parcelize data class AccountType (
@Parcelize
data class AccountType(
@SerializedName("id")
var id: Int? =null,
var id: Int? = null,
@SerializedName("code")
var code: String? =null,
var code: String? = null,
@SerializedName("value")
var value: String? =null,
var value: String? = null,
) : Parcelable
{
constructor() : this(null, null, null)
}

14
core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/AccountTypeOption.kt
View File

@ -4,20 +4,14 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by dilpreet on 14/6/17.
*/
@Parcelize
data class AccountTypeOption (
data class AccountTypeOption(
@SerializedName("id")
var id: Int? =null,
var id: Int? = null,
@SerializedName("code")
var code: String? =null,
var code: String? = null,
@SerializedName("value")
var value: String? =null,
var value: String? = null,
) : Parcelable
{
constructor() : this(null, null, null)
}

8
core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/BeneficiaryTemplate.kt
View File

@ -4,14 +4,8 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* Created by dilpreet on 14/6/17.
*/
@Parcelize
data class BeneficiaryTemplate(
@SerializedName("accountTypeOptions")
var accountTypeOptions: List<AccountTypeOption?>? = null
) : Parcelable
{
constructor() : this(ArrayList())
}
) : Parcelable