receipt fix

app/build.gradle.kts

@@ -40,8 +40,8 @@ android {
             dimension = "env"
             applicationIdSuffix = ".uat"
             versionNameSuffix = "-UAT"
-            versionCode = 15
+            versionCode = 17
-            versionName = "3.3"
+            versionName = "3.5"
             buildConfigField("String", "ENV", "\"UAT\"")
             resValue("string", "app_name", "MOB-UAT")
         }

app/src/main/java/com/mob/utsmyanmar/auto_settlement/SettlementScheduler.kt

@@ -29,7 +29,7 @@ object SettlementScheduler {
 
         val configuredTime = parseTime(
 //            SystemParamsOperation.getInstance().clearBatchTime
-            "10:50:00"
+            "21:35:00"
         ) ?: parseTime(FALLBACK_ALERT_TIME)!!
 
         val calendar = Calendar.getInstance().apply {

paylibs/src/main/java/com/utsmyanmar/paylibs/print/PrintReceipt.java

@@ -575,7 +575,7 @@ public class PrintReceipt {
 
             String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
 
-            String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
+//            String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
 
             sunmiPrinterService.sendRAWData(boldOn(), null);
             sunmiPrinterService.setAlignment(1, null);
@@ -596,7 +596,7 @@ public class PrintReceipt {
             } else {
                 sunmiPrinterService.printText("***** CUSTOMER COPY *****" + "\n", null);
             }
-            sunmiPrinterService.printText(finalVersion + "\n", null);
+//            sunmiPrinterService.printText(finalVersion + "\n", null);
             sunmiPrinterService.printText(receiptFooter + "\n", null);
 
         } catch (RemoteException e) {

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java

@@ -202,11 +202,11 @@ public abstract class BaseXPrint {
 
         try {
             String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
-            String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
+//            String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
 
             sunmiPrinterService.setFontSize(textSize, innerResultCallback);
 //            sunmiPrinterService.printText("***** MERCHANT COPY *****" + "\n", innerResultCallback);
-            sunmiPrinterService.printText(finalVersion + "\n", innerResultCallback);
+//            sunmiPrinterService.printText(finalVersion + "\n", innerResultCallback);
             sunmiPrinterService.printText(receiptFooter + "\n", innerResultCallback);
         } catch (RemoteException e) {
             e.printStackTrace();
@@ -267,6 +267,7 @@ public abstract class BaseXPrint {
             }
                 sunmiPrinterService.printText("REF NUM     : "  + payDetail.getReferNo() + "\n", innerResultCallback);
                 sunmiPrinterService.printText("TRACE NO    : " + payDetail.getVoucherNo() + "\n", innerResultCallback);
+                sunmiPrinterService.printText("APR CODE    : " + payDetail.getApprovalCode() + "\n", innerResultCallback);
 //            sunmiPrinterService.printColumnsString(new String[]{"REF NUM", ":" + payDetail.getReferNo()}, new int[]{1, 2}, new int[]{0, 0}, innerResultCallback);
 //            sunmiPrinterService.printColumnsString(new String[]{"TRACE No", ":" + payDetail.getVoucherNo()}, new int[]{1, 2}, new int[]{0, 0}, innerResultCallback);
 
@@ -718,7 +719,7 @@ public abstract class BaseXPrint {
 
             String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
 
-            String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
+//            String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
 
             sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
             sunmiPrinterService.setAlignment(1, innerResultCallback);
@@ -761,7 +762,7 @@ public abstract class BaseXPrint {
             } else {
                 sunmiPrinterService.printText("***** CUSTOMER COPY *****" + "\n", innerResultCallback);
             }
-            sunmiPrinterService.printText(finalVersion + "\n", innerResultCallback);
+//            sunmiPrinterService.printText(finalVersion + "\n", innerResultCallback);
             sunmiPrinterService.printText(receiptFooter + "\n", innerResultCallback);
 
         } catch (RemoteException e) {

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java

@@ -48,14 +48,14 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
         opts.inJustDecodeBounds = true;
 
 // Step 1: Only read dimensions first
-        BitmapFactory.decodeResource(resources, R.drawable.mob_print_logo, opts);
+        BitmapFactory.decodeResource(resources, R.drawable.logo_mob_receipt, opts);
 
 // Step 2: Calculate sample size so width <= 384px
         opts.inSampleSize = calculateInSampleSize(opts, 384, 384);
         opts.inJustDecodeBounds = false;
 
 // Step 3: Decode scaled-down bitmap
-        bitmap = BitmapFactory.decodeResource(resources, R.drawable.mob_print_logo, opts);
+        bitmap = BitmapFactory.decodeResource(resources, R.drawable.logo_mob_receipt, opts);
     }
 
     @Override
@@ -172,6 +172,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
         try {
             setHeight(0x12);
             printLogo();
+            sunmiPrinterService.lineWrap(1, innerResultCallback);
             printMerchantHeader();
             printTransHeader(payDetail);
             printTransDetailWave(payDetail);