|
@@ -95,7 +95,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
|
|
|
|
|
|
private var cardPaymentResource = CardPaymentResource()
|
|
private var cardPaymentResource = CardPaymentResource()
|
|
|
|
|
|
- private val regex = Regex("^-?\\d+(\\.\\d{1,2})?\$")
|
|
|
|
|
|
+ private val regex = Regex("^-?\\d+(\\.\\d{1,2})?$")
|
|
|
|
|
|
private var isAuditGM = -1
|
|
private var isAuditGM = -1
|
|
|
|
|
|
@@ -743,7 +743,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
|
|
binding.transfer.visibility = View.GONE
|
|
binding.transfer.visibility = View.GONE
|
|
binding.remit.visibility = View.GONE
|
|
binding.remit.visibility = View.GONE
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
popupWindow.dismiss()
|
|
popupWindow.dismiss()
|
|
@@ -921,7 +920,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
|
|
airplaneTicketResource.flightsTime = binding.flightTime.text.toString()
|
|
airplaneTicketResource.flightsTime = binding.flightTime.text.toString()
|
|
}
|
|
}
|
|
|
|
|
|
- if (customerList.size == 0) {
|
|
|
|
|
|
+ if (customerList.isEmpty()) {
|
|
showMessage(resources.getString(R.string.customer_select_hint))
|
|
showMessage(resources.getString(R.string.customer_select_hint))
|
|
return@setOnClickListener
|
|
return@setOnClickListener
|
|
} else {
|
|
} else {
|
|
@@ -1255,6 +1254,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
|
|
call: Call<AirplaneTicketDetailResponse>,
|
|
call: Call<AirplaneTicketDetailResponse>,
|
|
response: Response<AirplaneTicketDetailResponse>
|
|
response: Response<AirplaneTicketDetailResponse>
|
|
) {
|
|
) {
|
|
|
|
+
|
|
val detailResponse = response.body()
|
|
val detailResponse = response.body()
|
|
|
|
|
|
if (detailResponse != null) {
|
|
if (detailResponse != null) {
|
|
@@ -1457,7 +1457,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
|
|
|
|
|
|
for (item in customerSelected) {
|
|
for (item in customerSelected) {
|
|
for (selector in customerSelector) {
|
|
for (selector in customerSelector) {
|
|
- if (item.matches(Regex("[0-9]*\$"))) {
|
|
|
|
|
|
+ if (item.matches(Regex("[0-9]*$"))) {
|
|
if (item.toInt() == selector.id) {
|
|
if (item.toInt() == selector.id) {
|
|
customerList.add(selector)
|
|
customerList.add(selector)
|
|
}
|
|
}
|