fix: Make billing information compulsory for paid orders (#2136)

Author: liveHarshit

app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt

@@ -59,8 +59,6 @@ import kotlinx.android.synthetic.main.fragment_attendee.view.cardNumber
 import kotlinx.android.synthetic.main.fragment_attendee.view.acceptCheckbox
 import kotlinx.android.synthetic.main.fragment_attendee.view.countryPicker
 import kotlinx.android.synthetic.main.fragment_attendee.view.billingInfoContainer
-import kotlinx.android.synthetic.main.fragment_attendee.view.billingInfoCheckboxSection
-import kotlinx.android.synthetic.main.fragment_attendee.view.billingEnabledCheckbox
 import kotlinx.android.synthetic.main.fragment_attendee.view.billingCity
 import kotlinx.android.synthetic.main.fragment_attendee.view.billingCompany
 import kotlinx.android.synthetic.main.fragment_attendee.view.taxId
@@ -126,6 +124,7 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
     private val safeArgs: AttendeeFragmentArgs by navArgs()
     private lateinit var timer: CountDownTimer
     private lateinit var card: Card
+    private var showBillingInfoLayout = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -134,6 +133,8 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
             attendeeViewModel.singleTicket = safeArgs.ticketIdAndQty?.value?.map { it.second }?.sum() == 1
         }
 
+        showBillingInfoLayout = safeArgs.hasPaidTickets || safeArgs.amount > 0
+
         attendeeRecyclerAdapter.setEventId(safeArgs.eventId)
         if (attendeeViewModel.paymentCurrency.isNotBlank())
             ticketsRecyclerAdapter.setCurrency(attendeeViewModel.paymentCurrency)
@@ -318,7 +319,6 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
 
         attendeeViewModel.totalAmount.value = safeArgs.amount
         rootView.paymentSelectorContainer.isVisible = safeArgs.amount > 0
-        rootView.billingInfoCheckboxSection.isVisible = safeArgs.amount > 0
 
         attendeeViewModel.tickets
             .nonNull()
@@ -488,16 +488,12 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
     }
 
     private fun setupBillingInfo() {
+        rootView.billingInfoContainer.isVisible = showBillingInfoLayout
+        attendeeViewModel.billingEnabled = showBillingInfoLayout
         rootView.billingCompanyLayout.setRequired()
         rootView.billingAddressLayout.setRequired()
         rootView.billingCityLayout.setRequired()
         rootView.billingPostalCodeLayout.setRequired()
-        rootView.billingInfoContainer.isVisible = rootView.billingEnabledCheckbox.isChecked
-        attendeeViewModel.billingEnabled = rootView.billingEnabledCheckbox.isChecked
-        rootView.billingEnabledCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            attendeeViewModel.billingEnabled = isChecked
-            rootView.billingInfoContainer.isVisible = isChecked
-        }
     }
 
     private fun setupCountryOptions() {
@@ -691,7 +687,7 @@ class AttendeeFragment : Fragment(), ComplexBackPressFragment {
             rootView.email.checkEmpty()
 
         var checkBillingInfo = true
-        if (rootView.billingEnabledCheckbox.isChecked) {
+        if (showBillingInfoLayout) {
             checkBillingInfo = rootView.billingCompany.checkEmpty() && rootView.billingAddress.checkEmpty() &&
                 rootView.billingCity.checkEmpty() && rootView.billingPostalCode.checkEmpty()
         }

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt

@@ -213,15 +213,16 @@ class TicketsFragment : Fragment() {
     }
 
     private fun redirectToAttendee() {
-
         val wrappedTicketAndQty = TicketIdAndQtyWrapper(ticketIdAndQty)
         ticketsViewModel.mutableAmount.value = null
         findNavController(rootView).navigate(TicketsFragmentDirections.actionTicketsToAttendee(
             eventId = safeArgs.eventId,
             ticketIdAndQty = wrappedTicketAndQty,
             currency = safeArgs.currency,
-            amount = totalAmount
+            amount = totalAmount,
+            hasPaidTickets = ticketsViewModel.hasPaidTickets
         ))
+        ticketsViewModel.hasPaidTickets = false
     }
 
     private fun redirectToLogin() {

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt

@@ -44,6 +44,7 @@ class TicketsViewModel(
     val ticketTableVisibility: LiveData<Boolean> = mutableTicketTableVisibility
     val ticketIdAndQty = MutableLiveData<List<Triple<Int, Int, Float>>>()
     var discountCodeCurrentLayout = APPLY_DISCOUNT_CODE
+    var hasPaidTickets = false
 
     fun isLoggedIn() = authHolder.isLoggedIn()
 
@@ -128,6 +129,8 @@ class TicketsViewModel(
                         }
                     }
                     price.let { prices += price * qty[index++] }
+                    if (ticket.type == TICKET_TYPE_PAID)
+                        hasPaidTickets = true
                 }
                 mutableAmount.value = prices + donation
             }, {

app/src/main/res/layout/fragment_attendee.xml

@@ -370,25 +370,6 @@
                     tools:itemCount="3"
                     tools:listitem="@layout/item_attendee" />
 
-                <RelativeLayout
-                    android:id="@+id/billingInfoCheckboxSection"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/billing_information"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/heading_text_size"
-                        android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true"/>
-                    <CheckBox
-                        android:id="@+id/billingEnabledCheckbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"/>
-                </RelativeLayout>
-
                 <LinearLayout
                     android:id="@+id/billingInfoContainer"
                     android:layout_width="match_parent"
@@ -397,6 +378,14 @@
                     android:orientation="vertical"
                     android:visibility="gone"
                     tools:visibility="visible">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/billing_information"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/heading_text_size"/>
+
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/billingCompanyLayout"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"

app/src/main/res/navigation/navigation_graph.xml

@@ -728,6 +728,11 @@
             app:argType="float"
             app:nullable="false"
             android:defaultValue="0.0"/>
+
+        <argument
+            android:name="hasPaidTickets"
+            app:argType="boolean"
+            android:defaultValue="false"/>
     </fragment>
     <fragment
         android:id="@+id/orderCompletedFragment"