diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java
index 5a0d356..6d23398 100644
--- a/app/src/main/java/com/utsmm/kbz/MainActivity.java
+++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java
@@ -158,10 +158,10 @@ public class MainActivity extends AppCompatActivity implements
}
private void initKey(){
-// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
- SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com");
-// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt");
- SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com");
+ SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
+// SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com");
+ SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt");
+// SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com");
PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad();
byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK();
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
index 0bdb261..6fee0b4 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
@@ -175,10 +175,17 @@ public class InputTraceNoFragment extends DataBindingFragment {
sharedViewModel.payDetail.setValue(payDetail);
if(sharedViewModel.hostType.getValue() == HostType.MPU) {
- sharedViewModel.isEmv.setValue(false);
- transProcessViewModel.transType.setValue(sharedViewModel.transactionsType.getValue());
- transProcessViewModel.setOldTransPayDetail(payDetail);
- transProcessViewModel.setPayDetail(payDetail);
+ boolean isMpu = "MPU".equals(payDetail.getAccountType());
+ if (isMpu) {
+ sharedViewModel.isEmv.setValue(false);
+ transProcessViewModel.transType.setValue(sharedViewModel.transactionsType.getValue());
+ transProcessViewModel.setOldTransPayDetail(payDetail);
+ transProcessViewModel.setPayDetail(payDetail);
+ } else {
+ sharedViewModel.isEmv.setValue(true);
+ emvTransactionProcessViewModel.transType.setValue(sharedViewModel.transactionsType.getValue());
+ emvTransactionProcessViewModel.setPayDetail(payDetail);
+ }
} else {
sharedViewModel.isEmv.setValue(true);
emvTransactionProcessViewModel.transType.setValue(sharedViewModel.transactionsType.getValue());
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
index d91a37d..f11a727 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
@@ -94,12 +94,8 @@ public class DetailReportFragment extends DataBindingFragment {
managementViewModel.hostTypeDR.setValue("PAYMENT");
managementViewModel.cardTypeDR.setValue("QR PAY");
} else if(sharedViewModel.hostType.getValue() == HostType.MPU) {
- managementViewModel.hostTypeDR.setValue("MPU");
- managementViewModel.cardTypeDR.setValue("MPU");
- } else if(sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
- managementViewModel.hostTypeDR.setValue("VISA/MASTER");
- managementViewModel.cardTypeDR.setValue("VISA/MASTER");
-
+ managementViewModel.hostTypeDR.setValue("CARD");
+ managementViewModel.cardTypeDR.setValue("CARD");
}
}
@@ -153,7 +149,7 @@ public class DetailReportFragment extends DataBindingFragment {
if(sharedViewModel.hostType.getValue() == HostType.MPU) {
- if(payDetail.getAccountType().equals("MPU") && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
+ if(payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.VOID.value || payDetail.getTransactionType() == TransactionsType.REFUND.value;
lists.add(payDetail);
count++;
@@ -175,19 +171,6 @@ public class DetailReportFragment extends DataBindingFragment {
totalAmount += payDetail.getAmount();
}
}
- } if(sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
-
- if(!payDetail.getAccountType().equals("MPU") && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
- boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.VOID.value || payDetail.getTransactionType() == TransactionsType.REFUND.value;
- lists.add(payDetail);
- count++;
- if(isNeedMinusSign) {
- totalAmount -= payDetail.getAmount();
- } else {
- totalAmount += payDetail.getAmount();
- }
- }
-
}
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
index 4a86eca..d6e4eaf 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
@@ -122,6 +122,7 @@ public class ManagementFunctionFragment extends DataBindingFragment {
public void onClickReprintLastTrans() {
sharedViewModel.setTransMenu(TransMenu.REPRINT);
+ sharedViewModel.suppressReprintButtons.setValue(false);
observeLastTransaction();
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
index d1168a9..6b14fe7 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
@@ -308,7 +308,7 @@ public class ReprintAnyTransactionFragment extends DataBindingFragment {
// April 2, 2024 client requested to add QR host at host selection type
if(sharedViewModel.hostType.getValue() == HostType.MPU) {
- if(pay.getAccountType().equals("MPU") && pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.MMQR_REFUND.value) {
+ if(pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.MMQR_REFUND.value) {
filteredLists.add(pay);
}
@@ -318,10 +318,6 @@ public class ReprintAnyTransactionFragment extends DataBindingFragment {
filteredLists.add(pay);
}
}
- } else if(sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
- if(!pay.getAccountType().equals("MPU") && pay.getTransactionType() != TransactionsType.MMQR.value && pay.getTransactionType() != TransactionsType.MMQR_REFUND.value) {
- filteredLists.add(pay);
- }
}
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/SelectHostFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/SelectHostFragment.java
index 6ee3b32..733be93 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/SelectHostFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/SelectHostFragment.java
@@ -354,13 +354,11 @@ public class SelectHostFragment extends DataBindingFragment implements DataBindi
}
break;
case TIP_ADJUSTMENT:
- if(sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
+ if(sharedViewModel.hostType.getValue() != HostType.QR) {
routeId = R.id.action_selectHostFragment_to_inputTraceFragment;
-
} else {
routeId = R.id.action_selectHostFragment_to_errorFragment;
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_tip_adjust_not_allowed));
-
}
safeNavigateToRouteId();
break;
@@ -411,23 +409,9 @@ public class SelectHostFragment extends DataBindingFragment implements DataBindi
public class ClickEvent {
- public void onClickVisaMaster() {
- sharedViewModel.hostType.setValue(HostType.VISA_MASTER);
-
- if(SystemParamsOperation.getInstance().isEmvEnabled()) {
- observeRoute();
- } else {
- showSingleInfoDialog("Currently this menu is unavailable!");
- }
-
- }
-
- public void onClickMPU() {
-
+ public void onClickCards() {
sharedViewModel.hostType.setValue(HostType.MPU);
-
observeRoute();
-
}
public void onClickQR() {
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java
index a3d62e7..b63ea16 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java
@@ -282,44 +282,22 @@ public class TransactionSummaryFragment extends DataBindingFragment {
waveRefund.inc(pay.amount);
}
} else if (sharedViewModel.hostType.getValue() == HostType.MPU) {
- if ("MPU".equals(pay.getAccountType())) {
- if (pay.getTransactionType() == TransactionsType.VOID.value) {
- voidTran.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.SALE.value) {
- sale.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.CASH_OUT.value) {
- ca.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_SALE.value) {
- preAuth.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_VOID.value) {
- preAuthVoid.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE.value) {
- preAuthComp.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE_VOID.value) {
- preAuthCompVoid.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.REFUND.value) {
- refund.inc(pay.amount);
- }
- }
- } else if (sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
- if (!"MPU".equals(pay.getAccountType())) {
- if (pay.getTransactionType() == TransactionsType.VOID.value) {
- voidTran.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.SALE.value) {
- sale.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.CASH_OUT.value) {
- ca.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_SALE.value) {
- preAuth.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_VOID.value) {
- preAuthVoid.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE.value) {
- preAuthComp.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE_VOID.value) {
- preAuthCompVoid.inc(pay.amount);
- } else if (pay.getTransactionType() == TransactionsType.REFUND.value) {
- refund.inc(pay.amount);
- }
+ if (pay.getTransactionType() == TransactionsType.VOID.value) {
+ voidTran.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.SALE.value) {
+ sale.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.CASH_OUT.value) {
+ ca.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_SALE.value) {
+ preAuth.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_VOID.value) {
+ preAuthVoid.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE.value) {
+ preAuthComp.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE_VOID.value) {
+ preAuthCompVoid.inc(pay.amount);
+ } else if (pay.getTransactionType() == TransactionsType.REFUND.value) {
+ refund.inc(pay.amount);
}
}
}
@@ -350,9 +328,7 @@ public class TransactionSummaryFragment extends DataBindingFragment {
if (sharedViewModel.hostType.getValue() == HostType.QR) {
return "WALLET";
} else if (sharedViewModel.hostType.getValue() == HostType.MPU) {
- return "MPU";
- } else if (sharedViewModel.hostType.getValue() == HostType.VISA_MASTER) {
- return "Visa/Master";
+ return "CARD";
}
return "";
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java
index ec51cd8..136ab3f 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java
@@ -42,8 +42,8 @@ public class RefundCertificateManager {
return;
};
- String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local
-// String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod
+// String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local
+ String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod
String certUrl = SystemParamsOperation.getInstance().getCertificateUrl();
String clientCertUrl = SystemParamsOperation.getInstance().getCertificateClientUrl();
diff --git a/app/src/main/res/drawable/ic_bank_card.png b/app/src/main/res/drawable/ic_bank_card.png
new file mode 100644
index 0000000..f71da73
Binary files /dev/null and b/app/src/main/res/drawable/ic_bank_card.png differ
diff --git a/app/src/main/res/layout/fragment_select_host_screen.xml b/app/src/main/res/layout/fragment_select_host_screen.xml
index d793f85..c612f3f 100644
--- a/app/src/main/res/layout/fragment_select_host_screen.xml
+++ b/app/src/main/res/layout/fragment_select_host_screen.xml
@@ -86,9 +86,9 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
+
+ android:onClick="@{()->click.onClickCards()}">
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-