fix: Reset default value for order

Detail: - Set default value of order to 0 instead of null Fixes: #1621
fossasia · May 14, 2019 · b3cec1f · b3cec1f
1 parent 86242f2
commit b3cec1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt
@@ -246,11 +246,11 @@ class AttendeeViewModel(
 
     private fun createOrder() {
         val attendeeList = attendees.map { AttendeeId(it.id) }.toList()
-        var amount = totalAmount.value
+        var amount: Float = totalAmount.value ?: 0F
         var paymentMode: String? = paymentOption.toLowerCase()
-        if (amount == null || amount <= 0) {
+        if (amount <= 0) {
             paymentMode = resource.getString(R.string.free)
-            amount = null
+            amount = 0F
         }
         val eventId = event.value?.id
         if (eventId != null) {

diff --git a/app/src/main/java/org/fossasia/openevent/general/order/Order.kt b/app/src/main/java/org/fossasia/openevent/general/order/Order.kt
@@ -31,7 +31,7 @@ data class Order(
     val paymentMode: String? = null,
     val country: String? = null,
     val status: String? = null,
-    val amount: Float? = null,
+    val amount: Float = 0F,
     val identifier: String? = null,
     val orderNotes: String? = null,
     val completedAt: String? = null,