diff --git a/image/before_member/bn_change_pass_mmr.png b/image/before_member/bn_change_pass_mmr.png index f397251f..a9145274 100644 Binary files a/image/before_member/bn_change_pass_mmr.png and b/image/before_member/bn_change_pass_mmr.png differ diff --git a/image/before_member/bn_check_coupon_mmr.png b/image/before_member/bn_check_coupon_mmr.png index 7742f57d..cda2a603 100644 Binary files a/image/before_member/bn_check_coupon_mmr.png and b/image/before_member/bn_check_coupon_mmr.png differ diff --git a/image/before_member/bn_topup_credit_mmr.png b/image/before_member/bn_topup_credit_mmr.png index d8a22e67..4a5772e3 100644 Binary files a/image/before_member/bn_topup_credit_mmr.png and b/image/before_member/bn_topup_credit_mmr.png differ diff --git a/image/before_member/bp_change_pass_mmr.png b/image/before_member/bp_change_pass_mmr.png index 5784d20f..7f93fc69 100644 Binary files a/image/before_member/bp_change_pass_mmr.png and b/image/before_member/bp_change_pass_mmr.png differ diff --git a/image/before_member/bp_check_coupon_mmr.png b/image/before_member/bp_check_coupon_mmr.png index 6c82a5b3..53a89bd1 100644 Binary files a/image/before_member/bp_check_coupon_mmr.png and b/image/before_member/bp_check_coupon_mmr.png differ diff --git a/image/before_member/bp_topup_credit_mmr.png b/image/before_member/bp_topup_credit_mmr.png index f637b631..4b6763e1 100644 Binary files a/image/before_member/bp_topup_credit_mmr.png and b/image/before_member/bp_topup_credit_mmr.png differ diff --git a/image/clean_feedback/bn_feedback_level_1_mmr.png b/image/clean_feedback/bn_feedback_level_1_mmr.png new file mode 100644 index 00000000..685e56c0 Binary files /dev/null and b/image/clean_feedback/bn_feedback_level_1_mmr.png differ diff --git a/image/clean_feedback/bn_feedback_level_2_mmr.png b/image/clean_feedback/bn_feedback_level_2_mmr.png new file mode 100644 index 00000000..21a1c698 Binary files /dev/null and b/image/clean_feedback/bn_feedback_level_2_mmr.png differ diff --git a/image/clean_feedback/bn_feedback_level_3_mmr.png b/image/clean_feedback/bn_feedback_level_3_mmr.png new file mode 100644 index 00000000..8414258f Binary files /dev/null and b/image/clean_feedback/bn_feedback_level_3_mmr.png differ diff --git a/image/clean_feedback/bn_feedback_level_4_mmr.png b/image/clean_feedback/bn_feedback_level_4_mmr.png new file mode 100644 index 00000000..dda598a7 Binary files /dev/null and b/image/clean_feedback/bn_feedback_level_4_mmr.png differ diff --git a/image/clean_feedback/bn_feedback_level_5_mmr.png b/image/clean_feedback/bn_feedback_level_5_mmr.png new file mode 100644 index 00000000..2685cc95 Binary files /dev/null and b/image/clean_feedback/bn_feedback_level_5_mmr.png differ diff --git a/image/clean_feedback/bp_feedback_level_1_mmr.png b/image/clean_feedback/bp_feedback_level_1_mmr.png new file mode 100644 index 00000000..25c13036 Binary files /dev/null and b/image/clean_feedback/bp_feedback_level_1_mmr.png differ diff --git a/image/clean_feedback/bp_feedback_level_2_mmr.png b/image/clean_feedback/bp_feedback_level_2_mmr.png new file mode 100644 index 00000000..ff5bdc99 Binary files /dev/null and b/image/clean_feedback/bp_feedback_level_2_mmr.png differ diff --git a/image/clean_feedback/bp_feedback_level_3_mmr.png b/image/clean_feedback/bp_feedback_level_3_mmr.png new file mode 100644 index 00000000..39846027 Binary files /dev/null and b/image/clean_feedback/bp_feedback_level_3_mmr.png differ diff --git a/image/clean_feedback/bp_feedback_level_4_mmr.png b/image/clean_feedback/bp_feedback_level_4_mmr.png new file mode 100644 index 00000000..be059afe Binary files /dev/null and b/image/clean_feedback/bp_feedback_level_4_mmr.png differ diff --git a/image/clean_feedback/bp_feedback_level_5_mmr.png b/image/clean_feedback/bp_feedback_level_5_mmr.png new file mode 100644 index 00000000..dd3d6f46 Binary files /dev/null and b/image/clean_feedback/bp_feedback_level_5_mmr.png differ diff --git a/image/collect_point1_mmr/bn_back.png b/image/collect_point1_mmr/bn_back.png index 2eb3ad1a..c9dce354 100644 Binary files a/image/collect_point1_mmr/bn_back.png and b/image/collect_point1_mmr/bn_back.png differ diff --git a/image/collect_point1_mmr/bn_ignore.png b/image/collect_point1_mmr/bn_ignore.png index 2e86d0b8..00cb97e7 100644 Binary files a/image/collect_point1_mmr/bn_ignore.png and b/image/collect_point1_mmr/bn_ignore.png differ diff --git a/image/collect_point1_mmr/bn_negative.png b/image/collect_point1_mmr/bn_negative.png index 2e86d0b8..00cb97e7 100644 Binary files a/image/collect_point1_mmr/bn_negative.png and b/image/collect_point1_mmr/bn_negative.png differ diff --git a/image/collect_point1_mmr/bn_negative2.png b/image/collect_point1_mmr/bn_negative2.png index 344140e0..a85db9ed 100644 Binary files a/image/collect_point1_mmr/bn_negative2.png and b/image/collect_point1_mmr/bn_negative2.png differ diff --git a/image/collect_point1_mmr/bn_positive.png b/image/collect_point1_mmr/bn_positive.png index bcd77236..11977cf3 100644 Binary files a/image/collect_point1_mmr/bn_positive.png and b/image/collect_point1_mmr/bn_positive.png differ diff --git a/image/collect_point1_mmr/bp_back.png b/image/collect_point1_mmr/bp_back.png index b6fea86b..3c6eb0e5 100644 Binary files a/image/collect_point1_mmr/bp_back.png and b/image/collect_point1_mmr/bp_back.png differ diff --git a/image/collect_point1_mmr/bp_negative.png b/image/collect_point1_mmr/bp_negative.png index 0a68337e..e35bb160 100644 Binary files a/image/collect_point1_mmr/bp_negative.png and b/image/collect_point1_mmr/bp_negative.png differ diff --git a/image/collect_point1_mmr/bp_negative2.png b/image/collect_point1_mmr/bp_negative2.png index 0a68337e..e35bb160 100644 Binary files a/image/collect_point1_mmr/bp_negative2.png and b/image/collect_point1_mmr/bp_negative2.png differ diff --git a/image/collect_point1_mmr/bp_positive.png b/image/collect_point1_mmr/bp_positive.png index b0ff6a09..5a4b179d 100644 Binary files a/image/collect_point1_mmr/bp_positive.png and b/image/collect_point1_mmr/bp_positive.png differ diff --git a/image/collect_point1_mmr/text_1.png b/image/collect_point1_mmr/text_1.png index b50d34bc..283bde84 100644 Binary files a/image/collect_point1_mmr/text_1.png and b/image/collect_point1_mmr/text_1.png differ diff --git a/image/collect_point1_mmr/text_2.png b/image/collect_point1_mmr/text_2.png index da985652..097b18c3 100644 Binary files a/image/collect_point1_mmr/text_2.png and b/image/collect_point1_mmr/text_2.png differ diff --git a/image/collect_point1_mmr/text_3.png b/image/collect_point1_mmr/text_3.png index a5bf6f18..02dd72e8 100644 Binary files a/image/collect_point1_mmr/text_3.png and b/image/collect_point1_mmr/text_3.png differ diff --git a/image/collect_point1_mmr/text_4.png b/image/collect_point1_mmr/text_4.png index b0ae3b2e..6c1c0b73 100644 Binary files a/image/collect_point1_mmr/text_4.png and b/image/collect_point1_mmr/text_4.png differ diff --git a/image/collect_point1_mmr/text_5.png b/image/collect_point1_mmr/text_5.png index 8c9782c2..b21a89d8 100644 Binary files a/image/collect_point1_mmr/text_5.png and b/image/collect_point1_mmr/text_5.png differ diff --git a/image/collect_point1_mmr/text_6.png b/image/collect_point1_mmr/text_6.png index 0f5284c5..7a7c54c3 100644 Binary files a/image/collect_point1_mmr/text_6.png and b/image/collect_point1_mmr/text_6.png differ diff --git a/image/collect_point1_mmr/text_7.png b/image/collect_point1_mmr/text_7.png index 0f7bbea5..32581a4f 100644 Binary files a/image/collect_point1_mmr/text_7.png and b/image/collect_point1_mmr/text_7.png differ diff --git a/image/collect_point1_mmr/text_edit.png b/image/collect_point1_mmr/text_edit.png index 6df6f018..2683c05e 100644 Binary files a/image/collect_point1_mmr/text_edit.png and b/image/collect_point1_mmr/text_edit.png differ diff --git a/image/collect_point1_mmr/text_edit2.png b/image/collect_point1_mmr/text_edit2.png index 656061af..6cc8280b 100644 Binary files a/image/collect_point1_mmr/text_edit2.png and b/image/collect_point1_mmr/text_edit2.png differ diff --git a/image/collectiing_mmr/PinFailed.png b/image/collectiing_mmr/PinFailed.png index f99f4808..6f8deebe 100644 Binary files a/image/collectiing_mmr/PinFailed.png and b/image/collectiing_mmr/PinFailed.png differ diff --git a/image/collectiing_mmr/PinSuccess.png b/image/collectiing_mmr/PinSuccess.png index a114dc3c..78db2426 100644 Binary files a/image/collectiing_mmr/PinSuccess.png and b/image/collectiing_mmr/PinSuccess.png differ diff --git a/image/collectiing_mmr/bn_back.png b/image/collectiing_mmr/bn_back.png index 2eb3ad1a..c9dce354 100644 Binary files a/image/collectiing_mmr/bn_back.png and b/image/collectiing_mmr/bn_back.png differ diff --git a/image/collectiing_mmr/bn_back2.png b/image/collectiing_mmr/bn_back2.png index d5ebfd2b..11368038 100644 Binary files a/image/collectiing_mmr/bn_back2.png and b/image/collectiing_mmr/bn_back2.png differ diff --git a/image/collectiing_mmr/bn_back3.png b/image/collectiing_mmr/bn_back3.png index 02abad89..1b6d7528 100644 Binary files a/image/collectiing_mmr/bn_back3.png and b/image/collectiing_mmr/bn_back3.png differ diff --git a/image/collectiing_mmr/bn_cancel2.png b/image/collectiing_mmr/bn_cancel2.png index 2eb3ad1a..c9dce354 100644 Binary files a/image/collectiing_mmr/bn_cancel2.png and b/image/collectiing_mmr/bn_cancel2.png differ diff --git a/image/collectiing_mmr/bn_cancel3.png b/image/collectiing_mmr/bn_cancel3.png index a83aa6b7..adfb5c0a 100644 Binary files a/image/collectiing_mmr/bn_cancel3.png and b/image/collectiing_mmr/bn_cancel3.png differ diff --git a/image/collectiing_mmr/bn_catalog.png b/image/collectiing_mmr/bn_catalog.png index e5957b30..901573f4 100644 Binary files a/image/collectiing_mmr/bn_catalog.png and b/image/collectiing_mmr/bn_catalog.png differ diff --git a/image/collectiing_mmr/bn_close.png b/image/collectiing_mmr/bn_close.png index b37bd7ca..27fb748f 100644 Binary files a/image/collectiing_mmr/bn_close.png and b/image/collectiing_mmr/bn_close.png differ diff --git a/image/collectiing_mmr/bn_confirm.png b/image/collectiing_mmr/bn_confirm.png index c4b2c424..77890777 100644 Binary files a/image/collectiing_mmr/bn_confirm.png and b/image/collectiing_mmr/bn_confirm.png differ diff --git a/image/collectiing_mmr/bn_continue.png b/image/collectiing_mmr/bn_continue.png index 9cb0aa22..3e00747d 100644 Binary files a/image/collectiing_mmr/bn_continue.png and b/image/collectiing_mmr/bn_continue.png differ diff --git a/image/collectiing_mmr/bn_door_open.png b/image/collectiing_mmr/bn_door_open.png index ffe50773..45327407 100644 Binary files a/image/collectiing_mmr/bn_door_open.png and b/image/collectiing_mmr/bn_door_open.png differ diff --git a/image/collectiing_mmr/bn_door_open2-1.png b/image/collectiing_mmr/bn_door_open2-1.png index c59d1d44..1b6a8fbc 100644 Binary files a/image/collectiing_mmr/bn_door_open2-1.png and b/image/collectiing_mmr/bn_door_open2-1.png differ diff --git a/image/collectiing_mmr/bn_door_open2.png b/image/collectiing_mmr/bn_door_open2.png index c59d1d44..1b6a8fbc 100644 Binary files a/image/collectiing_mmr/bn_door_open2.png and b/image/collectiing_mmr/bn_door_open2.png differ diff --git a/image/collectiing_mmr/bn_getPin.png b/image/collectiing_mmr/bn_getPin.png index 1519a0fb..40a58c26 100644 Binary files a/image/collectiing_mmr/bn_getPin.png and b/image/collectiing_mmr/bn_getPin.png differ diff --git a/image/collectiing_mmr/bn_getSMSPage.png b/image/collectiing_mmr/bn_getSMSPage.png index cfa09e2e..fe188ee0 100644 Binary files a/image/collectiing_mmr/bn_getSMSPage.png and b/image/collectiing_mmr/bn_getSMSPage.png differ diff --git a/image/collectiing_mmr/bn_other.png b/image/collectiing_mmr/bn_other.png index a3881d53..739d0294 100644 Binary files a/image/collectiing_mmr/bn_other.png and b/image/collectiing_mmr/bn_other.png differ diff --git a/image/collectiing_mmr/bn_recieve_coupon.png b/image/collectiing_mmr/bn_recieve_coupon.png index 4cc1aa36..50566f34 100644 Binary files a/image/collectiing_mmr/bn_recieve_coupon.png and b/image/collectiing_mmr/bn_recieve_coupon.png differ diff --git a/image/collectiing_mmr/bn_topup_with_cash.png b/image/collectiing_mmr/bn_topup_with_cash.png index 66f55d80..64295866 100644 Binary files a/image/collectiing_mmr/bn_topup_with_cash.png and b/image/collectiing_mmr/bn_topup_with_cash.png differ diff --git a/image/collectiing_mmr/bn_topup_with_code.png b/image/collectiing_mmr/bn_topup_with_code.png index 1dcd174d..0609516f 100644 Binary files a/image/collectiing_mmr/bn_topup_with_code.png and b/image/collectiing_mmr/bn_topup_with_code.png differ diff --git a/image/collectiing_mmr/bn_topup_with_qr.png b/image/collectiing_mmr/bn_topup_with_qr.png index ce7be729..8b67dfd2 100644 Binary files a/image/collectiing_mmr/bn_topup_with_qr.png and b/image/collectiing_mmr/bn_topup_with_qr.png differ diff --git a/image/collectiing_mmr/bn_tryAgainPin.png b/image/collectiing_mmr/bn_tryAgainPin.png index d2ce16d4..543f4bce 100644 Binary files a/image/collectiing_mmr/bn_tryAgainPin.png and b/image/collectiing_mmr/bn_tryAgainPin.png differ diff --git a/image/collectiing_mmr/bp_back.png b/image/collectiing_mmr/bp_back.png index f92feb6f..86fa2b70 100644 Binary files a/image/collectiing_mmr/bp_back.png and b/image/collectiing_mmr/bp_back.png differ diff --git a/image/collectiing_mmr/bp_back2.png b/image/collectiing_mmr/bp_back2.png index dea44d0a..8fb9892e 100644 Binary files a/image/collectiing_mmr/bp_back2.png and b/image/collectiing_mmr/bp_back2.png differ diff --git a/image/collectiing_mmr/bp_back3.png b/image/collectiing_mmr/bp_back3.png index ef4d66f7..2a680106 100644 Binary files a/image/collectiing_mmr/bp_back3.png and b/image/collectiing_mmr/bp_back3.png differ diff --git a/image/collectiing_mmr/bp_cancel2.png b/image/collectiing_mmr/bp_cancel2.png index 174234c8..bed13f9c 100644 Binary files a/image/collectiing_mmr/bp_cancel2.png and b/image/collectiing_mmr/bp_cancel2.png differ diff --git a/image/collectiing_mmr/bp_cancel3.png b/image/collectiing_mmr/bp_cancel3.png index a647bd13..7510cea4 100644 Binary files a/image/collectiing_mmr/bp_cancel3.png and b/image/collectiing_mmr/bp_cancel3.png differ diff --git a/image/collectiing_mmr/bp_catalog.png b/image/collectiing_mmr/bp_catalog.png index b6443c8c..b90b2019 100644 Binary files a/image/collectiing_mmr/bp_catalog.png and b/image/collectiing_mmr/bp_catalog.png differ diff --git a/image/collectiing_mmr/bp_close.png b/image/collectiing_mmr/bp_close.png index 73c8994d..b904849e 100644 Binary files a/image/collectiing_mmr/bp_close.png and b/image/collectiing_mmr/bp_close.png differ diff --git a/image/collectiing_mmr/bp_confirm.png b/image/collectiing_mmr/bp_confirm.png index fe82b39a..bfbbad84 100644 Binary files a/image/collectiing_mmr/bp_confirm.png and b/image/collectiing_mmr/bp_confirm.png differ diff --git a/image/collectiing_mmr/bp_continue.png b/image/collectiing_mmr/bp_continue.png index fcf2f669..c9dce354 100644 Binary files a/image/collectiing_mmr/bp_continue.png and b/image/collectiing_mmr/bp_continue.png differ diff --git a/image/collectiing_mmr/bp_door_open.png b/image/collectiing_mmr/bp_door_open.png index a1ffb28b..aa6725cf 100644 Binary files a/image/collectiing_mmr/bp_door_open.png and b/image/collectiing_mmr/bp_door_open.png differ diff --git a/image/collectiing_mmr/bp_door_open2.png b/image/collectiing_mmr/bp_door_open2.png index 42023e64..67c35b91 100644 Binary files a/image/collectiing_mmr/bp_door_open2.png and b/image/collectiing_mmr/bp_door_open2.png differ diff --git a/image/collectiing_mmr/bp_getSMSPage.png b/image/collectiing_mmr/bp_getSMSPage.png index 3dca6b93..ff64c7d9 100644 Binary files a/image/collectiing_mmr/bp_getSMSPage.png and b/image/collectiing_mmr/bp_getSMSPage.png differ diff --git a/image/collectiing_mmr/bp_other.png b/image/collectiing_mmr/bp_other.png index df0db40a..ad6b8e61 100644 Binary files a/image/collectiing_mmr/bp_other.png and b/image/collectiing_mmr/bp_other.png differ diff --git a/image/collectiing_mmr/bp_recieve_coupon.png b/image/collectiing_mmr/bp_recieve_coupon.png index 98070f3c..c1239a84 100644 Binary files a/image/collectiing_mmr/bp_recieve_coupon.png and b/image/collectiing_mmr/bp_recieve_coupon.png differ diff --git a/image/collectiing_mmr/bp_topup_with_cash.png b/image/collectiing_mmr/bp_topup_with_cash.png index d5a637dd..fcdec94a 100644 Binary files a/image/collectiing_mmr/bp_topup_with_cash.png and b/image/collectiing_mmr/bp_topup_with_cash.png differ diff --git a/image/collectiing_mmr/bp_topup_with_code.png b/image/collectiing_mmr/bp_topup_with_code.png index 693c96cc..8202dce1 100644 Binary files a/image/collectiing_mmr/bp_topup_with_code.png and b/image/collectiing_mmr/bp_topup_with_code.png differ diff --git a/image/collectiing_mmr/bp_topup_with_qr.png b/image/collectiing_mmr/bp_topup_with_qr.png index aa66243b..6aee1998 100644 Binary files a/image/collectiing_mmr/bp_topup_with_qr.png and b/image/collectiing_mmr/bp_topup_with_qr.png differ diff --git a/image/collectiing_mmr/bp_tryAgainPin.png b/image/collectiing_mmr/bp_tryAgainPin.png index 95383298..3d5bb06d 100644 Binary files a/image/collectiing_mmr/bp_tryAgainPin.png and b/image/collectiing_mmr/bp_tryAgainPin.png differ diff --git a/image/collectiing_mmr/cash_warning_text.png b/image/collectiing_mmr/cash_warning_text.png index 8c62cc3c..1c9779fe 100644 Binary files a/image/collectiing_mmr/cash_warning_text.png and b/image/collectiing_mmr/cash_warning_text.png differ diff --git a/image/collectiing_mmr/img_popup11.png b/image/collectiing_mmr/img_popup11.png index 87214f6b..afb2ac10 100644 Binary files a/image/collectiing_mmr/img_popup11.png and b/image/collectiing_mmr/img_popup11.png differ diff --git a/image/collectiing_mmr/img_popup12.png b/image/collectiing_mmr/img_popup12.png index ea906c5b..9e90e0ee 100644 Binary files a/image/collectiing_mmr/img_popup12.png and b/image/collectiing_mmr/img_popup12.png differ diff --git a/image/collectiing_mmr/img_popup13.png b/image/collectiing_mmr/img_popup13.png index 93f08cc8..6b2ad0e5 100644 Binary files a/image/collectiing_mmr/img_popup13.png and b/image/collectiing_mmr/img_popup13.png differ diff --git a/image/collectiing_mmr/img_popup15.png b/image/collectiing_mmr/img_popup15.png index ae07d94c..7205bc54 100644 Binary files a/image/collectiing_mmr/img_popup15.png and b/image/collectiing_mmr/img_popup15.png differ diff --git a/image/collectiing_mmr/img_popup16.png b/image/collectiing_mmr/img_popup16.png index 616ea43f..32f6b04b 100644 Binary files a/image/collectiing_mmr/img_popup16.png and b/image/collectiing_mmr/img_popup16.png differ diff --git a/image/collectiing_mmr/img_popup19.png b/image/collectiing_mmr/img_popup19.png index 2d49fec8..c9b95697 100644 Binary files a/image/collectiing_mmr/img_popup19.png and b/image/collectiing_mmr/img_popup19.png differ diff --git a/image/collectiing_mmr/img_popup20-Failed.png b/image/collectiing_mmr/img_popup20-Failed.png index 36e0f5c5..6fae4c75 100644 Binary files a/image/collectiing_mmr/img_popup20-Failed.png and b/image/collectiing_mmr/img_popup20-Failed.png differ diff --git a/image/collectiing_mmr/img_popup20.png b/image/collectiing_mmr/img_popup20.png index 970562b5..cd0cbb93 100644 Binary files a/image/collectiing_mmr/img_popup20.png and b/image/collectiing_mmr/img_popup20.png differ diff --git a/image/collectiing_mmr/img_popup21.png b/image/collectiing_mmr/img_popup21.png index d87a13a3..420e771b 100644 Binary files a/image/collectiing_mmr/img_popup21.png and b/image/collectiing_mmr/img_popup21.png differ diff --git a/image/collectiing_mmr/smartphone.png b/image/collectiing_mmr/smartphone.png index ffea56ba..cc567ba2 100644 Binary files a/image/collectiing_mmr/smartphone.png and b/image/collectiing_mmr/smartphone.png differ diff --git a/image/collectiing_mmr/text13-2.png b/image/collectiing_mmr/text13-2.png index c6fcfab1..bff94eea 100644 Binary files a/image/collectiing_mmr/text13-2.png and b/image/collectiing_mmr/text13-2.png differ diff --git a/image/collectiing_mmr/text13.png b/image/collectiing_mmr/text13.png index a0a27309..40b04c5e 100644 Binary files a/image/collectiing_mmr/text13.png and b/image/collectiing_mmr/text13.png differ diff --git a/image/collectiing_mmr/text22-2.png b/image/collectiing_mmr/text22-2.png index 3364ccad..3227b926 100644 Binary files a/image/collectiing_mmr/text22-2.png and b/image/collectiing_mmr/text22-2.png differ diff --git a/image/collectiing_mmr/text22.png b/image/collectiing_mmr/text22.png index 7cdd8044..e0f2ebae 100644 Binary files a/image/collectiing_mmr/text22.png and b/image/collectiing_mmr/text22.png differ diff --git a/image/collectiing_mmr/text23.png b/image/collectiing_mmr/text23.png index baf2a383..ba289ca6 100644 Binary files a/image/collectiing_mmr/text23.png and b/image/collectiing_mmr/text23.png differ diff --git a/image/collectiing_mmr/textRefundChannel1.png b/image/collectiing_mmr/textRefundChannel1.png index 77413ac8..e5c201e6 100644 Binary files a/image/collectiing_mmr/textRefundChannel1.png and b/image/collectiing_mmr/textRefundChannel1.png differ diff --git a/image/collectiing_mmr/textRefundChannel2.png b/image/collectiing_mmr/textRefundChannel2.png index c8a9465f..e7f1079a 100644 Binary files a/image/collectiing_mmr/textRefundChannel2.png and b/image/collectiing_mmr/textRefundChannel2.png differ diff --git a/image/collectiing_mmr/textRefundChannel3.png b/image/collectiing_mmr/textRefundChannel3.png index 3dec1563..915e4160 100644 Binary files a/image/collectiing_mmr/textRefundChannel3.png and b/image/collectiing_mmr/textRefundChannel3.png differ diff --git a/image/collectiing_mmr/text_11.png b/image/collectiing_mmr/text_11.png index 3b72b27e..49e34a7f 100644 Binary files a/image/collectiing_mmr/text_11.png and b/image/collectiing_mmr/text_11.png differ diff --git a/image/collectiing_mmr/text_16.png b/image/collectiing_mmr/text_16.png index a92b18e1..efc9f31f 100644 Binary files a/image/collectiing_mmr/text_16.png and b/image/collectiing_mmr/text_16.png differ diff --git a/image/collectiing_mmr/text_17.png b/image/collectiing_mmr/text_17.png index bf4f2a6a..ba098727 100644 Binary files a/image/collectiing_mmr/text_17.png and b/image/collectiing_mmr/text_17.png differ diff --git a/image/collectiing_mmr/text_20.png b/image/collectiing_mmr/text_20.png index cdda2d9f..87ec5dab 100644 Binary files a/image/collectiing_mmr/text_20.png and b/image/collectiing_mmr/text_20.png differ diff --git a/image/collectiing_mmr/text_21.png b/image/collectiing_mmr/text_21.png index 86cc92c8..73004905 100644 Binary files a/image/collectiing_mmr/text_21.png and b/image/collectiing_mmr/text_21.png differ diff --git a/image/collectiing_mmr/text_23.png b/image/collectiing_mmr/text_23.png index 4e813905..95636558 100644 Binary files a/image/collectiing_mmr/text_23.png and b/image/collectiing_mmr/text_23.png differ diff --git a/image/collectiing_mmr/text_24.png b/image/collectiing_mmr/text_24.png index 7aea9f70..7d702055 100644 Binary files a/image/collectiing_mmr/text_24.png and b/image/collectiing_mmr/text_24.png differ diff --git a/image/collectiing_mmr/text_25.png b/image/collectiing_mmr/text_25.png index 3e65c8d5..663516ca 100644 Binary files a/image/collectiing_mmr/text_25.png and b/image/collectiing_mmr/text_25.png differ diff --git a/image/collectiing_mmr/text_27.png b/image/collectiing_mmr/text_27.png index e1690fbd..395793b0 100644 Binary files a/image/collectiing_mmr/text_27.png and b/image/collectiing_mmr/text_27.png differ diff --git a/image/collectiing_mmr/text_28.png b/image/collectiing_mmr/text_28.png index 756a3fed..753109e0 100644 Binary files a/image/collectiing_mmr/text_28.png and b/image/collectiing_mmr/text_28.png differ diff --git a/image/collectiing_mmr/text_29.png b/image/collectiing_mmr/text_29.png index 185e23be..753109e0 100644 Binary files a/image/collectiing_mmr/text_29.png and b/image/collectiing_mmr/text_29.png differ diff --git a/image/collectiing_mmr/text_30.png b/image/collectiing_mmr/text_30.png index 3e2a525e..ebc88308 100644 Binary files a/image/collectiing_mmr/text_30.png and b/image/collectiing_mmr/text_30.png differ diff --git a/image/collectiing_mmr/text_31.png b/image/collectiing_mmr/text_31.png index c9498113..956ec453 100644 Binary files a/image/collectiing_mmr/text_31.png and b/image/collectiing_mmr/text_31.png differ diff --git a/image/collectiing_mmr/text_33.png b/image/collectiing_mmr/text_33.png index 75d34ad7..a7511c30 100644 Binary files a/image/collectiing_mmr/text_33.png and b/image/collectiing_mmr/text_33.png differ diff --git a/image/collectiing_mmr/text_34.png b/image/collectiing_mmr/text_34.png index ae250aa2..b6a31123 100644 Binary files a/image/collectiing_mmr/text_34.png and b/image/collectiing_mmr/text_34.png differ diff --git a/image/collectiing_mmr/text_35.png b/image/collectiing_mmr/text_35.png index c3f974b1..d50f1e28 100644 Binary files a/image/collectiing_mmr/text_35.png and b/image/collectiing_mmr/text_35.png differ diff --git a/image/collectiing_mmr/text_37.png b/image/collectiing_mmr/text_37.png index f77428c7..e95a8bff 100644 Binary files a/image/collectiing_mmr/text_37.png and b/image/collectiing_mmr/text_37.png differ diff --git a/image/collectiing_mmr/text_39.png b/image/collectiing_mmr/text_39.png index d1854937..a42d0620 100644 Binary files a/image/collectiing_mmr/text_39.png and b/image/collectiing_mmr/text_39.png differ diff --git a/image/collectiing_mmr/text_40.png b/image/collectiing_mmr/text_40.png index 8231e954..b6ce2230 100644 Binary files a/image/collectiing_mmr/text_40.png and b/image/collectiing_mmr/text_40.png differ diff --git a/image/collectiing_mmr/text_41.png b/image/collectiing_mmr/text_41.png index 8e8c9816..400f6ac3 100644 Binary files a/image/collectiing_mmr/text_41.png and b/image/collectiing_mmr/text_41.png differ diff --git a/image/collectiing_mmr/text_43_2.png b/image/collectiing_mmr/text_43_2.png index 1d47ed0c..e2520a3a 100644 Binary files a/image/collectiing_mmr/text_43_2.png and b/image/collectiing_mmr/text_43_2.png differ diff --git a/image/collectiing_mmr/text_44.png b/image/collectiing_mmr/text_44.png index 60d8ca5d..c3f26cfe 100644 Binary files a/image/collectiing_mmr/text_44.png and b/image/collectiing_mmr/text_44.png differ diff --git a/image/collectiing_mmr/text_46.png b/image/collectiing_mmr/text_46.png index 4004913c..bf8d7b6b 100644 Binary files a/image/collectiing_mmr/text_46.png and b/image/collectiing_mmr/text_46.png differ diff --git a/image/collectiing_mmr/text_show_amountInvalid.png b/image/collectiing_mmr/text_show_amountInvalid.png index eba2f0bb..0d699638 100644 Binary files a/image/collectiing_mmr/text_show_amountInvalid.png and b/image/collectiing_mmr/text_show_amountInvalid.png differ diff --git a/image/collectiing_mmr/text_show_amountInvalid2.png b/image/collectiing_mmr/text_show_amountInvalid2.png index 259bb3bc..58ef4d3f 100644 Binary files a/image/collectiing_mmr/text_show_amountInvalid2.png and b/image/collectiing_mmr/text_show_amountInvalid2.png differ diff --git a/image/collectiing_mmr/text_show_error.png b/image/collectiing_mmr/text_show_error.png index 6d73c7d5..5e0ba338 100644 Binary files a/image/collectiing_mmr/text_show_error.png and b/image/collectiing_mmr/text_show_error.png differ diff --git a/image/collectiing_mmr/text_show_error2.png b/image/collectiing_mmr/text_show_error2.png index 1c901e8e..14600c5e 100644 Binary files a/image/collectiing_mmr/text_show_error2.png and b/image/collectiing_mmr/text_show_error2.png differ diff --git a/image/collectiing_mmr/text_show_error3.png b/image/collectiing_mmr/text_show_error3.png index 253389be..94a3272a 100644 Binary files a/image/collectiing_mmr/text_show_error3.png and b/image/collectiing_mmr/text_show_error3.png differ diff --git a/image/collectiing_mmr/text_show_error4.png b/image/collectiing_mmr/text_show_error4.png index 70384d11..7f429ea0 100644 Binary files a/image/collectiing_mmr/text_show_error4.png and b/image/collectiing_mmr/text_show_error4.png differ diff --git a/image/collectiing_mmr/text_show_error5.png b/image/collectiing_mmr/text_show_error5.png index a7363544..26475967 100644 Binary files a/image/collectiing_mmr/text_show_error5.png and b/image/collectiing_mmr/text_show_error5.png differ diff --git a/image/collectiing_mmr/text_show_error6.png b/image/collectiing_mmr/text_show_error6.png index 9744cac7..fa9bd3e4 100644 Binary files a/image/collectiing_mmr/text_show_error6.png and b/image/collectiing_mmr/text_show_error6.png differ diff --git a/image/collectiing_mmr/text_show_error7.png b/image/collectiing_mmr/text_show_error7.png index ed4650b8..6b96efd2 100644 Binary files a/image/collectiing_mmr/text_show_error7.png and b/image/collectiing_mmr/text_show_error7.png differ diff --git a/image/collectiing_mmr/text_show_error8.png b/image/collectiing_mmr/text_show_error8.png index abac0b04..31fb95d3 100644 Binary files a/image/collectiing_mmr/text_show_error8.png and b/image/collectiing_mmr/text_show_error8.png differ diff --git a/image/collectiing_mmr/text_show_notEnough.png b/image/collectiing_mmr/text_show_notEnough.png index eca2c223..6b22a0c2 100644 Binary files a/image/collectiing_mmr/text_show_notEnough.png and b/image/collectiing_mmr/text_show_notEnough.png differ diff --git a/image/collectiing_mmr/text_show_notEnough2.png b/image/collectiing_mmr/text_show_notEnough2.png index a97e755a..e97db6f9 100644 Binary files a/image/collectiing_mmr/text_show_notEnough2.png and b/image/collectiing_mmr/text_show_notEnough2.png differ diff --git a/image/collectiing_mmr/text_show_notfound.png b/image/collectiing_mmr/text_show_notfound.png index 869cec3b..68f71b90 100644 Binary files a/image/collectiing_mmr/text_show_notfound.png and b/image/collectiing_mmr/text_show_notfound.png differ diff --git a/image/collectiing_mmr/text_show_sentSMS.png b/image/collectiing_mmr/text_show_sentSMS.png index 3fffea5a..b54f9e8c 100644 Binary files a/image/collectiing_mmr/text_show_sentSMS.png and b/image/collectiing_mmr/text_show_sentSMS.png differ diff --git a/image/complete_mmr/Preparing.png b/image/complete_mmr/Preparing.png index 637b9b12..32190361 100644 Binary files a/image/complete_mmr/Preparing.png and b/image/complete_mmr/Preparing.png differ diff --git a/image/complete_mmr/Preparing2.png b/image/complete_mmr/Preparing2.png index 2c71d681..a7f4f661 100644 Binary files a/image/complete_mmr/Preparing2.png and b/image/complete_mmr/Preparing2.png differ diff --git a/image/complete_mmr/bn_open door.png b/image/complete_mmr/bn_open door.png new file mode 100644 index 00000000..2c73f290 Binary files /dev/null and b/image/complete_mmr/bn_open door.png differ diff --git a/image/complete_mmr/bp_open door.png b/image/complete_mmr/bp_open door.png new file mode 100644 index 00000000..76a46950 Binary files /dev/null and b/image/complete_mmr/bp_open door.png differ diff --git a/image/complete_mmr/img2.png b/image/complete_mmr/img2.png index 9b26e081..c12ef464 100644 Binary files a/image/complete_mmr/img2.png and b/image/complete_mmr/img2.png differ diff --git a/image/complete_mmr/text_bottom.png b/image/complete_mmr/text_bottom.png index 83249f84..4264772e 100644 Binary files a/image/complete_mmr/text_bottom.png and b/image/complete_mmr/text_bottom.png differ diff --git a/image/complete_mmr/txtDrinkFailed.png b/image/complete_mmr/txtDrinkFailed.png index e46061d1..fdd9c755 100644 Binary files a/image/complete_mmr/txtDrinkFailed.png and b/image/complete_mmr/txtDrinkFailed.png differ diff --git a/image/complete_mmr/txtDrinkOK.png b/image/complete_mmr/txtDrinkOK.png index 990c3541..863f40b2 100644 Binary files a/image/complete_mmr/txtDrinkOK.png and b/image/complete_mmr/txtDrinkOK.png differ diff --git a/image/consent_mmr/bn_accept.png b/image/consent_mmr/bn_accept.png index faa51698..37840167 100644 Binary files a/image/consent_mmr/bn_accept.png and b/image/consent_mmr/bn_accept.png differ diff --git a/image/consent_mmr/bn_back.png b/image/consent_mmr/bn_back.png index 2eb3ad1a..c9dce354 100644 Binary files a/image/consent_mmr/bn_back.png and b/image/consent_mmr/bn_back.png differ diff --git a/image/consent_mmr/bn_decline.png b/image/consent_mmr/bn_decline.png index 5adb1975..538710b4 100644 Binary files a/image/consent_mmr/bn_decline.png and b/image/consent_mmr/bn_decline.png differ diff --git a/image/consent_mmr/bp_accept.png b/image/consent_mmr/bp_accept.png index 090f093a..40ef75ce 100644 Binary files a/image/consent_mmr/bp_accept.png and b/image/consent_mmr/bp_accept.png differ diff --git a/image/consent_mmr/bp_back.png b/image/consent_mmr/bp_back.png index b67e6fdd..23930d33 100644 Binary files a/image/consent_mmr/bp_back.png and b/image/consent_mmr/bp_back.png differ diff --git a/image/consent_mmr/bp_decline.png b/image/consent_mmr/bp_decline.png index 735051ae..3f50b970 100644 Binary files a/image/consent_mmr/bp_decline.png and b/image/consent_mmr/bp_decline.png differ diff --git a/image/consent_mmr/img1.png b/image/consent_mmr/img1.png index a13cdb16..f4dacbc9 100644 Binary files a/image/consent_mmr/img1.png and b/image/consent_mmr/img1.png differ diff --git a/image/consent_mmr/img_all.png b/image/consent_mmr/img_all.png index 6330d8a0..df290f50 100644 Binary files a/image/consent_mmr/img_all.png and b/image/consent_mmr/img_all.png differ diff --git a/image/consent_mmr/img_popup1.png b/image/consent_mmr/img_popup1.png index 4a1a511b..5075936d 100644 Binary files a/image/consent_mmr/img_popup1.png and b/image/consent_mmr/img_popup1.png differ diff --git a/image/consent_mmr/img_popup2.png b/image/consent_mmr/img_popup2.png index bbd6822c..2485403f 100644 Binary files a/image/consent_mmr/img_popup2.png and b/image/consent_mmr/img_popup2.png differ diff --git a/image/display_disqualified_mmr/bn_accept.png b/image/display_disqualified_mmr/bn_accept.png index ec30f738..bfc01674 100644 Binary files a/image/display_disqualified_mmr/bn_accept.png and b/image/display_disqualified_mmr/bn_accept.png differ diff --git a/image/display_disqualified_mmr/bp_accept.png b/image/display_disqualified_mmr/bp_accept.png index 95c9db29..f662e769 100644 Binary files a/image/display_disqualified_mmr/bp_accept.png and b/image/display_disqualified_mmr/bp_accept.png differ diff --git a/image/display_disqualified_mmr/img_popup1.png b/image/display_disqualified_mmr/img_popup1.png index e99edef4..b19625b5 100644 Binary files a/image/display_disqualified_mmr/img_popup1.png and b/image/display_disqualified_mmr/img_popup1.png differ diff --git a/image/display_get_discount_mmr/bn_accept.png b/image/display_get_discount_mmr/bn_accept.png index b37bd7ca..27fb748f 100644 Binary files a/image/display_get_discount_mmr/bn_accept.png and b/image/display_get_discount_mmr/bn_accept.png differ diff --git a/image/display_get_discount_mmr/bn_get15discount.png b/image/display_get_discount_mmr/bn_get15discount.png index ae75fa82..fbaf40e0 100644 Binary files a/image/display_get_discount_mmr/bn_get15discount.png and b/image/display_get_discount_mmr/bn_get15discount.png differ diff --git a/image/display_get_discount_mmr/bn_keep.png b/image/display_get_discount_mmr/bn_keep.png index 0368251d..bd84adc2 100644 Binary files a/image/display_get_discount_mmr/bn_keep.png and b/image/display_get_discount_mmr/bn_keep.png differ diff --git a/image/display_get_discount_mmr/bp_accept.png b/image/display_get_discount_mmr/bp_accept.png index 48f6fedf..eb96159f 100644 Binary files a/image/display_get_discount_mmr/bp_accept.png and b/image/display_get_discount_mmr/bp_accept.png differ diff --git a/image/display_get_discount_mmr/bp_get15discount.png b/image/display_get_discount_mmr/bp_get15discount.png index 37c98ba3..5bad8d76 100644 Binary files a/image/display_get_discount_mmr/bp_get15discount.png and b/image/display_get_discount_mmr/bp_get15discount.png differ diff --git a/image/display_get_discount_mmr/bp_keep.png b/image/display_get_discount_mmr/bp_keep.png index cf7858a0..106dc893 100644 Binary files a/image/display_get_discount_mmr/bp_keep.png and b/image/display_get_discount_mmr/bp_keep.png differ diff --git a/image/display_get_discount_mmr/disable2_get15discount.png b/image/display_get_discount_mmr/disable2_get15discount.png index 5bd369a2..9c4d4e70 100644 Binary files a/image/display_get_discount_mmr/disable2_get15discount.png and b/image/display_get_discount_mmr/disable2_get15discount.png differ diff --git a/image/display_get_discount_mmr/img_popup1.png b/image/display_get_discount_mmr/img_popup1.png index 9e04ebed..811018d3 100644 Binary files a/image/display_get_discount_mmr/img_popup1.png and b/image/display_get_discount_mmr/img_popup1.png differ diff --git a/image/display_get_discount_mmr/img_popup2.png b/image/display_get_discount_mmr/img_popup2.png index 5fe3a650..3c6026b0 100644 Binary files a/image/display_get_discount_mmr/img_popup2.png and b/image/display_get_discount_mmr/img_popup2.png differ diff --git a/image/display_get_discount_mmr/img_popup3.png b/image/display_get_discount_mmr/img_popup3.png index 5b9556ba..e947ff5e 100644 Binary files a/image/display_get_discount_mmr/img_popup3.png and b/image/display_get_discount_mmr/img_popup3.png differ diff --git a/image/display_get_discount_mmr/img_popup4.png b/image/display_get_discount_mmr/img_popup4.png index 030338fd..3cb7ca96 100644 Binary files a/image/display_get_discount_mmr/img_popup4.png and b/image/display_get_discount_mmr/img_popup4.png differ diff --git a/image/display_get_discount_mmr/img_popup_15discount_error.png b/image/display_get_discount_mmr/img_popup_15discount_error.png index 23dcb50f..5c652163 100644 Binary files a/image/display_get_discount_mmr/img_popup_15discount_error.png and b/image/display_get_discount_mmr/img_popup_15discount_error.png differ diff --git a/image/display_get_discount_mmr/img_popup_drink5baht_error.png b/image/display_get_discount_mmr/img_popup_drink5baht_error.png index c84123a7..5c652163 100644 Binary files a/image/display_get_discount_mmr/img_popup_drink5baht_error.png and b/image/display_get_discount_mmr/img_popup_drink5baht_error.png differ diff --git a/image/display_get_free_mmr/bn_accept.png b/image/display_get_free_mmr/bn_accept.png index ec30f738..bfc01674 100644 Binary files a/image/display_get_free_mmr/bn_accept.png and b/image/display_get_free_mmr/bn_accept.png differ diff --git a/image/display_get_free_mmr/bp_accept.png b/image/display_get_free_mmr/bp_accept.png index 10033148..8f701e4d 100644 Binary files a/image/display_get_free_mmr/bp_accept.png and b/image/display_get_free_mmr/bp_accept.png differ diff --git a/image/display_get_free_mmr/img_popup1.png b/image/display_get_free_mmr/img_popup1.png index 0bb65a87..d8a315e4 100644 Binary files a/image/display_get_free_mmr/img_popup1.png and b/image/display_get_free_mmr/img_popup1.png differ diff --git a/image/display_get_free_mmr/img_popup2.png b/image/display_get_free_mmr/img_popup2.png index 913e9f98..894bb62a 100644 Binary files a/image/display_get_free_mmr/img_popup2.png and b/image/display_get_free_mmr/img_popup2.png differ diff --git a/image/display_get_free_mmr/img_popup3.png b/image/display_get_free_mmr/img_popup3.png index dc9db9ab..8afb8c3c 100644 Binary files a/image/display_get_free_mmr/img_popup3.png and b/image/display_get_free_mmr/img_popup3.png differ diff --git a/image/display_get_free_mmr/img_popup4.png b/image/display_get_free_mmr/img_popup4.png index 5bc344df..ca9d92aa 100644 Binary files a/image/display_get_free_mmr/img_popup4.png and b/image/display_get_free_mmr/img_popup4.png differ diff --git a/image/display_get_free_mmr/img_popup5.png b/image/display_get_free_mmr/img_popup5.png index 95f492bb..ed173adc 100644 Binary files a/image/display_get_free_mmr/img_popup5.png and b/image/display_get_free_mmr/img_popup5.png differ diff --git a/image/display_got_free_mmr/bn_accept.png b/image/display_got_free_mmr/bn_accept.png index ec30f738..bfc01674 100644 Binary files a/image/display_got_free_mmr/bn_accept.png and b/image/display_got_free_mmr/bn_accept.png differ diff --git a/image/display_got_free_mmr/bp_accept.png b/image/display_got_free_mmr/bp_accept.png index c13609b3..bcdaa995 100644 Binary files a/image/display_got_free_mmr/bp_accept.png and b/image/display_got_free_mmr/bp_accept.png differ diff --git a/image/display_got_free_mmr/img_popup1.png b/image/display_got_free_mmr/img_popup1.png index cfffab0b..9edace27 100644 Binary files a/image/display_got_free_mmr/img_popup1.png and b/image/display_got_free_mmr/img_popup1.png differ diff --git a/image/display_point_mmr/bn_cancel2.png b/image/display_point_mmr/bn_cancel2.png index 616a7319..4af8d55e 100644 Binary files a/image/display_point_mmr/bn_cancel2.png and b/image/display_point_mmr/bn_cancel2.png differ diff --git a/image/display_point_mmr/bn_changePin.png b/image/display_point_mmr/bn_changePin.png index 71d75e51..5b1230d4 100644 Binary files a/image/display_point_mmr/bn_changePin.png and b/image/display_point_mmr/bn_changePin.png differ diff --git a/image/display_point_mmr/bn_check.png b/image/display_point_mmr/bn_check.png index b0314422..50cb3531 100644 Binary files a/image/display_point_mmr/bn_check.png and b/image/display_point_mmr/bn_check.png differ diff --git a/image/display_point_mmr/bn_checkKradong.png b/image/display_point_mmr/bn_checkKradong.png index ab03e7a6..c36762c1 100644 Binary files a/image/display_point_mmr/bn_checkKradong.png and b/image/display_point_mmr/bn_checkKradong.png differ diff --git a/image/display_point_mmr/bn_close.png b/image/display_point_mmr/bn_close.png index 07dafeea..27fb748f 100644 Binary files a/image/display_point_mmr/bn_close.png and b/image/display_point_mmr/bn_close.png differ diff --git a/image/display_point_mmr/bn_keep.png b/image/display_point_mmr/bn_keep.png index e8f2e49d..1fbfced0 100644 Binary files a/image/display_point_mmr/bn_keep.png and b/image/display_point_mmr/bn_keep.png differ diff --git a/image/display_point_mmr/bn_main.png b/image/display_point_mmr/bn_main.png index 02abad89..1b6d7528 100644 Binary files a/image/display_point_mmr/bn_main.png and b/image/display_point_mmr/bn_main.png differ diff --git a/image/display_point_mmr/bn_topup.png b/image/display_point_mmr/bn_topup.png index 088e1a8c..2f85470e 100644 Binary files a/image/display_point_mmr/bn_topup.png and b/image/display_point_mmr/bn_topup.png differ diff --git a/image/display_point_mmr/bn_topupCredit.png b/image/display_point_mmr/bn_topupCredit.png index 840eb3a0..1eb014f3 100644 Binary files a/image/display_point_mmr/bn_topupCredit.png and b/image/display_point_mmr/bn_topupCredit.png differ diff --git a/image/display_point_mmr/bn_useCoupon.png b/image/display_point_mmr/bn_useCoupon.png index 45bac84a..10dcf0df 100644 Binary files a/image/display_point_mmr/bn_useCoupon.png and b/image/display_point_mmr/bn_useCoupon.png differ diff --git a/image/display_point_mmr/bp_cancel2.png b/image/display_point_mmr/bp_cancel2.png index 28472cf5..c299ed11 100644 Binary files a/image/display_point_mmr/bp_cancel2.png and b/image/display_point_mmr/bp_cancel2.png differ diff --git a/image/display_point_mmr/bp_check.png b/image/display_point_mmr/bp_check.png index 4fee7319..5e0ba113 100644 Binary files a/image/display_point_mmr/bp_check.png and b/image/display_point_mmr/bp_check.png differ diff --git a/image/display_point_mmr/bp_checkKradong.png b/image/display_point_mmr/bp_checkKradong.png index b65ba6fd..d5bc7ef2 100644 Binary files a/image/display_point_mmr/bp_checkKradong.png and b/image/display_point_mmr/bp_checkKradong.png differ diff --git a/image/display_point_mmr/bp_close.png b/image/display_point_mmr/bp_close.png index c7df1ff9..9ed97ae1 100644 Binary files a/image/display_point_mmr/bp_close.png and b/image/display_point_mmr/bp_close.png differ diff --git a/image/display_point_mmr/bp_keep.png b/image/display_point_mmr/bp_keep.png index 246e29e7..c25252e5 100644 Binary files a/image/display_point_mmr/bp_keep.png and b/image/display_point_mmr/bp_keep.png differ diff --git a/image/display_point_mmr/bp_main.png b/image/display_point_mmr/bp_main.png index ef4d66f7..2a680106 100644 Binary files a/image/display_point_mmr/bp_main.png and b/image/display_point_mmr/bp_main.png differ diff --git a/image/display_point_mmr/bp_topup.png b/image/display_point_mmr/bp_topup.png index 56e9f5df..497883a8 100644 Binary files a/image/display_point_mmr/bp_topup.png and b/image/display_point_mmr/bp_topup.png differ diff --git a/image/display_point_mmr/bp_useCoupon.png b/image/display_point_mmr/bp_useCoupon.png index f5c7ee40..0f302388 100644 Binary files a/image/display_point_mmr/bp_useCoupon.png and b/image/display_point_mmr/bp_useCoupon.png differ diff --git a/image/display_point_mmr/disable2_get15discount.png b/image/display_point_mmr/disable2_get15discount.png index 9b0f54e7..eacd9dcf 100644 Binary files a/image/display_point_mmr/disable2_get15discount.png and b/image/display_point_mmr/disable2_get15discount.png differ diff --git a/image/display_point_mmr/imgCoupon112.png b/image/display_point_mmr/imgCoupon112.png index cca35735..e909b777 100644 Binary files a/image/display_point_mmr/imgCoupon112.png and b/image/display_point_mmr/imgCoupon112.png differ diff --git a/image/display_point_mmr/imgCoupon113.png b/image/display_point_mmr/imgCoupon113.png index 517cf00d..d15a0876 100644 Binary files a/image/display_point_mmr/imgCoupon113.png and b/image/display_point_mmr/imgCoupon113.png differ diff --git a/image/display_point_mmr/imgCoupon120.png b/image/display_point_mmr/imgCoupon120.png index 1bdd5dcd..bc14c689 100644 Binary files a/image/display_point_mmr/imgCoupon120.png and b/image/display_point_mmr/imgCoupon120.png differ diff --git a/image/display_point_mmr/imgCoupon121.png b/image/display_point_mmr/imgCoupon121.png index 19f08931..6e65b72f 100644 Binary files a/image/display_point_mmr/imgCoupon121.png and b/image/display_point_mmr/imgCoupon121.png differ diff --git a/image/display_point_mmr/imgCouponC33.png b/image/display_point_mmr/imgCouponC33.png index f257d3ec..718a4772 100644 Binary files a/image/display_point_mmr/imgCouponC33.png and b/image/display_point_mmr/imgCouponC33.png differ diff --git a/image/display_point_mmr/imgCouponC38.png b/image/display_point_mmr/imgCouponC38.png index f955ca78..f1b1e399 100644 Binary files a/image/display_point_mmr/imgCouponC38.png and b/image/display_point_mmr/imgCouponC38.png differ diff --git a/image/display_point_mmr/imgCouponC39.png b/image/display_point_mmr/imgCouponC39.png index d0ea495c..8eb93b81 100644 Binary files a/image/display_point_mmr/imgCouponC39.png and b/image/display_point_mmr/imgCouponC39.png differ diff --git a/image/display_point_mmr/imgCouponC40.png b/image/display_point_mmr/imgCouponC40.png index 74d22f8e..7d96e8ff 100644 Binary files a/image/display_point_mmr/imgCouponC40.png and b/image/display_point_mmr/imgCouponC40.png differ diff --git a/image/display_point_mmr/imgCouponC41.png b/image/display_point_mmr/imgCouponC41.png index 07a0898b..b49340fc 100644 Binary files a/image/display_point_mmr/imgCouponC41.png and b/image/display_point_mmr/imgCouponC41.png differ diff --git a/image/display_point_mmr/imgCouponC42.png b/image/display_point_mmr/imgCouponC42.png index d2d37a9f..7059a35d 100644 Binary files a/image/display_point_mmr/imgCouponC42.png and b/image/display_point_mmr/imgCouponC42.png differ diff --git a/image/display_point_mmr/imgCouponC44.png b/image/display_point_mmr/imgCouponC44.png index e2100140..3b4aaaae 100644 Binary files a/image/display_point_mmr/imgCouponC44.png and b/image/display_point_mmr/imgCouponC44.png differ diff --git a/image/display_point_mmr/imgCouponFree.png b/image/display_point_mmr/imgCouponFree.png index a8151727..fc9d8394 100644 Binary files a/image/display_point_mmr/imgCouponFree.png and b/image/display_point_mmr/imgCouponFree.png differ diff --git a/image/display_point_mmr/imgCouponMKP1.png b/image/display_point_mmr/imgCouponMKP1.png index c796dc32..40cc85b1 100644 Binary files a/image/display_point_mmr/imgCouponMKP1.png and b/image/display_point_mmr/imgCouponMKP1.png differ diff --git a/image/display_point_mmr/img_popup1.png b/image/display_point_mmr/img_popup1.png index d7b8a666..eea96cbc 100644 Binary files a/image/display_point_mmr/img_popup1.png and b/image/display_point_mmr/img_popup1.png differ diff --git a/image/display_point_mmr/img_popup4.png b/image/display_point_mmr/img_popup4.png index 046d402d..8a8d2f70 100644 Binary files a/image/display_point_mmr/img_popup4.png and b/image/display_point_mmr/img_popup4.png differ diff --git a/image/display_point_mmr/img_popup5.png b/image/display_point_mmr/img_popup5.png index 48442b1e..704ebad0 100644 Binary files a/image/display_point_mmr/img_popup5.png and b/image/display_point_mmr/img_popup5.png differ diff --git a/image/display_point_mmr/img_popup6.png b/image/display_point_mmr/img_popup6.png index b3b4b150..5cbc0ee3 100644 Binary files a/image/display_point_mmr/img_popup6.png and b/image/display_point_mmr/img_popup6.png differ diff --git a/image/display_point_mmr/img_popup7.png b/image/display_point_mmr/img_popup7.png index c06427bb..789ff4ed 100644 Binary files a/image/display_point_mmr/img_popup7.png and b/image/display_point_mmr/img_popup7.png differ diff --git a/image/display_point_mmr/img_popup8.png b/image/display_point_mmr/img_popup8.png index 0e74be94..dc6b42bc 100644 Binary files a/image/display_point_mmr/img_popup8.png and b/image/display_point_mmr/img_popup8.png differ diff --git a/image/display_point_mmr/taoLevel.png b/image/display_point_mmr/taoLevel.png new file mode 100644 index 00000000..df212a9a Binary files /dev/null and b/image/display_point_mmr/taoLevel.png differ diff --git a/image/display_point_mmr/taoLevel1.png b/image/display_point_mmr/taoLevel1.png index 7af8efac..04774c87 100644 Binary files a/image/display_point_mmr/taoLevel1.png and b/image/display_point_mmr/taoLevel1.png differ diff --git a/image/display_point_mmr/taoLevel3.png b/image/display_point_mmr/taoLevel3.png index 9fe73578..bd9d6912 100644 Binary files a/image/display_point_mmr/taoLevel3.png and b/image/display_point_mmr/taoLevel3.png differ diff --git a/image/display_point_mmr/taoLevel4.png b/image/display_point_mmr/taoLevel4.png index 60c2f867..82a39906 100644 Binary files a/image/display_point_mmr/taoLevel4.png and b/image/display_point_mmr/taoLevel4.png differ diff --git a/image/display_point_mmr/text4.png b/image/display_point_mmr/text4.png index 90d08c91..bdf04234 100644 Binary files a/image/display_point_mmr/text4.png and b/image/display_point_mmr/text4.png differ diff --git a/image/display_point_mmr/text5-MMR.png b/image/display_point_mmr/text5-MMR.png index 926acd46..be765eac 100644 Binary files a/image/display_point_mmr/text5-MMR.png and b/image/display_point_mmr/text5-MMR.png differ diff --git a/image/display_point_mmr/text7.png b/image/display_point_mmr/text7.png index 1ab78ddd..bdcd925c 100644 Binary files a/image/display_point_mmr/text7.png and b/image/display_point_mmr/text7.png differ diff --git a/image/display_point_mmr/text8.png b/image/display_point_mmr/text8.png index d206d64a..197acd97 100644 Binary files a/image/display_point_mmr/text8.png and b/image/display_point_mmr/text8.png differ diff --git a/image/display_point_mmr/text8_28.png b/image/display_point_mmr/text8_28.png index be4ccf7a..3c0e8c2d 100644 Binary files a/image/display_point_mmr/text8_28.png and b/image/display_point_mmr/text8_28.png differ diff --git a/image/event/lucky_draw_ads/bn_close_mmr.png b/image/event/lucky_draw_ads/bn_close_mmr.png index 0245827f..bfc01674 100644 Binary files a/image/event/lucky_draw_ads/bn_close_mmr.png and b/image/event/lucky_draw_ads/bn_close_mmr.png differ diff --git a/image/event/lucky_draw_ads/bn_interested_mmr.png b/image/event/lucky_draw_ads/bn_interested_mmr.png index 1de8c25d..76d96560 100644 Binary files a/image/event/lucky_draw_ads/bn_interested_mmr.png and b/image/event/lucky_draw_ads/bn_interested_mmr.png differ diff --git a/image/event/lucky_draw_ads/bn_skip_mmr.png b/image/event/lucky_draw_ads/bn_skip_mmr.png index a53d8b92..c82ca2b1 100644 Binary files a/image/event/lucky_draw_ads/bn_skip_mmr.png and b/image/event/lucky_draw_ads/bn_skip_mmr.png differ diff --git a/image/event/lucky_draw_ads/bp_close_mmr.png b/image/event/lucky_draw_ads/bp_close_mmr.png index 5bea3692..242941a2 100644 Binary files a/image/event/lucky_draw_ads/bp_close_mmr.png and b/image/event/lucky_draw_ads/bp_close_mmr.png differ diff --git a/image/event/lucky_draw_ads/bp_interested_mmr.png b/image/event/lucky_draw_ads/bp_interested_mmr.png index 076ec31d..b7533b29 100644 Binary files a/image/event/lucky_draw_ads/bp_interested_mmr.png and b/image/event/lucky_draw_ads/bp_interested_mmr.png differ diff --git a/image/event/lucky_draw_ads/bp_skip_mmr.png b/image/event/lucky_draw_ads/bp_skip_mmr.png index 260ff13a..da482d44 100644 Binary files a/image/event/lucky_draw_ads/bp_skip_mmr.png and b/image/event/lucky_draw_ads/bp_skip_mmr.png differ diff --git a/image/page3_2_mmr/bn_Pepsi_7up.png b/image/page3_2_mmr/bn_Pepsi_7up.png index e0fd3787..ef79b719 100644 Binary files a/image/page3_2_mmr/bn_Pepsi_7up.png and b/image/page3_2_mmr/bn_Pepsi_7up.png differ diff --git a/image/page3_2_mmr/bn_appfast2.png b/image/page3_2_mmr/bn_appfast2.png index ff81f4ef..42ac2955 100644 Binary files a/image/page3_2_mmr/bn_appfast2.png and b/image/page3_2_mmr/bn_appfast2.png differ diff --git a/image/page3_2_mmr/bn_cho_ca2.png b/image/page3_2_mmr/bn_cho_ca2.png index 7d21a30b..6bc5fb5e 100644 Binary files a/image/page3_2_mmr/bn_cho_ca2.png and b/image/page3_2_mmr/bn_cho_ca2.png differ diff --git a/image/page3_2_mmr/bn_cocktail.png b/image/page3_2_mmr/bn_cocktail.png index 4ca8df9f..a0d49e37 100644 Binary files a/image/page3_2_mmr/bn_cocktail.png and b/image/page3_2_mmr/bn_cocktail.png differ diff --git a/image/page3_2_mmr/bn_coffee2.png b/image/page3_2_mmr/bn_coffee2.png index 3009bc2e..4a76b110 100644 Binary files a/image/page3_2_mmr/bn_coffee2.png and b/image/page3_2_mmr/bn_coffee2.png differ diff --git a/image/page3_2_mmr/bn_forkid2.png b/image/page3_2_mmr/bn_forkid2.png index c21eeea6..83a1f794 100644 Binary files a/image/page3_2_mmr/bn_forkid2.png and b/image/page3_2_mmr/bn_forkid2.png differ diff --git a/image/page3_2_mmr/bn_health.png b/image/page3_2_mmr/bn_health.png index dc5a374a..ca45a2d7 100644 Binary files a/image/page3_2_mmr/bn_health.png and b/image/page3_2_mmr/bn_health.png differ diff --git a/image/page3_2_mmr/bn_protein2.png b/image/page3_2_mmr/bn_protein2.png index f449f5e8..208200b1 100644 Binary files a/image/page3_2_mmr/bn_protein2.png and b/image/page3_2_mmr/bn_protein2.png differ diff --git a/image/page3_2_mmr/bn_recommend2.png b/image/page3_2_mmr/bn_recommend2.png index 384c87de..4ecdd144 100644 Binary files a/image/page3_2_mmr/bn_recommend2.png and b/image/page3_2_mmr/bn_recommend2.png differ diff --git a/image/page3_2_mmr/bn_sodada2.png b/image/page3_2_mmr/bn_sodada2.png index 528c73df..b222418f 100644 Binary files a/image/page3_2_mmr/bn_sodada2.png and b/image/page3_2_mmr/bn_sodada2.png differ diff --git a/image/page3_2_mmr/bn_tea2.png b/image/page3_2_mmr/bn_tea2.png index 185b429d..163b5315 100644 Binary files a/image/page3_2_mmr/bn_tea2.png and b/image/page3_2_mmr/bn_tea2.png differ diff --git a/image/page3_2_mmr/bn_vending2.png b/image/page3_2_mmr/bn_vending2.png index 75f914f7..de6215e0 100644 Binary files a/image/page3_2_mmr/bn_vending2.png and b/image/page3_2_mmr/bn_vending2.png differ diff --git a/image/page3_2_mmr/bp_Pepsi_7up.png b/image/page3_2_mmr/bp_Pepsi_7up.png index 46989ef3..ba8d6711 100644 Binary files a/image/page3_2_mmr/bp_Pepsi_7up.png and b/image/page3_2_mmr/bp_Pepsi_7up.png differ diff --git a/image/page3_2_mmr/bp_appfast2.png b/image/page3_2_mmr/bp_appfast2.png index 92d992e1..0d0c5796 100644 Binary files a/image/page3_2_mmr/bp_appfast2.png and b/image/page3_2_mmr/bp_appfast2.png differ diff --git a/image/page3_2_mmr/bp_cho_ca2.png b/image/page3_2_mmr/bp_cho_ca2.png index 47a1f015..8ffb2570 100644 Binary files a/image/page3_2_mmr/bp_cho_ca2.png and b/image/page3_2_mmr/bp_cho_ca2.png differ diff --git a/image/page3_2_mmr/bp_cocktail.png b/image/page3_2_mmr/bp_cocktail.png index b4260301..15cb1479 100644 Binary files a/image/page3_2_mmr/bp_cocktail.png and b/image/page3_2_mmr/bp_cocktail.png differ diff --git a/image/page3_2_mmr/bp_coffee2.png b/image/page3_2_mmr/bp_coffee2.png index eade538d..2c4fce33 100644 Binary files a/image/page3_2_mmr/bp_coffee2.png and b/image/page3_2_mmr/bp_coffee2.png differ diff --git a/image/page3_2_mmr/bp_forkid2.png b/image/page3_2_mmr/bp_forkid2.png index 82540c15..14b465bb 100644 Binary files a/image/page3_2_mmr/bp_forkid2.png and b/image/page3_2_mmr/bp_forkid2.png differ diff --git a/image/page3_2_mmr/bp_health.png b/image/page3_2_mmr/bp_health.png index 024135ad..e64a22cd 100644 Binary files a/image/page3_2_mmr/bp_health.png and b/image/page3_2_mmr/bp_health.png differ diff --git a/image/page3_2_mmr/bp_protein2.png b/image/page3_2_mmr/bp_protein2.png index 89c62860..c2ea6a51 100644 Binary files a/image/page3_2_mmr/bp_protein2.png and b/image/page3_2_mmr/bp_protein2.png differ diff --git a/image/page3_2_mmr/bp_recommend2.png b/image/page3_2_mmr/bp_recommend2.png index 75acfc19..86228c0c 100644 Binary files a/image/page3_2_mmr/bp_recommend2.png and b/image/page3_2_mmr/bp_recommend2.png differ diff --git a/image/page3_2_mmr/bp_sodada2.png b/image/page3_2_mmr/bp_sodada2.png index ba04f468..241e2184 100644 Binary files a/image/page3_2_mmr/bp_sodada2.png and b/image/page3_2_mmr/bp_sodada2.png differ diff --git a/image/page3_2_mmr/bp_tea2.png b/image/page3_2_mmr/bp_tea2.png index 7c369ebc..2b828625 100644 Binary files a/image/page3_2_mmr/bp_tea2.png and b/image/page3_2_mmr/bp_tea2.png differ diff --git a/image/page3_2_mmr/bp_vending2.png b/image/page3_2_mmr/bp_vending2.png index 398ae92a..11facd01 100644 Binary files a/image/page3_2_mmr/bp_vending2.png and b/image/page3_2_mmr/bp_vending2.png differ diff --git a/image/page_payment_cash_extend_mmr/bn_cancel3.png b/image/page_payment_cash_extend_mmr/bn_cancel3.png index 5dad9e21..944ff3c3 100644 Binary files a/image/page_payment_cash_extend_mmr/bn_cancel3.png and b/image/page_payment_cash_extend_mmr/bn_cancel3.png differ diff --git a/image/page_payment_cash_extend_mmr/bn_keep.png b/image/page_payment_cash_extend_mmr/bn_keep.png index 12352a42..6fdc7e31 100644 Binary files a/image/page_payment_cash_extend_mmr/bn_keep.png and b/image/page_payment_cash_extend_mmr/bn_keep.png differ diff --git a/image/page_payment_cash_extend_mmr/bp_cancel3.png b/image/page_payment_cash_extend_mmr/bp_cancel3.png index 04478b39..c460ed15 100644 Binary files a/image/page_payment_cash_extend_mmr/bp_cancel3.png and b/image/page_payment_cash_extend_mmr/bp_cancel3.png differ diff --git a/image/page_payment_cash_extend_mmr/bp_keep.png b/image/page_payment_cash_extend_mmr/bp_keep.png index 7f9a428e..61bdf4d7 100644 Binary files a/image/page_payment_cash_extend_mmr/bp_keep.png and b/image/page_payment_cash_extend_mmr/bp_keep.png differ diff --git a/image/page_payment_cash_extend_mmr/img_popup11.png b/image/page_payment_cash_extend_mmr/img_popup11.png index 87214f6b..fb9ecc6b 100644 Binary files a/image/page_payment_cash_extend_mmr/img_popup11.png and b/image/page_payment_cash_extend_mmr/img_popup11.png differ diff --git a/image/page_payment_cash_extend_mmr/img_popup14.png b/image/page_payment_cash_extend_mmr/img_popup14.png index d2536638..810333ec 100644 Binary files a/image/page_payment_cash_extend_mmr/img_popup14.png and b/image/page_payment_cash_extend_mmr/img_popup14.png differ diff --git a/image/page_payment_cash_extend_mmr/img_popup15.png b/image/page_payment_cash_extend_mmr/img_popup15.png index 28a8831e..8203a864 100644 Binary files a/image/page_payment_cash_extend_mmr/img_popup15.png and b/image/page_payment_cash_extend_mmr/img_popup15.png differ diff --git a/image/page_payment_mmr/page_payment/CancelOrder.png b/image/page_payment_mmr/page_payment/CancelOrder.png index 8c9ec704..fb3bc583 100644 Binary files a/image/page_payment_mmr/page_payment/CancelOrder.png and b/image/page_payment_mmr/page_payment/CancelOrder.png differ diff --git a/image/page_payment_mmr/page_payment/CancelOrder2.png b/image/page_payment_mmr/page_payment/CancelOrder2.png index a8331c27..35f692ea 100644 Binary files a/image/page_payment_mmr/page_payment/CancelOrder2.png and b/image/page_payment_mmr/page_payment/CancelOrder2.png differ diff --git a/image/page_payment_mmr/page_payment/PaymentSuccess.png b/image/page_payment_mmr/page_payment/PaymentSuccess.png index cf9517f8..ec1f10af 100644 Binary files a/image/page_payment_mmr/page_payment/PaymentSuccess.png and b/image/page_payment_mmr/page_payment/PaymentSuccess.png differ diff --git a/image/page_payment_mmr/page_payment/QRError.png b/image/page_payment_mmr/page_payment/QRError.png index b220ad63..6230d172 100644 Binary files a/image/page_payment_mmr/page_payment/QRError.png and b/image/page_payment_mmr/page_payment/QRError.png differ diff --git a/image/page_payment_mmr/page_payment/bn_add_order.png b/image/page_payment_mmr/page_payment/bn_add_order.png index 5b807a63..ab4c836a 100644 Binary files a/image/page_payment_mmr/page_payment/bn_add_order.png and b/image/page_payment_mmr/page_payment/bn_add_order.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cancel.png b/image/page_payment_mmr/page_payment/bn_cancel.png index 90387350..ec0c3786 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cancel.png and b/image/page_payment_mmr/page_payment/bn_cancel.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cancel2.png b/image/page_payment_mmr/page_payment/bn_cancel2.png index 9baecd8f..4af8d55e 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cancel2.png and b/image/page_payment_mmr/page_payment/bn_cancel2.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cancel3-1.png b/image/page_payment_mmr/page_payment/bn_cancel3-1.png index 126322fc..d6fae32b 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cancel3-1.png and b/image/page_payment_mmr/page_payment/bn_cancel3-1.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cancel3.png b/image/page_payment_mmr/page_payment/bn_cancel3.png index ec1a494f..3d0fe746 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cancel3.png and b/image/page_payment_mmr/page_payment/bn_cancel3.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cancel_all.png b/image/page_payment_mmr/page_payment/bn_cancel_all.png index f27cbde4..514e91f2 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cancel_all.png and b/image/page_payment_mmr/page_payment/bn_cancel_all.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cashS.png b/image/page_payment_mmr/page_payment/bn_cashS.png index 08c57998..465a3958 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cashS.png and b/image/page_payment_mmr/page_payment/bn_cashS.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cashSmall.png b/image/page_payment_mmr/page_payment/bn_cashSmall.png index b4b62350..53a8c277 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cashSmall.png and b/image/page_payment_mmr/page_payment/bn_cashSmall.png differ diff --git a/image/page_payment_mmr/page_payment/bn_cash_2.png b/image/page_payment_mmr/page_payment/bn_cash_2.png index b50ac742..5767a812 100644 Binary files a/image/page_payment_mmr/page_payment/bn_cash_2.png and b/image/page_payment_mmr/page_payment/bn_cash_2.png differ diff --git a/image/page_payment_mmr/page_payment/bn_codeS.png b/image/page_payment_mmr/page_payment/bn_codeS.png index cbf1c4aa..b726c061 100644 Binary files a/image/page_payment_mmr/page_payment/bn_codeS.png and b/image/page_payment_mmr/page_payment/bn_codeS.png differ diff --git a/image/page_payment_mmr/page_payment/bn_confirm2.png b/image/page_payment_mmr/page_payment/bn_confirm2.png index eea855db..84b07f6d 100644 Binary files a/image/page_payment_mmr/page_payment/bn_confirm2.png and b/image/page_payment_mmr/page_payment/bn_confirm2.png differ diff --git a/image/page_payment_mmr/page_payment/bn_drink.png b/image/page_payment_mmr/page_payment/bn_drink.png index fa391324..8ecd25c9 100644 Binary files a/image/page_payment_mmr/page_payment/bn_drink.png and b/image/page_payment_mmr/page_payment/bn_drink.png differ diff --git a/image/page_payment_mmr/page_payment/bn_edit.png b/image/page_payment_mmr/page_payment/bn_edit.png index 3b822eed..8baa90c9 100644 Binary files a/image/page_payment_mmr/page_payment/bn_edit.png and b/image/page_payment_mmr/page_payment/bn_edit.png differ diff --git a/image/page_payment_mmr/page_payment/bn_keep.png b/image/page_payment_mmr/page_payment/bn_keep.png index 12352a42..fc93366f 100644 Binary files a/image/page_payment_mmr/page_payment/bn_keep.png and b/image/page_payment_mmr/page_payment/bn_keep.png differ diff --git a/image/page_payment_mmr/page_payment/bn_main.png b/image/page_payment_mmr/page_payment/bn_main.png index 21a8f1d9..2a680106 100644 Binary files a/image/page_payment_mmr/page_payment/bn_main.png and b/image/page_payment_mmr/page_payment/bn_main.png differ diff --git a/image/page_payment_mmr/page_payment/bn_prompt_payS.png b/image/page_payment_mmr/page_payment/bn_prompt_payS.png index 4a7b3d34..1ad33a87 100644 Binary files a/image/page_payment_mmr/page_payment/bn_prompt_payS.png and b/image/page_payment_mmr/page_payment/bn_prompt_payS.png differ diff --git a/image/page_payment_mmr/page_payment/bn_prompt_paySmall.png b/image/page_payment_mmr/page_payment/bn_prompt_paySmall.png index 1023c776..9207bfc5 100644 Binary files a/image/page_payment_mmr/page_payment/bn_prompt_paySmall.png and b/image/page_payment_mmr/page_payment/bn_prompt_paySmall.png differ diff --git a/image/page_payment_mmr/page_payment/bn_topup_credit.png b/image/page_payment_mmr/page_payment/bn_topup_credit.png index 622e1f53..98fae642 100644 Binary files a/image/page_payment_mmr/page_payment/bn_topup_credit.png and b/image/page_payment_mmr/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment_mmr/page_payment/bp_add_order.png b/image/page_payment_mmr/page_payment/bp_add_order.png index 21fd399a..2df4cf56 100644 Binary files a/image/page_payment_mmr/page_payment/bp_add_order.png and b/image/page_payment_mmr/page_payment/bp_add_order.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cancel.png b/image/page_payment_mmr/page_payment/bp_cancel.png index a8a8b707..177d2409 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cancel.png and b/image/page_payment_mmr/page_payment/bp_cancel.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cancel2.png b/image/page_payment_mmr/page_payment/bp_cancel2.png index 80b0459b..45532e27 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cancel2.png and b/image/page_payment_mmr/page_payment/bp_cancel2.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cancel3-1.png b/image/page_payment_mmr/page_payment/bp_cancel3-1.png index 2501868f..7c7b549d 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cancel3-1.png and b/image/page_payment_mmr/page_payment/bp_cancel3-1.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cancel3.png b/image/page_payment_mmr/page_payment/bp_cancel3.png index 18692f82..ecb67fa1 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cancel3.png and b/image/page_payment_mmr/page_payment/bp_cancel3.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cancel_all.png b/image/page_payment_mmr/page_payment/bp_cancel_all.png index aec7d7eb..e1f5a290 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cancel_all.png and b/image/page_payment_mmr/page_payment/bp_cancel_all.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cashS.png b/image/page_payment_mmr/page_payment/bp_cashS.png index 5d5fd557..9197b7c0 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cashS.png and b/image/page_payment_mmr/page_payment/bp_cashS.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cashSmall.png b/image/page_payment_mmr/page_payment/bp_cashSmall.png index aa0d68fb..8c015d62 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cashSmall.png and b/image/page_payment_mmr/page_payment/bp_cashSmall.png differ diff --git a/image/page_payment_mmr/page_payment/bp_cash_2.png b/image/page_payment_mmr/page_payment/bp_cash_2.png index 29916e3a..8f84c814 100644 Binary files a/image/page_payment_mmr/page_payment/bp_cash_2.png and b/image/page_payment_mmr/page_payment/bp_cash_2.png differ diff --git a/image/page_payment_mmr/page_payment/bp_codeS.png b/image/page_payment_mmr/page_payment/bp_codeS.png index c8f67a45..3bc6008c 100644 Binary files a/image/page_payment_mmr/page_payment/bp_codeS.png and b/image/page_payment_mmr/page_payment/bp_codeS.png differ diff --git a/image/page_payment_mmr/page_payment/bp_confirm.png b/image/page_payment_mmr/page_payment/bp_confirm.png index caf78239..ebc6201f 100644 Binary files a/image/page_payment_mmr/page_payment/bp_confirm.png and b/image/page_payment_mmr/page_payment/bp_confirm.png differ diff --git a/image/page_payment_mmr/page_payment/bp_confirm2.png b/image/page_payment_mmr/page_payment/bp_confirm2.png index da4d9802..fc56c859 100644 Binary files a/image/page_payment_mmr/page_payment/bp_confirm2.png and b/image/page_payment_mmr/page_payment/bp_confirm2.png differ diff --git a/image/page_payment_mmr/page_payment/bp_drink.png b/image/page_payment_mmr/page_payment/bp_drink.png index 7410dca8..07374d73 100644 Binary files a/image/page_payment_mmr/page_payment/bp_drink.png and b/image/page_payment_mmr/page_payment/bp_drink.png differ diff --git a/image/page_payment_mmr/page_payment/bp_edit.png b/image/page_payment_mmr/page_payment/bp_edit.png index 2779bede..65006a28 100644 Binary files a/image/page_payment_mmr/page_payment/bp_edit.png and b/image/page_payment_mmr/page_payment/bp_edit.png differ diff --git a/image/page_payment_mmr/page_payment/bp_keep.png b/image/page_payment_mmr/page_payment/bp_keep.png index 7f9a428e..73c98cc4 100644 Binary files a/image/page_payment_mmr/page_payment/bp_keep.png and b/image/page_payment_mmr/page_payment/bp_keep.png differ diff --git a/image/page_payment_mmr/page_payment/bp_main.png b/image/page_payment_mmr/page_payment/bp_main.png index ec22f189..1b6d7528 100644 Binary files a/image/page_payment_mmr/page_payment/bp_main.png and b/image/page_payment_mmr/page_payment/bp_main.png differ diff --git a/image/page_payment_mmr/page_payment/bp_prompt_payS.png b/image/page_payment_mmr/page_payment/bp_prompt_payS.png index 3bea9685..75a083b4 100644 Binary files a/image/page_payment_mmr/page_payment/bp_prompt_payS.png and b/image/page_payment_mmr/page_payment/bp_prompt_payS.png differ diff --git a/image/page_payment_mmr/page_payment/bp_prompt_paySmall.png b/image/page_payment_mmr/page_payment/bp_prompt_paySmall.png index fcc47d64..5cb508bb 100644 Binary files a/image/page_payment_mmr/page_payment/bp_prompt_paySmall.png and b/image/page_payment_mmr/page_payment/bp_prompt_paySmall.png differ diff --git a/image/page_payment_mmr/page_payment/bp_topup_credit.png b/image/page_payment_mmr/page_payment/bp_topup_credit.png index 7d66eb19..b8ace870 100644 Binary files a/image/page_payment_mmr/page_payment/bp_topup_credit.png and b/image/page_payment_mmr/page_payment/bp_topup_credit.png differ diff --git a/image/page_payment_mmr/page_payment/image/bn_change_pass_mmr.png b/image/page_payment_mmr/page_payment/image/bn_change_pass_mmr.png deleted file mode 100644 index f397251f..00000000 Binary files a/image/page_payment_mmr/page_payment/image/bn_change_pass_mmr.png and /dev/null differ diff --git a/image/page_payment_mmr/page_payment/image/bn_check_coupon_mmr.png b/image/page_payment_mmr/page_payment/image/bn_check_coupon_mmr.png deleted file mode 100644 index 7742f57d..00000000 Binary files a/image/page_payment_mmr/page_payment/image/bn_check_coupon_mmr.png and /dev/null differ diff --git a/image/page_payment_mmr/page_payment/image/bn_topup_credit_mmr.png b/image/page_payment_mmr/page_payment/image/bn_topup_credit_mmr.png deleted file mode 100644 index d8a22e67..00000000 Binary files a/image/page_payment_mmr/page_payment/image/bn_topup_credit_mmr.png and /dev/null differ diff --git a/image/page_payment_mmr/page_payment/image_warning_energy_drink_en.png b/image/page_payment_mmr/page_payment/image_warning_energy_drink_en.png new file mode 100644 index 00000000..2178755c Binary files /dev/null and b/image/page_payment_mmr/page_payment/image_warning_energy_drink_en.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup1.png b/image/page_payment_mmr/page_payment/img_popup1.png index a5a2c853..b927661b 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup1.png and b/image/page_payment_mmr/page_payment/img_popup1.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup10.png b/image/page_payment_mmr/page_payment/img_popup10.png index 00c2fab5..d2fd6fb7 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup10.png and b/image/page_payment_mmr/page_payment/img_popup10.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup11.png b/image/page_payment_mmr/page_payment/img_popup11.png index bbd05e84..f14c2606 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup11.png and b/image/page_payment_mmr/page_payment/img_popup11.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup12.png b/image/page_payment_mmr/page_payment/img_popup12.png index 9d677389..f65d2abd 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup12.png and b/image/page_payment_mmr/page_payment/img_popup12.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup12_offline.png b/image/page_payment_mmr/page_payment/img_popup12_offline.png new file mode 100644 index 00000000..27ec16ee Binary files /dev/null and b/image/page_payment_mmr/page_payment/img_popup12_offline.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup13.png b/image/page_payment_mmr/page_payment/img_popup13.png index cf9927a0..e386f110 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup13.png and b/image/page_payment_mmr/page_payment/img_popup13.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup2.png b/image/page_payment_mmr/page_payment/img_popup2.png index 768aabf6..e0d05fe6 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup2.png and b/image/page_payment_mmr/page_payment/img_popup2.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup20.png b/image/page_payment_mmr/page_payment/img_popup20.png index f81b2e72..a0bfe250 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup20.png and b/image/page_payment_mmr/page_payment/img_popup20.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup21.png b/image/page_payment_mmr/page_payment/img_popup21.png index 6682c5fe..a804c9e9 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup21.png and b/image/page_payment_mmr/page_payment/img_popup21.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup3.png b/image/page_payment_mmr/page_payment/img_popup3.png index 6a0cfe91..626f2685 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup3.png and b/image/page_payment_mmr/page_payment/img_popup3.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup4-2.png b/image/page_payment_mmr/page_payment/img_popup4-2.png index 1e89b45c..6373764a 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup4-2.png and b/image/page_payment_mmr/page_payment/img_popup4-2.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup4-3.png b/image/page_payment_mmr/page_payment/img_popup4-3.png index 3a5fee60..57b606e2 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup4-3.png and b/image/page_payment_mmr/page_payment/img_popup4-3.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup4.png b/image/page_payment_mmr/page_payment/img_popup4.png index a88edc12..1125b0ef 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup4.png and b/image/page_payment_mmr/page_payment/img_popup4.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup5.png b/image/page_payment_mmr/page_payment/img_popup5.png index d7e045eb..4834e672 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup5.png and b/image/page_payment_mmr/page_payment/img_popup5.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup8.png b/image/page_payment_mmr/page_payment/img_popup8.png index f67472e2..bef31fec 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup8.png and b/image/page_payment_mmr/page_payment/img_popup8.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup8_with_service_charge.png b/image/page_payment_mmr/page_payment/img_popup8_with_service_charge.png new file mode 100644 index 00000000..9affdd43 Binary files /dev/null and b/image/page_payment_mmr/page_payment/img_popup8_with_service_charge.png differ diff --git a/image/page_payment_mmr/page_payment/img_popup9.png b/image/page_payment_mmr/page_payment/img_popup9.png index f7441ede..5ecf413f 100644 Binary files a/image/page_payment_mmr/page_payment/img_popup9.png and b/image/page_payment_mmr/page_payment/img_popup9.png differ diff --git a/image/page_payment_mmr/page_payment/text_1.png b/image/page_payment_mmr/page_payment/text_1.png index c3f3a7ea..267e28b1 100644 Binary files a/image/page_payment_mmr/page_payment/text_1.png and b/image/page_payment_mmr/page_payment/text_1.png differ diff --git a/image/page_payment_mmr/page_payment/text_2.png b/image/page_payment_mmr/page_payment/text_2.png index d99f2710..ce602471 100644 Binary files a/image/page_payment_mmr/page_payment/text_2.png and b/image/page_payment_mmr/page_payment/text_2.png differ diff --git a/image/page_payment_mmr/page_payment/text_3.png b/image/page_payment_mmr/page_payment/text_3.png index 457b4cfc..47b99460 100644 Binary files a/image/page_payment_mmr/page_payment/text_3.png and b/image/page_payment_mmr/page_payment/text_3.png differ diff --git a/image/page_payment_mmr/page_payment/text_4-MMR.png b/image/page_payment_mmr/page_payment/text_4-MMR.png index cce80d92..b4d4da20 100644 Binary files a/image/page_payment_mmr/page_payment/text_4-MMR.png and b/image/page_payment_mmr/page_payment/text_4-MMR.png differ diff --git a/image/page_payment_mmr/page_payment/text_next_order.png b/image/page_payment_mmr/page_payment/text_next_order.png index cd033c02..404667fd 100644 Binary files a/image/page_payment_mmr/page_payment/text_next_order.png and b/image/page_payment_mmr/page_payment/text_next_order.png differ diff --git a/image/page_thankyou_mmr/imgGetChange-MMR.png b/image/page_thankyou_mmr/imgGetChange-MMR.png new file mode 100644 index 00000000..2e56e0e9 Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange-MMR.png differ diff --git a/image/page_thankyou_mmr/remainCredit.png b/image/page_thankyou_mmr/remainCredit.png index 1ae3199f..b299f105 100644 Binary files a/image/page_thankyou_mmr/remainCredit.png and b/image/page_thankyou_mmr/remainCredit.png differ diff --git a/image/user_take_cup_mmr/bd_door_open_take_double_cup.png b/image/user_take_cup_mmr/bd_door_open_take_double_cup.png index d29f4f5b..1b84aca8 100644 Binary files a/image/user_take_cup_mmr/bd_door_open_take_double_cup.png and b/image/user_take_cup_mmr/bd_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_mmr/bn_door_open.png b/image/user_take_cup_mmr/bn_door_open.png index 95c71084..45327407 100644 Binary files a/image/user_take_cup_mmr/bn_door_open.png and b/image/user_take_cup_mmr/bn_door_open.png differ diff --git a/image/user_take_cup_mmr/bn_door_open_take_double_cup.png b/image/user_take_cup_mmr/bn_door_open_take_double_cup.png index 93aac86d..bf85952f 100644 Binary files a/image/user_take_cup_mmr/bn_door_open_take_double_cup.png and b/image/user_take_cup_mmr/bn_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_mmr/bp_door_open.png b/image/user_take_cup_mmr/bp_door_open.png index 3118674a..382f77bd 100644 Binary files a/image/user_take_cup_mmr/bp_door_open.png and b/image/user_take_cup_mmr/bp_door_open.png differ diff --git a/image/user_take_cup_mmr/bp_door_open_take_double_cup.png b/image/user_take_cup_mmr/bp_door_open_take_double_cup.png index b91b0025..f6f28e1b 100644 Binary files a/image/user_take_cup_mmr/bp_door_open_take_double_cup.png and b/image/user_take_cup_mmr/bp_door_open_take_double_cup.png differ diff --git a/image/user_take_cup_mmr/img5.png b/image/user_take_cup_mmr/img5.png index 2f3d61f5..71f037c4 100644 Binary files a/image/user_take_cup_mmr/img5.png and b/image/user_take_cup_mmr/img5.png differ diff --git a/image/user_take_cup_mmr/img_take_cup_for_next_brew.png b/image/user_take_cup_mmr/img_take_cup_for_next_brew.png index a77452bd..fb0e53b2 100644 Binary files a/image/user_take_cup_mmr/img_take_cup_for_next_brew.png and b/image/user_take_cup_mmr/img_take_cup_for_next_brew.png differ diff --git a/image/vending_error_mmr/text1.png b/image/vending_error_mmr/text1.png index 126e7570..c667b5da 100644 Binary files a/image/vending_error_mmr/text1.png and b/image/vending_error_mmr/text1.png differ diff --git a/image/vending_error_mmr/text2.png b/image/vending_error_mmr/text2.png index 19d14971..f025852e 100644 Binary files a/image/vending_error_mmr/text2.png and b/image/vending_error_mmr/text2.png differ diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index f64983ea..5b6793c3 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -1171,7 +1171,7 @@ 1300016 Brew time:sec เวลาชง: วินาที 1300017 Test grind sizes ทดสอบขนาดบด 1300018 Coffee module type : ประเภทชุดกาแฟ : -1300019 1. Select grind sizes 1. เลือกขนาดการบด +1300019 1. Select grind sizes 1. เลือกขนาดบด 1300020 More coarse หยาบขึ้น 1300021 More fine ละเอียดขึ้น 1300022 2. Test grinding 2. ทดสอบการบด diff --git a/xml/page_check_member_point.xml b/xml/page_check_member_point.xml index 47e8a40a..88032d6b 100644 --- a/xml/page_check_member_point.xml +++ b/xml/page_check_member_point.xml @@ -778,17 +778,20 @@ Var PointEndDate = "" GetDateEndOfMonth PointEndDate DEBUGVAR PointEndDate - Var xPointEndDate = 490 + + Var xPointEndDate = 485 Var yPointEndDate = 1570 + Var xDescEndDate = 172 If show_eng = "true" Then - Var xPointEndDate = 575 + Var xPointEndDate = 566 Var yPointEndDate = 1563 EndIf If LanguageShow = "MYANMAR" Then Var xPointEndDate = 520 Var yPointEndDate = 1568 + Var xDescEndDate = 265 EndIf @@ -1262,7 +1265,7 @@ - 172 + xDescEndDate 1570 Var( DirImage + "/text8_28.png" ) diff --git a/xml/page_clean_feedback.xml b/xml/page_clean_feedback.xml index 34ee4252..9f474eb9 100644 --- a/xml/page_clean_feedback.xml +++ b/xml/page_clean_feedback.xml @@ -45,6 +45,25 @@ Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_en.png" EndIf + If LanguageShow = "MYANMAR" Then + Var PopupTitle = "စက်သန့်ရှင်းမှု အမှတ်" + Var Description = "ကျွန်တော်တို့ နေ့စဉ် တိုးတက်ချင်လို့ပါ။" + + Var TitleSize = 60 + + Var FeedbackLevel[0] = DirImage + "bn_feedback_level_1_mmr.png" + Var FeedbackLevel[0].Pressed = DirImage + "bp_feedback_level_1_mmr.png" + Var FeedbackLevel[1] = DirImage + "bn_feedback_level_2_mmr.png" + Var FeedbackLevel[1].Pressed = DirImage + "bp_feedback_level_2_mmr.png" + Var FeedbackLevel[2] = DirImage + "bn_feedback_level_3_mmr.png" + Var FeedbackLevel[2].Pressed = DirImage + "bp_feedback_level_3_mmr.png" + Var FeedbackLevel[3] = DirImage + "bn_feedback_level_4_mmr.png" + Var FeedbackLevel[3].Pressed = DirImage + "bp_feedback_level_4_mmr.png" + Var FeedbackLevel[4] = DirImage + "bn_feedback_level_5_mmr.png" + Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_mmr.png" + + EndIf + 1000 diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 0624468d..7dee9069 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -777,6 +777,7 @@ Var PointEndDate = "" GetDateEndOfMonth PointEndDate DEBUGVAR PointEndDate + Var TextEndDateX = 172 Var xPointEndDate = 570 If show_eng = "true" Then @@ -784,7 +785,8 @@ EndIf If LanguageShow = "MYANMAR" Then - Var xPointEndDate = 658 + Var xPointEndDate = 490 + Var TextEndDateX = 190 EndIf Var Point2XState = "Invisible" @@ -1356,7 +1358,7 @@ - 172 + TextEndDateX TextEndDateY Var( DirImage + "/text8.png" ) diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index 155fe6c1..ca6272db 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -794,14 +794,17 @@ DEBUGVAR PointEndDate Var xPointEndDate = 490 Var yPointEndDate = 1570 + Var xDescEndDate = 172 If show_eng = "true" Then Var xPointEndDate = 575 Var yPointEndDate = 1563 EndIf + If LanguageShow = "MYANMAR" Then Var xPointEndDate = 520 Var yPointEndDate = 1568 + Var xDescEndDate = 265 EndIf @@ -1310,7 +1313,7 @@ - 172 + xDescEndDate 1570 Var( DirImage + "/text8_28.png" ) diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml index 9e07411c..833baa9e 100644 --- a/xml/page_get_yourchange.xml +++ b/xml/page_get_yourchange.xml @@ -54,6 +54,19 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou" EndIf + If LanguageShow = "MYANMAR" Then + + If CountryName = "Singapore" Then + Var show_btp = "" + Var show_btn = "" + + EndIf + + + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" + EndIf + If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Dont_forget_your_changes_below.mp3" Else @@ -62,6 +75,11 @@ Var imgGetChange = "/imgGetChange.png" + ;inter-th-mmr + If LanguageShow = "MYANMAR" Then + Var imgGetChange = "/imgGetChange-MMR.png" + EndIf + ;inter-image If CountryName = "Malaysia" Then Var imgGetChange = "/imgGetChange-MYR.png" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 948b0bf3..ea1af6e1 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -506,7 +506,7 @@ EndIf If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout - Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr = RemainAmountStr + "###size=60" EndIf EndIf @@ -2606,7 +2606,7 @@ EndIf If LanguageShow = "MYANMAR" Then Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout - Var RemainAmountStr = RemainAmountStr + "###size=90" + Var RemainAmountStr = RemainAmountStr + "###size=60" EndIf EndIf @@ -3412,7 +3412,7 @@ eval( 0 - 1041 + RemainAmountStrY 144 Center 1080 diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 8c3f9599..9b2d7d4a 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -35,6 +35,7 @@ Var ReqFlag = 0 Var Xtext = 246 + Var Ytext_16 = 699 If show_eng = "true" Then @@ -46,6 +47,7 @@ If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" + Var Ytext_16 = 640 EndIf Var Ext1a = "" @@ -893,7 +895,7 @@ 188 - 699 + Ytext_16 Var( DirImage + "/text_16.png" ) diff --git a/xml/payment_cash.ev b/xml/payment_cash.ev index d672796f..05c1737e 100644 --- a/xml/payment_cash.ev +++ b/xml/payment_cash.ev @@ -1,14 +1,9 @@ -If CountryName = "Thailand" Then - ; ignore -Else - - If LanguageShow = "ENG" Then - Var show_eng = "true" - EndIf - If LanguageShow = "THAI" Then - Var show_eng = "false" - EndIf - +;for 3 langs +If LanguageShow = "ENG" Then + Var show_eng = "true" +EndIf +If LanguageShow = "THAI" Then + Var show_eng = "false" EndIf @@ -20,6 +15,7 @@ If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Var LOADING_STATE_X = 267 + Var RemainAmountStrY = 1041 Else Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" @@ -28,6 +24,7 @@ Else Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Var LOADING_STATE_X = 267 + Var RemainAmountStrY = 1041 EndIf If LanguageShow = "MYANMAR" Then @@ -38,6 +35,7 @@ If LanguageShow = "MYANMAR" Then Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Var LOADING_STATE_X = 267 + Var RemainAmountStrY = 1061 EndIf If RoadShow = "true" Then