Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

2025-07-16 14:11:01 +07:00 · 2025-07-16 14:11:01 +07:00 · bbc9525c35
commit bbc9525c35
parent 9be94753d3 316696f71a
348 changed files with 126954 additions and 46969 deletions
--- a/xml/event/double_promotion_americano_and_apple_farm_festival.xml
+++ b/xml/event/double_promotion_americano_and_apple_farm_festival.xml
--- a/xml/event/ignore_multi_promotion_config_americano_taiwanese_tea.json
+++ b/xml/event/ignore_multi_promotion_config_americano_taiwanese_tea.json
--- a/xml/event/multi_promotion_config_americano_apple_fastival.json
+++ b/xml/event/multi_promotion_config_americano_apple_fastival.json
@ -0,0 +1,30 @@
+[
+  {
+    "name": "americano",
+    "template": "/event/promotion_video_template.inc",
+    "config": {
+      "normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+      "video_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
+      "video_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
+      "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
+    }
+  },
+  {
+    "name": "apple_farm_festival",
+    "template": "/event/promotion_template.inc",
+    "config": {
+        "normal_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "normal_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "press_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "press_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "disable_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "disable_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+        "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_apple_farm_festival.xml"
+    }
+  }
+]
--- a/xml/event/promotion_americano.xml
+++ b/xml/event/promotion_americano.xml
--- a/xml/event/promotion_apple_farm_festival.xml
+++ b/xml/event/promotion_apple_farm_festival.xml
--- a/xml/event/promotion_taiwanese_tea.xml
+++ b/xml/event/promotion_taiwanese_tea.xml
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@ -5,10 +5,10 @@ DEBUGVAR CocktailShow
 DEBUGVAR OpenFromPageBoard

 DEBUGVAR SchoolOvaltinePro
-DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR HappyTriosPro
 DEBUGVAR TaiwaneseTeaPro
 DEBUGVAR AmericanoPro
+DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR Discount7_7Pro

 Var PromotionState1 = "Invisible"
@ -75,6 +75,15 @@ Else
 			    Var PromotionState2 = "Enable"
 				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_taiwanese_tea.xml"
 			EndIf
+
+			If AppleFarmFestivalPro = 1 Then
+                Var PromotionState2 = "Enable"
+    			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_americano_and_apple_farm_festival.xml"
+			EndIf
+		Else
+		    If AppleFarmFestivalPro = 1 Then
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
+			EndIf
 		EndIf

 	EndIf
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -83,9 +83,6 @@ Var MatchaEveryDayPro = 0
 ; Oreo volcano, 1 - 31 May
 Var OreoVolcanoPro = 0

-; Apple Farm Festival, 1 - 30 June
-Var AppleFarmFestivalPro = 0
-
 ; Happy Trios, 1 - 30 June
 Var HappyTriosPro = 0

@ -101,6 +98,9 @@ Var AmericanoPro = 0
 ;7.7 discount code,  7 - 13 July
 Var Discount7_7Pro = 0

+; Apple Farm Festival, 15 - 31 July
+Var AppleFarmFestivalPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0

@ -182,7 +182,6 @@ EndIf
 If SystemDateMonthInt = 7 Then

    Var AmericanoPro = 1
-    Var TaiwaneseTeaPro = 1

    If SystemDateDayInt >= 7 Then
        If SystemDateDayInt <= 13 Then
@ -190,8 +189,16 @@ If SystemDateMonthInt = 7 Then
        EndIf
    EndIf

+    If SystemDateDayInt >= 15 Then
+        Var AppleFarmFestivalPro = 1
+    Else
+        Var TaiwaneseTeaPro = 1
+    EndIf
+
 EndIf

+DEBUGVAR AppleFarmFestivalPro
+

 Var JemilaToppingFlag = 1
 If SystemDateDayOfWeek = "Wednesday" Then
@ -238,11 +245,6 @@ If BoxID = 201729 Then
 EndIf

 If BoxID = 123456 Then
-	Var AppleFarmFestivalPro = 0
-	Var HappyTriosPro = 0
-	Var SchoolOvaltinePro = 0
-	;Var AmericanoPro = 1
-    ;Var TaiwaneseTeaPro = 1
 EndIf

 If BoxID = 173149 Then
@ -314,6 +316,11 @@ If taobin_nopro = "true" Then
 	Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"

 	Var Discount7_7Pro = 0
+
+	Var AmericanoPro = 0
+    Var TaiwaneseTeaPro = 0
+
+	
 EndIf

 ;  zone block logic follow ingredent
--- a/xml/function2.inc
+++ b/xml/function2.inc
@ -137,8 +137,39 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_hot

 		Var text_hot_color = "0xFFFFFF"
-		Var text_cold_color = "0x84776F"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			If cold_button_state = "Enable" Then
+				Var text_cold_color = "0xFF0000"
+				Var popup_discount_cold_show = "Enable"
+			Else
+				Var popup_discount_cold_show = "Invisible"
+			EndIf
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			If blend_button_state = "Enable" Then
+				Var text_blender_color = "0xFF0000"
+				If text_show_eng = "Enable" Then
+					Var popup_discount_blend_show_eng = "Enable"
+					Var popup_discount_blend_show_thai = "Invisible"
+				Else
+					Var popup_discount_blend_show_eng = "Invisible"
+					Var popup_discount_blend_show_thai = "Enable"
+				EndIf
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Invisible"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -180,9 +211,40 @@
 		Var Seeker.NameDrinkEN = menu_name_eng_cold
 		Var Seeker.NameDrinkTH = menu_name_thai_cold

-		Var text_hot_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			If hot_button_state = "Enable" Then
+				Var text_hot_color = "0xFF0000"
+				Var popup_discount_hot_show = "Enable"
+			Else
+				Var popup_discount_hot_show = "Invisible"
+			EndIf
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 		Var text_cold_color = "0xFFFFFF"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			If blend_button_state = "Enable" Then
+				Var text_blender_color = "0xFF0000"
+				If text_show_eng = "Enable" Then
+					Var popup_discount_blend_show_eng = "Enable"
+					Var popup_discount_blend_show_thai = "Invisible"
+				Else
+					Var popup_discount_blend_show_eng = "Invisible"
+					Var popup_discount_blend_show_thai = "Enable"
+				EndIf
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Invisible"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -232,9 +294,33 @@
 		Var Seeker.NameDrinkEN = menu_name_eng_blender
 		Var Seeker.NameDrinkTH = menu_name_thai_blender

-		Var text_hot_color = "0x84776F"
-		Var text_cold_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			If hot_button_state = "Enable" Then
+				Var text_hot_color = "0xFF0000"
+				Var popup_discount_hot_show = "Enable"
+			Else
+				Var popup_discount_hot_show = "Invisible"
+			EndIf
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			If cold_button_state = "Enable" Then
+				Var text_cold_color = "0xFF0000"
+				Var popup_discount_cold_show = "Enable"
+			Else
+				Var popup_discount_cold_show = "Invisible"
+			EndIf
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 		Var text_blender_color = "0xFFFFFF"
+		If PriceDiscount[2] > 0 Then
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -406,15 +492,12 @@
 		Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
 		Var strMulti6_1 = "TPID=321,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
-	Else
-
+    Else
 		;Var PriceDrinkTmp = PriceDrinkNoTop

 		Var strMulti6_1 = "TPID=320,multiply=0"

 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 		
 	EndIf

@ -424,14 +507,12 @@
 		;Var topping6 = toppingID6index5
 		Var strMulti6_2 = "TPID=323,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else
 		;Var PriceDrinkTmp = PriceDrinkNoTop

 		Var strMulti6_2 = "TPID=320,multiply=0"

 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 		
 	EndIf

@ -440,7 +521,6 @@
 		;Var topping6 = toppingID6index3
 		Var strMulti6_3 = "TPID=322,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else

 		;Var PriceDrinkTmp = PriceDrinkNoTop
@ -448,61 +528,52 @@
 		Var strMulti6_3 = "TPID=320,multiply=0"

 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 		
 	EndIf

 	If CustomMilkState[0] = "PressForever" Then
 		Var strMulti11_1 = "TPID=541,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else
 		Var strMulti11_1 = "TPID=542,multiply=0"
 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 	EndIf

 	If CustomMilkState[1] = "PressForever" Then
 		Var strMulti11_2 = "TPID=542,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else
 		Var strMulti11_2 = "TPID=542,multiply=0"
 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 	EndIf

 	If CustomMilkState[2] = "PressForever" Then
 		Var strMulti11_3 = "TPID=543,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else
 		Var strMulti11_3 = "TPID=542,multiply=0"
 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 	EndIf

 	If CustomTaiwaneseTeaState[0] = "PressForever" Then
 		Var strMulti11_4 = "TPID=546,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else
 		Var strMulti11_4 = "TPID=546,multiply=0"
 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 	EndIf

 	If CustomTaiwaneseTeaState[1] = "PressForever" Then
 		Var strMulti11_5 = "TPID=547,multiply=1"
 		Var DisableUsingCode = "true"
-		DEBUGVAR DisableUsingCode
 	Else
 		Var strMulti11_5 = "TPID=547,multiply=0"
 		Var DisableUsingCode = "false"
-		DEBUGVAR DisableUsingCode
 	EndIf


+	DEBUGVAR DisableUsingCode
+        
 	If CustomTaiwaneseTeaState[1] = "PressForever" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice
 	EndIf
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@ -385,26 +385,26 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu21Selected </State>
-<Filename> Var( DirImage + "/bn_forkid.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid.png") </FilenamePress>
+<Filename> Var( DirImage + "/bn_dessert.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
    Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+    Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml" 
 </EventClick>
 </Button>
 <Button>
 <X> 611 </X>
 <Y> 395 </Y>
 <State> Menu21Selected2 </State>
-<Filename> Var( DirImage + "/bn_forkid2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid2.png") </FilenamePress>
+<Filename> Var( DirImage + "/bn_dessert.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
    Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+    Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml" 
 </EventClick>
 </Button>

--- a/xml/menu_catalog_new.xml
+++ b/xml/menu_catalog_new.xml
@ -281,8 +281,8 @@
        <Button>
        <Layout> "linear" </Layout>
        <State> Menu21Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
+        <Filename> Var( DirImageAlter + "/bn_dessert.png") </Filename>
+        <FilenamePress> Var( DirImageAlter + "/bp_dessert.png") </FilenamePress>
        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
        <Volume> SoundVolume </Volume>
        <EventClick> 
@ -293,7 +293,7 @@
    
                OpenInst 2 OpenFileXML
            Else
-                Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+                Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml" 
            EndIf
        </EventClick>
        </Button>
--- a/xml/multi_ads/ads_path.ev
+++ b/xml/multi_ads/ads_path.ev
@ -321,7 +321,7 @@ Else
    ;DEBUGVAR a_video_menu[12]
    ;DEBUGVAR a_video_menu[18]

-    DEBUGVAR a_video_menu[0]
+    ;DEBUGVAR a_video_menu[0]

    SPLIT XMLLiveInfo "/" 1 AdvDisplayMode
    SPLIT XMLLiveInfo "/" 2 CurrentTotalCup
@ -329,6 +329,6 @@ EndIf



-DEBUGVAR showSingleAds
-DEBUGVAR showMultiAds
-DEBUGVAR XMLLiveInfo
+;DEBUGVAR showSingleAds
+;DEBUGVAR showMultiAds
+;DEBUGVAR XMLLiveInfo
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -8,7 +8,15 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; tab_menu hide
-	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	If CountryName = "Thailand" Then
+	    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "HongKong" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "Australia" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf

 	RootLayoutVisible 3 "hide"

@ -59,6 +67,9 @@
 	DEBUGVAR web_pin

 	Var web_telnumOK = ""
+	
+	DEBUGVAR web_readyOK
+
 	Var web_readyOK = "false"

 	Var GetFreeFromError = 0
@ -74,7 +85,6 @@
 	Var Seeker.CurrCreditTelNum = ""
 	Var Seeker.CurrCreditPinNum = ""

-	DEBUGVAR PaySuccessWithDaemonTask

 	Var PaidPaymentFromNextStage = 0
 	Var DrinkPaid = "-"
@ -149,7 +159,7 @@
 		Var XPosiShowCountDownBrew = 768
 	EndIf

-
+	Var CountUpForProjectThisFileStruct = 0

 	Var MinPhoneNumber = 10
 	Var MaxPhoneNumber = 10
@ -181,7 +191,7 @@

 	STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable

-
+	

 	If XMLProfile = "" Then
 		CacheVarStr "get" XMLProfile
@ -625,9 +635,13 @@
    	If POS_SELL_MODE = "NORMAL" Then

    	Else
-            Var BackgroundColor = "0x2C2F4E"
-            OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
-            Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+            If POS_SELL_MODE = "CLOSE" Then
+                Var BackgroundColor = "0x2C2F4E"
+                OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+                Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+            Else
+                OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
+            EndIf
    	EndIf
 	EndIf

@ -652,6 +666,7 @@

 	If default_english = "true" Then
 		Var show_eng = "true"
+		SetLanguage "ENG"
 	EndIf

 	Var InternationalEnable = 0
@ -728,6 +743,7 @@


 	;inter-page-board
+	
 	If CountryName = "Malaysia" Then

 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
@ -1382,7 +1398,6 @@
 			Var WebAppShow = "Invisible"
 			Var ENABLE_UAE_DUBAI = "Invisible"

-			Var LanguageShow = "THAI"
 			EnableLanguage "ENG"
 			EnableLanguage "THAI"

@ -1392,7 +1407,6 @@
 				EnableLanguage "MSC"
 			EndIf

-			SetLanguage "THAI"
 			LanguageControl "UpdateList" "-"
 			Var show_eng = "false"

@ -2046,7 +2060,15 @@ PRICE "Reset" "-"
 <Timeout> 1000 </Timeout>
 <EventTimeout>

-	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+    If CountryName = "Thailand" Then
+	    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "HongKong" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	If CountryName = "Australia" Then
+	    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf

 	DEBUGVAR XMLEngineFrontStage

@ -2352,7 +2374,7 @@ PRICE "Reset" "-"
 		; Original value is 40
 		If EnableMultiInstance = "true" Then

-			If CountUpReloadAll > 100 Then
+			If CountUpReloadAll > 200 Then
 				Var NeedReboot = "false"

 				Var StartUpExt = "-"
@ -2518,9 +2540,13 @@ PRICE "Reset" "-"
            If POS_SELL_MODE = "NORMAL" Then

            Else
-                Var BackgroundColor = "0x2C2F4E"
-                OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
-                Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+                If POS_SELL_MODE = "CLOSE" Then
+                    Var BackgroundColor = "0x2C2F4E"
+                    OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+                    Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+                Else
+                    OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
+                EndIf
            EndIf
 		EndIf
 	EndIf
--- a/xml/page_catalog3.xml
+++ b/xml/page_catalog3.xml
@ -512,15 +512,15 @@

 <Button>
 <X> 392 </X>
-<Y> 1532 </Y>
+<Y> 1478 </Y>
 <State>MenuKidButtonState</State>
-<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
-<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+<Filename> Var(DirImage + "/bn_dessert.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"

 </EventClick>
 </Button>
--- a/xml/page_catalog_group_dessert.skt
+++ b/xml/page_catalog_group_dessert.skt
@ -0,0 +1,51 @@
+<?hurr 
+    #include=menu_head.py 
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+        ; protein
+    If AppFastEnable = "true" Then
+        Var Menu11Selected = "PressForever" 
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "Invisible"
+    Else
+        Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "PressForever"
+    EndIf
+
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+</Popup>
--- a/xml/page_catalog_group_dessert.xml
+++ b/xml/page_catalog_group_dessert.xml
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
--- a/xml/page_catalog_group_pro_apple_farm_festival.xml
+++ b/xml/page_catalog_group_pro_apple_farm_festival.xml
@ -2325,9 +2325,9 @@ Longback" </Value>
 	<State> Flag( 12-03-03-0107.Button,$Sum1203030107) </State> 
 	<Button>
 	<State> $Sum1203030107 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Apple_Oreo_Volcano.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Apple_Oreo_Volcano.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Apple_Oreo_Volcano.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Apple_Oreo_Volcano_banner.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Apple_Oreo_Volcano_banner.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Apple_Oreo_Volcano_banner.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-03-03-0107, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@ -2336,7 +2336,7 @@ Longback" </Value>
 		Var NameDrinkTH = "แอปเปิ้ลโอริโอ"
 		Var DrinkDescriptionTH = "แอปเปิ้ล นม โอรีโอ"
 		Var DrinkDescription = "Apple Milk Oreo"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Apple_Oreo_Volcano.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Apple_Oreo_Volcano_banner.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
--- a/xml/page_catalog_with_vending.xml
+++ b/xml/page_catalog_with_vending.xml
@ -422,15 +422,15 @@

 <Button>
 <X> 392 </X>
-<Y> 1532 </Y>
+<Y> 1478 </Y>
 <State>MenuKidButtonState</State>
-<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
-<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+<Filename> Var(DirImage + "/bn_dessert.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-		Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+		Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"

 </EventClick>
 </Button>
--- a/xml/page_main_blank.xml
+++ b/xml/page_main_blank.xml
@ -2,64 +2,12 @@
 <Width> 1080 </Width>
 <Height> 1312 </Height>
 <EventOpen>
-	DEBUGVAR PaySuccessWithDaemonTask
+
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>

-	If PaySuccessWithDaemonTask = 1 Then
-		
-		DEBUGVAR PaidPaymentFromNextStage
-		DEBUGVAR LastMakeDrinkResult
-		; from 
-		If LastMakeDrinkResult = "success" Then
-			If PaidPaymentFromNextStage = 1 Then
-				Var DelayForMakeDrink = 0
-				Var PaidPaymentFromNextStage = 2
-			EndIf
-		EndIf
-
-		If PaidPaymentFromNextStage = 2 Then
-			DEBUGVAR HaveCup
-			DEBUGVAR MaybeHaveCup
-			DEBUGVAR DoorCupPosition
-			
-			If HaveCup = "false" Then
-				If MaybeHaveCup = "false" Then
-					If DoorCupPosition = "bottom" Then
-
-						Topping "Select" NextUserSelectDrinkFromPaid
-
-						; Set option toppinng and pack 
-						Topping "Select1-ID" NextUserSelecttopping1Paid
-						Topping "Select2-ID" NextUserSelecttopping2Paid
-						Topping "Select3-ID" NextUserSelecttopping3Paid
-
-						; Pack
-						Topping "Pack" ExtendDataCurr
-
-						Var DelayForMakeDrink = 2
-						Var PaidPaymentFromNextStage = 3
-
-						DEBUGVAR NextUserSelectDrinkFromPaid
-					EndIf
-				EndIf
-			EndIf
-		EndIf
-	
-		DEBUGVAR DelayForMakeDrink
-	
-	EndIf
-	
-	If DelayForMakeDrink > 0 Then
-		DEBUGVAR DelayForMakeDrink
-		Var DelayForMakeDrink = DelayForMakeDrink - 1
-		If DelayForMakeDrink = 0 Then
-			Var MakeContinue = 1
-			MakeDrinkV1  NextUserSelectDrinkFromPaid SelectSugarID
-		EndIf
-	EndIf

 	; hurr
 	TimerReset
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -124,6 +124,9 @@
 	   Var PriceDrink = OriginalPrice + TOPPING_PRICE
 	EndIf

+	If Seeker.PriceDiscount > 0 Then
+		Var PriceDrink = Seeker.PriceMain + TOPPING_PRICE
+	EndIf

 	DEBUGVAR PriceDrink
 	DEBUGVAR PromotionPriceDrink
@ -456,6 +459,10 @@
 		If SELLSTATUS = "SELLNOCASH" Then
 			Var SELLONLINE = 1
 		EndIf
+		
+		If POS_SELL_MODE = "OFFLINE" Then
+		    Var SELLONLINE = 0
+		EndIf

 		If SELLONLINE = 0 Then
 			SAVELOG "POS-MACHINE: OFFLINE in page_payment.xml"
--- a/xml/page_pos_machine_network_down.xml
+++ b/xml/page_pos_machine_network_down.xml
@ -32,7 +32,9 @@
        EndIf

        If SELLONLINE = 1 Then
-            Open "ROOT/taobin_project/xml/page_board.xml"
+            If POS_SELL_MODE = "NORMAL" Then
+                Open "ROOT/taobin_project/xml/page_board.xml"
+           	EndIf
        EndIf

        Var Timeout = 0
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -170,7 +170,7 @@

 	Var buttonRemoveCup = "Invisible"

-	Var thankyouContiVersion = "TC13 "
+	Var thankyouContiVersion = "TC15 "
 	SAVELOG "Thank you conti version " + thankyouContiVersion
 	SAVELOG "Support NextSmoothie and fix bug next"
 	SAVELOG "MenuErrorCode"
@ -300,8 +300,9 @@
 		EndIf
 	EndIf

-
-	__CMD "check-cup" Seeker.selected_a_drink "-" "-"
+	If New_Payment = 1 Then
+		__CMD "check-cup" Seeker.selected_a_drink "-" "-"
+	EndIf

 	; old condition
 	If HaveCup = "false" Then
@ -442,32 +443,34 @@
 	DEBUGVAR MenuErrorCode

 	If MenuReadyForCup = "YES" Then
-
+		
 		If DoorCupPosition = "bottom" Then
+			; new payment not enable. use have cup false only.
+			If New_Payment = 1 Then
+				Var VideoPlayFile = VideoPath
+				Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+				Var VideoPlayFile = VideoPlayFile + "1"
+				Var VideoPlayFile = VideoPlayFile + VideoFileEnd

-			Var VideoPlayFile = VideoPath
-			Var VideoPlayFile = VideoPlayFile + VideoFileBegin
-			Var VideoPlayFile = VideoPlayFile + "1"
-			Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+				Var PictureFile = PicturePath
+				Var PictureFile = PictureFile + PictureBegin
+				Var PictureFile = PictureFile + "1"
+				Var PictureFile = PictureFile + PictureEnd

-			Var PictureFile = PicturePath
-			Var PictureFile = PictureFile + PictureBegin
-			Var PictureFile = PictureFile + "1"
-			Var PictureFile = PictureFile + PictureEnd
+				DEBUGVAR CountDownForShowMenuNextOrderToBrew
+				DEBUGVAR Seeker.selected_a_drink

-			DEBUGVAR CountDownForShowMenuNextOrderToBrew
-			DEBUGVAR Seeker.selected_a_drink
+				If CountDownForShowMenuNextOrderToBrew = 3 Then

-			If CountDownForShowMenuNextOrderToBrew = 3 Then
-
-			EndIf
+				EndIf


-			If CountDownForShowMenuNextOrderToBrew = 0 Then
-				Var CountDownThankyou = 0
-			Else
-				Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1
+				If CountDownForShowMenuNextOrderToBrew = 0 Then
+					Var CountDownThankyou = 0
+				Else
+					Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1

+				EndIf
 			EndIf
 		Else

--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -48,6 +48,12 @@

 	Var DisableAllNotFreeTopping = 0

+	;Discount-promotion-state
+	Var popup_discount_hot_show = "Invisible"
+	Var popup_discount_cold_show = "Invisible"
+	Var popup_discount_blend_show_eng = "Invisible"
+	Var popup_discount_hot_show_thai = "Invisible"
+
 	Var SaveProductCodeSelect = "-"
 	Var UserSelectProductCode = "-"

@ -171,6 +177,7 @@
 	Var topping2 = "31"
 	Var topping3 = "31"

+	Var DirImageToppingInter = "ROOT/taobin_project/image/topping_inter"

 	Var BugFlag = 0

@ -333,9 +340,23 @@

 	Var high_light_drink_type = "Invisible"

-	Var text_hot_color = "0x84776F"
-	Var text_cold_color = "0x84776F"
-	Var text_blender_color = "0x84776F"
+	If PriceDiscount[0] > 0 Then
+		Var text_hot_color = "0xFF0000"
+	Else
+		Var text_hot_color = "0x84776F"
+	EndIf
+	If PriceDiscount[1] > 0 Then
+		Var text_cold_color = "0xFF0000"
+	Else
+		Var text_cold_color = "0x84776F"
+	EndIf
+	If PriceDiscount[2] > 0 Then
+		Var text_blender_color = "0xFF0000"
+	Else
+		Var text_blender_color = "0x84776F"
+	EndIf
+
+	Var text_original_price_color = "0x84776F"

 	If new_layout = "true" Then
 		Var PriceDrinkTmpShow = "---"
@ -392,20 +413,55 @@

 	If hot_button_state = "Disable2" Then
 		Var text_price_d1 = ""
+		Var text_price_original_d1 = ""
+		Var popup_discount_hot_show = "Invisible"
 	Else
 		Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Enable"
+		Else
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 	EndIf

 	If cold_button_state = "Disable2" Then
 		Var text_price_d2 = ""
+		Var text_price_original_d2 = ""
+		Var popup_discount_cold_show = "Invisible"
 	Else
 		Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Enable"
+		Else
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 	EndIf

 	If blend_button_state = "Disable2" Then
 		Var text_price_d3 = ""
+		Var text_price_original_d3 = ""
+		Var popup_discount_blend_show_eng = "Invisible"
+		Var popup_discount_blend_show_thai = "Invisible"
 	Else
 		Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow)
+		Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow)
+
+		If PriceDiscount[2] > 0 Then
+			If text_show_eng = "Enable" Then
+				Var popup_discount_blend_show_eng = "Enable"
+				Var popup_discount_blend_show_thai = "Invisible"
+			Else
+				Var popup_discount_blend_show_thai = "Enable"
+				Var popup_discount_blend_show_eng = "Invisible"
+			EndIf
+		Else
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf
 	EndIf

 	DEBUGVAR PD_CODE1
@ -2553,6 +2609,10 @@
 			Var showShotEnable = "Invisible"
 			Var ShotCoffeePremium = "Invisible"
 			Var ExtraTopping = "Invisible"
+			
+			Var CustomCoffeeEnable = "False"
+			Var showCustomCoffee = "Invisible"
+			var showCoffeeLevel = "Invisible"
 		EndIf

 		Function 2
@ -2563,24 +2623,6 @@
 </EventMachine>

 <EventCart>
-		;Var BugFlag = 1
-	If CartUpdate = "true" Then
-		Var CartUpdate = "-"
-
-
-		If CART_COUNT = 3 Then
-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-			Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-		Else
-			If ButtonNext = "true" Then
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-			Else
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-				Open "ROOT/taobin_project/xml/page_catalog.xml"
-			EndIf
-		EndIf
-	EndIf

 </EventCart>

@ -2728,6 +2770,7 @@
 	Topping "Load" PD_CODE1

 	Var high_light_drink_type = "Invisible"
+	Var IndexDrinktType = 0



@ -2780,6 +2823,8 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2

+	Var IndexDrinktType = 1
+


 </EventClick>
@ -2830,6 +2875,8 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE3

+	Var IndexDrinktType = 2
+



@ -2874,6 +2921,94 @@
 <Value> text_price_d3 </Value>
 </Text>

+<Image>
+	<X> 552 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_hot_show </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 552 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_hot_show </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 562 </X>
+<Y> 55 </Y>
+<State> popup_discount_hot_show </State>
+<Font> KanitRegularTTF </Font>
+<Size> 21 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d1 </Value>
+</Text>
+
+<Image>
+	<X> 710 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_cold_show </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 710 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_cold_show </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 720 </X>
+<Y> 55 </Y>
+<State> popup_discount_cold_show </State>
+<Font> KanitRegularTTF </Font>
+<Size> 21 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d2 </Value>
+</Text>
+
+<Image>
+	<X> 852 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_thai </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 852 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_thai </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 862 </X>
+<Y> 55 </Y>
+<State> popup_discount_blend_show_thai </State>
+<Font> KanitRegularTTF </Font>
+<Size> 23 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d3 </Value>
+</Text>
+
+<Image>
+	<X> 892 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_eng </State>
+	<Filename> Var( DirImageToppingInter + "/original_price_block.png" ) </Filename>
+</Image>
+<Image>
+	<X> 892 </X>
+	<Y> 55 </Y>
+	<State> popup_discount_blend_show_eng </State>
+	<Filename> Var( DirImageToppingInter + "/discount_line.png" ) </Filename>
+</Image>
+<Text>
+<X> 902 </X>
+<Y> 55 </Y>
+<State> popup_discount_blend_show_eng </State>
+<Font> KanitRegularTTF </Font>
+<Size> 23 </Size>
+<Color> text_original_price_color </Color>
+<Value> text_price_original_d3 </Value>
+</Text>
+
 </Block>


@ -6878,6 +7013,19 @@


 			If SelectDrinkType = 1 Then
+				If hot_button_state = "PressForever" Then
+					Var IndexDrinktType = 0
+				EndIf
+				If cold_button_state = "PressForever" Then
+					Var IndexDrinktType = 1
+				EndIf
+				If blend_button_state = "PressForever" Then
+					Var IndexDrinktType = 2
+				EndIf
+
+				Var Seeker.PriceMain = PriceMain[IndexDrinktType]
+				Var Seeker.PriceDiscount = PriceDiscount[IndexDrinktType]
+				Var Seeker.PriceTag = PriceTag[IndexDrinktType]
 			EndIf
 		EndIf

@ -7147,6 +7295,20 @@
 		Else

 			If SelectDrinkType = 1 Then
+				If hot_button_state = "PressForever" Then
+					Var IndexDrinktType = 0
+				EndIf
+				If cold_button_state = "PressForever" Then
+					Var IndexDrinktType = 1
+				EndIf
+				If blend_button_state = "PressForever" Then
+					Var IndexDrinktType = 2
+				EndIf
+
+				Var Seeker.PriceMain = PriceMain[IndexDrinktType]
+				Var Seeker.PriceDiscount = PriceDiscount[IndexDrinktType]
+				Var Seeker.PriceTag = PriceTag[IndexDrinktType]
+
 				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 				Open "ROOT/taobin_project/xml/page_identity_verification.xml"
 			EndIf
@ -7656,8 +7818,39 @@
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_hot

 		Var text_hot_color = "0xFFFFFF"
-		Var text_cold_color = "0x84776F"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			If cold_button_state = "Enable" Then
+				Var text_cold_color = "0xFF0000"
+				Var popup_discount_cold_show = "Enable"
+			Else
+				Var popup_discount_cold_show = "Invisible"
+			EndIf
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			If blend_button_state = "Enable" Then
+				Var text_blender_color = "0xFF0000"
+				If text_show_eng = "Enable" Then
+					Var popup_discount_blend_show_eng = "Enable"
+					Var popup_discount_blend_show_thai = "Invisible"
+				Else
+					Var popup_discount_blend_show_eng = "Invisible"
+					Var popup_discount_blend_show_thai = "Enable"
+				EndIf
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Invisible"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -7695,9 +7888,40 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_cold
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold

-		Var text_hot_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			If hot_button_state = "Enable" Then
+				Var text_hot_color = "0xFF0000"
+				Var popup_discount_hot_show = "Enable"
+			Else
+				Var popup_discount_hot_show = "Invisible"
+			EndIf
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
 		Var text_cold_color = "0xFFFFFF"
-		Var text_blender_color = "0x84776F"
+		If PriceDiscount[1] > 0 Then
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
+		If PriceDiscount[2] > 0 Then
+			If blend_button_state = "Enable" Then
+				Var text_blender_color = "0xFF0000"
+				If text_show_eng = "Enable" Then
+					Var popup_discount_blend_show_eng = "Enable"
+					Var popup_discount_blend_show_thai = "Invisible"
+				Else
+					Var popup_discount_blend_show_eng = "Invisible"
+					Var popup_discount_blend_show_thai = "Enable"
+				EndIf
+			Else
+				Var popup_discount_blend_show_eng = "Invisible"
+				Var popup_discount_blend_show_thai = "Invisible"
+			EndIf
+		Else
+			Var text_blender_color = "0x84776F"
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

@ -7743,9 +7967,33 @@
 		Var Seeker.NameDrinkTH = menu_name_thai_blender
 		Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender

-		Var text_hot_color = "0x84776F"
-		Var text_cold_color = "0x84776F"
+		If PriceDiscount[0] > 0 Then
+			If hot_button_state = "Enable" Then
+				Var text_hot_color = "0xFF0000"
+				Var popup_discount_hot_show = "Enable"
+			Else
+				Var popup_discount_hot_show = "Invisible"
+			EndIf
+		Else
+			Var text_hot_color = "0x84776F"
+			Var popup_discount_hot_show = "Invisible"
+		EndIf
+		If PriceDiscount[1] > 0 Then
+			If cold_button_state = "Enable" Then
+				Var text_cold_color = "0xFF0000"
+				Var popup_discount_cold_show = "Enable"
+			Else
+				Var popup_discount_cold_show = "Invisible"
+			EndIf
+		Else
+			Var text_cold_color = "0x84776F"
+			Var popup_discount_cold_show = "Invisible"
+		EndIf
 		Var text_blender_color = "0xFFFFFF"
+		If PriceDiscount[2] > 0 Then
+			Var popup_discount_blend_show_eng = "Invisible"
+			Var popup_discount_blend_show_thai = "Invisible"
+		EndIf

 		Var SelectDrinkType = 1

--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
--- a/xml/process/discount_from_promotion.ev
+++ b/xml/process/discount_from_promotion.ev
@ -39,6 +39,16 @@ If FromPassionMintPro = 1 Then
    Var Seeker.CampaignPPrice = PromotionPriceDrink
 EndIf

+If Seeker.PriceDiscount > 0 Then
+    Var PriceDiff = Seeker.PriceMain - Seeker.PriceDiscount
+    Var Seeker.VendingCode = Seeker.PriceTag
+    Var Seeker.CodeNumber = "00000000"
+    Var Seeker.CodeChannel = 1
+    Var Seeker.FreeVendingCampaign = 0
+    Var Seeker.IntVendingCampaign = PriceDiff
+    Var Seeker.VendingCampaignRI3 = PriceDiff
+EndIf
+
 If BoxID = 105005 Then
    If Seeker.selected_a_drink = "12-05-02-0045" Then
        Var PriceDiff = PriceDrink - 25
@ -99,6 +109,15 @@ If FromCoffeeDrink1BathPro = 1 Then
    Var PromotionIDCurrentOrder = 3
 EndIf

+If Seeker.ProductCodeDiscount > 0 Then
+    Var PriceDiff = PriceDrink - PromotionPriceDrink
+    Var Seeker.VendingCode = "DFB" + PriceDiff
+    Var Seeker.CodeNumber = "00000000"
+    Var Seeker.CodeChannel = 1
+    Var Seeker.FreeVendingCampaign = 0
+    Var Seeker.IntVendingCampaign = PriceDiff
+    Var Seeker.VendingCampaignRI3 = PriceDiff
+EndIf


 If InternationalEnable = 1 Then
--- a/xml/test_all_syntax.xml
+++ b/xml/test_all_syntax.xml
@ -10,7 +10,6 @@

 	
 	OpenInst 3 "ROOT/taobin_project/xml/page_list.xml"
-	OpenInst 1 "ROOT/taobin_project/xml/page_list.xml"
 	OpenInst 2 "ROOT/taobin_project/xml/page_list.xml"


@ -48,102 +47,22 @@

 	

-	SAVELOG "============================== Test elseif ====================================="
-	Var idx = 0
-	Var idx2 = 0
-
-
-	If idx = 22 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 11 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 33 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 0 Then
-		SAVELOG "================ Test 1 elseif true OK" 
-	Else
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	EndIf
-
-
-	If idx = 0 Then
-		 SAVELOG "================ Test 2 elseif true OK" 
-	ElIf idx = 4 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 2 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	EndIf
-
-	If idx = 0 Then
-		SAVELOG "================ Test 3 elseif true OK" 
-	ElIf idx = 0 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 0 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	EndIf
+	SAVELOG "============================== Test step 1 ========================"
+	
+	Var idx_test = 0
+	DEBUGVAR idx_test
+	
+	
+	TRY "ROOT/taobin_project/xml/test_forloop.xml"
+	

 	
-	If idx = 99 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 0 Then
-		 SAVELOG "================ Test 4 elseif true OK" 
-	ElIf idx = 98 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	EndIf
-
-	If idx = 2 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 12 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	ElIf idx = 13 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	EndIf
-
-	If idx = 2 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	ElIf idx = 12 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	ElIf idx = 14 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	Else
-		 SAVELOG "================ Test 5 elseif true OK" 
-	EndIf
-
-	SAVELOG "============================== Test step 1 ========================"
-
-	If idx = 2 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		If idx2 = 0 Then
-			SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		EndIf
-	ElIf idx = 0 Then
-		If idx2 = 0 Then
-			SAVELOG "================ Test 6 elseif true OK" 
-		EndIf
-	ElIf idx = 10 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	EndIf
-
-
-	If idx = 2 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		If idx2 = 0 Then
-			SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-		EndIf
-	ElIf idx = 0 Then
-		If idx2 = 2 Then
-			SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-		ElIf idx2 = 0 Then
-			SAVELOG "================ Test 5 elseif true OK" 
-		EndIf
-	ElIf idx = 10 Then
-		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
-	EndIf
-
-
-
 	SAVELOG "===========   END  ==========="
 	
+	Var $12-03-03-0094.Price = 35
+	Var $12-03-03-0094.Discount = 15
+
+

 </EventOpen>
 <Timeout> 120000 </Timeout>
@ -160,5 +79,46 @@

 </EventTimeout>

+<Text>
+<X>200</X>
+<Y>200</Y>
+<Value> "Value must be ฿15 "
+</Value>
+<Size> 30 </Size>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+</Text>
+
+<Text>
+<X>480</X>
+<Y>200</Y>
+<Value>
+	
+	eval(
+		SAVELOG " ============ This is test express recursive ==========="
+		If $12-03-03-0094.Price = -1 Then
+			Var priceFormat = "Free"
+		Else
+			If $12-03-03-0094.Discount = "" Then
+				Var priceFormat = $12-03-03-0094.Price
+			Else
+				If $12-03-03-0094.Discount > 0 Then
+					Var priceFormat = $12-03-03-0094.Discount
+				Else
+					Var priceFormat = $12-03-03-0094.Price
+				EndIf
+			EndIf
+		EndIf
+		
+		DEBUGVAR priceFormat
+		Var return !assigned StringFmt( priceFormat, DisplayFormat, PreScaleConvertShow)
+
+	)
+	
+</Value>
+<Size> 30 </Size>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+</Text>

 </Page>
--- a/xml/test_else_if.xml
+++ b/xml/test_else_if.xml
@ -0,0 +1,92 @@
+
+	
+
+	SAVELOG "============================== Test elseif ====================================="
+	Var idx = 0
+	Var idx2 = 0
+
+
+	If idx = 22 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 11 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 33 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 0 Then
+		SAVELOG "================ Test 1 elseif true OK" 
+	Else
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	EndIf
+
+
+	If idx = 0 Then
+		 SAVELOG "================ Test 2 elseif true OK" 
+	ElIf idx = 4 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 2 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	EndIf
+
+	If idx = 0 Then
+		SAVELOG "================ Test 3 elseif true OK" 
+	ElIf idx = 0 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 0 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	EndIf
+
+	
+	If idx = 99 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 0 Then
+		 SAVELOG "================ Test 4 elseif true OK" 
+	ElIf idx = 98 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	EndIf
+
+	If idx = 2 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 12 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	ElIf idx = 13 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	EndIf
+
+	If idx = 2 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	ElIf idx = 12 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	ElIf idx = 14 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	Else
+		 SAVELOG "================ Test 5 elseif true OK" 
+	EndIf
+    
+    If idx = 2 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		If idx2 = 0 Then
+			SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		EndIf
+	ElIf idx = 0 Then
+		If idx2 = 0 Then
+			SAVELOG "================ Test 6 elseif true OK" 
+		EndIf
+	ElIf idx = 10 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	EndIf
+
+
+	If idx = 2 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		If idx2 = 0 Then
+			SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		EndIf
+	ElIf idx = 0 Then
+		If idx2 = 2 Then
+			SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+		ElIf idx2 = 0 Then
+			SAVELOG "================ Test 5 elseif true OK" 
+		EndIf
+	ElIf idx = 10 Then
+		SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"	
+	EndIf
--- a/xml/test_for_loop.xml
+++ b/xml/test_for_loop.xml
@ -1,35 +0,0 @@
-
-	For idx < 10 Loop
-		Var idx = idx + 1
-		DEBUGVAR idx
-		If idx = 5 Then
-		 SAVELOG "================ test for loop depth 1 with i f"
-		Else
-		 	SAVELOG "Hurr Hurr Hurr Hurr"
-			
-		EndIf
-
-		Var TestLoopArray[idx] = idx + 10
-
-		Var idx2 = 0
-		For idx2 < 30 Loop
-			Var idx2 = idx2 + 1
-			DEBUGVAR idx2
-			If idx2  <  15 Then
-				SAVELOG "###### TTTTTT ######"
-			Else
-				SAVELOG "++++++ TTTTTT ++++++"
-			EndIf
-		EndFor
-
-		
-	EndFor
-
-	Var idx = 0
-	For idx < 10 Loop
-		Var idx = idx + 1
-		DEBUGVAR TestLoopArray[idx]
-
-		
-	EndFor
-    
--- a/xml/test_forloop.xml
+++ b/xml/test_forloop.xml
@ -0,0 +1,47 @@
+
+	SAVELOG "================== start test f or l oop ================"
+
+
+	If HaveKok = "" Then
+	
+	Else
+		SAVELOG " NO KOK NO COMMIT "
+	EndIf 
+
+
+	
+
+	For idx_test < 10 Loop
+		DEBUGVAR idx_test
+		Var idx_test = idx_test + 1
+		If idx_test = 5 Then
+			SAVELOG "================ test fo r lo op depth 1 with i f"
+		Else
+			SAVELOG "Hurr Hurr Hurr Hurr"
+			
+		EndIf
+
+		Var TestroopArray[idx_test] = idx_test + 10
+
+		Var idx2 = 0
+		For idx2 < 30 Loop
+			Var idx2 = idx2 + 1
+			DEBUGVAR idx2
+			If idx2  <  15 Then
+				SAVELOG "###### TTTTTT ######"
+			Else
+				SAVELOG "++++++ TTTTTT ++++++"
+			EndIf
+		EndFor
+
+		
+	EndFor
+
+	Var idx = 0
+	For idx < 10 Loop
+		Var idx = idx + 1
+		DEBUGVAR TestroopArray[idx]
+
+		
+	EndFor
+	SAVELOG "================== end test f or l oop ================"
--- a/xml/topview2.xml
+++ b/xml/topview2.xml
@ -162,7 +162,6 @@
 		EndIf
 	EndIf

-	DEBUGVAR exhaust_fan_schedule
 	
 	TRY exhaust_fan_schedule

@ -170,14 +169,23 @@

 	;include="ROOT/taobin_project/inc/language_toggle_mode.inc"

-	DEBUGVAR langfn	
-	DEBUGVAR LanguageButtonEnable
-	DEBUGVAR LanguageShow
+	;DEBUGVAR langfn	
+	;DEBUGVAR LanguageButtonEnable
+	;DEBUGVAR LanguageShow

 	Var CheckDisableTimeout = 0

 	TRY "ROOT/taobin_project/xml/features/alert_sms/check_disable.ev"
 	
+	READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" str_openfile_xml_0 
+	READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_2" str_openfile_xml_2 
+	If str_openfile_xml_0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Then
+		If str_openfile_xml_2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
+			Var CountUpForProjectThisFileStruct = CountUpForProjectThisFileStruct + 1
+			DEBUGVAR CountUpForProjectThisFileStruct
+		EndIf 
+	EndIf
+

 </EventOpen>
 <Timeout> 1000 </Timeout>
@ -307,6 +315,7 @@
 		EndIf
 	EndIf

+
 	TimerReset

 </EventTimeout>