diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingFragment.java index a1656be..1b962f8 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingFragment.java @@ -462,20 +462,6 @@ public class ProcessingFragment extends DataBindingFragment { }); } - - private String mapDE3ToShortCode(String de3) { - if (de3 == null) return "UNK"; - - switch (de3) { - case "000000": return "S"; // Sale - case "020000": return "V"; // Void - case "200000": return "R"; // Refund - case "030000": return "P"; // Preauth - case "310000": return "PC"; // Preauth Complete - } - return "UNK"; // Unknown - } - public static String mapTransactionType(int type) { switch (type) { case 1: // SALE @@ -570,7 +556,7 @@ public class ProcessingFragment extends DataBindingFragment { EReceiptCardRequest request = new EReceiptCardRequest(); request.setDE2(PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo())); - request.setDE3(mapDE3ToShortCode(payDetail.getProcessCode())); + request.setDE3(mapTransactionType(payDetail.getTransactionType())); request.setDE4(amount); request.setDE7(currentTimestamp); request.setDE11(payDetail.getVoucherNo()); diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java index 0a4cc12..669fb1c 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java @@ -503,14 +503,14 @@ public class SharedViewModel extends ViewModel { // Parse JSON to model EReceiptResponse res = new Gson().fromJson(errorJson, EReceiptResponse.class); Log.e("E-Receipt", "Parsed Error => " + res.getMessage()); - postToastMsg("E-Receipt save failed!"); + postToastMsg("E-Receipt could not save!"); } catch (Exception e) { e.printStackTrace(); - postToastMsg("E-Receipt save failed!"); + postToastMsg("E-Receipt could not save!"); } } else { Log.e("E-Receipt", "Unexpected error => " + error.getMessage()); - postToastMsg("E-Receipt save failed!"); + postToastMsg("E-Receipt could not save!"); } } );