ارتقا به نسخه 1.1.5 و محاسبه مجموع پرداختیهای دوره جاری برای هر فرد
Android Release / build (push) Canceled after 0s
Android Release / build (push) Canceled after 0s
This commit is contained in:
1 parent
f1c19cba52
commit
9ed2b59d81
2 files changed
+3
-3
No files matched your search
@@ -30,8 +30,8 @@ android {
|
|||||||
applicationId = "com.oqba26.monthlypaymentapp"
|
applicationId = "com.oqba26.monthlypaymentapp"
|
||||||
minSdk = 25
|
minSdk = 25
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 15
|
versionCode = 16
|
||||||
versionName = "1.1.4"
|
versionName = "1.1.5"
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables { useSupportLibrary = true }
|
vectorDrawables { useSupportLibrary = true }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ class PersonViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
val latestPayment = personCyclePayments.maxByOrNull { if ((it.createdAt ?: 0L) > 0L) it.createdAt!! else it.timestamp }
|
val latestPayment = personCyclePayments.maxByOrNull { if ((it.createdAt ?: 0L) > 0L) it.createdAt!! else it.timestamp }
|
||||||
val lastPaymentTime = latestPayment?.let { if ((it.createdAt ?: 0L) > 0L) it.createdAt!! else it.timestamp }
|
val lastPaymentTime = latestPayment?.let { if ((it.createdAt ?: 0L) > 0L) it.createdAt!! else it.timestamp }
|
||||||
val lastPaymentAmount = latestPayment?.amount
|
val lastPaymentAmount = if (personCyclePayments.isNotEmpty()) personCyclePayments.sumOf { it.amount } else null
|
||||||
|
|
||||||
val unpaidResult = if (category == "mosque" || person.isAnonymous) {
|
val unpaidResult = if (category == "mosque" || person.isAnonymous) {
|
||||||
Triple(0, 0.0, emptyList<String>() to emptyList())
|
Triple(0, 0.0, emptyList<String>() to emptyList())
|
||||||
|
|||||||
Reference in new issue
Block a user