From 50ff46561b4691ef76bf5b508c056b2b6113cc06 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 12 Jan 2024 11:53:16 +0700 Subject: [PATCH] update use discount 15 baht page --- xml/page_collect_point_3_28.xml | 16 +--------------- xml/page_display_get_15_discount.xml | 17 ++++++----------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index 991f45a0..1538d334 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -61,11 +61,6 @@ Var PointDiff = 0 - - - Var Discount15Timeout = 0 - - Var TaobinExpireDay = "" Var TaobinExpireMonth = "" Var TaobinExpireMonthX = "" @@ -675,16 +670,7 @@ If CoffeePoint >= 28 Then Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" Else - If CoffeePoint >= 15 Then - If Get15DiscountState = "Disable2" Then - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - Else - Var Discount15Timeout = 1 - Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml" - EndIf - Else - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf EndIf diff --git a/xml/page_display_get_15_discount.xml b/xml/page_display_get_15_discount.xml index 90c84e0c..2ef5267a 100644 --- a/xml/page_display_get_15_discount.xml +++ b/xml/page_display_get_15_discount.xml @@ -14,17 +14,10 @@ Var DirImage = "ROOT/taobin_project/image/display_get_discount" EndIf - DEBUGVAR Discount15Timeout - - Var PopUpState1 = "Enable" - Var PopUpState2 = "Invisible" + Var PopUpState1 = "Invisible" + Var PopUpState2 = "Enable" Var PopUpErrorState = "Invisible" - If Discount15Timeout = 1 Then - Var PopUpState2 = "Enable" - Var PopUpState1 = "Invisible" - EndIf - If PayOfflineMode = 1 Then Var PopUpErrorState = "Enable" Var PopUpState1 = "Invisible" @@ -119,8 +112,10 @@ ; goto lid straw Var Seeker.UseGet15Discount = 1 Var PreviousSeeker.UseGet15Discount = 1 - Var Discount15Timeout = 0 - Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml" + Var PopUpState2 = "Invisible" + Var PopUpState1 = "Enable" + Var Timeout = 0 + Refresh