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

removed AID for JCB cards and Pre Auth Flow is fixed

Browse Source
This commit is contained in:
kizzy 2026-05-19 12:25:49 +07:00 committed by moon
parent 8f218b5c99
commit 5e40b948de
8 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/utsmm/kbz/ui/core_ui/InputRRNFragment.java
View File

@ -245,6 +245,8 @@ public class InputRRNFragment extends DataBindingFragment {
} else { } else {
LogUtil.d(TAG,"PreAuth Cancel RRN not found!");
terminateProcess(isECR); terminateProcess(isECR);
} }

4
app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/EmvTransactionProcessViewModel.java
View File

@ -457,8 +457,8 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
@Override @Override
public void processPreVoidDb(PayDetail payResult) { public void processPreVoidDb(PayDetail payResult) {
mPayDetail.setIsCanceled(true); oldTransPayDetail.setIsCanceled(true);
updatePayDetail(mPayDetail); updatePayDetail(oldTransPayDetail);
repository.insertPayDetail(updateCurrentDateAndTime(payResult)); repository.insertPayDetail(updateCurrentDateAndTime(payResult));
} }

4
app/src/main/java/com/utsmm/kbz/ui/manual_entry/ManualEntryFragment.java
View File

@ -77,7 +77,7 @@ public class ManualEntryFragment extends DataBindingFragment {
} }
private void processEmvCard() { private void processEmvCard() {
if(sharedViewModel.transactionsType.getValue() == TransactionsType.REFUND || sharedViewModel.transactionsType.getValue() == TransactionsType.PRE_AUTH_VOID) { if(sharedViewModel.transactionsType.getValue() == TransactionsType.REFUND || sharedViewModel.transactionsType.getValue() == TransactionsType.PRE_AUTH_VOID || sharedViewModel.transactionsType.getValue() == TransactionsType.PRE_AUTH_COMPLETE) {
routeId = R.id.action_manualEntryFragment_to_inputRRNFragment; routeId = R.id.action_manualEntryFragment_to_inputRRNFragment;
} else { } else {
routeId = R.id.action_manualEntryFragment_to_emvTransactionFragment; routeId = R.id.action_manualEntryFragment_to_emvTransactionFragment;
@ -106,7 +106,7 @@ public class ManualEntryFragment extends DataBindingFragment {
payDetail.setICC55(""); payDetail.setICC55("");
// payDetail.setAuthNo(manualEntryViewModel.cvv.getValue()); // payDetail.setAuthNo(manualEntryViewModel.cvv.getValue());
emvTransactionProcessViewModel.cardNum.setValue(cardNo);
emvTransactionProcessViewModel.setTradeData(tradeData); emvTransactionProcessViewModel.setTradeData(tradeData);
safeNavigateToRouteId(); safeNavigateToRouteId();

2
baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
View File

@ -143,7 +143,7 @@ public interface PayDetailDao {
@Query(("SELECT * FROM paydetail WHERE isCanceled = 0 AND CardNo IN(:cardNo) AND referNo IN(:referNo)")) @Query(("SELECT * FROM paydetail WHERE isCanceled = 0 AND CardNo IN(:cardNo) AND referNo IN(:referNo)"))
LiveData<PayDetail> searchPayDetail(String cardNo,String referNo); LiveData<PayDetail> searchPayDetail(String cardNo,String referNo);
@Query(("SELECT * FROM paydetail WHERE isCanceled = 0 and isAdjust = 0 AND CardNo IN(:cardNo) AND referNo IN(:referNo)")) @Query(("SELECT * FROM paydetail WHERE isCanceled = 0 AND isAdjust = 0 AND CardNo IN(:cardNo) AND referNo IN(:referNo)"))
LiveData<PayDetail> searchPayDetailPreCancel(String cardNo,String referNo); LiveData<PayDetail> searchPayDetailPreCancel(String cardNo,String referNo);

2
baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamOperation.java
View File

@ -116,7 +116,7 @@ public class EmvParamOperation extends ParamOperation{
processPayWave(); processPayWave();
processPayPass(); processPayPass();
processQuickPass(); processQuickPass();
processJSpeedy(); // processJSpeedy();
processMPUCtls(); processMPUCtls();
processChips(); processChips();
processRids(); processRids();

7
baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
View File

@ -179,7 +179,8 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
protected boolean isSecondCall = false; protected boolean isSecondCall = false;
protected int mProcessStep; protected int mProcessStep;
protected int mAppSelect = 0; protected int mAppSelect = 0;
private static final String[] RESTRICTED_BINS = {"624430", private static final String[] RESTRICTED_BINS = {
"624430",
"624431", "624431",
"624445", "624445",
"626220", "626220",
@ -291,7 +292,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
setTransactionLimitForMPUCtls(false); setTransactionLimitForMPUCtls(false);
// emvHandler.contactlessConfigKernelId(EmvCardBrandEnum.EMV_CARD_BRAND_JCB,(byte) 0x01,ByteUtils.hexString2ByteArray("06")); emvHandler.contactlessConfigKernelId(EmvCardBrandEnum.EMV_CARD_BRAND_JCB,(byte) 0x01,ByteUtils.hexString2ByteArray("06"));
emvHandler.contactlessAppendAidIntoKernel(EmvCardBrandEnum.EMV_CARD_BRAND_MASTER, (byte) 0x07, ByteUtils.hexString2ByteArray("A0000008890101")); emvHandler.contactlessAppendAidIntoKernel(EmvCardBrandEnum.EMV_CARD_BRAND_MASTER, (byte) 0x07, ByteUtils.hexString2ByteArray("A0000008890101"));
// emvHandler.contactlessAppendAidIntoKernelFirst(true); // emvHandler.contactlessAppendAidIntoKernelFirst(true);
LogUtil.d(TAG, "TransData :" + transData.getTransAmount()); LogUtil.d(TAG, "TransData :" + transData.getTransAmount());
@ -1238,7 +1239,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
emvHandler.setTlv(new byte[]{(byte) 0xDF, (byte) 0x81, (byte) 0x1B}, new byte[]{(byte) 0x30}); emvHandler.setTlv(new byte[]{(byte) 0xDF, (byte) 0x81, (byte) 0x1B}, new byte[]{(byte) 0x30});
//EMV MODE :amount >contactless cvm limit, set 60 = online pin and signature , set 20 = signature //EMV MODE :amount >contactless cvm limit, set 60 = online pin and signature , set 20 = signature
emvHandler.setTlv(new byte[]{(byte) 0xDF, (byte) 0x81, (byte) 0x18}, new byte[]{(byte) 0xF0}); //F8 emvHandler.setTlv(new byte[]{(byte) 0xDF, (byte) 0x81, (byte) 0x18}, new byte[]{(byte) 0xF0}); //F8 //F0
//EMV mode :amount < contactless cvm limit, set 08 = no cvm //EMV mode :amount < contactless cvm limit, set 08 = no cvm
emvHandler.setTlv(new byte[]{(byte) 0xDF, (byte) 0x81, (byte) 0x19}, new byte[]{(byte) 0x08}); //08 emvHandler.setTlv(new byte[]{(byte) 0xDF, (byte) 0x81, (byte) 0x19}, new byte[]{(byte) 0x08}); //08

6
baselib/src/main/res/raw/contacts_config.json
View File

@ -530,7 +530,7 @@
"currencyCode": "0104" "currencyCode": "0104"
}, },
{ {
"aidEnable": true, "aidEnable": false,
"aid": "A00000006510", "aid": "A00000006510",
"cardScheme": "JCB", "cardScheme": "JCB",
"applicationVersion": "0030", "applicationVersion": "0030",
@ -553,7 +553,7 @@
"currencyCode": "0104" "currencyCode": "0104"
}, },
{ {
"aidEnable": true, "aidEnable": false,
"aid": "A0000000651010", "aid": "A0000000651010",
"cardScheme": "JCB", "cardScheme": "JCB",
"applicationVersion": "0030", "applicationVersion": "0030",
@ -576,7 +576,7 @@
"currencyCode": "0104" "currencyCode": "0104"
}, },
{ {
"aidEnable": true, "aidEnable": false,
"aid": "A0000001570040", "aid": "A0000001570040",
"cardScheme": "JCB", "cardScheme": "JCB",
"applicationVersion": "0030", "applicationVersion": "0030",

10
baselib/src/main/res/raw/rid_config.json
View File

@ -309,5 +309,15 @@
"exponent": "03", "exponent": "03",
"expDate": "20201231", "expDate": "20201231",
"checkSum": "43A3151513B7ADCEB92DBEA2A262CEB336D26C83" "checkSum": "43A3151513B7ADCEB92DBEA2A262CEB336D26C83"
},
{
"rid": "A000000065",
"indx": "13",
"hashInd": "01",
"arithInd": "00",
"modul": "A3270868367E6E29349FC2743EE545AC53BD3029782488997650108524FD051E3B6EACA6A9A6C1441D28889A5F46413C8F62F3645AAEB30A1521EEF41FD4F3445BFA1AB29F9AC1A74D9A16B93293296CB09162B149BAC22F88AD8F322D684D6B49A12413FC1B6AC70EDEDB18EC1585519A89B50B3D03E14063C2CA58B7C2BA7FB22799A33BCDE6AFCBEB4A7D64911D08D18C47F9BD14A9FAD8805A15DE5A38945A97919B7AB88EFA11A88C0CD92C6EE7DC352AB0746ABF13585913C8A4E04464B77909C6BD94341A8976C4769EA6C0D30A60F4EE8FA19E767B170DF4FA80312DBA61DB645D5D1560873E2674E1F620083F30180BD96CA589",
"exponent": "03",
"expDate": "20201231",
"checkSum": "54CFAE617150DFA09D3F901C9123524523EBEDF3"
} }
] ]