TP-69845 | PS | Tstore pms changes (#11238)

This commit is contained in:
Prakhar Saxena
2024-06-11 16:03:41 +05:30
committed by GitHub
parent 158abffa94
commit 081ece5a14
5 changed files with 18 additions and 4 deletions

View File

@@ -52,6 +52,8 @@ const val SOURCE_SCREEN_NAME = "sourceScreenName"
const val NAVI_PAY_RESPONSE = "NAVI_PAY_RESPONSE"
const val CANCEL = "CANCEL"
const val UPI_REQUEST_ID = "upiRequestId"
const val T_STORE_ORDER_REFERENCE_ID = "tstoreOrderReferenceId"
const val METADATA = "metadata"
const val STATUS_CODE_200 = 200
const val STATUS_CODE_100 = 100
const val UPI_RESULT_CODE = 200

View File

@@ -58,5 +58,6 @@ data class GatewayTxnInfo(
@SerializedName("transactionType") val transactionType: String,
@SerializedName("paymentMode") val paymentMode: String? = null,
@SerializedName("instrumentType") val instrumentType: String? = null,
@SerializedName("tstoreOrderId") val tstoreOrderId: String? = null,
@SerializedName("txnRequestType") val txnRequestType: String? = null
)

View File

@@ -41,6 +41,8 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.navi.alfred.AlfredManager
import com.navi.common.upi.METADATA
import com.navi.common.upi.T_STORE_ORDER_REFERENCE_ID
import com.navi.common.upi.UPI_RESULT_CODE
import com.navi.common.utils.CommonUtils.initFraudCheckSDK
import com.navi.pay.R
@@ -162,8 +164,9 @@ fun SendMoneyScreen(
LaunchedEffect(Unit) {
val selectedBankAccountId =
sendMoneyViewModel.getSelectedBankAccountId(naviPayActivity.intent.extras)
sendMoneyViewModel.setMetadataForTransaction(
naviPayActivity.intent.extras?.getString("metadata")
sendMoneyViewModel.setTransactionParameters(
tstoreOrderId = naviPayActivity.intent.extras?.getString(T_STORE_ORDER_REFERENCE_ID),
metadata = naviPayActivity.intent.extras?.getString(METADATA)
)
sendMoneyViewModel.init(
selectedBankAccountId = selectedBankAccountId,

View File

@@ -381,6 +381,7 @@ constructor(
)
private var metadata: String? = null
private var tstoreOrderId: String? = null
val blockAndSpamOptionEnabled =
payeeEntity
@@ -1731,6 +1732,7 @@ constructor(
PAY_AGAIN
else "",
instrumentType = TransactionInstrumentType.TRANSACTION.name,
tstoreOrderId = tstoreOrderId,
txnRequestType = null
),
deviceData = deviceInfoProvider.getDeviceData(),
@@ -2528,7 +2530,8 @@ constructor(
return extras?.getString(PAYER_BANK_ACCOUNT_ID)
}
fun setMetadataForTransaction(metadata: String?) {
fun setTransactionParameters(tstoreOrderId: String?, metadata: String?) {
this.tstoreOrderId = tstoreOrderId
this.metadata = metadata
}

View File

@@ -42,7 +42,9 @@ import com.navi.base.utils.orFalse
import com.navi.common.model.RequestConfig
import com.navi.common.uitron.model.action.UpiIntent
import com.navi.common.upi.CANCEL
import com.navi.common.upi.METADATA
import com.navi.common.upi.NAVI_PAY_RESPONSE
import com.navi.common.upi.T_STORE_ORDER_REFERENCE_ID
import com.navi.common.utils.TemporaryStorageHelper
import com.navi.common.utils.log
import com.navi.common.utils.stringToJsonObject
@@ -258,7 +260,10 @@ fun MPSScreen(
"navi_pmt_redirection_to_upi",
mapOf("entry_point" to UpiIntent.SEND_MONEY.name)
)
sendMoneyViewModel.setMetadataForTransaction(json.getString("metadata"))
sendMoneyViewModel.setTransactionParameters(
tstoreOrderId = json.getString(T_STORE_ORDER_REFERENCE_ID),
metadata = json.getString(METADATA)
)
sendMoneyViewModel.init(
selectedBankAccountId = selectedBankAccount?.accountId.orEmpty(),
isActivityRecreated = false,