Skip to content

fix: wrong order status #2032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2019
Merged

fix: wrong order status #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ import java.util.Calendar
import java.util.Currency
import kotlin.collections.ArrayList

private const val COUNT_DOWN_TIME = 15 // in minutes

class AttendeeFragment : Fragment(), ComplexBackPressFragment {

private lateinit var rootView: View
Expand Down Expand Up @@ -244,8 +246,6 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
.setTitle(getString(R.string.cancel_order))
.setMessage(getString(R.string.cancel_order_message))
.setPositiveButton(getString(R.string.continue_string)) { _, _ ->
if (!attendeeViewModel.orderCreatedSuccess)
attendeeViewModel.cancelPendingOrder()
findNavController(rootView).popBackStack()
}
.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
Expand Down Expand Up @@ -288,7 +288,7 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {

val currentPendingOrder = attendeeViewModel.pendingOrder.value
if (currentPendingOrder == null) {
attendeeViewModel.createPendingOrder(safeArgs.eventId)
attendeeViewModel.initializeOrder(safeArgs.eventId)
}
}

Expand All @@ -297,12 +297,10 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
rootView.timeoutInfoTextView.text =
getString(R.string.ticket_timeout_info_message, event.orderExpiryTime.toString())

val timeLeft: Long = if (attendeeViewModel.timeout == -1L) event.orderExpiryTime * 60 * 1000L
val timeLeft: Long = if (attendeeViewModel.timeout == -1L) COUNT_DOWN_TIME * 60 * 1000L
else attendeeViewModel.timeout
timer = object : CountDownTimer(timeLeft, 1000) {
override fun onFinish() {
if (!attendeeViewModel.orderCreatedSuccess)
attendeeViewModel.cancelPendingOrder()
findNavController(rootView).navigate(AttendeeFragmentDirections
.actionAttendeeToTicketPop(safeArgs.eventId, safeArgs.currency, true))
}
Expand Down
22 changes: 3 additions & 19 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const val ORDER_STATUS_PENDING = "pending"
const val ORDER_STATUS_COMPLETED = "completed"
const val ORDER_STATUS_PLACED = "placed"
const val ORDER_STATUS_CANCELLED = "cancelled"
const val ORDER_STATUS_INITIALIZING = "initializing"
const val PAYMENT_MODE_FREE = "free"
const val PAYMENT_MODE_BANK = "bank"
const val PAYMENT_MODE_ONSITE = "onsite"
Expand Down Expand Up @@ -95,7 +96,6 @@ class AttendeeViewModel(
var yearSelectedPosition: Int = 0
var paymentCurrency: String = ""
var timeout: Long = -1L
var orderCreatedSuccess = false
var ticketDetailsVisible = false
var billingEnabled = false

Expand Down Expand Up @@ -147,24 +147,8 @@ class AttendeeViewModel(
})
}

fun cancelPendingOrder() {
var order = mutablePendingOrder.value
val identifier: String? = orderIdentifier
if (order == null || identifier == null) return

order = order.copy(status = ORDER_STATUS_CANCELLED)
compositeDisposable += orderService.editOrder(identifier, order)
.withDefaultSchedulers()
.subscribe({
Timber.d("Pending order cancelled")
mutableMessage.value = resource.getString(R.string.pending_order_cancelled_message)
}, {
Timber.e("Fail on cancelling order")
})
}

fun createPendingOrder(eventId: Long) {
val emptyOrder = Order(id = getId(), status = ORDER_STATUS_PENDING, event = EventId(eventId))
fun initializeOrder(eventId: Long) {
val emptyOrder = Order(id = getId(), status = ORDER_STATUS_INITIALIZING, event = EventId(eventId))

compositeDisposable += orderService.placeOrder(emptyOrder)
.withDefaultSchedulers()
Expand Down