From 117c93a2c44cd238af2a67a8254534ab6f8129d2 Mon Sep 17 00:00:00 2001
From: moon <56061215+MgKyawLay@users.noreply.github.com>
Date: Mon, 28 Sep 2026 13:57:41 +0630
Subject: [PATCH] package for jcb

---
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   3 ++-
 CHANGELOG.md                                  |   3 +++
 app/build.gradle                              |   4 ++--
 .../kbz/ui/adapters/MyBindingAdapter.java     |   4 +---
 .../utsmm/kbz/ui/qr_pay/QRRefundFragment.java |   2 +-
 .../baselineProfiles/0/app-uat-release.dm     | Bin 3236 -> 3239 bytes
 .../baselineProfiles/1/app-uat-release.dm     | Bin 3148 -> 3151 bytes
 app/uat/release/output-metadata.json          |   4 ++--
 .../utsmyanmar/baselib/TerminalKeyUtil.java   |   3 ++-
 .../paylibs/print/printx/BaseXPrint.java      |   2 +-
 .../utils/AuthorizationProcessUtil.java       |   8 ++++++++
 13 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8e60dc8..90679bc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="temurin-17" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a8a2b16..991a888 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f514dfb..2468fa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,3 +105,6 @@ card
 
 
 ## [2.43]
+- settlement can now send without Tid, Mid but only Qr
+- USD sale, void fixed that showing only MMR
+- fixed QR records showing previous data when settle
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 179e212..100e41d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,8 +39,8 @@ android {
             applicationId "com.utsmm.kbz.uat"
             versionNameSuffix "-uat"
             resValue "string", "app_name", "KBZ-UAT"
-            versionCode 48
-            versionName "2.43"
+            versionCode 49
+            versionName "2.44"
         }
 
         prod {
diff --git a/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java b/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java
index 84f015b..5b6289b 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/adapters/MyBindingAdapter.java
@@ -310,9 +310,7 @@ public class MyBindingAdapter {
     @BindingAdapter({"isTrace"})
     public static void checkIsTraceOrInvoice(TextView textView, PayDetail payDetail) {
         if(payDetail.getTransactionType() == TransactionsType.MMQR.value || payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
-//            textView.setText("INV:"+payDetail.getInvoiceNo());
-            //tempo fix for qr trace num
-            textView.setText("TRC:"+payDetail.getVoucherNo());
+            textView.setText("INV:"+payDetail.getInvoiceNo());
         } else {
             textView.setText("TRC:"+payDetail.getVoucherNo());
         }
diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java
index a0813e1..c19a5e3 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java
@@ -134,7 +134,7 @@ public class QRRefundFragment extends DataBindingFragment {
 
         List<PayDetail> filteredList = new ArrayList<>();
         for(PayDetail item: originalList){
-            boolean match = item.getVoucherNo() != null && item.getVoucherNo().contains(keyword);
+            boolean match = item.getInvoiceNo() != null && item.getInvoiceNo().contains(keyword);
             if(match){
                 filteredList.add(item);
             }
diff --git a/app/uat/release/baselineProfiles/0/app-uat-release.dm b/app/uat/release/baselineProfiles/0/app-uat-release.dm
index 847c2e94165d25a8eebb5d1cb59ed4e21b811509..cb6b943cfd114918b4437f39a464552ac6c18f1a 100644
GIT binary patch
delta 2883
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
E7bPQrVE_OC

delta 2880
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

diff --git a/app/uat/release/baselineProfiles/1/app-uat-release.dm b/app/uat/release/baselineProfiles/1/app-uat-release.dm
index 69f14276ed2f9e3208d5fd014a917eef3a444470..6f51070481a15e744521026f1ec463b6a00642b8 100644
GIT binary patch
literal 3151
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
b-*LrGM#4-CPM`UGO?|w)j%^G5@7=!v#-P?P

literal 3148
zcmZ`*XH*l|5)MTYx+qVSE(nMs5L##wG$PFcks@6>NKfb(BCxcji-7dr`_dDN2!^uK
zg@7PcdJB-y%fq*O-m-h%n|tPbbI;tlKfbwl&ZnVHLCFjNfk1!=<9`_eE*RZ;?2NE=
zFhzI?J0qN|$Yg0glg<NxC|DFgZV?Fp2+{xmo@DEW^fuayH+=gV1RxNoxN?u7>i}nJ
z&6c&WYvpKJvH-4-E|Z6i_BP*VHSy6RiTJ?f(NK&8$TG9$NzN--OeqGwrc+QcV5B=b
zqFK1n=P#|Kht<pHusnTVHg=SPOgr=fceC1j+V!1j+B|AHo7zD&>`fq@-~t^Mc*>a1
zl2M$8!&six7GIO+eL-n~drnKGEHOrEEyZ_Ec0!Bu#!Y=nVePtXoyFWsdAEmuQ2NBZ
zTLq3|40TJ{!J54@K%dk>8a`ZWuorim0<7?XpoTw}v`r*DYVc8RtlA|$T)ftXmOqrF
z6lWLrkguH^3Uco*2)O>G^{n8L9MUhF;V@WUJyfAzGl<dR^6^`;*RaPT#5qjAxIOnS
zED?ngs^f)J_;GBlvFwN}cy|_r>PM@FDA85C<v`VM+oujCkfwuAFRQb;e&FR?4GNd9
z$mYWD1)P2b-B^s2-Op4`5opJ_yq{4=?`KF!gCy^Qol(&gmF;BB;kgX%E6ZV|-}11!
zB@vBFH(dJ3?ygarEd|J`$9>G~I7Lonm^+P5iQKN_Y8Mwde#s@1kx%d4O@J8|Oh4>M
z3O8j~^1DG?S5tpqp+kh~QM=<=#P(Y6PdWN_7EnWpAKeuD-gHvjP^iuZ;)78Sl#gfT
z4#8Y=6C{{2din|b((3N?xBjbp3~tNMBU1=74T0f?am}52W2*vM!SXM~L)=l1oAVfa
zC~(9Xndym>6Emmj>K7f0v@2b<Ko2~l9JO7*lSs)d$TS59vR=$Q86mgFB6*osZqBAH
z#g1S38LmG)Mdr@xCk8eIx5qqYLiUT>{ockB7}pvQNqE9!(q3V`PdG@e9EIYt>hum$
zB<mdyW0CZPY>}fmq!_AoIpEFvu0oiII8x5_Wdb%|dc3pdaVQE5+$T<KjFi4NI#Xjq
zV!RJu0J-o{c6l79ao~!ZLA5c`;6SMHSz>I8+YIm_=PUmv<H8>!4Ulvg5Sqr6=CJf(
z&s)rHAULJ3B_+V5FF_Vk$0iPEC-Q#QTG6DCQ0?kD*?QBvBL+#Y64<{2{b6B@r~~5c
zdrzhVcAlO%+}WW6m@l*;1$sAl2qgUO;_gbfhmA&)6pnpI@|yeCPe}xMAlu#*@9w40
zmYtU#RfFz)`&CrO4UP+e-+KaNP#MZkXTvz7+3d`XM<0~<z3dEWJ#00SL)6}$@kp(&
z<n%EUZg1m4j_?LY)+{la5EmA*p*tD;uH3i)<WpKLD}@myp%IP5Rl!Sbq`)t-p2B7v
z2}5T)uY=_!7ac`P=9+c1inr<M_dPcHWWPYvNg-`AujG5FK-PY;h;~hW>#|jsT_BqU
zPHWdC?AvuluF(U`VEp)Xb*M4gnL*C{K;IuVXZNpdKhgZneC@~bD`2#x6LJ2=Tj&Ua
zKdP+}oUlxLe0z@0Idb9)quk-6=h#)6Z$LCn651c<xniIZdZ@@}vqgb6Db%rJAxf4A
z568nDz%`;Y>@kVT(ckhGF^a{!j747s(SvRFzoi-cC|4^DdCa#LjNC3sD5_?7ZJ8Qy
zWE&~lGmo?09=7?`ugZ__T-4IP<?vgcsq#$&5eJbxw+z^>|Ax)A*iyM6Z9#bREcTgH
zcN?b;Tx&UYMK86?QJ*zJ`c;Z0ju%v5xK4=?5;nN8J05iN73ey7(A)n27ZZ6Gw)xg9
zNp~(uj7ybE_*TA>_xE=ZIc35+g75u8H6FMJmFq%yqg0hTFhxHSi2Al91;II1(jo7p
zcop66NjY1U3aZ~cygP`4h3x#wV||7D>;1I+pP87Ga|*SJj8`_J1sQqPsCc)6tyW}@
zOq%Ut+3&fs>rXUfd~K>KsmqF2x<VJ1i1vH54HD)XVyX*59Z}8dmDXEYnhP<37S9x#
zZbos|v+*^;#_s3)68dtRUzGo{=+E0VCU;Way<C{z){Yi@ze(kRR?oR>A3JI0AyImq
z;Lm>6qpQyfwCwoZTOhM$c{AUbzMNS8-JPJ;7N5h<kOLL!4F4W;O_c%dq}i16##Fe7
z{!(tes>pX4->^Q3N$BZ9e6V**6Z*_Hrs-<2*?rlArBC;4A_M2kf~N#K$8~#~+-C;u
zRg3tx^i72zXUna2XqMR`N(jUv81h^VoU>+x<{!(xNcEqLXFtl2m+z*$rXYMd1lJhm
zWeYqc(Y4eL-{ptnlt)x84U*BK_+*4#&Za+!zABwLVBz7R6&_2Urdi*p>??c1N!>Eg
zf;2nSE9kUtY>U&gSJ(xu4Ub#Ej&`s-mh0B2aYf(7H5eq}&5{azxZ{=MJKhd4wbGiC
zC$ogv`}@bfrdS1)k$p1l2?JgZBh%>A1?|nR3N$+^bG|Y8Cn6nP=Gv+f@1mCJ$zUHZ
zi&E140jK#)(#0mMW%Nl_)zZa6vta`XSE-K;8wieuF1SI=8!3sgVQa^sx~In>v8)Lm
zQZgeWiMc9Sxm%2=6XThXIlFyB@#wh8q&TG(t^0NLWe-~3jo-ZMd=eJJ%-}{jqqa=z
z3g5+K6*OpFJxom~cMu{qEo4f0-MV6%M9^ul(u1Lf6E_yKGaF86PNHj{>+Ct1pHjS2
zL6+7=N5EVN*?OnXyIm9@QaYgazA_;~1_F|$GUeg1ZX1F3y)(M2*x}ceEZ5sS=KP7x
z^Hm1ywFvZ9M6B>>cE(hn=Y4s%Me%X0rFwupM>Fy3$|z%>$>7cqi8z<uv^a5(&F-0r
zA!0H)8?8E6U2W_QS!=b$nD4{O?N8dgwAA^P5GIF#zNt$gk;NVJ5k4Y~+j#W)cuN(x
zK?3C0gd8c9iWD5~t5KUSJ;6Os3pLpOJvJ&IO>Q8RzdPe}%8o8y3>WYp2h)ZD1E(B9
z*{eeTd?*(ooWXCVc#4J7h$oCwo$_6!P}+zuKguw7>XMTnaG%xtCOjfNXN8e7a?Qta
zU=^#S_XO&he$DZ9yl_)x^_pt^EtetHO(&MA)i9F}vYYtU7>PBO2g#`e%%Lu%ikgC>
z8m==20L)`)EL&V#5;GIUBj2EEe|N)?p^Is&y1PGgug`VvEQW*587qLD*VR$lEQL?u
zIj!;=NQC2Bwi=10u2<`?`;G>g$J}FAtWH&!q-(jcMiD*pEk|$ZK1J9%uL-5;amNk?
zvwQEmJR6J1rBCs0pQ+u>IPGC!&^=;BRha%UlSF$jtI!<s3>@I1@XZqA2VW5>lD6yr
z9ak4QnYiwEd2inSpSiPp<oovc3qx)K;P({K9a}ef)Vs9_`L?=1?<^MkKR)Ihs~;BU
z<}s4;x7<fhC2r30h!d_o64$(>{G5h55QOO<szA?0qwKkB{9oZo{}18mKn5b)J9S1l
z07ON_0OWu%G5}!r{ER1=k*1s@IhdJ!9J>b0isR<a&3;S8L-Xu`Qrjg(Y9oxpw6Wpa
zt2r6d<gU&js}U*cwOD*MM11pLOp(n5nv9tosoGrced;IfSQr4q#kGmrkKUKM4YrW7
z{qRf4Hdrl7f$FxXI8{^7J!1*PExO+sCh@bU*PKg;9lc=O&6bKZ;y{&hnDmTE_d5=j
z@EFxZ^~y{!JFBHY3|vqmDt=;Rp71O+@1VwOn*C0ee@ankEH7;d^z7G^(Zz#%NVrc_
z|5-(2O!14pmqUZ;W}%Kq*3F(J8HG3ScrERyCqRK&>X9!ff{yGK^`dv%%GKiy&68`7
zfAScB?oy;bX90BX8tP=^%z(cn{6&s`O8CFqMM3}1%8R%D?7?5=b>6Rwl@1!}m#BWG
O$<LSDIkwXN-2EG#^w-S*

diff --git a/app/uat/release/output-metadata.json b/app/uat/release/output-metadata.json
index 2c82620..9d8ed29 100644
--- a/app/uat/release/output-metadata.json
+++ b/app/uat/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 47,
-      "versionName": "2.42-uat",
+      "versionCode": 48,
+      "versionName": "2.43-uat",
       "outputFile": "app-uat-release.apk"
     }
   ],
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java b/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java
index ad85785..2c171f2 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java
@@ -25,7 +25,8 @@ public final class TerminalKeyUtil {
 //    private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("B4D74774CC846CAFF6D1AAAC2EB79CFF".toUpperCase()); // KBZ UAT
 //    private static final byte[] main_key_usd_data = ByteUtil.hexStr2Bytes("3f4bcac6cc559ab12bbbc5a51118f3f5".toUpperCase()); // KBZ UAT
 //    private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("3F4BCAC6CC559AB12BBBC5A51118F3F5".toUpperCase());
-    private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("b4d74774cc846caff6d1aaac2eb79cff".toUpperCase());
+//    private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("b4d74774cc846caff6d1aaac2eb79cff".toUpperCase());
+    private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("875f63741753d18811a3449090d1777b".toUpperCase());
 //    private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("e121249099a677e8b7d4f6a9d49fe8d1".toUpperCase()); // MPU
     private static final byte[] work_key_data = new byte[16];
     public static void initNexKey() {
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
index 7e23097..b80c25e 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
@@ -1286,7 +1286,7 @@ public abstract class BaseXPrint {
 
                 printString("CARD TYPE:" + pay.getAccountType());
                 printString("CARD NO  :" + PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo()));
-                printString("INV  NO  :" + pay.getVoucherNo());
+                printString("INV  NO  :" + pay.getInvoiceNo());
                 printString("RRN      :" + pay.getReferNo());
                 printString("DATE     :" + POSUtil.getInstance().formatDisplayDate(pay.getTransDate()));
                 printString("          " + pay.getTransTime());
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java
index 387a9f8..3e11683 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java
@@ -72,6 +72,9 @@ public class AuthorizationProcessUtil {
                         case "104":
                             emvOnlineResult.setRejCode("62");
                             break;
+                        case "123":
+                            emvOnlineResult.setRejCode("61");
+                            break;
                         default:
                             emvOnlineResult.setRejCode(field39.getDataStr());
                             break;
@@ -116,6 +119,7 @@ public class AuthorizationProcessUtil {
             String value71 = null;
             String value72 = null;
             String value91 = null;
+            String value61 = null;
             if (f055Valid) {
                 String f55 = field55.getDataStr();
                 Map<String, String> tlvMap = TLVUtils.builderAuthorizationProcessMap(f55);
@@ -166,6 +170,10 @@ public class AuthorizationProcessUtil {
                 tagList.add("91");
                 valueList.add(value91);
             }
+            if (value61 != null && value61.length() > 0) {
+                tagList.add("61");
+                valueList.add(value61);
+            }
 
             int size = tagList.size();
             byte[] outData = new byte[24];