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

2025-06-17 14:02:56 +07:00 · 2025-06-17 14:02:56 +07:00 · decac96cba
commit decac96cba
parent 0ab45a7053 62f4c1ef03
560 changed files with 233482 additions and 69931 deletions
--- a/xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml
+++ b/xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml
--- a/xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml
+++ b/xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml
--- a/xml/event/ignore_multi_promotion_config_apple_farm_festival_school_ovaltine.json
+++ b/xml/event/ignore_multi_promotion_config_apple_farm_festival_school_ovaltine.json
@ -0,0 +1,28 @@
+[
+  {
+      "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"
+      }
+  },
+  {
+      "name": "school_ovaltine",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
+      }
+  }
+]
--- a/xml/event/ignore_multi_promotion_config_taiwanese_tea_school_ovaltine.json
+++ b/xml/event/ignore_multi_promotion_config_taiwanese_tea_school_ovaltine.json
@ -0,0 +1,28 @@
+[
+  {
+      "name": "taiwanese_tea",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "normal_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "press_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "press_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "disable_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "disable_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
+      }
+  },
+  {
+      "name": "school_ovaltine",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
+      }
+  }
+]
--- a/xml/event/out_put_file2.txt
+++ b/xml/event/out_put_file2.txt
@ -1 +1 @@
-/event/promotion_oreo_volcano.xml
+/event/promotion_taiwanese_tea.xml
--- a/xml/event/promotion_onclick2.inc
+++ b/xml/event/promotion_onclick2.inc
@ -1 +1 @@
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_volcano.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
--- a/xml/event/promotion_onclick4.inc
+++ b/xml/event/promotion_onclick4.inc
@ -1 +1 @@
-        Var BigButtonEnable = "Invisible"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
--- a/xml/event/promotion_school_ovaltine.xml
+++ b/xml/event/promotion_school_ovaltine.xml
--- a/xml/event/promotion_taiwanese_tea.xml
+++ b/xml/event/promotion_taiwanese_tea.xml
--- a/xml/event/promotion_template4.inc
+++ b/xml/event/promotion_template4.inc
@ -5,18 +5,9 @@

 <State> BigButtonEnable </State>
    <Filename> ###normal_thai </Filename>
-    <FilenamePress> ###normal_thai </FilenamePress>
-    <FilenameDisable> ###normal_thai </FilenameDisable>
+    <FilenamePress> ###press_thai </FilenamePress>
+    <FilenameDisable> ###disable_thai </FilenameDisable>
 <EventOnClick>
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
+        ###EventOnClick
 </EventOnClick>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4" </Filename>
-</Video>
 </Button>
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@ -5,9 +5,9 @@ DEBUGVAR CocktailShow
 DEBUGVAR OpenFromPageBoard

 DEBUGVAR SchoolOvaltinePro
-DEBUGVAR OreoVolcanoPro
 DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR HappyTriosPro
+DEBUGVAR TaiwaneseTeaPro

 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@ -31,26 +31,6 @@ Else

 	Else

-		If SchoolOvaltinePro = 1 Then
-			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
-			Var PromotionState1 = "Enable"
-
-			If OreoVolcanoPro = 1 Then
-				Var PromotionState2 = "Enable"
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_school_ovaltine_and_oreo_volcano.xml"
-			EndIf
-		Else
-    		If OreoVolcanoPro = 1 Then
-    			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_oreo_volcano.xml"
-    			Var PromotionState1 = "Enable"
-
-    			If MatchaEveryDayPro = 1 Then
-    				Var PromotionState2 = "Enable"
-    				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml"
-    			EndIf
-    		EndIf
-		EndIf
-
 		If AppleFarmFestivalPro = 1 Then
            Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
            Var PromotionState1 = "Enable"
@ -59,11 +39,30 @@ Else
    			Var PromotionState2 = "Enable"
    			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_happy_trios.xml"
    		EndIf
+
+            If SchoolOvaltinePro = 1 Then
+			    Var PromotionState2 = "Enable"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml"
+			EndIf
 		Else
            If HappyTriosPro = 1 Then
    			Var PromotionState2 = "Enable"
    			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_happy_trios.xml"
    		EndIf
+
+            If SchoolOvaltinePro = 1 Then
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
+			EndIf
+		EndIf
+
+		If TaiwaneseTeaPro = 1 Then
+		    Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_taiwanese_tea.xml"
+			Var PromotionState1 = "Enable"
+
+			If SchoolOvaltinePro = 1 Then
+			    Var PromotionState2 = "Enable"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml"
+			EndIf
 		EndIf

 	EndIf
@ -92,9 +91,3 @@ Else
 	EndIf
 EndIf
 Var OpenFromPageBoard = 0
-
-If OpenFromMulti = 1 Then
-	TabMenuVisibleInst 99
-EndIf
-Var OpenFromMulti = 0
-
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -80,9 +80,6 @@ Var BoostEnergyPro = 0
 ; Matcha every day, 1 - 18 May
 Var MatchaEveryDayPro = 0

-; School Ovaltine, 19 - 31 May
-Var SchoolOvaltinePro = 0
-
 ; Oreo volcano, 1 - 31 May
 Var OreoVolcanoPro = 0

@ -92,6 +89,12 @@ Var AppleFarmFestivalPro = 0
 ; Happy Trios, 1 - 30 June
 Var HappyTriosPro = 0

+; School Ovaltine, 15 - 30 June
+Var SchoolOvaltinePro = 0
+
+; Taiwanese Tea, 16 - 30 June
+Var TaiwaneseTeaPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0

@ -156,8 +159,18 @@ If SystemDateMonthInt = 5 Then
 EndIf

 If SystemDateMonthInt = 6 Then
-    Var AppleFarmFestivalPro = 1
-    Var HappyTriosPro = 1
+
+    If SystemDateDayInt <= 14 Then
+        Var HappyTriosPro = 1
+    Else
+        Var SchoolOvaltinePro = 1
+    EndIf
+
+    If SystemDateDayInt <= 14 Then
+        Var AppleFarmFestivalPro = 1
+    Else
+        Var TaiwaneseTeaPro = 1
+    EndIf
 EndIf


@ -192,8 +205,6 @@ EndIf


 If BoxID = 201714 Then
-	Var Catalog20BahtEnable = 1
-	Var AppleFarmFestivalPro = 1
 EndIf

 If BoxID = 201729 Then
@ -201,10 +212,27 @@ If BoxID = 201729 Then
 EndIf

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

+If BoxID = 173149 Then
+	Var AppleFarmFestivalPro = 0
+	Var HappyTriosPro = 0
+	Var TaiwaneseTeaPro = 1
+	Var SchoolOvaltinePro = 1
+EndIf
+
+If BoxID = 200435 Then
+	Var AppleFarmFestivalPro = 0
+	Var HappyTriosPro = 0
+	Var TaiwaneseTeaPro = 1
+	Var SchoolOvaltinePro = 1
+EndIf
+
+
 DEBUGVAR ConfigNumer
 If ConfigNumer >= 1762 Then
 	Var ToppingNewUINewSystem = 1
@ -307,8 +335,17 @@ Else
    Var AppleFarmFestivalPro = 0
 EndIf

+
+If TaiwanesePowderEnable = "true" Then
+
+Else
+    Var TaiwaneseTeaPro = 0
+EndIf
+
 Var CurrentMainVideoTemp = 0

+DEBUGVAR TaiwanesePowderEnable
+DEBUGVAR TaiwaneseTeaPro


 ; Check reward out of stock
--- a/xml/menu_catalog_new.xml
+++ b/xml/menu_catalog_new.xml
@ -75,39 +75,7 @@


    ; zone cup on arm
-    If Seeker = "curr" Then
-		If CupOnArm = "true" Then
-
-			If CheckCupStateDoorCupClose = "" Then
-				If buttonRemoveCup =  "Enable" Then
-
-				Else
-					Refresh
-				EndIf
-
-				Var buttonRemoveCup = "Enable"
-
-			EndIf
-
-			If CheckCupStateDoorCupClose = "done" Then
-				If buttonRemoveCup =  "Enable" Then
-
-				Else
-					Refresh
-				EndIf
-				
-				Var buttonRemoveCup = "Enable"
-		
-			EndIf
-		Else
-			If buttonRemoveCup = "Enable" Then
-				Var buttonRemoveCup = "Invisible"
-				Refresh
-			EndIf
-		EndIf
-	Else
-		Var buttonRemoveCup = "Invisible"
-	EndIf
+    

    Var Timeout = Timeout + 1
    TimerReset
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -643,6 +643,12 @@
 	__CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
 	__CMD "SetErrorCodeHandleByXML" 1031 "-" "-"

+	Var IndexCharWhenTImeZero = 0
+	
+	Var ArrayCharWhenTImeZero[0] = "- "
+	Var ArrayCharWhenTImeZero[1] = "\ "
+	Var ArrayCharWhenTImeZero[2] = "| "
+	Var ArrayCharWhenTImeZero[3] = "/ "
 </EventOpen>
 <EventLanguageOnChange>
 	Var XPosiShowCountDownBrew = 768
@ -790,7 +796,6 @@
 		Var MOVE_CUP_TO_DOOR = "false"
 	EndIf

-	Var CountDownBrewing = BREW_CNT



@ -825,8 +830,6 @@
 	EndIf


-	Var ShowCountDownBrewing = CountDownBrewing
-

 	; TODO
 	DEBUGVAR EnableDoubleCupNoError
@ -844,6 +847,10 @@
 	EndIf


+
+	Var CountDownBrewing = BREW_CNT
+	Var ShowCountDownBrewing = CountDownBrewing
+
 	If BREW_CNT = 0 Then
 		If CountUpWhenBREW_CNT > 56 Then
 			Var CountUpWhenBREW_CNT = 0
@ -858,6 +865,14 @@

 		Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1

+		
+		Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero]
+		
+		Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1
+		If IndexCharWhenTImeZero > 3 Then
+			Var IndexCharWhenTImeZero = 0
+		EndIf
+
 	EndIf

 	If Timeout > 480 Then
--- a/xml/page_NewBrewing3Conti.xml
+++ b/xml/page_NewBrewing3Conti.xml
@ -308,7 +308,15 @@


 	Var ShowCountDownBrewing = CountDownBrewing
+	If CountDownBrewing = 0 Then

+		Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero]
+	
+		Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1
+		If IndexCharWhenTImeZero > 3 Then
+			Var IndexCharWhenTImeZero = 0
+		EndIf
+	EndIf

 	If Timeout > 540 Then
 		SAVELOG "back_to_main from line  > 217."
--- a/xml/page_back_to_error.xml
+++ b/xml/page_back_to_error.xml
@ -6,25 +6,33 @@

 	; Reset here
 	Var CheckCupStateDoorCupClose = ""
+	Var Opened = 0

 	If InternationalEnable = 1 Then
 		If CountryName = "Australia" Then
 			OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml"
+			Var Opened = 1
 		EndIf

 		If CountryName = "Singapore" Then
 			OpenInst 0 "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml"
+			Var Opened = 1
 		EndIf

 		If CountryName = "UnitedArabEmirates Dubai" Then
 			OpenInst 0 "ROOT/taobin_project/inter/uae_dubai/xml/page_show_error.lxml"
+			Var Opened = 1
 		EndIf

 		If CountryName = "United Kingdom" Then
+		    SAVELOG "Kenta420"
 			OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/gbr/xml/page_show_error.lxml"
+			Var Opened = 1
 		EndIf

-		OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
+		If Opened = 0 Then
+		    OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
+		EndIf
 	Else
 		OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
 	EndIf
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -160,6 +160,7 @@
 	Var TestLoopFailed = 0

 	Var cock_tail_str = ""
+	Var BeerTrapEnable = ""

 	READ_FILE "/mnt/sdcard/coffeevending/cock_tail_enable" cock_tail_str
 	STRCONTAIN "1" cock_tail_str cock_tail_enable
@ -178,6 +179,7 @@
 	EndIf


+	STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable



@ -389,7 +391,6 @@
 	Var TimerFirst = "true"


-	Var buttonRemoveCup = "Invisible"

 	Var led_new = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/led_new" led_new
@ -1303,7 +1304,7 @@
 		Var TextPriceMenuY = 264
 		Var TextPriceMenuBlendX = 180
 		Var TextPriceMenuHotX = 48
-		Var ShowButtonClick2 = "Enable"
+		Var ShowButtonClick2 = "Invisible"
 		Var ButtontoTopupMenu = "Invisible"

 		Var PriceUnitText = ""
@ -1334,14 +1335,32 @@
 	; New mode
 	; Inter + Multi-Instance  available ./inter/tha/multi

+	Var EnableMultiInstanceFromBoxID = 0

-	TRY "ROOT/taobin_project/inter/tha/configure.ev"
+	If CountryName = "Thailand" Then
+	    TRY "ROOT/taobin_project/inter/tha/configure.ev"
+	EndIf

+	If CountryName = "Australia" Then
+	    TRY "ROOT/taobin_project/inter/tha/configure.ev"
+	EndIf

-	If BoxID = 173372 Then
-		Var SpiralOnline = "true"
+	DEBUGVAR EnableMultiInstanceFromBoxID

-		Var InternationalShow = 1
+	If MAT_ID_2301 = "Enable" Then
+		If EnableMultiInstanceFromBoxID = 0 Then
+
+			If CountUpForRestartApp = "" Then
+				Var CountUpForRestartApp = 0
+			EndIf
+			DEBUGVAR CountUpForRestartApp
+			Var CountUpForRestartApp = CountUpForRestartApp + 1
+
+			If CountUpForRestartApp > 1 Then
+				WRITE_FILE "/mnt/sdcard/enable_ui_v3" "true"
+				FINISH
+			EndIf
+		EndIf
 	EndIf

 	If EnableMultiInstanceFromBoxID = 1 Then
@ -1387,7 +1406,7 @@
 			Var InternationalShow = 0

 			Var CatalogLayoutV3 = 1
-			
+

 			If BoxID = 123456 Then
 				Var SpiralOnline = "true"
@ -1395,7 +1414,7 @@
 				Var InternationalShow = 0
 			EndIf

-			If BoxID = 201193 Then
+			If BoxID = 201729 Then
 				Var InternationalShow = 1
 			EndIf

@ -1475,6 +1494,71 @@


 		EndIf
+
+		If CountryName = "Australia" Then
+            ; enable helper
+      		Var EnableHelperShow = 0
+      		;Var FromDrinkOk = 1
+ 			RootLayoutVisible 3 "hide"
+
+      		Var EnableMultiInstance = "true"
+      		Var InternationalShow = 0
+      		Var CatalogLayoutV3 = 1
+
+      		Var New_Payment = 1
+      		Var InternationalEnable = 1
+      		DEBUGVAR InternationalEnable
+
+
+      		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
+
+      		;specified to unittest4
+      		Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
+      		Var CountryShortName = "aus"
+
+      		Var WebAppShow = "Invisible"
+
+      		Var LanguageShow = "ENG"
+      		EnableLanguage "ENG"
+
+      		Var RedirectToNormalVersion = 1
+
+      		SetLanguage "ENG"
+      		LanguageControl "UpdateList" "-"
+      		Var show_eng = "true"
+
+      		;Var ShowNetworkProblemText = "Network error. Payment Cash only."
+
+      		Var TextPriceMenuSize = 12
+      		Var TextPriceMenuY = 266
+      		Var TextPriceMenuBlendX = 180
+      		Var TextPriceMenuHotX = 48
+
+      		Var ShowButtonClick2 = "Enable"
+      		Var ButtontoTopupMenu = "Enable"
+      		Var CurrentPageShowError = 0
+
+
+      		Var PriceUnitText = ""
+
+
+      		Var show_eng_button_stage = "Invisible"
+
+
+      		Var XButtonMember = 212
+      		Var YButtonMember = 1695
+
+      		If Not#LanguageLoaded = "" Then
+     			LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/aus/menu/lang.tsv"
+      		EndIf
+
+      		Var cups_sold_text = "Cups Sold Worldwide"
+
+      		Var MinPhoneNumber = 10
+      		Var MaxPhoneNumber = 10
+
+      		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+		EndIf
 	EndIf

 	DEBUGVAR InternationalEnable
@ -1498,6 +1582,10 @@
 		DEBUGVAR OpenFileXML
 		TRY OpenFileXML

+		If CountryName = "Thailand" Then
+			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+		EndIf
+
 	Else
 		Var LanguageObjectShow = "Invisible"
 		Var NoLangObjectShow = "Enable"
@ -1580,21 +1668,13 @@
 		Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
 	EndIf

-	If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
+	If CountryName = "HongKong" Then
+		Var bnRemoveCup = CountryRootPath + "/image/main_page/bn_remove_cup.png"
+		Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
 	EndIf

+
+
 	If IgnoreProfileFromRunEV = "" Then
 		Var IgnoreProfileFromRunEV = 0
 	EndIf
@ -1753,10 +1833,14 @@

 	   	OpenInst 2 PepsiFullScreenPageBoard
 	EndIf
+	If CupOnArm = "true" Then

-	; tap screen for press popup when app hang
-	TapScreen 860 1004
-	
+	Else
+		; tap screen for press popup when app hang
+		TapScreen 860 1004
+	EndIf
+
+	Var buttonRemoveCupOnArm = "Invisible"
 	Var CountDownFailErrorHappendClear = 8
 </EventOpen>

@ -1906,17 +1990,17 @@ PRICE "Reset" "-"
 </EventUnitTest7>

 <EventUnitTest8>
-    Var buttonRemoveCup = "Enable"
-    DEBUGVAR buttonRemoveCup
+    Var buttonRemoveCupOnArm = "Enable"
+    DEBUGVAR buttonRemoveCupOnArm
 	DEBUGVAR bnRemoveCup
 	DEBUGVAR bpRemoveCup

 </EventUnitTest8>

  <EventUnitTest9>
-	Var buttonRemoveCup = "Enable"
+	Var buttonRemoveCupOnArm = "Enable"
 	Var UseVeryBigRemoveCupButton = "Enable"
-    DEBUGVAR buttonRemoveCup
+    DEBUGVAR buttonRemoveCupOnArm


 </EventUnitTest9>
@ -1941,12 +2025,16 @@ PRICE "Reset" "-"
 	EndIf

 	DEBUGVAR FailErrorHappend
-	
+
 	If FailErrorHappend = 1 Then
-		If CountDownFailErrorHappendClear > 0 Then
-			Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
-			If CountDownFailErrorHappendClear = 1 Then
-				__CMD "error-code-clear-all" "-" "-" "-"
+		If CupOnArm = "true" Then
+
+		Else
+			If CountDownFailErrorHappendClear > 0 Then
+				Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
+				If CountDownFailErrorHappendClear = 1 Then
+					__CMD "error-code-clear-all" "-" "-" "-"
+				EndIf
 			EndIf
 		EndIf
 	EndIf
@ -2083,7 +2171,7 @@ PRICE "Reset" "-"

 	If TaobinOnlineX = "true" Then

-	
+

 		If CountDownShowButton = 31 Then
 			Var ShowButtonClickFull = "Enable"
@ -2186,7 +2274,7 @@ PRICE "Reset" "-"

 					TopView "show"
 					OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
-					
+
 					If InternationalEnable = 1 Then
 						If CountryName = "Thailand" Then
 							SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
@ -2210,7 +2298,7 @@ PRICE "Reset" "-"
 						EndIf
 					EndIf

-					
+
 				EndIf
 			EndIf
 		EndIf
@ -2305,23 +2393,7 @@ PRICE "Reset" "-"

 	EndIf

-
-
-
-	If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"



@ -2634,9 +2706,9 @@ PRICE "Reset" "-"
 	Var NextPage = "-"
 	Var BaseOnPageBoard = 0
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	
+
 	;inter-xml-open BEGIN
-	
+
 	If SpiralOnline = "true" Then
 		If InternationalEnable = 1 Then
 			If CountryName = "Thailand" Then
@ -2673,7 +2745,7 @@ PRICE "Reset" "-"
 <Button>
 <X> btnRemoveCupX </X>
 <Y> btnRemoveCupY </Y>
-<State> buttonRemoveCup </State>
+<State> buttonRemoveCupOnArm </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
 <Filename> bnRemoveCup </Filename>
@ -2683,7 +2755,8 @@ PRICE "Reset" "-"
 	Machine DoorLidOpen

 	Var CheckCupStateDoorCupClose = "reset"
-	Var buttonRemoveCup = "Invisible"
+	Var buttonRemoveCupOnArm = "Invisible"
+	RefreshAll
 </EventClick>
 </Button>

@ -2823,4 +2896,6 @@ PRICE "Reset" "-"
 </Text>


+;include="ROOT/taobin_project/inc/remove_cup_tag_on_arm.inc"
+
 </Page>
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@ -240,18 +240,7 @@
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"

-	; reset-if-empty
-	DEBUGVAR buttonRemoveCup

-	If buttonRemoveCup = "Invisible" Then
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-
-		Else
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@ -273,26 +262,7 @@



-	; zone cup on arm
-	DEBUGVAR CheckCupStateDoorCupClose
-	DEBUGVAR CupOnArm
-    If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-	DEBUGVAR MachineStage
-	DEBUGVAR buttonRemoveCup
-
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"

 	Refresh
 	TimerReset
@ -740,25 +710,8 @@
 <Value> ShowNetworkProblemText </Value>
 </Text>

-; Cart
-<Button>
-<X> 915 </X>
-<Y> 1769 </Y>
-<State> showCart </State>
-<Filename> cart_image_bn  </Filename>
-<Filename> cart_image_bp  </Filename>
-<FilenamePress> cart_image_bp </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<Interval> 400</Interval>
-<EventClick>

-
-	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"

 <EventWebApp>

@ -781,24 +734,8 @@



+;include="ROOT/inc/remove_cup_tag_on_arm.inc"

-<Button>
-<X> btnRemoveCupX </X>
-<Y> btnRemoveCupYNotPageBoard </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename>  bnRemoveCup </Filename>
-<Filename>  bpRemoveCup </Filename>
-<EventClick>
-    Machine RemoveCup
-	Machine DoorLidOpen
-
-	Var CheckCupStateDoorCupClose = "reset"
-	Var buttonRemoveCup = "Invisible"
-
-</EventClick>
-</Button>

 <EventUnitTest1>
 	Var StrawGetMoreState = "Invisible"
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@ -228,21 +228,8 @@

 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"

-	; zone cup on arm
-	If CupOnArm = "true" Then

-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
+	

 	If CounterEnable = 1 Then
 		If OnTaobinVending = 1 Then
@ -288,23 +275,7 @@
        EndIf
 	EndIf

-	; zone cup on arm
-    If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"


 	Refresh
@ -695,5 +666,6 @@
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
 </EventUnitTest4>

+;include="ROOT/inc/remove_cup_tag_on_arm.inc"

 </Popup>
--- a/xml/page_catalog3.xml
+++ b/xml/page_catalog3.xml
@ -222,27 +222,6 @@

 	TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"

-	; zone cup on arm
-	If Seeker = "curr" Then
-		If CupOnArm = "true" Then
-
-			If CheckCupStateDoorCupClose = "" Then
-				Var buttonRemoveCup = "Enable"
-			EndIf
-
-			If CheckCupStateDoorCupClose = "done" Then
-				Var buttonRemoveCup = "Enable"
-			EndIf
-		Else
-			If buttonRemoveCup = "Enable" Then
-				Var buttonRemoveCup = "Invisible"
-			EndIf
-		EndIf
-
-
-	Else
-		Var buttonRemoveCup = "Invisible"
-	EndIf


 	If CounterEnable = 1 Then
@ -300,25 +279,7 @@
        EndIf
 	EndIf

-	; zone cup on arm
-	If Seeker = "curr" Then
-		If CupOnArm = "true" Then
-
-			If CheckCupStateDoorCupClose = "" Then
-				Var buttonRemoveCup = "Enable"
-			EndIf
-
-			If CheckCupStateDoorCupClose = "done" Then
-				Var buttonRemoveCup = "Enable"
-			EndIf
-		Else
-			If buttonRemoveCup = "Enable" Then
-				Var buttonRemoveCup = "Invisible"
-			EndIf
-		EndIf
-	Else
-		Var buttonRemoveCup = "Invisible"
-	EndIf
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"



@ -754,4 +715,7 @@
 </EventUnitTest4>


+;include="ROOT/inc/remove_cup_tag_on_arm.inc"
+
+
 </Popup>
--- a/xml/page_catalog_beer_trap.xml
+++ b/xml/page_catalog_beer_trap.xml
@ -180,7 +180,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0005"
+			Topping "Load" "11-99-05-0028"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@ -208,7 +208,6 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
 		Open "ROOT/taobin_project/xml/page_topping_select7.xml"
 </EventClick>
 </Button>
@ -255,7 +254,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "11-99-05-0005"
+			Topping "Load" "11-99-05-0029"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
--- a/xml/page_catalog_group_pro_school_ovaltine.xml
+++ b/xml/page_catalog_group_pro_school_ovaltine.xml
@ -561,8 +561,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Ms. Savage"
-		Var NameDrinkTH = "ครูไหวใจร้าย"
+		Var NameDrink = "Ovaltine Latte"
+		Var NameDrinkTH = "โอวัลตินกาแฟ"
 		Var DrinkDescriptionTH = "โอวัลติน นม กาแฟ"
 		Var DrinkDescription = "Ovaltine Milk Coffee"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Latte.png"
@ -635,7 +635,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ครูไหวใจร้าย" </Value>
+	<Value> "โอวัลตินกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -656,7 +656,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Ms. Savage" </Value>
+	<Value> "Ovaltine Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -810,8 +810,8 @@ Super Volcano" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( 12-21-03-0092, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "Ms. Savage"
-		Var NameDrinkTH = "ครูไหวใจร้าย"
+		Var NameDrink = "Ovaltine Latte"
+		Var NameDrinkTH = "โอวัลตินกาแฟ"
 		Var DrinkDescriptionTH = "โอวัลติน นม กาแฟ"
 		Var DrinkDescription = "Ovaltine Milk Coffee"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Latte.png"
@ -884,7 +884,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ครูไหวใจร้าย" </Value>
+	<Value> "โอวัลตินกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -905,7 +905,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Ms. Savage" </Value>
+	<Value> "Ovaltine Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1060,8 +1060,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Hot Senior"
-		Var NameDrinkTH = "รุ่นพี่โซฮ็อต"
+		Var NameDrink = "Ovaltine Thai Milk Tea"
+		Var NameDrinkTH = "โอวัลตินชาไทยนม"
 		Var DrinkDescriptionTH = "โอวัลติน นม ชาไทย"
 		Var DrinkDescription = "Ovaltine Milk Thai Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_ThaiTea.png"
@ -1134,7 +1134,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "รุ่นพี่โซฮ็อต" </Value>
+	<Value> "โอวัลตินชาไทยนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1155,7 +1155,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Hot Senior" </Value>
+	<Value> "Ovaltine Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1311,8 +1311,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Gifted Geek"
-		Var NameDrinkTH = "กิ๊ฟเต็ดสายเนิร์ด"
+		Var NameDrink = "Ovaltine Matcha Latte"
+		Var NameDrinkTH = "โอวัลตินมัทฉะลาเต้"
 		Var DrinkDescriptionTH = "โอวัลติน นม มัทฉะ"
 		Var DrinkDescription = "Ovaltine Milk Matcha"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Matcha.png"
@ -1385,7 +1385,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กิ๊ฟเต็ดสายเนิร์ด" </Value>
+	<Value> "โอวัลตินมัทฉะลาเต้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1406,7 +1406,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Gifted Geek" </Value>
+	<Value> "Ovaltine Matcha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1562,8 +1562,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Back Row Gang"
-		Var NameDrinkTH = "แก๊งเด็กหลังห้อง"
+		Var NameDrink = "Ovaltine Taiwanese Milk Tea"
+		Var NameDrinkTH = "โอวัลตินชานม"
 		Var DrinkDescriptionTH = "โอวัลติน นม ชาไต้หวัน"
 		Var DrinkDescription = "Ovaltine Milk Taiwanese Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Taiwanese_Tea.png"
@ -1636,7 +1636,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "แก๊งเด็กหลังห้อง" </Value>
+	<Value> "โอวัลตินชานม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1657,7 +1657,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Back Row Gang" </Value>
+	<Value> "Ovaltine Taiwanese Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1813,8 +1813,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Hallway Gossiper"
-		Var NameDrinkTH = "เจ่เจ้ขาเมาส์"
+		Var NameDrink = "Ovaltine Jasmine Tea"
+		Var NameDrinkTH = "โอวัลตินมะลิ"
 		Var DrinkDescriptionTH = "โอวัลติน นม ชามะลิ"
 		Var DrinkDescription = "Ovaltine Milk Jasmine Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Jasmine.png"
@ -1887,7 +1887,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "เจ่เจ้ขาเมาส์" </Value>
+	<Value> "โอวัลตินมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1908,7 +1908,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Hallway Gossiper" </Value>
+	<Value> "Ovaltine Jasmine Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2064,8 +2064,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Cool Class Prez"
-		Var NameDrinkTH = "ประธานสุดคูล"
+		Var NameDrink = "Ovaltine Salak"
+		Var NameDrinkTH = "โอวัลตินน้ำแดง"
 		Var DrinkDescriptionTH = "โอวัลติน นม สละ"
 		Var DrinkDescription = "Ovaltine Milk Salak"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Salak.png"
@ -2138,7 +2138,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ประธานสุดคูล" </Value>
+	<Value> "โอวัลตินน้ำแดง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2159,7 +2159,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Cool Class Prez" </Value>
+	<Value> "Ovaltine Salak" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2315,8 +2315,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Head Majorette"
-		Var NameDrinkTH = "ดรัมเมเยอร์ไม้หนึ่ง"
+		Var NameDrink = "Ovaltine Caramel"
+		Var NameDrinkTH = "โอวัลตินคาราเมล"
 		Var DrinkDescriptionTH = "โอวัลติน นม คาราเมล"
 		Var DrinkDescription = "Ovaltine Milk Caramel"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Caramel.png"
@ -2389,7 +2389,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ดรัมเมเยอร์ไม้หนึ่ง" </Value>
+	<Value> "โอวัลตินคาราเมล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2410,7 +2410,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Head Majorette" </Value>
+	<Value> "Ovaltine Caramel" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2566,8 +2566,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Sweet Freshie"
-		Var NameDrinkTH = "รุ่นน้องหน้าหวาน"
+		Var NameDrink = "Ovaltine Coconut"
+		Var NameDrinkTH = "โอวัลตินมะพร้าว"
 		Var DrinkDescriptionTH = "โอวัลติน นม มะพร้าว"
 		Var DrinkDescription = "Ovaltine Milk Coconut"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Coconut.png"
@ -2640,7 +2640,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "รุ่นน้องหน้าหวาน" </Value>
+	<Value> "โอวัลตินมะพร้าว" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2661,7 +2661,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Sweet Freshie" </Value>
+	<Value> "Ovaltine Coconut" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_taiwanese_tea.skt
+++ b/xml/page_catalog_group_pro_taiwanese_tea.skt
@ -0,0 +1,36 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<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"
+
+
+    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_pro_taiwanese_tea.xml
+++ b/xml/page_catalog_group_pro_taiwanese_tea.xml
--- a/xml/page_catalog_group_recommend.skt
+++ b/xml/page_catalog_group_recommend.skt
@ -46,7 +46,6 @@
 ;include="ROOT/taobin_project/xml/menu_catalog_new.xml"


-
 <?hurr 
    #include=menu_new_layout_gen_v2.py
 ?>
@ -60,7 +59,6 @@

 ;BigLogoLayout

-;include="ROOT/taobin_project/inc/button_remove_cup.inc"

 </Popup>

--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
--- a/xml/page_catalog_group_recommend_multi_pro.xml
+++ b/xml/page_catalog_group_recommend_multi_pro.xml
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
--- a/xml/page_drinkfail2.xml
+++ b/xml/page_drinkfail2.xml
@ -35,7 +35,7 @@
 	EndIf
 	
 	If CountryName = "United Kingdom" Then
-		Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_gbr.lxml"
+		Open "ROOT/taobin_project/inter/gbr/xml/page_drinkfail_gbr.lxml"
 	EndIf

 	If CountryName = "Malaysia" Then
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@ -16,6 +16,7 @@

 	DEBUGVAR DrinkOKStringVersion

+	Var CountDownDrinkOK = 4

 	WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"

--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -181,6 +181,7 @@
 	Var Seeker.IntVendingCredit = 0

 	Var EMAMemberID = ""
+	Var UKBMemberID = ""

 	Var Seeker.StoreCreditFlag = 0
 	Var Seeker.pageStoreCredit0 = 0
--- a/xml/page_payment_cash-GBR.xml
+++ b/xml/page_payment_cash-GBR.xml
@ -16,7 +16,7 @@
 	;EndIf

 	Var ErrorCause = ""
-	Var MAX_UKB_CODE = 5
+	Var MAX_UKB_CODE = 6

    Var  PreScaleCanculate = 100

@ -98,7 +98,7 @@
 	Var EMAEnterNumberButtonState = "Invisible"
 	Var EMAPopupSuccessState = "Invisible"
 	Var EMAPopupErrorState = "Invisible"
-	Var QRErrorText = "Errror scanning\nthe QR code"
+	Var QRErrorText = "Errror scanning\nthe Barcode"
 	Var QRErrorImg = "/QRError.png"
 	Var QR_POPUP = "/img_popup8-2.png"

@ -421,7 +421,7 @@

        If CoinInFlag = 0 Then
            If CancelFlag = 0 Then
-           	    Var QR_POPUP = "/img_popup_ema.png"
+           	    Var QR_POPUP = "/img_popup_ukb.png"
 				Var QRCODE99 = ""

 				Var LOADING_STATE = "Enable"
@ -698,13 +698,13 @@
 				SAVELOG QRCODE99Shoppy
 				SAVELOG Ext21

-				SPLIT MemberData ":" 1 _EMAMemberName
-				SPLIT MemberData ":" 2 EMAMemberSurname
+				;SPLIT MemberData ":" 1 _EMAMemberName
+				;SPLIT MemberData ":" 2 EMAMemberSurname
 				SPLIT MemberData ":" 3 _EMAMemberBalance

 				INT _EMAMemberBalance

-				Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
+				;Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
 				Var _BalanceFormat = "Remain Balance: £%.2f"
 				Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow)

@ -1449,18 +1449,19 @@

    If scanresult = "true" Then

+        TrimCRLF scanmsg
        StrLen scanmsg textLen

        DEBUGVAR textLen

-        If textLen = MAX_EMA_CODE Then
+        If textLen = MAX_UKB_CODE Then

            Var UKBMemberID = scanmsg

            If Timeout < 120 Then
                If CoinInFlag = 0 Then
                    If CancelFlag = 0 Then
-                   	    Var QR_POPUP = "/img_popup_ema.png"
+                   	    Var QR_POPUP = "/img_popup_ukb.png"
        				Var QRCODE99 = ""

        				Var LOADING_STATE = "Enable"
@ -1841,7 +1842,7 @@ EndIf
            If CancelFlag = 0 Then
                If alphaState = "Invisible" Then

-               	    Var QR_POPUP = "/img_popup_ema.png"
+               	    Var QR_POPUP = "/img_popup_ukb.png"
    				Var QRCODE99 = ""

    				Var FlagQROpened = 1
@ -1998,17 +1999,17 @@ EndIf
 </Button>


-<Text>
-<X> 249 </X>
-<Y> 1186 </Y>
-<State> EMAPopupSuccessState </State>
-<Width> 583 </Width>
-<Font> KanitLightTTF </Font>
-<Size> 40 </Size>
-<Color> 0x513C2F </Color>
-<Align> center-vertical-horizontal </Align>
-<Value> EMAMemberName </Value>
-</Text>
+;<Text>
+;<X> 249 </X>
+;<Y> 1186 </Y>
+;<State> EMAPopupSuccessState </State>
+;<Width> 583 </Width>
+;<Font> KanitLightTTF </Font>
+;<Size> 40 </Size>
+;<Color> 0x513C2F </Color>
+;<Align> center-vertical-horizontal </Align>
+;<Value> EMAMemberName </Value>
+;</Text>

 <Text>
 <X> 249 </X>
@ -2045,7 +2046,7 @@ EndIf
    If Timeout < 120 Then
        If CoinInFlag = 0 Then
            If CancelFlag = 0 Then
-           	    Var QR_POPUP = "/img_popup_ema.png"
+           	    Var QR_POPUP = "/img_popup_ukb.png"
 				Var QRCODE99 = ""

 				Var FlagQROpened = 1
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@ -1952,6 +1952,7 @@
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
 				Var PopupTimeoutEnable = "Invisible"
+				Var cancelButtonQRPopupState = "Enable"
 				Var QRCODE99 = ""
 			EndIf
 		EndIf
--- a/xml/page_remove_cup.xml
+++ b/xml/page_remove_cup.xml
@ -14,6 +14,8 @@
 	READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
 	DEBUGVAR StrCountryShort

+	Var buttonRemoveCupOnArm = "Invisible"
+
 	; Don't forget
 	; This file can open before page_board.xml
 	If StrCountryShort = "MYS" Then
@ -23,6 +25,10 @@
 	If StrCountryShort = "AUS" Then
 		Open "ROOT/taobin_project/inter/aus/xml/page_remove_cup.lxml"
 	EndIf
+	
+	If StrCountryShort = "GBR" Then
+	    Open "ROOT/taobin_project/inter/gbr/xml/page_remove_cup.lxml"
+	EndIf

 	If StrCountryShort = "SGP" Then
 		Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@ -151,8 +151,12 @@
 	; ================= Video thankyou =============================

 	If InternationalEnable = 1 Then
-		Var script_thankyou = CountryRootPath + "video/script_thank.ev"
-		TRY script_thankyou
+		If CountryName = "Thailand" Then
+			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"	
+		Else
+			Var script_thankyou = CountryRootPath + "video/script_thank.ev"
+			TRY script_thankyou
+		EndIf
 	Else
 		TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
 	EndIf
@ -198,16 +202,16 @@
 	DEBUGVAR Seeker.CreditCardRef

 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/script_thankyou.ev"
-
-
+	SAVELOG "============================================== Thankyou.xml ====================================="
+	Var TimeoutThankyou = 0
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>

 	Var CountDownBrewing = BREW_CNT

-	Var Timeout = Timeout + 1
-	If Timeout = TimeoutToNext Then
+	Var TimeoutThankyou = TimeoutThankyou + 1
+	If TimeoutThankyou = TimeoutToNext Then

 		If 	CART_INDEX = 0  Then
 		Else
@ -288,6 +292,9 @@

 	EndIf

+	DEBUGVAR CountDownThankyou
+	DEBUGVAR PayOfflineMode
+	DEBUGVAR CleanFeedbackFlag

 	; run test;
 	If CountDownThankyou = 0 Then
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -167,10 +167,11 @@

 	Var buttonRemoveCup = "Invisible"

-	Var thankyouContiVersion = "TC12 "
+	Var thankyouContiVersion = "TC13 "
 	SAVELOG "Thank you conti version " + thankyouContiVersion
 	SAVELOG "Support NextSmoothie and fix bug next"
-	SAVELOG "DirImage detele. use DirImage2"
+	SAVELOG "MenuErrorCode"
+	

    DEBUGVAR NextSmoothie
    DEBUGVAR Seeker.SmoothieToPayment
@ -210,8 +211,9 @@
 			If CountDownFailErrorHappendClear = 29 Then
 				__CMD "CLI" "clear-ice-for-next-drink" "-" "-"
 			EndIf
+			
 			If CountDownFailErrorHappendClear = 25 Then
-				__CMD "error-code-clear-all" "-" "-" "-"
+				;__CMD "error-code-clear-all" "-" "-" "-"
 				
 			EndIf

@ -313,6 +315,7 @@
 			Var PictureFile = PictureFile + "1"
 			Var PictureFile = PictureFile + PictureEnd

+			SAVELOG "============ Older condition ================="
 			DEBUGVAR Seeker.selected_a_drink
 			If NextOrderStatus = "Disable" Then
 				Var LastMakeDrinkResult = "fail"
@ -327,54 +330,6 @@

 	DEBUGVAR CountDownThankyou

-	; obsolete
-	If CountDownThankyou = 99 Then
-
-		; reset all var
-		DEBUGVAR MachineStage
-		SAVELOG "CountDownThankyou = 0"
-
-		Var CountDownBrewing = BrewTime
-		Var CountUpBrewing = 0
-		SAVELOG BrewTime
-
-		Var ShowCountDownBrewing = CountDownBrewing
-		Var MachineState_Result = 0
-
-		If MachineStage = "show-menu" Then
-			If HaveCup = "false" Then
-
-				Var LastMakeDrinkResult = "-"
-				If New_Payment = 1 Then
-					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
-				EndIf
-				MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
-
-				If CountryName = "Thailand" Then
-
-					If New_Payment = 1 Then
-						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
-					Else
-						Open "ROOT/taobin_project/xml/page_brewing3.xml"
-					EndIf
-				Else
-
-					If InternationalEnable = 1 Then
-						Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
-						Open Brew3Inter
-					Else
-						;obsolete
-						If New_Payment = 1 Then
-							Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
-						Else
-							Open "ROOT/taobin_project/xml/page_brewing3.xml"
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-     	EndIf
-
-	EndIf

 		; run test;
 	If CountDownThankyou = 0 Then
@ -421,8 +376,6 @@

 				If New_Payment = 1 Then
 					Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_brewing3.xml"
 				EndIf
 			Else

@ -458,6 +411,7 @@


 	;include=ROOT/taobin_project/inc/remove_cup_step.inc
+	
 	If Timeout2 < 3 Then
    	Var buttonRemoveCup = "Invisible"
    EndIf
@ -477,6 +431,7 @@
    EndIf

 	DEBUGVAR MenuReadyForCup
+	DEBUGVAR MenuErrorCode

 	If MenuReadyForCup = "YES" Then

@ -515,6 +470,32 @@
 		Var buttonRemoveCup = "Invisible"

 	Else
+		If MenuErrorCode > 0 Then
+			
+			If Timeout2 > 40 Then
+				SAVELOG "Timeout2 40 MenuErrorCode not zero"
+
+
+				Var error_code_stop_now = MenuErrorCode
+
+
+				If DoorCupPosition = "bottom" Then
+
+				Else
+					Var error_code_stop_now = 1296
+					__CMD "error-code-1296" 0 "-" "-"
+				EndIf
+
+				If New_Payment = 1 Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+				EndIf
+
+				Var LastMakeDrinkResult = "fail"
+				Open "ROOT/taobin_project/xml/page_cannotConti.xml"
+
+			EndIf
+
+		EndIf


 	EndIf
--- a/xml/page_topping_select5.xml
+++ b/xml/page_topping_select5.xml
@ -91,6 +91,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
 	EndIf

+	If ConfigNumer >= 1775 Then
+		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+	EndIf 
+
 	DEBUGVAR ToppingNewUINewSystem
 	If ToppingNewUINewSystem = 1 Then
 		Var ProductMilkCat = "12-03-03-0105,12-03-02-0005,12-03-03-0005,12-03-01-0001,12-03-02-0001,12-03-03-0001,12-03-01-0004,12-03-02-0004,12-03-03-0004,12-03-02-0006,12-03-03-0006,12-03-01-0002,12-03-02-0002,12-03-03-0002,12-03-02-0065,12-03-03-0065,12-03-02-0067,12-03-03-0067,12-01-03-0078,12-21-03-0078,12-02-03-0057,12-02-03-0058,12-01-03-0010,12-03-02-0010,12-03-03-0010,12-03-03-0011,12-03-03-0009,12-03-01-0019,12-03-02-0019,12-03-03-0019,12-03-03-0032,12-03-03-0026,12-03-02-0058,12-03-03-0058,12-03-02-0059,12-03-03-0059,12-03-03-0027,12-03-03-0094,12-03-03-0095,12-03-03-0100,12-03-03-0101,12-03-03-0102,12-03-03-0103,12-03-03-0104"
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -12,6 +12,8 @@
 		;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
 	EndIf
 	Machine WakeUp
+
+	Var EndOfTopping = 0
 	
 	Var Seeker.orderFromNewTopping  = 0

--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@ -70,6 +70,7 @@
 	Var blendedStateShow = "Invisible"
 	Var ShotCoffeeBG = "Invisible"
 	Var showShotEnable = "Invisible"
+	Var showShotEnableHealthy = "Invisible"
 	Var ShowLidStraw = "Invisible"
 	Var ShowStrawOnly = "Invisible"
 	Var ShowLidOnly = "Invisible"
@ -111,6 +112,7 @@
 	Var showShotSodaEnable = "Invisible"
 	Var showCoffeeEnable = "Invisible"
 	Var showMilkEnable = "Invisible"
+	Var showTaiwaneseTeaEnable = "Invisible"
 	

 ; Customer Coffee
@ -175,6 +177,9 @@
 	Var CustomMilkState[1] = "Invisible"
 	Var CustomMilkState[2] = "Invisible"

+	Var CustomTaiwaneseTeaState[0] = "Invisible"
+	Var CustomTaiwaneseTeaState[1] = "Invisible"
+
 	Var showShotEnableSoda = "Disable"
 	Var CustomEnergyState[0] = "Disable"
 	Var CustomEnergyState[1] = "Disable"
@ -273,6 +278,7 @@
 		Var showname = NameDrink
 		Var showdesc = DrinkDescription

+		Var DirImageRevamp = "ROOT/taobin_project/image/topping2_en/topping_revamp"
 		Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept2.png"
 		Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept2.png"
 		Var bnAcceptX = 360
@ -357,6 +363,12 @@
 		Var CustomSweetestPercentTextX = 935
 		Var CustomEspressoTextX = 793

+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 695
+		Var CustomEspressoShotTextNewX = 840
+
 		Var CustomEspressoShotTextX = 892
 		Var SugarZeroCalTextX = 890
 		Var SugarTextX = 800
@ -391,6 +403,7 @@
 		Var showname = NameDrinkTH
 		Var showdesc = DrinkDescriptionTH

+		Var DirImageRevamp = "ROOT/taobin_project/image/topping2/topping_revamp"
 		Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png"
    	Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png"
 		Var bnAcceptX = 360
@ -450,8 +463,8 @@
 		Var custom_coffee_level_medium_text_x = 560
 		Var custom_coffee_level_medium_price_x = 600
 		Var custom_coffee_level_right_text_x = 676
-		Var custom_coffee_level_darker_text_x = 880
-		Var custom_coffee_level_dark_text_x = 790
+		Var custom_coffee_level_darker_text_x = 875
+		Var custom_coffee_level_dark_text_x = 780

 		Var SugarZeroCalPrice_X = 482

@ -475,6 +488,12 @@

 		Var CustomEspressoTextX = 804

+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 705
+		Var CustomEspressoShotTextNewX = 840
+
 		Var CustomEspressoShotTextX = 892
 		Var SugarZeroCalTextX = 890
 		Var SugarTextX = 800
@ -504,6 +523,11 @@
 	EndIf

 	If LanguageShow = "MYANMAR" Then
+
+		Var DirImageRevamp = "ROOT/taobin_project/image/topping_revamp_mmr"
+		Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
+		Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
+
 		Var CustomEspressoShotTextX = 892
 		Var CustomEspressoTextX = 804
 		Var SugarZeroCalTextX = 880
@ -528,6 +552,12 @@
 		Var CustomMilkIntensityII_X = 804
 		Var CustomMilkIntensityIII_X = 893

+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 705
+		Var CustomEspressoShotTextNewX = 840
+
 		; healthy sugar
 		Var CustomHealthySugar_Text_X = 360
 		Var CustomHealthySugar_TextBelow_X = 295
@ -543,6 +573,11 @@
 	EndIf

 	If LanguageShow = "MSC" Then
+
+		Var DirImageRevamp = "ROOT/taobin_project/image/topping_revamp_msc"
+		Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
+		Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
+
 		Var CustomEspressoShotTextX = 872
 		Var CustomEspressoTextX = 790
 		Var SugarZeroCalTextX = 890
@ -556,6 +591,12 @@
 		Var CustomSweetExtraTextX = 760
 		Var CustomSweetestTextX = 865

+		;coffee-shot-for-healthy
+		Var BtnChoiceX1 = 700
+		Var BtnChoiceX2 = 850
+		Var CustomEspressoTextNewX = 690
+		Var CustomEspressoShotTextNewX = 830
+
 		Var SugarTextX = 810
 		Var custom_coffee_level_right_text_x = 686

@ -949,6 +990,22 @@
 				Var MenuReady = "WaitSpiral"
 			EndIf
 		EndIf
+		
+		If UserSelectProductCode = "-" Then
+			Var MenuReady = "error-pd"
+		EndIf
+		
+		If UserSelectProductCode = "" Then
+			Var MenuReady = "error-pd2"
+		Else
+			Strlen UserSelectProductCode UserSelectProductCodeLen
+			If UserSelectProductCodeLen = 13 Then
+
+			Else
+				Var MenuReady = "error-pd3"	
+			EndIf
+		EndIf
+		DEBUGVAR MenuReady

        If MenuReady = "YES" Then
            DEBUGVAR ToppingDetail
@ -1544,6 +1601,16 @@
 		Var CustomSweetestPercentTextX = 935	
 	EndIf

+	If LanguageShow = "MYANMAR" Then
+		Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
+		Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
+	EndIf
+
+	If LanguageShow = "MSC" Then
+		Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
+		Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
+	EndIf
+
 	Var text_x_free_topping =  text_x_add_oreo_price + text_x_free_adjust


@ -1655,6 +1722,8 @@
 	DEBUGVAR TOPPING9
 	DEBUGVAR TOPPING10
 	DEBUGVAR TOPPING11
+	DEBUGVAR TOPPING11_EXT_1
+	DEBUGVAR TOPPING11_EXT_2
 	DEBUGVAR TOPPING12
 	DEBUGVAR TOPPING13

@ -1710,6 +1779,9 @@
 	DEBUGVAR toppingID11index1
 	DEBUGVAR toppingID11index2
 	DEBUGVAR toppingID11index3
+	DEBUGVAR toppingID11index4
+	DEBUGVAR toppingID11index5
+	DEBUGVAR toppingID11index6

 	DEBUGVAR toppingID12index1
 	DEBUGVAR toppingID12index2
@ -1841,27 +1913,52 @@
 		EndIf

 		If TOPPING11 = "milk-level" Then
-			Var showMilkEnable = "Enable"
 			;for some menu that not have sugar-level channel from json
 			If TOPPING1 = "" Then
 				Var BGMilkNew = "Enable"
+				Var showMilkEnable = "Invisible"
 				Var BGSugarNew = "Invisible"
 				Var SugarZeroCalOption = "Invisible"
+			Else
+				Var showMilkEnable = "Enable"
+				Var BGMilkNew = "Invisible"
 			EndIf
+
+			;taiwanese-tea-powder-level
+			If toppingID11index5 = 547 Then
+				Var showTaiwaneseTeaEnable = "Enable"
+			Else
+				Var showTaiwaneseTeaEnable = "Invisible"
+			EndIf 
 			
 			If blend_button_state = "PressForever" Then
 				Var CustomMilkState[0] = "Enable"
 				Var CustomMilkState[1] = "Enable"
 				Var CustomMilkState[2] = "Enable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
 			Else
 				If TOPPING11 = "milk-level" Then
 					Var CustomMilkState[0] = "Enable"
 					Var CustomMilkState[1] = "Enable"
 					Var CustomMilkState[2] = "Enable"
+
+					If showTaiwaneseTeaEnable = "Enable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
 				Else
 					Var CustomMilkState[0] = "Disable"
 					Var CustomMilkState[1] = "Disable"
 					Var CustomMilkState[2] = "Disable"
+
+					If showTaiwaneseTeaEnable = "Enable" Then
+						Var CustomTaiwaneseTeaState[0] = "Disable"
+						Var CustomTaiwaneseTeaState[1] = "Disable"
+					EndIf
 				EndIf
 			EndIf

@ -1869,6 +1966,36 @@
 			Var CustomMilkState[0] = "Disable"
 			Var CustomMilkState[1] = "Disable"
 			Var CustomMilkState[2] = "Disable"
+
+			If showTaiwaneseTeaEnable = "Enable" Then
+				Var CustomTaiwaneseTeaState[0] = "Disable"
+				Var CustomTaiwaneseTeaState[1] = "Disable"
+			EndIf
+		EndIf
+
+		;taiwanese-tea-powder-level
+		If TOPPING11 = "taiwanese-tea-level" Then
+			Var showTaiwaneseTeaEnable = "Enable"
+			
+			If blend_button_state = "PressForever" Then
+				Var CustomTaiwaneseTeaState[0] = "Enable"
+				Var CustomTaiwaneseTeaState[1] = "Enable"
+			Else
+				If TOPPING11 = "taiwanese-tea-level" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+		Else
+			If TOPPING11 = "milk-level" Then
+				;do-not-thing
+			Else
+				Var CustomTaiwaneseTeaState[0] = "Disable"
+				Var CustomTaiwaneseTeaState[1] = "Disable"
+			EndIf
 		EndIf

 		If TOPPING6 = "all-volcano" Then
@ -2664,10 +2791,59 @@
 						EndIf
 					EndIf
 				EndIf
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					If CustomTaiwaneseTeaState[0] = "Disable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[1] = "Disable" Then
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[0] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							If CustomTaiwaneseTeaState[1] = "Enable" Then
+								Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+							EndIf
+						EndIf
+					EndIf
+				EndIf
+				
 			Else
 				Var CustomMilkState[0] = "Disable"
 				Var CustomMilkState[1] = "Disable"
 				Var CustomMilkState[2] = "Disable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				If CustomTaiwaneseTeaState[0] = "Disable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[1] = "Disable" Then
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[0] = "Enable" Then
+					If CustomTaiwaneseTeaState[1] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+						EndIf
+					EndIf
+				EndIf	
+			Else
+				If TOPPING11 = "milk-level" Then
+					;do-not-thing
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
 			EndIf

 			If TOPPING13 = "shot coffee" Then
@ -2763,10 +2939,58 @@
 						EndIf
 					EndIf
 				EndIf
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					If CustomTaiwaneseTeaState[0] = "Disable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[1] = "Disable" Then
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[0] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							If CustomTaiwaneseTeaState[1] = "Enable" Then
+								Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+							EndIf
+						EndIf
+					EndIf
+				EndIf
 			Else
 				Var CustomMilkState[0] = "Disable"
 				Var CustomMilkState[1] = "Disable"
 				Var CustomMilkState[2] = "Disable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				If CustomTaiwaneseTeaState[0] = "Disable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[1] = "Disable" Then
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[0] = "Enable" Then
+					If CustomTaiwaneseTeaState[1] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+						EndIf
+					EndIf
+				EndIf	
+			Else
+				If TOPPING11 = "milk-level" Then
+					;do-not-thing
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
 			EndIf

 			If TOPPING13 = "shot coffee" Then
@ -2789,6 +3013,7 @@
 		; first time.
 		If blend_button_state = "PressForever" Then
 			If showShotEnableSoda = "Enable" Then
+				Var showShotNormalSoda = "Disable"
 				Var showShotEnableSoda = "Disable"
 			EndIf

@ -2817,10 +3042,58 @@
 					EndIf
 				EndIf

+				If showTaiwaneseTeaEnable = "Enable" Then
+					If CustomTaiwaneseTeaState[0] = "Disable" Then
+						Var CustomTaiwaneseTeaState[0] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[1] = "Disable" Then
+						Var CustomTaiwaneseTeaState[1] = "Enable"
+					EndIf
+
+					If CustomTaiwaneseTeaState[0] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							If CustomTaiwaneseTeaState[1] = "Enable" Then
+								Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+							EndIf
+						EndIf
+					EndIf
+				EndIf
+
 			Else
 				Var CustomMilkState[0] = "Disable"
 				Var CustomMilkState[1] = "Disable"
 				Var CustomMilkState[2] = "Disable"
+
+				If showTaiwaneseTeaEnable = "Enable" Then
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
+			EndIf
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				If CustomTaiwaneseTeaState[0] = "Disable" Then
+					Var CustomTaiwaneseTeaState[0] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[1] = "Disable" Then
+					Var CustomTaiwaneseTeaState[1] = "Enable"
+				EndIf
+
+				If CustomTaiwaneseTeaState[0] = "Enable" Then
+					If CustomTaiwaneseTeaState[1] = "Enable" Then
+						If CustomTaiwaneseTeaState[1] = "Enable" Then
+							Var CustomTaiwaneseTeaState[0] = "PressForever" Then
+						EndIf
+					EndIf
+				EndIf	
+			Else
+				If TOPPING11 = "milk-level" Then
+					;do-not-thing
+				Else
+					Var CustomTaiwaneseTeaState[0] = "Disable"
+					Var CustomTaiwaneseTeaState[1] = "Disable"
+				EndIf
 			EndIf

 			If TOPPING2 = "shot coffee" Then
@ -2886,6 +3159,7 @@

 			If Seeker.SmoothieToPayment = 1 Then
 				Var StrawState = "Press"
+				Var Seeker.thankStrawFlag = 1
 			EndIf

 			If StrawState = "Press" Then
@ -6961,6 +7235,110 @@
 	</Text>


+</Row1>
+
+;taiwanese-tea-powder-level
+<Row1>
+	<Width> 986 </Width>
+	<Height> "auto" </Height>
+	<State> showTaiwaneseTeaEnable </State>
+	<Image>
+		<X> 0 </X>
+		<Y> 0 </Y>
+		<Filename> Var( DirImageInter + "/bg_custom_taiwanese_tea_powder.png" ) </Filename>
+	</Image>
+
+	<Text>
+		<X> 130 </X>
+		<Y> 15 </Y>
+		<Width> 500 </Width>
+		<Height> 46 </Height>
+		<Language>
+			<ID> 002028 </ID>
+		</Language>
+	</Text>
+
+	<Button>
+		<X> 800 </X>
+		<Y> 10 </Y>
+		<State> CustomTaiwaneseTeaState[0] </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+			Var CustomTaiwaneseTeaState[0] = "PressForever"
+			Var CustomTaiwaneseTeaState[1] = "Enable"
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				Var topping11 = toppingID11index1
+			Else
+				Var topping11_2 = toppingID11index4
+			EndIf
+
+			Function 2
+			Refresh
+
+
+		</EventClick>
+	</Button>
+
+	<Button>
+		<X> 911 </X>
+		<Y> 10 </Y>
+		<State> CustomTaiwaneseTeaState[1] </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+			Var CustomTaiwaneseTeaState[0] = "Enable"
+			Var CustomTaiwaneseTeaState[1] = "PressForever"
+
+			If TOPPING11 = "taiwanese-tea-level" Then
+				Var topping11 = toppingID11index2
+			Else
+				Var topping11_2 = toppingID11index5
+			EndIf
+
+			Function 2
+			Refresh
+
+		</EventClick>
+	</Button>
+
+	<Text>
+		<X> CustomMilkIntensityII_X </X>
+		<Y> CustomEspressoTextY </Y>
+		<Width> 500 </Width>
+		<Height> 18 </Height>
+		<State> CustomTaiwaneseTeaState[0] </State>
+		<Language>
+			<ID> 000127 </ID>
+		</Language>
+	</Text>
+
+	<Text>
+		<X> CustomMilkIntensityIII_X </X>
+		<Y> CustomEspressoTextY </Y>
+		<Width> 500 </Width>
+		<Height> 23 </Height>
+		<State> CustomTaiwaneseTeaState[1] </State>
+		<Language>
+			<ID> 000128 </ID>
+			<SubValue> TaiwaneseTeaIncreasePriceText </SubValue>
+			<SubSize> 15 </SubSize>
+			<SubColor> 0x84776F </SubColor>
+		</Language>
+	</Text>
+
+
 </Row1>

 ; Sugar zero cal, Hot healthy, Then SugarZeroCalOption enable
@ -7292,7 +7670,7 @@

 </Row1>

-; Sugar zero cal, Hot healthy, Then SugarZeroCalOption not enable
+; Sugar zero cal, Cold healthy, Then SugarZeroCalOption not enable
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
@ -7601,7 +7979,7 @@

 </Row1>

-; Sugar zero cal, Hot healthy, Then SugarZeroCalOption enable
+; Sugar zero cal, Cold healthy, Then SugarZeroCalOption enable
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
@ -7968,10 +8346,50 @@

 </Row1>

+;If-not-healthy-type
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
-	<State> showShotEnable </State>
+	<State> eval(
+		If showShotEnable = "Enable" Then
+			If TOPPING1 = "Suger 4 step cold" Then
+				Var return = "Invisible"
+			Else
+				If TOPPING1 = "Suger 4 step hot" Then
+					Var return = "Invisible"
+				Else
+					Var return = "Enable"
+				EndIf
+			EndIf
+		Else
+			If showShotEnable = "Press" Then
+				If TOPPING1 = "Suger 4 step cold" Then
+					Var return = "Invisible"
+				Else
+					If TOPPING1 = "Suger 4 step hot" Then
+						Var return = "Invisible"
+					Else
+						Var return = "Enable"
+					EndIf
+				EndIf
+			Else
+				If showShotEnable = "Disable" Then
+					If TOPPING1 = "Suger 4 step cold" Then
+						Var return = "Invisible"
+					Else
+						If TOPPING1 = "Suger 4 step hot" Then
+							Var return = "Invisible"
+						Else
+							Var return = "Enable"
+						EndIf
+					EndIf
+				Else
+					Var return = "Invisible"
+				EndIf
+			EndIf
+		EndIf
+	)
+	</State>
 	<Image>
 		<X> 0 </X>
 		<Y> 0 </Y>
@ -8058,6 +8476,136 @@
 	
 </Row1>

+;If-is-healthy-type
+<Row1>
+	<Width> 986 </Width>
+	<Height> "auto" </Height>
+	<State> eval(
+			If showShotEnable = "Enable" Then
+				If TOPPING1 = "Suger 4 step cold" Then
+					Var return = "Enable"
+				Else
+					If TOPPING1 = "Suger 4 step hot" Then
+						Var return = "Enable"
+					Else
+						Var return = "Invisible"
+					EndIf
+				EndIf
+			Else
+				If showShotEnable = "Press" Then
+					If TOPPING1 = "Suger 4 step cold" Then
+						Var return = "Enable"
+					Else
+						If TOPPING1 = "Suger 4 step hot" Then
+							Var return = "Enable"
+						Else
+							Var return = "Invisible"
+						EndIf
+					EndIf
+				Else
+					If showShotEnable = "Disable" Then
+						If TOPPING1 = "Suger 4 step cold" Then
+							Var return = "Enable"
+						Else
+							If TOPPING1 = "Suger 4 step hot" Then
+								Var return = "Enable"
+							Else
+								Var return = "Invisible"
+							EndIf
+						EndIf
+					Else
+						Var return = "Invisible"
+					EndIf
+				EndIf
+			EndIf
+	)
+	</State>
+	<Image>
+		<X> 0 </X>
+		<Y> 0 </Y>
+		<Filename> Var( DirImageInter + "/bg_custom_espesso_healthy_level.png" ) </Filename>
+	</Image>
+
+	<Text>
+		<X> 130 </X>
+		<Y> 15 </Y>
+		<Width> 500 </Width>
+		<Height> 46 </Height>
+		<Language>
+			<ID> 002031 </ID>
+		</Language>
+	</Text>
+
+
+	<Button>
+		<X> BtnChoiceX1 </X>
+		<Y> 10 </Y>
+		<State> showShotNormal </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+		
+			Var showShotNormal = "Press"
+			Var showShotEnable = "Enable"
+			SAVELOG "esp shot ignore"
+
+			Function 2
+
+
+		</EventClick>
+	</Button>
+
+	<Button>
+		<X> BtnChoiceX2 </X>
+		<Y> 10 </Y>
+		<State> showShotEnable </State>
+		<Mode> "No" </Mode>
+		<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
+		<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
+		<FilenameDisable> Var( DirImage + "/topping_revamp/cb_locked_new.png" ) </FilenameDisable>
+		<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+		<Volume> SoundVolume </Volume>
+		<EventClick>
+
+			Var showShotEnable = "Press"
+			Var showShotNormal = "Enable"
+			SAVELOG "Espresso Shot add"
+
+			
+			Function 2
+		</EventClick>
+	</Button>
+
+
+
+	<Text>
+		<X> CustomEspressoTextNewX </X>
+		<Y> CustomEspressoTextY </Y>
+		<State> showEspressoLevel </State>
+		<Language>
+			<ID> 002059 </ID>
+		</Language>
+	</Text>
+
+	<Text>
+		<X> CustomEspressoShotTextNewX </X>
+		<Y> CustomEspressoTextY </Y>
+		<Font> KanitRegularTTF </Font>
+		<Language>
+			<ID> 002060 </ID>
+			<SubValue> CoffeeTextLevel1 </SubValue>
+			<SubSize> 15 </SubSize>
+			<SubColor> 0x84776F </SubColor>
+		</Language>
+	</Text>
+	
+</Row1>
+
 <Row1>
 	<Width> 986 </Width>
 	<Height> "auto" </Height>
@ -8701,7 +9249,7 @@
 		<X> CustomMilkIntensityI_X </X>
 		<Y> CustomEspressoTextY </Y>
 		<Width> 500 </Width>
-		<Height> 25 </Height>
+		<Height> 20 </Height>
 		<State> CustomMilkState[0] </State>
 		<Language>
 			<ID> 000126 </ID>
@ -8712,7 +9260,7 @@
 		<X> CustomMilkIntensityII_X </X>
 		<Y> CustomEspressoTextY </Y>
 		<Width> 500 </Width>
-		<Height> 25 </Height>
+		<Height> 18 </Height>
 		<State> CustomMilkState[1] </State>
 		<Language>
 			<ID> 000127 </ID>
@ -11174,6 +11722,7 @@
    Var StrawberryPrice = 5
    Var YuzuPrice = 5   
    Var MilkIncreasePrice = 5
+	Var TaiwaneseTeaIncreasePrice = 5

 	Var EnergyPriceLevel1 = 5
    Var EnergyPriceLevel2 = 10
@ -11187,6 +11736,7 @@
    Var StrawberryPriceText = "(+5)"
    Var YuzuPriceText = "(+5)"  
    Var MilkIncreasePriceText = "(+5)"
+	Var TaiwaneseTeaIncreasePriceText = "(+5)"
 	Var CollagenPriceText = "(Free)"

 	Var EnergyTextLevel1 = "(+5)"
@ -11307,6 +11857,17 @@
 	; Coaco
 	Var strMulti6_3 = "TPID:322+multiply:0"

+	; light-milk
+	Var strMulti11_1 = "TPID:541+multiply:0"
+	; normal-milk
+	Var strMulti11_2 = "TPID:542+multiply:0"
+	; rich-milk
+	Var strMulti11_3 = "TPID:543+multiply:0"
+	; normal-taiwanese-tea
+	Var strMulti11_4 = "TPID:546+multiply:0"
+	; rich-taiwanese-tea
+	Var strMulti11_5 = "TPID:547+multiply:0"
+

 	If showOreoAddEnable = "Press" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
@ -11358,11 +11919,65 @@
 		
 	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
+
+
+	If CustomTaiwaneseTeaState[1] = "PressForever" Then
+		Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice
+	EndIf
+
 	If CustomMilkState[2] = "PressForever" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + MilkIncreasePrice
 	EndIf

-
 	If CustomEnergyState[0] = "Press" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1
 		Var topping12 = toppingID12index2
@ -11665,6 +12280,14 @@
            Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept.png"
            Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept.png"
        EndIf
+		If LanguageShow = "MYANMAR" Then
+			Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
+			Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
+		EndIf
+		If LanguageShow = "MSC" Then
+			Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
+			Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
+		EndIf
        Var bnAcceptX = 445
    Else
        Var PopupToppingSelect = "Enable"
@ -11675,6 +12298,14 @@
            Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png"
            Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png"
        EndIf
+		If LanguageShow = "MYANMAR" Then
+			Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
+			Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
+		EndIf
+		If LanguageShow = "MSC" Then
+			Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
+			Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
+		EndIf
        Var bnAcceptX = 360
    EndIf

@ -11744,7 +12375,7 @@
 <Width> 641 </Width>
 <Height> 180 </Height>
 <State> toppingSelectState </State>
-<Filename> Var( DirImage + "/topping_revamp/bg_top_popup.png" ) </Filename>
+<Filename> Var( DirImageRevamp + "/bg_top_popup.png" ) </Filename>
 </Image>


@ -11754,7 +12385,7 @@
 <Width> 641 </Width>
 <Height> 72 </Height>
 <State> CustomOvaltineState </State>
-<Filename> Var( DirImage + "/topping_revamp/bg_top_ovaltine.png" ) </Filename>
+<Filename> Var( DirImageRevamp + "/bg_top_ovaltine.png" ) </Filename>
 </Image>


@ -11858,7 +12489,7 @@
 <Width> 641 </Width>
 <Height> 72 </Height>
 <State> CustomOreoState </State>
-<Filename> Var( DirImage + "/topping_revamp/bg_top_oreo.png" ) </Filename>
+<Filename> Var( DirImageRevamp + "/bg_top_oreo.png" ) </Filename>
 </Image>

 <Button>
@ -11967,7 +12598,7 @@
 <Width> 641 </Width>
 <Height> 72 </Height>
 <State> CustomCocoaState </State>
-<Filename> Var( DirImage + "/topping_revamp/bg_top_cocoa.png" ) </Filename>
+<Filename> Var( DirImageRevamp + "/bg_top_cocoa.png" ) </Filename>
 </Image>

 <Button>
--- a/xml/topview2.xml
+++ b/xml/topview2.xml
@ -793,4 +793,10 @@
 </ListView1>
 ;

+
+
+
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
+
+
 </Popup>
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@ -185,6 +185,14 @@

 	Var CountTouchButton = 0

+	DEBUGVAR FrontDoorVersionInt
+	
+	If FrontDoorVersionInt > 2000 Then
+		Var EnableTestRGB = "Enable"
+	Else
+		Var EnableTestRGB = "Invisible"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@ -449,8 +457,15 @@
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
 	Var StartUpExt = "-"
-	ReloadAll
-	; FINISH
+	If ReloadAllPressButton = "" Then
+		Var ReloadAllPressButton = 0
+	EndIf
+	If ReloadAllPressButton = 2 Then
+		ReloadAll
+	EndIf
+	Var ReloadAllPressButton = ReloadAllPressButton + 1
+	
+	
 </EventClick>
 </Image>

@ -459,7 +474,13 @@
 <Y> info_3Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
-	FINISH
+	If FinishPressButton = "" Then
+		Var FinishPressButton = 0
+	EndIf
+	If FinishPressButton = 2 Then
+		FINISH
+	EndIf
+	Var FinishPressButton = FinishPressButton + 1
 </EventClick>
 </Image>

@ -1041,6 +1062,7 @@
 <Image>
 <X> info2_startX </X>
 <Y> info_15Y </Y>
+<State> EnableTestRGB </State>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_test_color.xml"
@ -1051,6 +1073,7 @@
 <X> info2_text_startX </X>
 <Y> info_text_15Y </Y>
 <Size> 30 </Size>
+<State> EnableTestRGB </State>
 <Font> fontType1 </Font>
 <Color> 0x000000 </Color>
 <Value> "Test RGB" </Value>