varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

NTP-1234 | Shivam | Arc Fixes (#14786)

Browse Source
This commit is contained in:
Shivam Goyal
2025-01-31 18:39:13 +05:30
committed by GitHub
parent ebdd3a70c8
commit 104f25f009
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/navi-pay/src/androidTest/kotlin/com/navi/pay/management/collectrequest/CollectRequestUtilsTest.kt
View File

@@ -9,7 +9,7 @@ package com.navi.pay.management.collectrequest
import com.navi.base.utils.DateUtils
import com.navi.common.utils.CommonUtils.capitalizeMeridiem
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME
import org.junit.Assert
import org.junit.Test
@@ -20,7 +20,7 @@ class CollectRequestUtilUnitTest {
val expiryTimestampFormatted =
DateUtils.getFormattedDateTimeAsStringFromDateTimeObject(
dateTime = expiryTimestamp.plusDays(2),
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME,
)
Assert.assertEquals(
"Expires on ${

4
android/navi-pay/src/androidTest/kotlin/com/navi/pay/tstore/details/ui/ArcStatusWidgetUtilsText.kt
View File

@@ -15,7 +15,7 @@ import com.navi.pay.R as R
import com.navi.pay.tstore.details.model.view.OrderProductType
import com.navi.pay.tstore.details.ui.common.ArcStatusWidgetUtils.prepareArcStatusWidgetProperties
import com.navi.pay.tstore.list.model.view.OrderStatusOfView
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME
import dagger.hilt.android.testing.HiltAndroidTest
import io.mockk.every
import io.mockk.mockk
@@ -73,7 +73,7 @@ class ArcStatusWidgetUtilsText {
val orderTimestamp =
getDateTimeObjectFromDateTimeString(
dateTime = "25 Jan, 02:00 PM",
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME,
)
val arcThresholdInDays = "3"

4
android/navi-pay/src/main/kotlin/com/navi/pay/management/collectrequest/CollectRequestUtils.kt
View File

@@ -12,7 +12,7 @@ import com.navi.base.utils.NaviDateFormatter.ONE_HOUR_IN_MILLIS
import com.navi.base.utils.NaviDateFormatter.ONE_MINUTE_IN_MILLIS
import com.navi.base.utils.NaviDateFormatter.ONE_SECOND_IN_MILLIS
import com.navi.common.utils.CommonUtils.capitalizeMeridiem
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME
import org.joda.time.DateTime
fun getExpiryTimestampFormatted(
@@ -35,7 +35,7 @@ fun getExpiryTimestampFormatted(
return "Expires on ${
DateUtils.getFormattedDateTimeAsStringFromDateTimeObject(
dateTime = expiryTimestamp,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME,
).capitalizeMeridiem()
}"
}

4
android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/ArcStatusWidgetUtils.kt
View File

@@ -16,7 +16,7 @@ import com.navi.pay.tstore.details.model.view.OrderPaymentStatus
import com.navi.pay.tstore.details.model.view.OrderProductType
import com.navi.pay.tstore.details.ui.bbps.OrderBbpsUtils.isRechargeCategory
import com.navi.pay.tstore.list.model.view.OrderStatusOfView
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME
import org.joda.time.DateTime
object ArcStatusWidgetUtils {
@@ -133,7 +133,7 @@ object ArcStatusWidgetUtils {
val arcThresholdTimestampFormatted =
DateUtils.getFormattedDateTimeAsStringFromDateTimeObject(
dateTime = orderTimestamp.plusDays(arcThresholdDays),
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME,
)
when (orderProductType) {

3
android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/model/view/OrderEntity.kt
View File

@@ -36,7 +36,6 @@ import com.navi.pay.tstore.list.model.network.OrderType
import com.navi.pay.tstore.list.util.OrderPaymentModeConverter
import com.navi.pay.tstore.list.util.OrderPaymentStatusConverter
import com.navi.pay.tstore.list.util.OrderStatusOfViewConverter
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME
import com.navi.pay.utils.DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME
import com.navi.pay.utils.NAVI_PAY_DATABASE_T_STORE_ORDER_HISTORY_TABLE_NAME
import com.navi.pay.utils.NAVI_PAY_UPI_LITE_SEND_MONEY_PURPOSE_CODE
@@ -235,7 +234,7 @@ data class OrderEntity(
DateUtils.getFormattedDateTimeAsStringFromDateTimeObject(
dateTime = dateTimeInDefaultZone,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME,
)
} else ""
}

1
android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt
View File

@@ -237,7 +237,6 @@ const val CL_STATUS_SUCCESS = "0"
// Date time formatter
const val DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR = "dd MMM yyyy"
const val DATE_TIME_FORMAT_DATE_MONTH_NAME_YEAR_AT_TIME = "d MMM yyyy, h:mm a"
const val DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME = "d MMM, hh:mm a"
const val DATE_TIME_FORMAT_DATE_MONTH_YEAR_WITHOUT_SEPARATOR = "ddMMyyyy"
const val DATE_TIME_FORMAT_YEAR_MONTH_DATE_WITH_SLASH_SEPARATOR = "yyyy/MM/dd"
const val DATE_TIME_FORMAT_DATE_MONTH_YEAR_WITH_SLASH_SEPARATOR = "dd/MM/yy"