diff --git a/app/build.gradle b/app/build.gradle index 0ea2ab2..5a76c6e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.utsmm.kbz" minSdk 24 targetSdk 33 - versionCode 3 - versionName "1.02" + versionCode 4 + versionName "1.03" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java index 14e1aff..a83ff33 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java @@ -232,7 +232,7 @@ public class KPayViewModel extends ViewModel { bizContent.put("trade_type", "PAY_BY_QRCODE"); bizContent.put("total_amount", amount); bizContent.put("title", "testing"); -// bizContent.put("operator_id", serialNum); + bizContent.put("operator_id", serialNum); bizContent.put("timeout_express", timeoutExpress); bizContent.put("trans_currency", "MMK"); bizContent.put("callback_info", "callback"); @@ -257,7 +257,8 @@ public class KPayViewModel extends ViewModel { amount, "MMK", timeoutExpress, - "callback" + "callback", + serialNum ); KPayQRRequest.QrRequest.RequestBody body = new KPayQRRequest.QrRequest.RequestBody( diff --git a/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java b/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java index dbd8e0c..988f46d 100644 --- a/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java +++ b/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java @@ -64,6 +64,7 @@ public class EReceiptUtil { request.setDE7(currentTimeStamp); request.setDE37(payDetail.getReferNo()); request.setDE49("MMK"); + request.setDE38(payDetail.getQrTransId()); request.setSerial(serialNum); request.setAppId(packageName); request.setDE41(qrTerminalId); diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/network/model/KPayQRRequest.java b/baselib/src/main/java/com/utsmyanmar/baselib/network/model/KPayQRRequest.java index 45d7635..a86a747 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/network/model/KPayQRRequest.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/network/model/KPayQRRequest.java @@ -178,7 +178,7 @@ public class KPayQRRequest { public BizContent(String appId, String merchCode, String merchOrderId, String tradeType, String title, String totalAmount, String transCurrency, - String timeoutExpress, String callbackInfo) { + String timeoutExpress, String callbackInfo, String operatorId) { this.appId = appId; this.merchCode = merchCode; this.merchOrderId = merchOrderId; @@ -188,6 +188,7 @@ public class KPayQRRequest { this.transCurrency = transCurrency; this.timeoutExpress = timeoutExpress; this.callbackInfo = callbackInfo; + this.operatorId = operatorId; } // Getters