Merge remote-tracking branch 'origin/uat/merged_settlement' into uat/merged_settlement

CHANGELOG.md

@@ -59,3 +59,34 @@
 - **General**
 - show total for each currency for duel currency
 - void, pre-auth, cash adv, refund can now control from TMS for paper receipt
+
+## [2.40]
+- 1. QR Host
+   When we generate QR , this transaction not successful.
+   But this transaction included as success transaction in summary report and history.
+   Please remove "CANCEL" records in summary report and history.
+
+- 2. Card Host
+   Settlement Screen
+
+- 3. 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
+
+
+- 4. 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
+
+- 5. MMQR Pay - 3000 (Not include in total net amount for refund transaction and cancel transaction)
+   QR pay - 4000
+   Refund - 1000
+
+- 6. Reprint Last Settlement Report
+   Same process with settlement