diff --git a/TODO.md b/TODO.md index 03daf2c..e69de29 100644 --- a/TODO.md +++ b/TODO.md @@ -1,22 +0,0 @@ - - -2. Card Host - Settlement Screen - -KBZ Host MMK - 3000 (Not include in total net amount for void , preauth , preauth cancel) -Sale - 2000 -Void - 1000 -Preauth - 2500 -Preauth cancel - 500 -Preauth complete - 2000 - -KBZ Host USD - 3000 (Not include in total net amount for void , preauth , preauth cancel) -Sale - 2000 -Void - 1000 -Preauth - 2500 -Preauth cancel - 500 -Preauth complete - 2000 - -MMQR Pay - 3000 (Not include in total net amount for refund transaction and cancel transaction) -QR pay - 4000 -Refund - 1000 \ No newline at end of file diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java index 58c4157..fca4edf 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java @@ -349,6 +349,12 @@ public class SettlementTransactionFragment extends DataBindingFragment implement } catch (IllegalStateException e) { LogUtil.e("SettlementTransactionFragment", "QR: Database cursor error - " + e); } + + settlementViewModel.qr_sale_count.setValue(qrSaleCount); + settlementViewModel.qr_sale_amount.setValue(qrSaleAmount); + settlementViewModel.qr_refund_count.setValue(qrRefundCount); + settlementViewModel.qr_refund_amount.setValue(qrRefundAmount); + settlementViewModel.qr_section_visibility.setValue(qrCount > 0 ? 0 : 8); } }); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java index b8c758a..bb034ae 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java @@ -81,6 +81,9 @@ public class SettlementViewModel extends ViewModel { public MutableLiveData qr_sale_count = new MutableLiveData<>(); public MutableLiveData qr_sale_amount = new MutableLiveData<>(); public MutableLiveData qr_sale_breakdown = new MutableLiveData<>(); + public MutableLiveData qr_refund_count = new MutableLiveData<>(); + public MutableLiveData qr_refund_amount = new MutableLiveData<>(); + public MutableLiveData qr_section_visibility = new MutableLiveData<>(8); public MutableLiveData void_count = new MutableLiveData<>(); public MutableLiveData void_amount = new MutableLiveData<>(); @@ -163,6 +166,11 @@ public class SettlementViewModel extends ViewModel { sale_count.setValue(0); sale_amount.setValue(0L); sale_breakdown.setValue(""); + qr_sale_count.setValue(0); + qr_sale_amount.setValue(0L); + qr_sale_breakdown.setValue(""); + qr_refund_count.setValue(0); + qr_refund_amount.setValue(0L); void_count.setValue(0); void_amount.setValue(0L); void_breakdown.setValue(""); diff --git a/app/src/main/res/layout/fragment_view_batch_screen.xml b/app/src/main/res/layout/fragment_view_batch_screen.xml index c0319e2..f70bab1 100644 --- a/app/src/main/res/layout/fragment_view_batch_screen.xml +++ b/app/src/main/res/layout/fragment_view_batch_screen.xml @@ -312,6 +312,40 @@ android:textSize="16sp" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EXP ECHO test Cash Deposit - Cash Out + Cash Adv Test Process Sale PreAuthComplete @@ -251,12 +251,12 @@ Trace No is Empty! Trace No not found! Please enter approval code! - Credit Type - Count - Totals + TXN Type + CNT + AMOUNT Sale Void - Sale Completion + Pre-Auth Comp Refund Amount Tips Amount 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 2ef24c9..d4114c6 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 @@ -332,13 +332,13 @@ public abstract class BaseXPrint { dotBreak(); // printer.appendPrnStr("Refund Total:MMK", "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false); - print2ColumnsString("Refund Total:MMK", "-" + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal)); + print2ColumnsString("Refund Total:", "-" + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + "MMK"); dotBreak(); // printer.appendPrnStr("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + " ", fontNormal, false); - print2ColumnsString("SALE TOTAL :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal)); + print2ColumnsString("SALE TOTAL :", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + "MMK"); dotBreak(); // printer.appendPrnStr("Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + " ", fontNormal, false); - print2ColumnsString("TOTAL : MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal)); + print2ColumnsString("GRAND TOTAL :", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + "MMK"); dashBreakEnding(); emptyLine(1); }