Skip to content

fix: pending ticket redirected to payment page. #2356

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.

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

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 32 additions & 31 deletions app/src/main/java/org/fossasia/openevent/general/di/Modules.kt
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ val viewModelModule = module {
viewModel { ProfileViewModel(get(), get()) }
viewModel { SignUpViewModel(get(), get(), get()) }
viewModel {
EventDetailsViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
EventDetailsViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
}
viewModel { SessionViewModel(get(), get(), get()) }
viewModel { SearchViewModel(get(), get()) }
viewModel { SearchResultsViewModel(get(), get(), get(), get(), get(), get()) }
Expand All @@ -254,7 +255,7 @@ val viewModelModule = module {
viewModel { FavoriteEventsViewModel(get(), get(), get()) }
viewModel { SettingsViewModel(get(), get(), get()) }
viewModel { OrderCompletedViewModel(get(), get(), get(), get()) }
viewModel { OrdersUnderUserViewModel(get(), get(), get(), get(), get()) }
viewModel { OrdersUnderUserViewModel(get(), get(), get(), get(), get(), get()) }
viewModel { OrderDetailsViewModel(get(), get(), get(), get()) }
viewModel { EditProfileViewModel(get(), get(), get()) }
viewModel { GeoLocationViewModel(get()) }
Expand All @@ -279,24 +280,24 @@ val networkModule = module {

single {
PagedList
.Config
.Builder()
.setPageSize(5)
.setInitialLoadSizeHint(5)
.setEnablePlaceholders(false)
.build()
.Config
.Builder()
.setPageSize(5)
.setInitialLoadSizeHint(5)
.setEnablePlaceholders(false)
.build()
}

single {
val connectTimeout = 15 // 15s
val readTimeout = 15 // 15s

val builder = OkHttpClient().newBuilder()
.connectTimeout(connectTimeout.toLong(), TimeUnit.SECONDS)
.readTimeout(readTimeout.toLong(), TimeUnit.SECONDS)
.addInterceptor(HostSelectionInterceptor(get()))
.addInterceptor(RequestAuthenticator(get()))
.addNetworkInterceptor(StethoInterceptor())
.connectTimeout(connectTimeout.toLong(), TimeUnit.SECONDS)
.readTimeout(readTimeout.toLong(), TimeUnit.SECONDS)
.addInterceptor(HostSelectionInterceptor(get()))
.addInterceptor(RequestAuthenticator(get()))
.addNetworkInterceptor(StethoInterceptor())

if (BuildConfig.DEBUG) {
val httpLoggingInterceptor = HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }
Expand All @@ -309,33 +310,33 @@ val networkModule = module {
val baseUrl = BuildConfig.DEFAULT_BASE_URL
val objectMapper: ObjectMapper = get()
val onlineApiResourceConverter = ResourceConverter(
objectMapper, Event::class.java, User::class.java,
SignUp::class.java, Ticket::class.java, SocialLink::class.java, EventId::class.java,
EventTopic::class.java, Attendee::class.java, TicketId::class.java, Order::class.java,
Charge::class.java, Paypal::class.java, ConfirmOrder::class.java,
CustomForm::class.java, EventLocation::class.java, EventType::class.java,
EventSubTopic::class.java, Feedback::class.java, Speaker::class.java, FavoriteEvent::class.java,
Session::class.java, SessionType::class.java, MicroLocation::class.java, SpeakersCall::class.java,
Sponsor::class.java, EventFAQ::class.java, Notification::class.java, Track::class.java,
DiscountCode::class.java, Settings::class.java, Proposal::class.java, Tax::class.java)
objectMapper, Event::class.java, User::class.java,
SignUp::class.java, Ticket::class.java, SocialLink::class.java, EventId::class.java,
EventTopic::class.java, Attendee::class.java, TicketId::class.java, Order::class.java,
Charge::class.java, Paypal::class.java, ConfirmOrder::class.java,
CustomForm::class.java, EventLocation::class.java, EventType::class.java,
EventSubTopic::class.java, Feedback::class.java, Speaker::class.java, FavoriteEvent::class.java,
Session::class.java, SessionType::class.java, MicroLocation::class.java, SpeakersCall::class.java,
Sponsor::class.java, EventFAQ::class.java, Notification::class.java, Track::class.java,
DiscountCode::class.java, Settings::class.java, Proposal::class.java, Tax::class.java)

Retrofit.Builder()
.client(get())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.addConverterFactory(JSONAPIConverterFactory(onlineApiResourceConverter))
.addConverterFactory(JacksonConverterFactory.create(objectMapper))
.baseUrl(baseUrl)
.build()
.client(get())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.addConverterFactory(JSONAPIConverterFactory(onlineApiResourceConverter))
.addConverterFactory(JacksonConverterFactory.create(objectMapper))
.baseUrl(baseUrl)
.build()
}
}

val databaseModule = module {

single {
Room.databaseBuilder(androidApplication(),
OpenEventDatabase::class.java, "open_event_database")
.fallbackToDestructiveMigration()
.build()
OpenEventDatabase::class.java, "open_event_database")
.fallbackToDestructiveMigration()
.build()
}

factory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import kotlinx.android.synthetic.main.fragment_expired_order.view.filterToolbar
import kotlinx.android.synthetic.main.fragment_expired_order.view.toolbar
import kotlinx.android.synthetic.main.fragment_expired_order.view.swipeRefresh
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.event.Event
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.fossasia.openevent.general.utils.extensions.nonNull
import org.jetbrains.anko.design.longSnackbar
Expand Down Expand Up @@ -110,7 +111,7 @@ class ExpiredOrderFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val recyclerViewClickListener = object : OrdersPagedListAdapter.OrderClickListener {
override fun onClick(eventID: Long, orderIdentifier: String, orderId: Long) {
override fun onClick(eventID: Long, orderIdentifier: String, orderId: Long, event: Event, order: Order) {
findNavController(rootView).navigate(ExpiredOrderFragmentDirections
.actionOrderExpiredToOrderDetails(eventID, orderIdentifier, orderId))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class OrdersPagedListAdapter : PagedListAdapter<Pair<Event, Order>, OrdersViewHo
}

interface OrderClickListener {
fun onClick(eventID: Long, orderIdentifier: String, orderId: Long)
fun onClick(eventID: Long, orderIdentifier: String, orderId: Long, event: Event, order: Order)
}
}

Expand Down
Loading