diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index 350e7b4..541b0d6 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -152,7 +152,7 @@ public class MainActivity extends AppCompatActivity implements private void initKey(){ // SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); -// SystemParamsOperation.getInstance().setTmsAddress("http://sirius-nest.utsmyanmar.com"); +// SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com"); // SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); // SystemParamsOperation.getInstance().setEReceiptAddress("http://receipt-nest.utsmyanmar.com"); diff --git a/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java b/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java index 8457280..283059e 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java @@ -182,7 +182,8 @@ public class DashboardTransFragment extends DataBindingFragment { public void onClickPreAuthCancel () { sharedViewModel.setTransactionsType(TransactionsType.PRE_AUTH_VOID); sharedViewModel.setTransMenu(TransMenu.PRE_AUTH_FULL_VOID); - sharedViewModel.amount.postValue(null); + sharedViewModel.amount.postValue("0"); // null to 0 +// sharedViewModel.amount.postValue(null); routeId = R.id.action_dashboardTransFragment_to_inputPasswordFragment; safeRouteTo(currentId,routeId,hostId); diff --git a/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryFragment.java b/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryFragment.java index 82c6a33..b18eab2 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryFragment.java @@ -104,7 +104,7 @@ public class ManualEntryFragment extends DataBindingFragment { payDetail.setAccountType(manualEntryViewModel.get_cardScheme().getValue().name); } payDetail.setICC55(""); - payDetail.setAuthNo(manualEntryViewModel.cvv.getValue()); +// payDetail.setAuthNo(manualEntryViewModel.cvv.getValue()); emvTransactionProcessViewModel.setTradeData(tradeData); diff --git a/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryViewModel.java index 0b94b05..10525db 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryViewModel.java @@ -90,6 +90,9 @@ public class ManualEntryViewModel extends ViewModel { return expDate; } + private boolean validateCard() { + return (cardFieldState.getValue() == EntryState.UNSELECTED && expFieldState.getValue() == EntryState.UNSELECTED && expDate.getValue() != null && !expDate.getValue().isEmpty()) ; + } private boolean validateDataMPU() { return (cardFieldState.getValue() == EntryState.UNSELECTED && expFieldState.getValue() == EntryState.UNSELECTED && expDate.getValue() != null && !expDate.getValue().isEmpty()) ; } @@ -106,8 +109,9 @@ public class ManualEntryViewModel extends ViewModel { } public boolean validateData() { - if(_cardScheme.getValue() == CardScheme.MPU) return validateDataMPU(); - else return validateDataEmv(); + return validateCard(); +// if(_cardScheme.getValue() == CardScheme.MPU) return validateDataMPU(); +// else return validateDataEmv(); } public void resetUI() { @@ -306,23 +310,23 @@ public class ManualEntryViewModel extends ViewModel { if (pan.startsWith("4")) { _cardScheme.setValue(CardScheme.VISA); - cvvVisibility.setValue(0); +// cvvVisibility.setValue(0); } else if (pan.startsWith("51") || pan.startsWith("52") || pan.startsWith("53") || pan.startsWith("54") || pan.startsWith("55")) { _cardScheme.setValue(CardScheme.MASTERCARD); - cvvVisibility.setValue(0); +// cvvVisibility.setValue(0); } else if (pan.startsWith("3528")) { if(pan.length() > 4 && (Integer.parseInt(pan.substring(0, 4)) >= 3528 && Integer.parseInt(pan.substring(0, 4)) <= 3589)) { _cardScheme.setValue(CardScheme.JCB); - cvvVisibility.setValue(0); +// cvvVisibility.setValue(0); } } else if (pan.startsWith("60") || pan.startsWith("62") || pan.startsWith("65") || pan.startsWith("81")) { _cardScheme.setValue(CardScheme.UPI); - cvvVisibility.setValue(0); +// cvvVisibility.setValue(0); } else { diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java index c7d43c9..3e0395b 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java @@ -18,6 +18,7 @@ import com.utsmyanmar.paylibs.model.TradeData; import com.utsmyanmar.paylibs.print.printx.PrintXStatus; import com.utsmyanmar.paylibs.sign_on.EchoTestProcess; import com.utsmyanmar.paylibs.sign_on.SignOnListener; +import com.utsmyanmar.paylibs.utils.POSUtil; import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation; import com.utsmyanmar.paylibs.utils.enums.TransMenu; import com.utsmyanmar.paylibs.utils.iso_utils.TransactionType; @@ -223,6 +224,7 @@ public class SettlementTransactionFragment extends DataBindingFragment implement } long totalAmount = saleAmount + preAmount + caAmount; sharedViewModel.totalAmount.postValue(totalAmount); + sharedViewModel.setAmount(POSUtil.getInstance().getDecimalAmountSeparatorFormat(totalAmount)); settlementViewModel.isNoData.setValue(false); @@ -243,6 +245,8 @@ public class SettlementTransactionFragment extends DataBindingFragment implement settlementViewModel.isNoData.setValue(true); + sharedViewModel.setAmount(POSUtil.getInstance().getDecimalAmountSeparatorFormat(0)); + setSettlementViewModelData(saleCount,saleAmount,preCount,preAmount,refundCount,refundAmount,caCount,caAmount); } }); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java index 17e3122..7094ec3 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java @@ -219,13 +219,13 @@ public class SettlementViewModel extends ViewModel { private void updateDB() { if(payDetails != null && payDetails.size() > 0) { - for (PayDetail paydetail:payDetails) { + for (PayDetail pay:payDetails) { // if(paydetail.getTransactionType() == TransactionsType.SALE.value) { // paydetail.setIsSettle(true); // updatePayDetail(paydetail); // } else { - deletePayDetail(payDetail); + deletePayDetail(pay); // repository.deletePayDetail(paydetail); // } @@ -403,7 +403,8 @@ public class SettlementViewModel extends ViewModel { SettleData settleData = new SettleData(saleCount,saleAmount,preAuthCount,preAuthAmount,refundCount,refundAmount,caCount,caAmount); payDetail.setSettleDataObj(settleData); - payDetail.setCardSettleData(CardSettleData.convertFromPayDetail(payDetails)); + if(payDetails != null) + payDetail.setCardSettleData(CardSettleData.convertFromPayDetail(payDetails)); if(hostName == HostName.BPC) { long totalAmount = saleAmount + preAuthAmount + refundAmount + caAmount; diff --git a/app/src/main/res/layout/fragment_manual_entry_screen.xml b/app/src/main/res/layout/fragment_manual_entry_screen.xml index 76b316a..30aa0d1 100644 --- a/app/src/main/res/layout/fragment_manual_entry_screen.xml +++ b/app/src/main/res/layout/fragment_manual_entry_screen.xml @@ -164,7 +164,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:visibility="@{mViewModel.cvvVisibility}"> + android:visibility="invisible"> +