Merge branch 'new_flow_payment' into masterpiece

2024-01-30 13:24:21 +07:00 · 2024-01-30 13:24:21 +07:00 · 88964df4ca
commit 88964df4ca
parent e42bd8119e 89da737dff
61 changed files with 3609 additions and 80 deletions
--- a/image/collectiing/bn_cancel4.png
+++ b/image/collectiing/bn_cancel4.png
--- a/image/collectiing/bn_cancel5.png
+++ b/image/collectiing/bn_cancel5.png
--- a/image/collectiing/bn_topup_with_cash.png
+++ b/image/collectiing/bn_topup_with_cash.png
--- a/image/collectiing/bn_topup_with_code.png
+++ b/image/collectiing/bn_topup_with_code.png
--- a/image/collectiing/bn_topup_with_qr.png
+++ b/image/collectiing/bn_topup_with_qr.png
--- a/image/collectiing/bn_useCredit2.png
+++ b/image/collectiing/bn_useCredit2.png
--- a/image/collectiing/bn_useCredit3.png
+++ b/image/collectiing/bn_useCredit3.png
--- a/image/collectiing/bp_cancel4.png
+++ b/image/collectiing/bp_cancel4.png
--- a/image/collectiing/bp_cancel5.png
+++ b/image/collectiing/bp_cancel5.png
--- a/image/collectiing/bp_topup_with_cash.png
+++ b/image/collectiing/bp_topup_with_cash.png
--- a/image/collectiing/bp_topup_with_code.png
+++ b/image/collectiing/bp_topup_with_code.png
--- a/image/collectiing/bp_topup_with_qr.png
+++ b/image/collectiing/bp_topup_with_qr.png
--- a/image/collectiing/bp_useCredit2.png
+++ b/image/collectiing/bp_useCredit2.png
--- a/image/collectiing/bp_useCredit3.png
+++ b/image/collectiing/bp_useCredit3.png
--- a/image/collectiing/img_popup18.png
+++ b/image/collectiing/img_popup18.png
--- a/image/collectiing/img_popup19.png
+++ b/image/collectiing/img_popup19.png
--- a/image/collectiing/img_popup20-Failed.png
+++ b/image/collectiing/img_popup20-Failed.png
--- a/image/collectiing/img_popup20.png
+++ b/image/collectiing/img_popup20.png
--- a/image/collectiing/text_44.png
+++ b/image/collectiing/text_44.png
--- a/image/collectiing/text_show_notEnough2.png
+++ b/image/collectiing/text_show_notEnough2.png
--- a/image/collectiing/text_show_notOperate.png
+++ b/image/collectiing/text_show_notOperate.png
--- a/image/collectiing_en/bn_cancel4.png
+++ b/image/collectiing_en/bn_cancel4.png
--- a/image/collectiing_en/bn_topup_with_cash.png
+++ b/image/collectiing_en/bn_topup_with_cash.png
--- a/image/collectiing_en/bn_topup_with_code.png
+++ b/image/collectiing_en/bn_topup_with_code.png
--- a/image/collectiing_en/bn_topup_with_qr.png
+++ b/image/collectiing_en/bn_topup_with_qr.png
--- a/image/collectiing_en/bn_useCredit2.png
+++ b/image/collectiing_en/bn_useCredit2.png
--- a/image/collectiing_en/bn_useCredit3.png
+++ b/image/collectiing_en/bn_useCredit3.png
--- a/image/collectiing_en/bp_cancel4.png
+++ b/image/collectiing_en/bp_cancel4.png
--- a/image/collectiing_en/bp_topup_with_cash.png
+++ b/image/collectiing_en/bp_topup_with_cash.png
--- a/image/collectiing_en/bp_topup_with_code.png
+++ b/image/collectiing_en/bp_topup_with_code.png
--- a/image/collectiing_en/bp_topup_with_qr.png
+++ b/image/collectiing_en/bp_topup_with_qr.png
--- a/image/collectiing_en/bp_useCredit2.png
+++ b/image/collectiing_en/bp_useCredit2.png
--- a/image/collectiing_en/bp_useCredit3.png
+++ b/image/collectiing_en/bp_useCredit3.png
--- a/image/collectiing_en/img_popup18.png
+++ b/image/collectiing_en/img_popup18.png
--- a/image/collectiing_en/img_popup19.png
+++ b/image/collectiing_en/img_popup19.png
--- a/image/collectiing_en/img_popup20-Failed.png
+++ b/image/collectiing_en/img_popup20-Failed.png
--- a/image/collectiing_en/img_popup20.png
+++ b/image/collectiing_en/img_popup20.png
--- a/image/collectiing_en/text_44.png
+++ b/image/collectiing_en/text_44.png
--- a/image/collectiing_en/text_show_notEnough2.png
+++ b/image/collectiing_en/text_show_notEnough2.png
--- a/image/page_payment/bn_codeS.png
+++ b/image/page_payment/bn_codeS.png
--- a/image/page_payment/bp_codeS.png
+++ b/image/page_payment/bp_codeS.png
--- a/image/page_payment_en/page_payment/bn_codeS.png
+++ b/image/page_payment_en/page_payment/bn_codeS.png
--- a/image/page_payment_en/page_payment/bp_codeS.png
+++ b/image/page_payment_en/page_payment/bp_codeS.png