From 2ae7b985eff21aff7723abb7bfc4f923d0ca5638 Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 23 Feb 2022 13:53:46 +0700 Subject: [PATCH 1/3] 100 sec and fix coupon --- xml/page_brewing3.xml | 3 +++ xml/page_check_member2.xml | 4 ++-- xml/page_payment.xml | 2 +- xml/page_payment_multi.xml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 0f8a095d..2a6a7ef5 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -155,11 +155,14 @@ If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2_en" Else Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2" EndIf Var next_pic_bg = DirImage + "/bn_add_order.png" + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" If LastMakeDrinkResult = "success" Then diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 22a0acbf..fb207979 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -694,7 +694,7 @@ Var CouponNameA = "/imgCouponC42.png" EndIf If CouponTypeA = "109" Then - Var CouponTypeA = "/imgCouponC33.png" + Var CouponNameA = "/imgCouponC33.png" EndIf INT CouponExireA_D @@ -798,7 +798,7 @@ Var CouponNameB = "/imgCouponC42.png" EndIf If CouponTypeB = "109" Then - Var CouponTypeB = "/imgCouponC33.png" + Var CouponNameB = "/imgCouponC33.png" EndIf INT CouponExireB_D diff --git a/xml/page_payment.xml b/xml/page_payment.xml index a476e485..178c8fb1 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -126,7 +126,7 @@ - 900 + 100 If ReadyForBrew = "false" Then diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index a5464a71..708d4360 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -230,7 +230,7 @@ - 500 + 100 If ReadyForBrew = "false" Then From c837937beba1a631f870f457bfaa327451bb8486 Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 23 Feb 2022 14:00:59 +0700 Subject: [PATCH 2/3] 100 sec and fix coupon --- xml/page_check_member2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index fb207979..54d9c66f 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -583,7 +583,7 @@ Var CouponNameB = "/imgCouponC42.png" EndIf If CouponTypeB = "109" Then - Var CouponTypeB = "/imgCouponC33.png" + Var CouponNameB = "/imgCouponC33.png" EndIf INT CouponExireB_D From d41b88e7da0ad63d69566a56d7ddbd3281461e4b Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 23 Feb 2022 14:02:17 +0700 Subject: [PATCH 3/3] 100 sec and fix coupon 900 --- xml/page_payment.xml | 2 +- xml/page_payment_multi.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 178c8fb1..a476e485 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -126,7 +126,7 @@ - 100 + 900 If ReadyForBrew = "false" Then diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index 708d4360..2b24c7e1 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -230,7 +230,7 @@ - 100 + 900 If ReadyForBrew = "false" Then