Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Kyaw_Min_Khant:4b03e2feaee19664cf7fc9d6180f9e2feadeb230
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:Production_2.0
Kyaw_Min_Khant:uat-release
Kyaw_Min_Khant:k
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
..
compare: Kyaw_Min_Khant:cdb7bb73c5ee4fafe75a39c64d59d1c61982d0b3
Branches Tags
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:Production_2.0
Kyaw_Min_Khant:uat-release
Kyaw_Min_Khant:k
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
Kyaw_Min_Khant:main

No commits in common. "4b03e2feaee19664cf7fc9d6180f9e2feadeb230" and "cdb7bb73c5ee4fafe75a39c64d59d1c61982d0b3" have entirely different histories.
4b03e2feae ... cdb7bb73c5

6 changed files with 9 additions and 141 deletions
Show Stats Expand all files Collapse all files

4
app/build.gradle
View File

@ -14,8 +14,8 @@ android {
applicationId "com.utsmm.kbz"
minSdk 24
targetSdk 33
versionCode 25
versionName "2.5"
versionCode 24
versionName "2.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

73
app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingCardFragment.java
View File

@ -168,29 +168,12 @@ public class ProcessingCardFragment extends DataBindingFragment {
transProcessViewModel.setTradeData(tradeData);
pinPadViewModel.setTradeData(tradeData);
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID && SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled() ) {
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID ) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
safeNavigateToRouteId();
return;
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_SALE && SystemParamsOperation.getInstance().getPreAuthManualEnabled()) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
safeNavigateToRouteId();
return;
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_COMPLETE && SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled()) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
safeNavigateToRouteId();
return;
}
// else if(sharedViewModel.transactionsType.getValue() == TransactionsType.REFUND) {
// sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_card_not_supported));
@ -255,28 +238,13 @@ public class ProcessingCardFragment extends DataBindingFragment {
transProcessViewModel.setTradeData(tradeData);
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID && SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled() ) {
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID ) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_SALE && SystemParamsOperation.getInstance().getPreAuthManualEnabled()) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_COMPLETE && SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled()) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
}
// else if(sharedViewModel.transactionsType.getValue() == TransactionsType.REFUND) {
// routeId = R.id.action_processingCardFragment_to_errorFragment;
// }
@ -306,39 +274,8 @@ public class ProcessingCardFragment extends DataBindingFragment {
emvTransactionViewModel.transType.setValue(sharedViewModel.transactionsType.getValue());
if (SystemParamsOperation.getInstance().isEmvEnabled()) {
prepareEmvTransaction();
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID && SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled() ) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
safeNavigateToRouteId();
return;
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_SALE && SystemParamsOperation.getInstance().getPreAuthManualEnabled()) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
safeNavigateToRouteId();
return;
}
if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_COMPLETE && SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled()) {
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
routeId = R.id.action_processingCardFragment_to_errorFragment;
safeNavigateToRouteId();
return;
}
routeId = R.id.action_processingCardFragment_to_emvTransactionFragment;
} else {
routeId = R.id.action_processingCardFragment_to_errorFragment;
sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_please_enable_emv));
@ -370,7 +307,9 @@ public class ProcessingCardFragment extends DataBindingFragment {
LogUtil.d(TAG,"card type:"+cardType);
LogUtil.d(TAG,"is MPU:"+isMPU);
// delayFunctionCall(()->{
//
// });
handlePreEmvProcess();
}

9
app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
View File

@ -639,15 +639,6 @@ public class TMSSetupsImpl implements TMSSetups{
}else if(TextUtils.equals(name, "is_duel_currency")){
SystemParamsOperation.getInstance().setDuelCurrencyStatus(parseBoolean(data));
}
else if(TextUtils.equals(name, "pre_auth_cancel_manual_enabled")) {
SystemParamsOperation.getInstance().setPreAuthVoidManualEnabled(parseBoolean(data));
}
else if(TextUtils.equals(name, "pre_auth_complete_manual_enabled")) {
SystemParamsOperation.getInstance().setPreAuthCompleteManualEnabled(parseBoolean(data));
}
else if(TextUtils.equals(name, "pre_auth_manual_enabled")) {
SystemParamsOperation.getInstance().setPreAuthManualEnabled(parseBoolean(data));
}
}
SystemParamsOperation.getInstance().setCarouselUrls(convertToString(imgUrls));

34
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java
View File

@ -1851,38 +1851,4 @@ public class SystemParamsOperation {
SystemParamsSettings paramsSettings = getSystemParamsSettings();
return paramsSettings.getDuelCurrencyStatus();
}
}
public void setPreAuthVoidManualEnabled(boolean preAuthVoidManualEnabled) {
SystemParamsSettings params = getSystemParamsSettings();
params.setPreAuthVoidManual(preAuthVoidManualEnabled);
saveSystemParamsSettings(params);
}
public boolean getPreAuthVoidManualEnabled() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getPreAuthVoidManual();
}
public void setPreAuthCompleteManualEnabled(boolean preAuthCompleteManualEnabled) {
SystemParamsSettings params = getSystemParamsSettings();
params.setPreAuthCompleteManual(preAuthCompleteManualEnabled);
saveSystemParamsSettings(params);
}
public boolean getPreAuthCompleteManualEnabled() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getPreAuthCompleteManual();
}
public void setPreAuthManualEnabled(boolean preAuthManualEnabled) {
SystemParamsSettings params = getSystemParamsSettings();
params.setPreAuthManual(preAuthManualEnabled);
saveSystemParamsSettings(params);
}
public boolean getPreAuthManualEnabled() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getPreAuthManual();
}
}

28
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
View File

@ -174,10 +174,6 @@ public class SystemParamsSettings implements Serializable {
private boolean isClearBatch = false;
private boolean isPreAuthVoidManual = false;
private boolean isPreAuthCompleteManual = false;
private boolean isPreAuthManual = false;
private boolean ssl_switch_status = false;
private boolean connect_status = false;
@ -535,30 +531,6 @@ public class SystemParamsSettings implements Serializable {
protected boolean getQRPayStatus() { return qrpay_status; }
protected void setPreAuthVoidManual(boolean status) {
this.isPreAuthVoidManual = status;
}
protected boolean getPreAuthVoidManual() {
return isPreAuthVoidManual;
}
protected void setPreAuthCompleteManual(boolean status) {
this.isPreAuthCompleteManual = status;
}
protected boolean getPreAuthCompleteManual() {
return isPreAuthCompleteManual;
}
protected void setPreAuthManual(boolean status) {
this.isPreAuthManual = status;
}
protected boolean getPreAuthManual() {
return isPreAuthManual;
}
protected boolean isAutoPrintCustomerCopy() {
return isAutoPrintCustomerCopy;
}

2
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java
View File

@ -110,7 +110,7 @@ public class BitmapConfig {
// public static final String BPC_PRE_AUTH_SALE_VOID_REVERSAL = "7234058008C09000"; // for tmk MPU
// public static final String BPC_PRE_AUTH_SALE_VOID_REVERSAL = "7230058008C09000"; // for KBZ MPU
// public static final String BPC_PRE_AUTH_SALE_VOID_REVERSAL = "7234058008C09000"; // for KBZ MPU added DE 14 Mar 25, 26
public static final String BPC_PRE_AUTH_SALE_VOID_REVERSAL = "7230058028C08000"; // from log March 25
public static final String BPC_PRE_AUTH_SALE_VOID_REVERSAL = "3230058028C08000"; // from log March 25
// public static final String BPC_PRE_AUTH_SALE_VOID_REVERSAL = "3230058028C19A00"; //DE55
//