diff --git a/image/collectiing/text_show_error3.png b/image/collectiing/text_show_error3.png new file mode 100644 index 00000000..1cafe76b Binary files /dev/null and b/image/collectiing/text_show_error3.png differ diff --git a/image/collectiing_en/text_show_error3.png b/image/collectiing_en/text_show_error3.png new file mode 100644 index 00000000..7b14e6d7 Binary files /dev/null and b/image/collectiing_en/text_show_error3.png differ diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 3fac1db0..5b783ace 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -24,6 +24,7 @@ Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" @@ -49,9 +50,9 @@ Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" - If TelephoneNumber = "" Then + Var TelephoneNumber = TelephoneNumberX - EndIf + Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf @@ -77,9 +78,9 @@ Open "ROOT/taobin_project/xml/page_show_consent.xml" Else Var StepGetPoint = 1 - If TelephoneNumber = "" Then + Var TelephoneNumber = TelephoneNumberX - EndIf + GETACCEXT TelephoneNumber 14 Var Ext1a = "" Open "ROOT/taobin_project/xml/page_collect_point_2.xml" @@ -88,11 +89,11 @@ If Ext1a = "" Then - ;Var CoffeePoint = 1 - ;Var Seeker.TNumberTaobinMember = TelephoneNumber + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" @@ -105,6 +106,7 @@ Var TaobinExpire = Ext1f Var TaobinLevel = Ext1e + Var TelephoneNumber = TelephoneNumberX Var TNumberTaobinMemberXXX = TelephoneNumber @@ -142,11 +144,11 @@ Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Else - ;Var CoffeePoint = 1 - ;Var Seeker.TNumberTaobinMember = TelephoneNumber + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf @@ -169,6 +171,7 @@ Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = "" + PayAmount Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" EndIf diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 5c034892..ca89b090 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -14,6 +14,7 @@ Var BmiYear = "0/0/0/0/0/0/0/0/0/1" Var PointCrm = "pdpa1" Var GetScore = "" + Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber ;AddData 4 TelephoneNumber BmiYear PointCrm GetScore ;Add after pay @@ -672,7 +673,7 @@ Var CouponInfo9 = Ext1i Var CouponInfo10 = Ext1j - + Var TelephoneNumber = TelephoneNumberX GETACCEXT TelephoneNumber 13 Var CheckCoupons = 2 @@ -810,7 +811,7 @@ - + Var TelephoneNumber = TelephoneNumberX GETACCEXT TelephoneNumber 15 Var CheckCoupons = 1 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 99fcb9a4..a6ced20a 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -289,7 +289,8 @@ Var pay_with_chanel_text = DirImage + "/text_1.png" - If DisableUsingCode = "true" Then + ;If DisableUsingCode = "true" Then + If DisableUsingCode = "-" Then SAVELOG "Diable code because using topping." Var PayState2 = "Disable" Var pay_with_code_image = DirImage + "/bd_pay_with_code.png" diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 1b4f70b4..90758fef 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -329,6 +329,10 @@ Var text_show_error = DirImage + "/text_show_error.png" EndIf + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + Var GetPayInfoFlag = 0 Var Seeker.CodeChannel = 0 Var Tel_Confirm_State = "Disable" diff --git a/xml/page_payment_codeAIS.xml b/xml/page_payment_codeAIS.xml index 5d0ff781..6e788c47 100644 --- a/xml/page_payment_codeAIS.xml +++ b/xml/page_payment_codeAIS.xml @@ -191,6 +191,10 @@ Var text_show_error = DirImage + "/text_show_error.png" EndIf + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + Var GetPayInfoFlag = 0 Var Seeker.CodeChannel = 0 Var Tel_Confirm_State = "Disable" diff --git a/xml/page_payment_codeDtac.xml b/xml/page_payment_codeDtac.xml index 0cb08036..7cf472f4 100644 --- a/xml/page_payment_codeDtac.xml +++ b/xml/page_payment_codeDtac.xml @@ -191,6 +191,10 @@ Var text_show_error = DirImage + "/text_show_error.png" EndIf + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + Var GetPayInfoFlag = 0 Var Seeker.CodeChannel = 0 Var Tel_Confirm_State = "Disable" diff --git a/xml/page_payment_codeLotus.xml b/xml/page_payment_codeLotus.xml index 77e7b1c0..bf315ca3 100644 --- a/xml/page_payment_codeLotus.xml +++ b/xml/page_payment_codeLotus.xml @@ -191,6 +191,10 @@ Var text_show_error = DirImage + "/text_show_error.png" EndIf + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + Var GetPayInfoFlag = 0 Var Seeker.CodeChannel = 0 Var Tel_Confirm_State = "Disable" diff --git a/xml/page_payment_codeThe1.xml b/xml/page_payment_codeThe1.xml index 1c123ccb..80ebb7fe 100644 --- a/xml/page_payment_codeThe1.xml +++ b/xml/page_payment_codeThe1.xml @@ -191,6 +191,10 @@ Var text_show_error = DirImage + "/text_show_error.png" EndIf + If ErrorCause = "failed_fromoper_0005" Then + Var text_show_error = DirImage + "/text_show_error3.png" + EndIf + Var GetPayInfoFlag = 0 Var Seeker.CodeChannel = 0 Var Tel_Confirm_State = "Disable"