Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

image/event/image_template1

@@ -1,6 +1 @@
-normal_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
+normal_thai=ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png
-normal_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
-press_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
-press_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
-disable_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
-disable_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png

inter/tha/xml/multi/page_catalog.lxml

@@ -18,6 +18,8 @@
 
 	DEBUGVAR ToppingNewShow
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev"
+
 	DEBUGVAR OpenFromPageBoard
 	If OpenFromPageBoard = 1 Then
 		Var OpenFromPageBoard = 0
@@ -450,8 +452,13 @@
 
 	If LanguageShow = "THAI" Then
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+
 		Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+
+		If SongkranSoundCampaign = 1 Then
+			Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
+		EndIf
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then
@@ -460,12 +467,12 @@
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
 	EndIf
 
+
 	If LanguageShow = "MSC" Then
 		Var show_eng = "true"
 		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
         Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
 	EndIf
-
 	Play PlaySoundLag
 	Var countDownRetrun = 120
 

xml/event/ignore_multi_promotion_config_kingdom_thai_tea_pepsi_x_taobin.json

@@ -0,0 +1,30 @@
+[
+    {
+        "name": "kingdom_thai_tea",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+            "normal_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+            "press_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+            "press_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+            "disable_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+            "disable_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_kingdom_thai_tea.xml"
+        }
+    },
+    {
+        "name": "pepsi_x_taobin",
+        "template": "/event/promotion_video_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
+            "normal_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
+            "press_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
+            "press_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
+            "disable_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
+            "disable_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
+            "video_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_x_taobin.xml"
+        }
+    }
+]

xml/event/out_put_file1.txt

@@ -1 +1 @@
-/event/promotion_cocoa77.xml
+/event/promotion_pepesi_x_taobin.xml

xml/event/promotion_kingdom_thai_tea.xml

@@ -1086,7 +1086,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>

xml/event/promotion_template1.inc

@@ -4,75 +4,21 @@
     <Y> 518 </Y>
 
 <State> BigButtonEnable </State>
-    <Filename>
+    <Filename> ###normal_thai </Filename>
-     eval( 
+    <FilenamePress> ###normal_thai </FilenamePress>
-        If show_eng = "true" Then 
+    <FilenameDisable> ###normal_thai </FilenameDisable>
-            Var return = ###normal_eng
-        Else
-            Var return = ###normal_thai
-        EndIf
-        )
-     </Filename>
-    <FilenamePress> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = ###normal_eng
-        Else
-            Var return = ###normal_thai
-        EndIf
-        )
-     </FilenamePress>
-    <FilenameDisable> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = ###normal_eng
-        Else
-            Var return = ###normal_thai
-        EndIf
-        )
-     </FilenameDisable>
 <EventOnClick>
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_x_taobin.xml"
-        
 </EventOnClick>
 
-
 <Video>
     <X> 42 </X>
     <Y> 518 </Y>
     <Width> 484 </Width>
     <Height> 616 </Height>
     <Loop> "true" </Loop>
-    <State> 
+    <Filename> "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4" </Filename>
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        ) 
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
 </Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        ) 
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
-</Video>
-
 </Button>
 
 <EventUnitTest1>

xml/event/script_common_for_open_promotion_xml.ev

@@ -10,6 +10,7 @@ DEBUGVAR RedStringOfFatePro
 DEBUGVAR CoconutMilkPro
 DEBUGVAR MatchaEveryDayPro
 DEBUGVAR KingdomThaiTeaPro
+DEBUGVAR PepsiXTaobinPro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -45,6 +46,16 @@ Else
 
 	If KingdomThaiTeaPro = 1 Then
 		Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_kingdom_thai_tea.xml"
+		Var PromotionState1 = "Enable"
+
+		If PepsiXTaobinPro = 1 Then
+			Var PromotionState2 = "Enable"
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml"
+		EndIf
+	Else
+		If PepsiXTaobinPro = 1 Then
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
+		EndIf
 	EndIf
 
 	If CatalogLayoutV3 = 1 Then

xml/event/tricker.ev

@@ -74,6 +74,12 @@ Var MatchaEveryDayPro = 0
 ; Kingdom of Thai tea, 1 Apr - 30 Apr
 Var KingdomThaiTeaPro = 0
 
+; Pepsi x Taobin, 7 - 27 Apr
+Var PepsiXTaobinPro = 0
+
+; 3 dialects sound campaign, 1 Apr - 30 Apr
+Var SongkranSoundCampaign = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0
 
@@ -137,6 +143,15 @@ If SystemDateMonthInt = 4 Then
 	If SystemDateDayInt < 7 Then
 		Var AdvertisePepsiAtTheSun = 1
 	EndIf
+
+	If SystemDateDayInt >= 7 Then
+		If SystemDateDayInt <= 27 Then
+			Var PepsiXTaobinPro = 1
+		EndIf
+	EndIf
+
+	Var KingdomThaiTeaPro = 1
+	Var SongkranSoundCampaign = 1
 EndIf
 If SystemDateMonthInt = 3 Then
 	If SystemDateDayInt = 31 Then
@@ -147,6 +162,7 @@ EndIf
 
 If SystemDateMonthInt = 4 Then
 	Var KingdomThaiTeaPro = 1
+	Var SongkranSoundCampaign = 1
 EndIf
 
 
@@ -273,6 +289,12 @@ Else
 	Var RedStringOfFatePro = 0
 EndIf
 
+If PepsiHighYSyrupEnable = "true" Then
+
+Else
+	Var PepsiXTaobinPro = 0
+EndIf
+
 DEBUGVAR OvaltineSchoolPro
 DEBUGVAR RedStringOfFatePro
 

xml/page_NewBrewing3.xml

@@ -98,16 +98,8 @@
 	Else
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
 
-		; Play Sound #zone
+		If SongkranSoundCampaign = 1 Then
-		If SoundBackToSchoolEnable = 1 Then
+			Var PlaySoundLag = ThankyouSound[SoundCampaignIndex]
-
-			If SoundBackToSchoolType = 1 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
-			EndIf
-			If SoundBackToSchoolType = 2 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
-			EndIf
-			Var PlaySoundLag = RootPathSoundBackToSchool + "thankyou.wav"
 		EndIf
 
 		Play PlaySoundLag
@@ -769,20 +761,8 @@
 
 				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
 
-				If FromJemilaPro = 1 Then
+				If SongkranSoundCampaign = 1 Then
-				     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/next_drink.m4a"
+					Var PlaySoundLag = NextDrinkSound[SoundCampaignIndex]
-				EndIf
-
-				; Play Sound #zone
-				If SoundBackToSchoolEnable = 1 Then
-
-					If SoundBackToSchoolType = 1 Then
-						Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
-					EndIf
-					If SoundBackToSchoolType = 2 Then
-						Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
-					EndIf
-					Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav"
 				EndIf
 
 				PlayLong PlaySoundLag

xml/page_catalog.xml

@@ -12,6 +12,8 @@
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
 	EndIf
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev"
+
 	If CatalogLayoutV3 = 1 Then
 		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/v3/open_catalog.ev"
 	Else

xml/page_catalog3.xml

@@ -79,16 +79,8 @@
 
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
 
-		; Play Sound #zone
+		If SongkranSoundCampaign = 1 Then
-		If SoundBackToSchoolEnable = 1 Then
+			Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
-
-			If SoundBackToSchoolType = 1 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
-			EndIf
-			If SoundBackToSchoolType = 2 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
-			EndIf
-			Var PlaySoundLag = RootPathSoundBackToSchool + "taobin_sawade.wav"
 		EndIf
 
 		Play PlaySoundLag

xml/page_catalog_group_pro_pepsi_x_taobin.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>

xml/page_catalog_with_vending.xml

@@ -14,6 +14,8 @@
 		Var MenuHealthyEnable = "Disable"
 	EndIf
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev"
+
 	If Seeker = "next" Then
 		;Open "ROOT/taobin_project/xml/page_catalog.xml"
 	EndIf
@@ -63,14 +65,8 @@
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
 
-		If SoundThaiIndex = 1 Then
+		If SongkranSoundCampaign = 1 Then
-			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/taobin_sawade.wav"
+			Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
-		EndIf
-		If SoundThaiIndex = 2 Then
-			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/taobin_sawade.wav"
-		EndIf
-		If SoundThaiIndex = 3 Then
-			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/taobin_sawade.wav"
 		EndIf
 
 		Play PlaySoundLag

xml/page_drinkok.xml

@@ -443,8 +443,8 @@
 			If CountryName = "Thailand" Then
 				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
 
-				If FromJemilaPro = 1 Then
+				If SongkranSoundCampaign = 1 Then
-					Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/drinkfinish.m4a"
+					Var PlaySoundLag = DrinkFinishSound[SoundCampaignIndex]
 				EndIf
 			Else
 				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"

xml/page_payment.xml

@@ -188,20 +188,8 @@
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3"
 
-		If FromJemilaPro = 1 Then
+		If SongkranSoundCampaign = 1 Then
-		     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/payment.m4a"
+			Var PlaySoundLag = SelectPayMethodSound[SoundCampaignIndex]
-		EndIf
-
-		; Play Sound #zone
-		If SoundBackToSchoolEnable = 1 Then
-
-			If SoundBackToSchoolType = 1 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
-			EndIf
-			If SoundBackToSchoolType = 2 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
-			EndIf
-			Var PlaySoundLag = RootPathSoundBackToSchool + "payment.wav"
 		EndIf
 
 		If CountryName = "HongKong" Then

xml/page_payment_cash.xml

@@ -1890,45 +1890,49 @@
 		Var PayInfoCFlag = 1
     EndIf
 
+    If credit_card_enable = "Enable" Then
+    	If ReqPayInfoFromCashOther = 2 Then
+			DEBUGVAR VendingCashless
+			If VendingCashless = "OK" Then
+				DEBUGVAR CashlessCode
 
-	DEBUGVAR VendingCashless
+				If KBankCashlessMachine = 1 Then
-	If VendingCashless = "OK" Then
-		DEBUGVAR CashlessCode
 
-		If KBankCashlessMachine = 1 Then
+					Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
 
-			Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
+					DEBUGVAR VendingTrackNumber
+					DEBUGVAR Var Seeker.CashlessVendingTrackNumber
 
-			DEBUGVAR VendingTrackNumber
-			DEBUGVAR Var Seeker.CashlessVendingTrackNumber
-
-		EndIf
-
-		Var Timeout = 0
-
-		Var QRErrorState = "Invisible"
-		Var LOADING_STATE = "Invisible"
-
-		If ViewBill > 0 Then
-				CoinVending BILLREJECT
-		EndIf
-
-		VendingQR OFF
-		CoinVending OFF
-		Refresh
-
-		If Seeker = "curr" Then
-				If New_Payment = 1 Then
-					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				EndIf
-				MakeDrinkV1  SelectDrink SelectSugarID
+
+				Var Timeout = 0
+
+				Var QRErrorState = "Invisible"
+				Var LOADING_STATE = "Invisible"
+
+				If ViewBill > 0 Then
+						CoinVending BILLREJECT
+				EndIf
+
+				VendingQR OFF
+				CoinVending OFF
+				Refresh
+
+				If Seeker = "curr" Then
+						If New_Payment = 1 Then
+							__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+						EndIf
+						MakeDrinkV1  SelectDrink SelectSugarID
+				EndIf
+				Var Seeker.CreditCard = 1
+				Var Seeker.CreditCardRef = CreditCardRef
+
+				Open "ROOT/taobin_project/xml/page_thankyou.xml"
+
+			EndIf
 		EndIf
-		Var Seeker.CreditCard = 1
+    EndIf
-		Var Seeker.CreditCardRef = CreditCardRef
 
-		Open "ROOT/taobin_project/xml/page_thankyou.xml"
-
-	EndIf
 
 </EventActionOk>
 
@@ -1952,25 +1956,29 @@
 	EndIf
 
 
-	If VendingCashless = "ERROR" Then
+	If credit_card_enable = "Enable" Then
-		If CoinInOK = 1 Then
+		If ReqPayInfoFromCashOther = 2 Then
+			If VendingCashless = "ERROR" Then
+				If CoinInOK = 1 Then
+
+				Else
+					If KBankCashlessMachine = 1 Then
+						; popup will close after 30 second
+						Var Timeout = 90
+						Var cancelButtonQRPopupState = "Enable"
+					Else
+						Var Timeout = 0
+					EndIf
+				EndIf
+
+				;Var QRErrorFlag = 1
+				If alphaState = "Enable" Then
+					Var QRErrorState = "Enable"
+					Var LOADING_STATE = "Invisible"
+				EndIf
 
-		Else
-			If KBankCashlessMachine = 1 Then
-				; popup will close after 30 second
-				Var Timeout = 90
-				Var cancelButtonQRPopupState = "Enable"
-			Else
-				Var Timeout = 0
 			EndIf
 		EndIf
-
-		;Var QRErrorFlag = 1
-		If alphaState = "Enable" Then
-			Var QRErrorState = "Enable"
-			Var LOADING_STATE = "Invisible"
-		EndIf
-
 	EndIf
 
 

xml/page_payment_credit2.xml

@@ -4,9 +4,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
-
 <Volume> SoundVolume </Volume>
-<Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
 
@@ -27,6 +25,9 @@
 	Var ShowTextNumber3 = "Invisible"
 	Var ShowTextNumber4 = "Invisible"
 
+	Var LoadingState = "Invisible"
+	Var ShowLoadingIn = 3
+
 	Var ShowErrorText = "Invisible"
 	Var Tel_Confirm_State = "Invisible"
 
@@ -130,6 +131,15 @@
 		EndIf
 	EndIf
 
+	If ReqAdddata22 = 1 Then
+		If ShowLoadingIn <= 0 Then
+			Var LoadingState = "Enable"
+			Refresh
+		Else
+			Var ShowLoadingIn = ShowLoadingIn - 1
+		EndIf
+	EndIf
+
 	If StateBGetSMS = "Disable" Then
 
 		Var TimeoutSMS = TimeoutSMS + 1
@@ -185,7 +195,7 @@
 
 			Var VendingCreditRemain = "" + SumCreditAmount
 
-		
+			Var LoadingState = "Invisible"
 
 			If useCreditTemp > 0 Then
 				Var Seeker.CurrCreditUse = useCreditTemp
@@ -253,15 +263,12 @@
 
 <EventActionError>
    Var ShowErrorText = "Enable"
-   Refresh
 
    If ReqAdddata22 = 1 Then
-	
+		Var LoadingState = "Invisible"
 		Var ReqAdddata22 = 0
-		
 	EndIf
-
+   Refresh
-
 </EventActionError>
 
 
@@ -915,6 +922,22 @@
 <Filename> Var( DirImage + "/text_show_sentSMS.png") </Filename>
 </Image>
 
+<Image>
+<X> 158 </X>
+<Y> 601 </Y>
+<State> LoadingState </State>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha_loading.png" </Filename>
+</Image>
+
+<GIF>
+<X> 494 </X>
+<Y> 1078 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> LoadingState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/loading.gif" </Filename>
+</GIF>
+
 
 ;include="ROOT/taobin_project/inc/video.inc"
 
@@ -942,7 +965,9 @@
                             Var BmiYear = useCreditAmount
                             Var GetScore = "useCredit"
                             AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+                         	Var ShowLoadingIn = 3
                             Var ReqAdddata22 = 1
+                            Refresh
                         EndIf
 					Else
 					   Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"

xml/page_topping_select7.xml

@@ -955,10 +955,8 @@
 			Else
 				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
 
-				; Play Sound #zone
+				If SongkranSoundCampaign = 1 Then
-
+					Var PlaySoundLag = SelectToppingSound[SoundCampaignIndex]
-				If FromJemilaPro = 1 Then
-				     Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/select_level.m4a"
 				EndIf
 
 				Play PlaySoundLag
@@ -2147,11 +2145,8 @@
 					Else
 						Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
 
-						; Play Sound #zone
+						If SongkranSoundCampaign = 1 Then
-
+							Var PlaySoundLag = SelectToppingSound[SoundCampaignIndex]
-
-						If LipitPro = 1 Then
-							Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/select_level.wav"
 						EndIf
 
 						Play PlaySoundLag

xml/page_topping_select8.xml

@@ -99,7 +99,7 @@
 	
 	Var showCustomCoffee = "Invisible"
 
-
+	Var showAdjust = "Invisible"
 
 	Var showOvaltineEnable = "Invisible"
 	Var showOreoAddEnable = "Invisible"
@@ -1376,6 +1376,7 @@
 	CRLFToSpace showdesc
 	
 	If BGSugar = "Enable" Then
+		Var showAdjust = "Enable"
 		If SelectDrinkType = 1 Then
 			If show_eng = "true" Then 
 				Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
@@ -1876,12 +1877,24 @@
 			EndIf
 
 			
+			Var SpecialMix = "Enable"
+			
+			Var showOreoAddEnable = "Disable"
+			Var showOvaltineEnable = "Disable"
+			Var showCocoaEnable = "Disable"
+		
+
+
 			Var CustomSyrup = "Enable"
 		
 			Var showStrawberryEnable = "Disable"
 			Var showYuzuEnable = "Disable"
 
 			If cold_button_state = "PressForever" Then
+				Var showOreoAddEnable = "Disable"
+				Var showOvaltineEnable = "Disable"
+				Var showCocoaEnable = "Disable"
+
 				Var showStrawberryEnable = "Enable"
 				Var showYuzuEnable = "Enable"
 			EndIf
@@ -1891,25 +1904,48 @@
 				Var SpecialMix = "Enable"
 				Var CustomSyrup = "Enable"
 
+				Var showOreoAddEnable = "Disable"
+				Var showOvaltineEnable = "Disable"
+				Var showCocoaEnable = "Disable"
+			
 				Var showStrawberryEnable = "Disable"
 				Var showYuzuEnable = "Disable"
 			EndIf
 			
 			
+			If toppingID6index3Status = "" Then
+				Var showCocoaEnable = "Invisible"
+			EndIf
 
-			If toppingID6index2Status = "" Then
+			If toppingID6index4Status = "" Then
+				Var showOvaltineEnable = "Invisible"
+			EndIf
+
+			If toppingID6index5Status = "" Then
 				Var showStrawberryEnable = "Invisible"
 			EndIf
 
-			If toppingID6index3Status = "" Then
+			If toppingID6index6Status = "" Then
 				Var showYuzuEnable = "Invisible"
 			EndIf
 
 			If toppingID6index2Status = "Disable" Then
-				Var showStrawberryEnable = "Disable"
+				Var showOreoAddEnable = "Disable"
 			EndIf
 
 			If toppingID6index3Status = "Disable" Then
+				Var showCocoaEnable = "Disable"
+			EndIf
+
+			If toppingID6index4Status = "Disable" Then
+				Var showOvaltineEnable = "Disable"
+			EndIf
+
+			If toppingID6index5Status = "Disable" Then
+				Var showStrawberryEnable = "Disable"
+			EndIf
+
+			If toppingID6index6Status = "Disable" Then
 				Var showYuzuEnable = "Disable"
 			EndIf
 
@@ -1931,7 +1967,7 @@
 
 
 		If TOPPING12 = "energy-drink" Then
-
+			Var showAdjust = "Enable"
 			If toppingID12index2Status = "Enable" Then
 				Var showEnergyEnable = "Enable"
 			EndIf
@@ -1977,10 +2013,56 @@
 				EndIf
 			EndIf
 
+			Var ProductSodaDisableShot = "12-05-02-0114,12-05-02-0104,12-05-02-0094"
+
+			Var IsSodaDisableShot = "false"
+			Var IsSodaDisableShot2 = "false"
+			Var IsSodaDisableShot3 = "false"
+			DEBUGVAR IsSodaDisableShot
+			DEBUGVAR IsSodaDisableShot2
+			DEBUGVAR IsSodaDisableShot3
+			STRCONTAIN PD_CODE1 ProductSodaDisableShot IsSodaDisableShot
+			STRCONTAIN PD_CODE2 ProductSodaDisableShot IsSodaDisableShot2
+			STRCONTAIN PD_CODE3 ProductSodaDisableShot IsSodaDisableShot3
+
+			DEBUGVAR IsSodaDisableShot
+			DEBUGVAR IsSodaDisableShot2
+			DEBUGVAR IsSodaDisableShot3
+			If IsSodaDisableShot = "true" Then
+				If cold_button_state = "PressForever" Then
+					Var CustomEnergyState[0] = "Disable"
+					Var CustomEnergyState[1] = "Disable"
+				Else
+					Var CustomEnergyState[0] = "Enable"
+					Var CustomEnergyState[1] = "Enable"
+				EndIf
+			EndIf
+
+			
+			If IsSodaDisableShot2 = "true" Then
+				If cold_button_state = "PressForever" Then
+					Var CustomEnergyState[0] = "Disable"
+					Var CustomEnergyState[1] = "Disable"
+				Else
+					Var CustomEnergyState[0] = "Enable"
+					Var CustomEnergyState[1] = "Enable"
+				EndIf
+			EndIf
+
+			If IsSodaDisableShot3 = "true" Then
+				If cold_button_state = "PressForever" Then
+					Var CustomEnergyState[0] = "Disable"
+					Var CustomEnergyState[1] = "Disable"
+				Else
+					Var CustomEnergyState[0] = "Enable"
+					Var CustomEnergyState[1] = "Enable"
+				EndIf
+			EndIf
+
 		EndIf
 
 		If TOPPING13 = "shot coffee" Then
-
+			Var showAdjust = "Enable"
 			If toppingID13index2Status = "Enable" Then
 				Var showShotSodaEnable = "Enable"
 			EndIf
@@ -2785,12 +2867,12 @@
 			;
 			If TOPPING1 = "Sugar" Then
 				Var SugarZeroCalOption = "Enable"
-
+				Var showAdjust = "Enable"
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
 				Else
-					Var BGSugar = "Enable"
+					Var showAdjust = "Enable"
 				EndIf
 
 				Var ShiftSugarStep = 1
@@ -2845,7 +2927,7 @@
 
 			If TOPPING1 = "Powder Sugar for Hot" Then
 				Var SugarZeroCalOption = "Enable"
-
+				Var showAdjust = "Enable"
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -2905,7 +2987,7 @@
 
 			If TOPPING1 = "Powder Sugar" Then
 				Var SugarZeroCalOption = "Enable"
-
+				Var showAdjust = "Enable"
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -2972,7 +3054,7 @@
 
 			If TOPPING1 = "Sugar Premix 25" Then
 				Var SugarZeroCalOption = "Enable"
-
+				Var showAdjust = "Enable"
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -3027,7 +3109,7 @@
 
 			If TOPPING1 = "Powder Sugar Premix 50" Then
 				Var SugarZeroCalOption = "Enable"
-
+				Var showAdjust = "Enable"
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -3092,7 +3174,7 @@
 
 			If TOPPING1 = "Powder Sugar Premix 25" Then
 				Var SugarZeroCalOption = "Enable"
-
+				Var showAdjust = "Enable"
 				If RecipeTag2 = "Topping6Step" Then
 					Var BGSugar = "Invisible"
 					Var BGSugarNew = "Enable"
@@ -3586,6 +3668,10 @@
 			Var ExtraTopping = "Invisible"
 		EndIf
 
+		If showShotEnable = "Enable" Then
+			Var showAdjust = "Enable"
+		EndIf
+
 		DEBUGVAR showShotEnable
 		DEBUGVAR showOreoAddEnable
 		DEBUGVAR ShotCoffeePremium
@@ -4147,7 +4233,7 @@
 <Row1>
 	<Width> 986 </Width>
 	<Height> 64 </Height>
-	<State> "Enable" </State>
+	<State> showAdjust </State>
 	<Image>
 		<Filename> Var( DirImage + "/topping_revamp/bg_top_custom_recipe.png" ) </Filename>
 	</Image>
@@ -4880,6 +4966,7 @@
 			Var return = "Invisible"
 		Else
 			If BGSugarNew = "Enable" Then
+				Var showAdjust = "Enable"
 				Var return = "Enable"
 			Else
 				Var return = "Invisible"
@@ -5454,6 +5541,7 @@
 	<State> eval(
 		If SugarZeroCalOption = "Enable" Then
 			If BGSugarNew = "Enable" Then
+				Var showAdjust = "Enable"
 				Var return = "Enable"
 			Else
 				Var return = "Invisible"
@@ -6240,6 +6328,7 @@
 			Var return = "Invisible"
 		Else
 			If BGSugarHotHealthy = "Enable" Then
+				Var showAdjust = "Enable"
 				Var return = "Enable"
 			Else
 				Var return = "Invisible"
@@ -6636,6 +6725,7 @@
 	<State> eval(
 		If SugarZeroCalOption = "Enable" Then
 			If BGSugarHotHealthy = "Enable" Then
+				Var showAdjust = "Enable"
 				Var return = "Enable"
 			Else
 				Var return = "Invisible"
@@ -6958,6 +7048,7 @@
 			Var return = "Invisible"
 		Else
 			If BGSugarColdHealthy = "Enable" Then
+				Var showAdjust = "Enable"
 				Var return = "Enable"
 			Else
 				Var return = "Invisible"
@@ -7256,6 +7347,7 @@
 	<State> eval(
 		If SugarZeroCalOption = "Enable" Then
 			If BGSugarColdHealthy = "Enable" Then
+				Var showAdjust = "Enable"
 				Var return = "Enable"
 			Else
 				Var return = "Invisible"
@@ -8374,12 +8466,12 @@
 ;
 ;
 <Row1>
-	<State> "Enable" </State>
+	<State> showAdjust </State>
 	<Width> 986 </Width>
 	<Height> 27 </Height>
 	<Y> -5 </Y>
 	<Image>
-		<State> "Enable" </State>
+		<State> showAdjust </State>
 		<Filename> "ROOT/taobin_project/image/topping2/bg_bottom.png" </Filename>
 	</Image>
 </Row1>
@@ -9916,16 +10008,16 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
-				If toppingID6index2Status = "Enable" Then
+				If toppingID6index5Status = "Enable" Then
 					Var showStrawberryEnable = "Enable"
 				Else
 					Var showStrawberryEnable = "Disable"
 				EndIf
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
-				If toppingID6index3Status = "Enable" Then
+				If toppingID6index6Status = "Enable" Then
 					Var showYuzuEnable = "Enable"
 				Else
 					Var showYuzuEnable = "Disable"
@@ -9948,13 +10040,13 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
-				If toppingID6index2Status = "Enable" Then
+				If toppingID6index5Status = "Enable" Then
 					Var showStrawberryEnable = "Press"
 				EndIf
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
 					Var showYuzuEnable = "Disable"
 			EndIf
 		EndIf
@@ -10006,16 +10098,16 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
-				If toppingID6index2Status = "Enable" Then
+				If toppingID6index5Status = "Enable" Then
 					Var showStrawberryEnable = "Enable"
 				Else
 					Var showStrawberryEnable = "Disable"
 				EndIf
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
-				If toppingID6index3Status = "Enable" Then
+				If toppingID6index6Status = "Enable" Then
 					Var showYuzuEnable = "Enable"
 				Else
 					Var showYuzuEnable = "Disable"
@@ -10038,13 +10130,13 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
-				If toppingID6index2Status = "Enable" Then
+				If toppingID6index5Status = "Enable" Then
 					Var showStrawberryEnable = "Press"
 				EndIf
 			EndIf
 			
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
 					Var showYuzuEnable = "Disable"
 			EndIf
 		EndIf
@@ -10128,16 +10220,16 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
-				If toppingID6index2Status = "Enable" Then
+				If toppingID6index5Status = "Enable" Then
 					Var showStrawberryEnable = "Enable"
 				Else
 					Var showStrawberryEnable = "Disable"
 				EndIf
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
-				If toppingID6index3Status = "Enable" Then
+				If toppingID6index6Status = "Enable" Then
 					Var showYuzuEnable = "Enable"
 				Else
 					Var showYuzuEnable = "Disable"
@@ -10159,12 +10251,12 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
 					Var showStrawberryEnable = "Disable"
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
-				If toppingID6index3Status = "Enable" Then
+				If toppingID6index6Status = "Enable" Then
 					Var showYuzuEnable = "Press"
 				EndIf
 			EndIf
@@ -10221,16 +10313,16 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
-				If toppingID6index2Status = "Enable" Then
+				If toppingID6index5Status = "Enable" Then
 					Var showStrawberryEnable = "Enable"
 				Else
 					Var showStrawberryEnable = "Disable"
 				EndIf
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
-				If toppingID6index3Status = "Enable" Then
+				If toppingID6index6Status = "Enable" Then
 					Var showYuzuEnable = "Enable"
 				Else
 					Var showYuzuEnable = "Disable"
@@ -10252,12 +10344,12 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			If toppingID6index2 = 91 Then
+			If toppingID6index5 = 94 Then
 					Var showStrawberryEnable = "Disable"
 			EndIf
 
-			If toppingID6index3 = 92 Then
+			If toppingID6index6 = 95 Then
-				If toppingID6index3Status = "Enable" Then
+				If toppingID6index6Status = "Enable" Then
 					Var showYuzuEnable = "Press"
 				EndIf
 			EndIf
@@ -10867,7 +10959,7 @@
 		EndIf
 
 		If TOPPING6 = "syrup-topping" Then
-			Var strMulti6_5 = "TPID=91,multiply=1"
+			Var strMulti6_5 = "TPID=94,multiply=1"
 		EndIf
 
 		Var DisableUsingCode = "true"
@@ -10895,7 +10987,7 @@
 			Var strMulti6_6 = "TPID=325,multiply=1"
 		EndIf
 		If TOPPING6 = "syrup-topping" Then
-			Var strMulti6_6 = "TPID=92,multiply=1"
+			Var strMulti6_6 = "TPID=95,multiply=1"
 		EndIf
 		Var DisableUsingCode = "true"
 	Else

xml/sometime/campaign_sound.ev

@@ -0,0 +1,40 @@
+
+
+If SongkranSoundCampaign = 1 Then
+
+	; 0 north, 1 south, 3 northeast
+
+	Var GreetingSound[0] = "ROOT/taobin_project/sound_thai/songkran/north/greeting.wav"
+	Var GreetingSound[1] = "ROOT/taobin_project/sound_thai/songkran/south/greeting.wav"
+	Var GreetingSound[2] = "ROOT/taobin_project/sound_thai/songkran/northeast/greeting.wav"
+
+	Var SelectToppingSound[0] = "ROOT/taobin_project/sound_thai/songkran/north/select_topping.wav"
+	Var SelectToppingSound[1] = "ROOT/taobin_project/sound_thai/songkran/south/select_topping.wav"
+	Var SelectToppingSound[2] = "ROOT/taobin_project/sound_thai/songkran/northeast/select_topping.wav"
+
+	Var SelectPayMethodSound[0] = "ROOT/taobin_project/sound_thai/songkran/north/select_pay_method.wav"
+	Var SelectPayMethodSound[1] = "ROOT/taobin_project/sound_thai/songkran/south/select_pay_method.wav"
+	Var SelectPayMethodSound[2] = "ROOT/taobin_project/sound_thai/songkran/northeast/select_pay_method.wav"
+
+	Var ThankyouSound[0] = "ROOT/taobin_project/sound_thai/songkran/north/thankyou.wav"
+	Var ThankyouSound[1] = "ROOT/taobin_project/sound_thai/songkran/south/thankyou.wav"
+	Var ThankyouSound[2] = "ROOT/taobin_project/sound_thai/songkran/northeast/thankyou.wav"
+
+	Var NextDrinkSound[0] = "ROOT/taobin_project/sound_thai/songkran/north/next_drink.wav"
+	Var NextDrinkSound[1] = "ROOT/taobin_project/sound_thai/songkran/south/next_drink.wav"
+	Var NextDrinkSound[2] = "ROOT/taobin_project/sound_thai/songkran/northeast/next_drink.wav"
+
+	Var DrinkFinishSound[0] = "ROOT/taobin_project/sound_thai/songkran/north/drink_finish.wav"
+	Var DrinkFinishSound[1] = "ROOT/taobin_project/sound_thai/songkran/south/drink_finish.wav"
+	Var DrinkFinishSound[2] = "ROOT/taobin_project/sound_thai/songkran/northeast/drink_finish.wav"
+
+	If SoundCampaignIndex = "" Then
+		Var SoundCampaignIndex = 0
+	Else
+		Var SoundCampaignIndex = SoundCampaignIndex + 1
+		If SoundCampaignIndex > 2 Then
+			Var SoundCampaignIndex = 0
+		EndIf
+	EndIf
+
+EndIf

xml/v3/event/event_v3/2_promotion_pepsi_x_taobin.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-04-07T00:00:00",
+  "end": "2025-04-27T00:00:00",
+  "state": "PepsiXTaobinProState",
+  "type": "VIDEO",
+  "media_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
+  "media_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
+  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_pepsi_x_taobin.xml\""
+}

xml/v3/event/event_v3/active_promotions.xml

@@ -134,22 +134,6 @@
 			<EventOnClick>
 				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml"
 			</EventOnClick>
-		</Banner>
-			<Banner>
-			<State> MatchaEveryDayProState </State>
-			<Type> IMAGE </Type>
-			<Media>
-				eval(
-					If show_eng = "true" Then
-						Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png"
-					Else
-						Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png"
-					EndIf
-				)
-			</Media>
-			<EventOnClick>
-				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_matcha_every_day.xml"
-			</EventOnClick>
 		</Banner>
 			<Banner>
 			<State> CoconutMilkProState </State>
@@ -167,12 +151,44 @@
 				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_coconut_milk.xml"
 			</EventOnClick>
 		</Banner>
+			<Banner>
+			<State> PepsiXTaobinProState </State>
+			<Type> VIDEO </Type>
+			<Media>
+				eval(
+					If show_eng = "true" Then
+						Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
+					Else
+						Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
+					EndIf
+				)
+			</Media>
+			<EventOnClick>
+				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_pepsi_x_taobin.xml"
+			</EventOnClick>
+		</Banner>
+			<Banner>
+			<State> MatchaEveryDayProState </State>
+			<Type> IMAGE </Type>
+			<Media>
+				eval(
+					If show_eng = "true" Then
+						Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png"
+					Else
+						Var return = "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png"
+					EndIf
+				)
+			</Media>
+			<EventOnClick>
+				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_matcha_every_day.xml"
+			</EventOnClick>
+		</Banner>
 	
 		; menu_new_list 58
 		; ==================> Len = 15
 		; - 12-02-02-0099 - 
 		<Menu>
-		<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
+		<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1202020099) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_pure_x3.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_pure_x3.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_pure_x3.png" </DisableImage>
@@ -280,16 +296,16 @@
 		; ==================> Len = 15
 		; - - 12-03-03-0103 
 		<Menu>
-		<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1203030103) </State>
+		<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Coconut_Milk_Smoothie.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Coconut_Milk_Smoothie.png" </DisableImage>
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake"
+					Var return = "Coconut Milk\nIce Cream"
 				Else
-					Var return = "กะทิเชค"
+					Var return = "เต่าบินไอติมถัง\nกะทิ"
 				EndIf
 			)
 		</Name>
@@ -388,16 +404,16 @@
 		; ==================> Len = 15
 		; - - 12-03-03-0106 
 		<Menu>
-		<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1203030106) </State>
+		<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Coconut_Milk_Matcha_Smoothie.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Coconut_Milk_Matcha_Smoothie.png" </DisableImage>
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Matcha"
+					Var return = "Coconut Milk\nMatcha Ice Cream"
 				Else
-					Var return = "กะทิเชคมัทฉะญี่ปุ่น"
+					Var return = "เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น"
 				EndIf
 			)
 		</Name>
@@ -496,7 +512,7 @@
 		; ==================> Len = 15
 		; - 12-01-02-0090 - 
 		<Menu>
-		<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1201020090) </State>
+		<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>
@@ -603,7 +619,7 @@
 
 		; - 12-21-02-0090 - 
 		<Menu>
-		<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1221020090) </State>
+		<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>

xml/v3/event/script_open_promotion_v3.ev

@@ -6,6 +6,7 @@ Var FileRecommendToOpen = "ROOT/taobin_project/xml/v3/event/event_v3/active_prom
 Var MatchaEveryDayProState  = "Invisible"
 Var CoconutMilkProState = "Invisible"
 Var KingdomThaiTeaProState = "Invisible"
+Var PepsiXTaobinProState = "Invisible"
 
 If CoconutMilkPro = 1 Then
     Var CoconutMilkProState = "Enable"
@@ -18,3 +19,7 @@ EndIf
 If KingdomThaiTeaPro = 1 Then
     Var KingdomThaiTeaProState = "Enable"
 EndIf
+
+If PepsiXTaobinPro = 1 Then
+	Var PepsiXTaobinProState = "Enable"
+EndIf

xml/v3/page_catalog3.xml

@@ -79,16 +79,8 @@
 
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
 
-		; Play Sound #zone
+		If SongkranSoundCampaign = 1 Then
-		If SoundBackToSchoolEnable = 1 Then
+			Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
-
-			If SoundBackToSchoolType = 1 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
-			EndIf
-			If SoundBackToSchoolType = 2 Then
-				Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
-			EndIf
-			Var PlaySoundLag = RootPathSoundBackToSchool + "taobin_sawade.wav"
 		EndIf
 
 		Play PlaySoundLag

xml/v3/page_catalog_group_coffee.xml

@@ -103,6 +103,221 @@
 	<Menus>
 ;banners
 		; menu_new_list 72
+		; ==================> Len = 20
+		; 12-01-01-0003 12-01-02-0001 - 
+		<Menu>
+		<State> Flag( 12-01-01-0003.Button,12-01-02-0001.Button,$Sum12010100031201020001) </State>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_hot_america_no.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_america_no.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_america_no.png" </DisableImage>
+		<Name>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Americano"
+				Else
+					Var return = "อเมริกาโน"
+				EndIf
+			)
+		</Name>
+		<Description>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Espresso, Water"
+				Else
+					Var return = "กาแฟ และน้ำ "
+				EndIf
+			)
+		</Description>
+		<HotState> $12-01-01-0003.Button </HotState>
+		<IceState> $12-01-02-0001.Button </IceState>
+		<BlendState> "Disable2" </BlendState>
+		<HotPrice> StringFmt(  $12-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
+		<IcePrice> StringFmt(  $12-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
+		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<EventOnClick>
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $12-01-01-0003.Price
+			Var PriceD2 = $12-01-02-0001.Price
+			Var PriceD3 = $##-##-##-####.Price
+			Var PD_CODE1 = "12-01-01-0003"
+			Var PD_CODE2 = "12-01-02-0001"
+			Var PD_CODE3 = "##-##-##-####"
+			Var PD_STAGE_1 = $12-01-01-0003.Button
+			Var PD_STAGE_2 = $12-01-02-0001.Button
+			Var PD_STAGE_3 = "Disable2"
+			Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+			DEBUGVAR OverlayMenuFilter
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-01-02-0001"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "12-01-01-0003"
+				Else
+				Topping "Load" "-"
+				EndIf
+			EndIf
+			Var menu_name_eng_hot = $12-01-01-0003.NameE
+			Var menu_desc_eng_hot = $12-01-01-0003.descriptionE
+			Var menu_name_thai_hot = $12-01-01-0003.Name
+			Var menu_desc_thai_hot = $12-01-01-0003.description
+			
+			Var menu_name_eng_cold = $12-01-02-0001.NameE
+			Var menu_desc_eng_cold = $12-01-02-0001.descriptionE
+			Var menu_name_thai_cold = $12-01-02-0001.Name
+			Var menu_desc_thai_cold = $12-01-02-0001.description
+			
+			Var menu_name_eng_blender = $##-##-##-####.NameE
+			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+			Var menu_name_thai_blender = $##-##-##-####.Name
+			Var menu_desc_thai_blender = $##-##-##-####.description
+			
+			DEBUGVAR PD_STAGE_1
+			DEBUGVAR PD_STAGE_2
+			DEBUGVAR PD_STAGE_3
+			Var SelectDrinkType = 0
+			
+			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		</EventOnClick>
+		</Menu>
+
+		; 12-21-01-0003 12-21-02-0001 - 
+		<Menu>
+		<State> Flag( 12-21-01-0003.Button,12-21-02-0001.Button,$Sum12210100031221020001) </State>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_hot_america_no.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_america_no.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_america_no.png" </DisableImage>
+		<Name>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Americano"
+				Else
+					Var return = "อเมริกาโน"
+				EndIf
+			)
+		</Name>
+		<Description>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Espresso, Water"
+				Else
+					Var return = "กาแฟ และน้ำ "
+				EndIf
+			)
+		</Description>
+		<HotState> $12-21-01-0003.Button </HotState>
+		<IceState> $12-21-02-0001.Button </IceState>
+		<BlendState> "Disable2" </BlendState>
+		<HotPrice> StringFmt(  $12-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
+		<IcePrice> StringFmt(  $12-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
+		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<EventOnClick>
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $12-21-01-0003.Price
+			Var PriceD2 = $12-21-02-0001.Price
+			Var PriceD3 = $##-##-##-####.Price
+			Var PD_CODE1 = "12-21-01-0003"
+			Var PD_CODE2 = "12-21-02-0001"
+			Var PD_CODE3 = "##-##-##-####"
+			Var PD_STAGE_1 = $12-21-01-0003.Button
+			Var PD_STAGE_2 = $12-21-02-0001.Button
+			Var PD_STAGE_3 = "Disable2"
+			Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+			DEBUGVAR OverlayMenuFilter
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "-"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "12-21-01-0003"
+				Else
+				Topping "Load" "12-21-02-0001"
+				EndIf
+			EndIf
+			Var menu_name_eng_hot = $12-21-01-0003.NameE
+			Var menu_desc_eng_hot = $12-21-01-0003.descriptionE
+			Var menu_name_thai_hot = $12-21-01-0003.Name
+			Var menu_desc_thai_hot = $12-21-01-0003.description
+			
+			Var menu_name_eng_cold = $12-21-02-0001.NameE
+			Var menu_desc_eng_cold = $12-21-02-0001.descriptionE
+			Var menu_name_thai_cold = $12-21-02-0001.Name
+			Var menu_desc_thai_cold = $12-21-02-0001.description
+			
+			Var menu_name_eng_blender = $##-##-##-####.NameE
+			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+			Var menu_name_thai_blender = $##-##-##-####.Name
+			Var menu_desc_thai_blender = $##-##-##-####.description
+			
+			DEBUGVAR PD_STAGE_1
+			DEBUGVAR PD_STAGE_2
+			DEBUGVAR PD_STAGE_3
+			Var SelectDrinkType = 0
+			
+			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		</EventOnClick>
+		</Menu>
+
 		; ==================> Len = 15
 		; - - 12-01-03-0090 
 		<Menu>
@@ -113,9 +328,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Coffee "
+					Var return = "Coconut Milk\nCoffee Ice Cream"
 				Else
-					Var return = "กะทิเชคกาแฟ"
+					Var return = "เต่าบินไอติมถัง\nกาแฟ"
 				EndIf
 			)
 		</Name>
@@ -220,9 +435,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Coffee "
+					Var return = "Coconut Milk\nCoffee Ice Cream"
 				Else
-					Var return = "กะทิเชคกาแฟ"
+					Var return = "เต่าบินไอติมถัง\nกาแฟ"
 				EndIf
 			)
 		</Name>
@@ -1608,221 +1823,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 20
-		; 12-01-01-0003 12-01-02-0001 - 
-		<Menu>
-		<State> Flag( 12-01-01-0003.Button,12-01-02-0001.Button,$Sum12010100031201020001) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_hot_america_no.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_america_no.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_america_no.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Americano"
-				Else
-					Var return = "อเมริกาโน"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Espresso, Water"
-				Else
-					Var return = "กาแฟ และน้ำ "
-				EndIf
-			)
-		</Description>
-		<HotState> $12-01-01-0003.Button </HotState>
-		<IceState> $12-01-02-0001.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> StringFmt(  $12-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $12-01-01-0003.Price
-			Var PriceD2 = $12-01-02-0001.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "12-01-01-0003"
-			Var PD_CODE2 = "12-01-02-0001"
-			Var PD_CODE3 = "##-##-##-####"
-			Var PD_STAGE_1 = $12-01-01-0003.Button
-			Var PD_STAGE_2 = $12-01-02-0001.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var OverlayMenuFilter !assigned xmlpro( 12-01-01-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-01-02-0001"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "12-01-01-0003"
-				Else
-				Topping "Load" "-"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $12-01-01-0003.NameE
-			Var menu_desc_eng_hot = $12-01-01-0003.descriptionE
-			Var menu_name_thai_hot = $12-01-01-0003.Name
-			Var menu_desc_thai_hot = $12-01-01-0003.description
-			
-			Var menu_name_eng_cold = $12-01-02-0001.NameE
-			Var menu_desc_eng_cold = $12-01-02-0001.descriptionE
-			Var menu_name_thai_cold = $12-01-02-0001.Name
-			Var menu_desc_thai_cold = $12-01-02-0001.description
-			
-			Var menu_name_eng_blender = $##-##-##-####.NameE
-			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-			Var menu_name_thai_blender = $##-##-##-####.Name
-			Var menu_desc_thai_blender = $##-##-##-####.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
-		; 12-21-01-0003 12-21-02-0001 - 
-		<Menu>
-		<State> Flag( 12-21-01-0003.Button,12-21-02-0001.Button,$Sum12210100031221020001) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_hot_america_no.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_america_no.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_america_no.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Americano"
-				Else
-					Var return = "อเมริกาโน"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Espresso, Water"
-				Else
-					Var return = "กาแฟ และน้ำ "
-				EndIf
-			)
-		</Description>
-		<HotState> $12-21-01-0003.Button </HotState>
-		<IceState> $12-21-02-0001.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> StringFmt(  $12-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $12-21-01-0003.Price
-			Var PriceD2 = $12-21-02-0001.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "12-21-01-0003"
-			Var PD_CODE2 = "12-21-02-0001"
-			Var PD_CODE3 = "##-##-##-####"
-			Var PD_STAGE_1 = $12-21-01-0003.Button
-			Var PD_STAGE_2 = $12-21-02-0001.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var OverlayMenuFilter !assigned xmlpro( 12-21-01-0003, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "-"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "12-21-01-0003"
-				Else
-				Topping "Load" "12-21-02-0001"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $12-21-01-0003.NameE
-			Var menu_desc_eng_hot = $12-21-01-0003.descriptionE
-			Var menu_name_thai_hot = $12-21-01-0003.Name
-			Var menu_desc_thai_hot = $12-21-01-0003.description
-			
-			Var menu_name_eng_cold = $12-21-02-0001.NameE
-			Var menu_desc_eng_cold = $12-21-02-0001.descriptionE
-			Var menu_name_thai_cold = $12-21-02-0001.Name
-			Var menu_desc_thai_cold = $12-21-02-0001.description
-			
-			Var menu_name_eng_blender = $##-##-##-####.NameE
-			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-			Var menu_name_thai_blender = $##-##-##-####.Name
-			Var menu_desc_thai_blender = $##-##-##-####.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 15
 		; 12-01-01-0081 12-01-02-0081 - 
 		<Menu>

xml/v3/page_catalog_group_forkid.xml

@@ -1193,222 +1193,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 20
-		; - - 12-03-03-0020 
-		<Menu>
-		<State> Flag( 12-03-03-0020.Button,$Sum1203030020) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_ovaltine.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_ovaltine.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_ovaltine.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Ovaltine Smoothie \nVolcano"
-				Else
-					Var return = "โอวัลตินปั่นภูเขาไฟ"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Ovaltine, Sugar, milk"
-				Else
-					Var return = "โอวัลติน น้ำตาล และ นม"
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> "Disable2" </IceState>
-		<BlendState> $12-03-03-0020.Button </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $12-03-03-0020.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_ovaltine.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $##-##-##-####.Price
-			Var PriceD3 = $12-03-03-0020.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "##-##-##-####"
-			Var PD_CODE3 = "12-03-03-0020"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = "Disable2"
-			Var PD_STAGE_3 = $12-03-03-0020.Button
-			Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0020, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "-"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "12-03-03-0020"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $##-##-##-####.NameE
-			Var menu_desc_eng_cold = $##-##-##-####.descriptionE
-			Var menu_name_thai_cold = $##-##-##-####.Name
-			Var menu_desc_thai_cold = $##-##-##-####.description
-			
-			Var menu_name_eng_blender = $12-03-03-0020.NameE
-			Var menu_desc_eng_blender = $12-03-03-0020.descriptionE
-			Var menu_name_thai_blender = $12-03-03-0020.Name
-			Var menu_desc_thai_blender = $12-03-03-0020.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
-		; ==================> Len = 20
-		; - - 12-03-03-0021 
-		<Menu>
-		<State> Flag( 12-03-03-0021.Button,$Sum1203030021) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_Ovalcocoa_smoothie.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Ovalcocoa_smoothie.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Ovalcocoa_smoothie.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Cocoa Ovaltine \nVolcano"
-				Else
-					Var return = "โกโก้โอดิบภูเขาไฟ"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Ovaltine, Cocoa, Sugar, milk"
-				Else
-					Var return = "โกโก้ โอวัลติน น้ำตาล และ นม"
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> "Disable2" </IceState>
-		<BlendState> $12-03-03-0021.Button </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $12-03-03-0021.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Ovalcocoa_smoothie.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $##-##-##-####.Price
-			Var PriceD3 = $12-03-03-0021.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "##-##-##-####"
-			Var PD_CODE3 = "12-03-03-0021"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = "Disable2"
-			Var PD_STAGE_3 = $12-03-03-0021.Button
-			Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0021, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "-"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "12-03-03-0021"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $##-##-##-####.NameE
-			Var menu_desc_eng_cold = $##-##-##-####.descriptionE
-			Var menu_name_thai_cold = $##-##-##-####.Name
-			Var menu_desc_thai_cold = $##-##-##-####.description
-			
-			Var menu_name_eng_blender = $12-03-03-0021.NameE
-			Var menu_desc_eng_blender = $12-03-03-0021.descriptionE
-			Var menu_name_thai_blender = $12-03-03-0021.Name
-			Var menu_desc_thai_blender = $12-03-03-0021.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 20
 		; - 12-05-02-0008 12-05-03-0008 
 		<Menu>

xml/v3/page_catalog_group_health.xml

@@ -119,9 +119,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Water"
+					Var return = "[Hot 5 Cal. , Iced 5 Cal.] Espresso, Water"
 				Else
-					Var return = "กาแฟ และน้ำร้อน\n(อเมริกาโน)"
+					Var return = "[ร้อน 5 Cal. , เย็น 5 Cal.] กาแฟ และน้ำร้อน\n(อเมริกาโน)"
 				EndIf
 			)
 		</Description>
@@ -226,9 +226,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Water"
+					Var return = "[Hot 5 Cal. , Iced 5 Cal.] Espresso, Water"
 				Else
-					Var return = "กาแฟ และน้ำร้อน\n(อเมริกาโน)"
+					Var return = "[ร้อน 5 Cal. , เย็น 5 Cal.] กาแฟ และน้ำร้อน\n(อเมริกาโน)"
 				EndIf
 			)
 		</Description>
@@ -334,9 +334,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Milk,\nFoamed Milk"
+					Var return = "[Hot 54 Cal. , Iced 84 Cal.] Espresso, Milk,\nFoamed Milk"
 				Else
-					Var return = "กาแฟ นม และ ฟองนม"
+					Var return = "[ร้อน 54 Cal. , เย็น 84 Cal.] กาแฟ นม และ ฟองนม"
 				EndIf
 			)
 		</Description>
@@ -441,9 +441,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Milk,\nFoamed Milk"
+					Var return = "[Hot 54 Cal. , Iced 84 Cal.] Espresso, Milk,\nFoamed Milk"
 				Else
-					Var return = "กาแฟ นม และ ฟองนม"
+					Var return = "[ร้อน 54 Cal. , เย็น 84 Cal.] กาแฟ นม และ ฟองนม"
 				EndIf
 			)
 		</Description>
@@ -549,9 +549,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Cocoa,\nMilk, Sugar"
+					Var return = "[Hot 55 Cal. , Iced 99 Cal.] Espresso, Cocoa,\nMilk, Sugar"
 				Else
-					Var return = "กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล"
+					Var return = "[ร้อน 55 Cal. , เย็น 99 Cal.] กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล"
 				EndIf
 			)
 		</Description>
@@ -656,9 +656,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Cocoa,\nMilk, Sugar"
+					Var return = "[Hot 55 Cal. , Iced 99 Cal.] Espresso, Cocoa,\nMilk, Sugar"
 				Else
-					Var return = "กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล"
+					Var return = "[ร้อน 55 Cal. , เย็น 99 Cal.] กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล"
 				EndIf
 			)
 		</Description>
@@ -764,9 +764,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Milk,\nFoamed Milk"
+					Var return = "[Hot 54 Cal. , Iced 89 Cal.] Espresso, Milk,\nFoamed Milk"
 				Else
-					Var return = "กาแฟ นม และ ฟองนม"
+					Var return = "[ร้อน 54 Cal. , เย็น 89 Cal.] กาแฟ นม และ ฟองนม"
 				EndIf
 			)
 		</Description>
@@ -871,9 +871,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Espresso, Milk,\nFoamed Milk"
+					Var return = "[Hot 54 Cal. , Iced 89 Cal.] Espresso, Milk,\nFoamed Milk"
 				Else
-					Var return = "กาแฟ นม และ ฟองนม"
+					Var return = "[ร้อน 54 Cal. , เย็น 89 Cal.] กาแฟ นม และ ฟองนม"
 				EndIf
 			)
 		</Description>
@@ -979,9 +979,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Thai Tea, Sugar, Milk"
+					Var return = "[Hot 5 Cal. , Iced 5 Cal.] Thai Tea, Sugar, Milk"
 				Else
-					Var return = "ชาไทย และ นมอุ่น"
+					Var return = "[ร้อน 5 Cal. , เย็น 5 Cal.] ชาไทย และ นมอุ่น"
 				EndIf
 			)
 		</Description>
@@ -1087,9 +1087,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Taiwanese Tea, Sugar, \nAnd Milk"
+					Var return = "[Hot 57 Cal. , Iced 90 Cal.] Taiwanese Tea, Sugar, \nAnd Milk"
 				Else
-					Var return = "ชาไต้หวัน และ นมอุ่น"
+					Var return = "[ร้อน 57 Cal. , เย็น 90 Cal.]  ชาไต้หวัน และ นมอุ่น"
 				EndIf
 			)
 		</Description>
@@ -1195,9 +1195,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Matcha And Warm Milk"
+					Var return = "[Hot 61 Cal. , Iced 97 Cal.] Matcha And Warm Milk"
 				Else
-					Var return = "ชาเขียวมัทฉะ และ นมอุ่น "
+					Var return = "[ร้อน 61 Cal. , เย็น 97 Cal.] ชาเขียวมัทฉะ และ นมอุ่น "
 				EndIf
 			)
 		</Description>
@@ -1303,9 +1303,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Matcha And Hot Water"
+					Var return = "[Hot 3 Cal. , Iced 6 Cal.] Matcha And Hot Water"
 				Else
-					Var return = "ชาเชียว และน้ำ"
+					Var return = "[ร้อน 3 Cal. , เย็น 6 Cal.] ชาเชียว และน้ำ"
 				EndIf
 			)
 		</Description>
@@ -1411,9 +1411,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Thai Tea And Water"
+					Var return = "[Hot 7 Cal. , Iced 7 Cal.] Thai Tea And Water"
 				Else
-					Var return = "ชาไทย และน้ำ"
+					Var return = "[ร้อน 7 Cal. , เย็น 7 Cal.] ชาไทย และน้ำ"
 				EndIf
 			)
 		</Description>
@@ -1519,9 +1519,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Thai Tea, Limenade And Water"
+					Var return = "[Hot 11 Cal. , Iced 11 Cal.] Thai Tea, Limenade And Water"
 				Else
-					Var return = "ชาไทย มะนาว และน้ำ"
+					Var return = "[ร้อน 11 Cal. , เย็น 11 Cal.] ชาไทย มะนาว และน้ำ"
 				EndIf
 			)
 		</Description>
@@ -1627,9 +1627,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Taiwan Tea, Water, And Ice"
+					Var return = "[Hot 7 Cal. , Iced 7 Cal.] Taiwan Tea, Water, And Ice"
 				Else
-					Var return = "ชาอู่หลงไต้หวัน น้ำ"
+					Var return = "[ร้อน 7 Cal. , เย็น 7 Cal.] ชาอู่หลงไต้หวัน น้ำ"
 				EndIf
 			)
 		</Description>
@@ -1735,9 +1735,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Taiwan Tea, Limenade, \nWater, And Ice"
+					Var return = "[Hot 3 Cal. , Iced 15 Cal.] Taiwan Tea, Limenade, \nWater, And Ice"
 				Else
-					Var return = "ชาอู่หลงไต้หวัน น้ำ มะนาว"
+					Var return = "[ร้อน 3 Cal. , เย็น 15 Cal.] ชาอู่หลงไต้หวัน น้ำ มะนาว"
 				EndIf
 			)
 		</Description>
@@ -1843,9 +1843,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Hojicha And Milk"
+					Var return = "[Hot 49 Cal. , Iced 79 Cal.] Hojicha And Milk"
 				Else
-					Var return = "ชาเขียวคั่ว และ นมอุ่น "
+					Var return = "[ร้อน 49 Cal. , เย็น 79 Cal.] ชาเขียวคั่ว และ นมอุ่น "
 				EndIf
 			)
 		</Description>
@@ -1951,9 +1951,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Milk, Cocoa, Sugar"
+					Var return = "[Hot 56 Cal. , Iced 98 Cal.] Milk, Cocoa, Sugar"
 				Else
-					Var return = "โกโก้ นมและน้ำตาล"
+					Var return = "[ร้อน 56 Cal. , เย็น 98 Cal.] โกโก้ นมและน้ำตาล"
 				EndIf
 			)
 		</Description>
@@ -2059,9 +2059,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Milk"
+					Var return = "[Hot 49 Cal. , Iced 79 Cal.] Milk"
 				Else
-					Var return = "นม"
+					Var return = "[ร้อน 49 Cal. , เย็น 79 Cal.] นม"
 				EndIf
 			)
 		</Description>
@@ -2167,9 +2167,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Limenade, Sugar"
+					Var return = "[Hot 11 Cal. , Iced 23 Cal.] Limenade, Sugar"
 				Else
-					Var return = "น้ำมะนาว น้ำตาล"
+					Var return = "[ร้อน 11 Cal. , เย็น 23 Cal.] น้ำมะนาว น้ำตาล"
 				EndIf
 			)
 		</Description>
@@ -2275,9 +2275,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Limenade, Sugar, Soda, Ice"
+					Var return = "[23 Cal.] Limenade, Sugar, Soda, Ice"
 				Else
-					Var return = "มะนาว โซดา และน้ำแข็ง"
+					Var return = "[23 Cal.] มะนาว โซดา และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -2383,9 +2383,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Thai Tea, Sugar, Milk"
+					Var return = "[Hot 53 Cal. , Iced 89 Cal.] Thai Tea, Sugar, Milk"
 				Else
-					Var return = "ชาไทย และ นมอุ่น"
+					Var return = "[ร้อน 53 Cal. , เย็น 89 Cal.] ชาไทย และ นมอุ่น"
 				EndIf
 			)
 		</Description>
@@ -2491,9 +2491,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Thai Tea And Water"
+					Var return = "[Hot 7 Cal. , Iced 7 Cal.] Thai Tea And Water"
 				Else
-					Var return = "ชาไทย และน้ำ"
+					Var return = "[ร้อน 7 Cal. , เย็น 7 Cal.] ชาไทย และน้ำ"
 				EndIf
 			)
 		</Description>
@@ -2599,9 +2599,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Thai Tea, Limenade And Water"
+					Var return = "[Hot 3 Cal. , Iced 14 Cal.] Thai Tea, Limenade And Water"
 				Else
-					Var return = "ชาไทย ผงมะนาว และน้ำ"
+					Var return = "[ร้อน 3 Cal. , เย็น 14 Cal.] ชาไทย ผงมะนาว และน้ำ"
 				EndIf
 			)
 		</Description>
@@ -2707,9 +2707,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Milk and Ice"
+					Var return = "[90 Cal.] Jemila, Milk and Ice"
 				Else
-					Var return = "เจมิลา นม และน้ำแข็ง"
+					Var return = "[90 Cal.] เจมิลา นม และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -2815,9 +2815,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Water and Ice"
+					Var return = "[60 Cal.] Jemila, Water and Ice"
 				Else
-					Var return = "เจมิลา น้ำ และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา น้ำ และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -2923,9 +2923,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Thai tea and Ice"
+					Var return = "[60 Cal.] Jemila, Thai tea and Ice"
 				Else
-					Var return = "เจมิลา ชาไทย และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา ชาไทย และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3031,9 +3031,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Soda and Ice"
+					Var return = "[60 Cal.] Jemila, Soda and Ice"
 				Else
-					Var return = "เจมิลา โซดา และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา โซดา และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3139,9 +3139,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Espresso and Ice"
+					Var return = "[60 Cal.] Jemila, Espresso and Ice"
 				Else
-					Var return = "เจมิลา กาแฟ และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา กาแฟ และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3246,9 +3246,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Espresso and Ice"
+					Var return = "[60 Cal.] Jemila, Espresso and Ice"
 				Else
-					Var return = "เจมิลา กาแฟ และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา กาแฟ และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3354,9 +3354,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Cocoa and Ice"
+					Var return = "[70 Cal.] Jemila, Cocoa and Ice"
 				Else
-					Var return = "เจมิลา โกโก้ และน้ำแข็ง"
+					Var return = "[70 Cal.] เจมิลา โกโก้ และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3462,9 +3462,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Ginger and Ice"
+					Var return = "[60 Cal.] Jemila, Ginger and Ice"
 				Else
-					Var return = "เจมิลา ขิง และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา ขิง และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3570,9 +3570,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, 7 up and Ice"
+					Var return = "[60 Cal.] Jemila, 7 up and Ice"
 				Else
-					Var return = "เจมิลา 7up และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา 7up และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3678,9 +3678,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Lime and Ice"
+					Var return = "[60 Cal.] Jemila, Lime and Ice"
 				Else
-					Var return = "เจมิลา มะนาว และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา มะนาว และน้ำแข็ง"
 				EndIf
 			)
 		</Description>
@@ -3786,9 +3786,9 @@
 		<Description>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Jemila, Jasmine tea and Ice"
+					Var return = "[60 Cal.] Jemila, Jasmine tea and Ice"
 				Else
-					Var return = "เจมิลา ชามะลิ และน้ำแข็ง"
+					Var return = "[60 Cal.] เจมิลา ชามะลิ และน้ำแข็ง"
 				EndIf
 			)
 		</Description>

xml/v3/page_catalog_group_pepsi_7up.xml

@@ -100,8 +100,8 @@
 	</Configuration>
 	<Menus>
 ;banners
-		; menu_new_list 38
+		; menu_new_list 36
-		; ==================> Len = 20
+		; ==================> Len = 34
 		; - 12-05-02-0007 12-05-03-0007 
 		<Menu>
 		<State> Flag( 12-05-02-0007.Button,12-05-03-0007.Button,$Sum12050200071205030007) </State>
@@ -425,114 +425,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 15
-		; - 12-05-02-0114 - 
-		<Menu>
-		<State> Flag( 12-05-02-0114.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1205020114) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Pepsi_Coconut.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Pepsi_Coconut.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pepsi_Coconut.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi Coconut"
-				Else
-					Var return = "เป๊ปซี่มะพร้าว"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi Coconut Soda"
-				Else
-					Var return = "เป๊ปซี่ มะพร้าว โซดา"
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0114.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-05-02-0114.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pepsi_Coconut.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0114.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0114"
-			Var PD_CODE3 = "##-##-##-####"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0114.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0114, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0114"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "-"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $12-05-02-0114.NameE
-			Var menu_desc_eng_cold = $12-05-02-0114.descriptionE
-			Var menu_name_thai_cold = $12-05-02-0114.Name
-			Var menu_desc_thai_cold = $12-05-02-0114.description
-			
-			Var menu_name_eng_blender = $##-##-##-####.NameE
-			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-			Var menu_name_thai_blender = $##-##-##-####.Name
-			Var menu_desc_thai_blender = $##-##-##-####.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 15
 		; - 12-05-02-0057 - 
 		<Menu>
@@ -1073,6 +965,330 @@
 		</EventOnClick>
 		</Menu>
 
+		; ==================> Len = 15
+		; - 12-05-02-0114 12-05-03-0114 
+		<Menu>
+		<State> Flag( 12-05-02-0114.Button,12-05-03-0114.Button,DateTimeStart="2025/04/01T00:00:00",$Sum12050201141205030114) </State>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Pepsi_Coconut.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Pepsi_Coconut.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pepsi_Coconut.png" </DisableImage>
+		<Name>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Pepsi Coconut"
+				Else
+					Var return = "เป๊ปซี่มะพร้าว"
+				EndIf
+			)
+		</Name>
+		<Description>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Pepsi Coconut Soda"
+				Else
+					Var return = "เป๊ปซี่ มะพร้าว โซดา"
+				EndIf
+			)
+		</Description>
+		<HotState> "Disable2" </HotState>
+		<IceState> $12-05-02-0114.Button </IceState>
+		<BlendState> $12-05-03-0114.Button </BlendState>
+		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
+		<IcePrice> StringFmt(  $12-05-02-0114.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
+		<BlendPrice> StringFmt(  $12-05-03-0114.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<EventOnClick>
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pepsi_Coconut.png"
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $##-##-##-####.Price
+			Var PriceD2 = $12-05-02-0114.Price
+			Var PriceD3 = $12-05-03-0114.Price
+			Var PD_CODE1 = "##-##-##-####"
+			Var PD_CODE2 = "12-05-02-0114"
+			Var PD_CODE3 = "12-05-03-0114"
+			Var PD_STAGE_1 = "Disable2"
+			Var PD_STAGE_2 = $12-05-02-0114.Button
+			Var PD_STAGE_3 = $12-05-03-0114.Button
+			Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0114, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+			DEBUGVAR OverlayMenuFilter
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-05-02-0114"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "-"
+				Else
+				Topping "Load" "12-05-03-0114"
+				EndIf
+			EndIf
+			Var menu_name_eng_hot = $##-##-##-####.NameE
+			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+			Var menu_name_thai_hot = $##-##-##-####.Name
+			Var menu_desc_thai_hot = $##-##-##-####.description
+			
+			Var menu_name_eng_cold = $12-05-02-0114.NameE
+			Var menu_desc_eng_cold = $12-05-02-0114.descriptionE
+			Var menu_name_thai_cold = $12-05-02-0114.Name
+			Var menu_desc_thai_cold = $12-05-02-0114.description
+			
+			Var menu_name_eng_blender = $12-05-03-0114.NameE
+			Var menu_desc_eng_blender = $12-05-03-0114.descriptionE
+			Var menu_name_thai_blender = $12-05-03-0114.Name
+			Var menu_desc_thai_blender = $12-05-03-0114.description
+			
+			DEBUGVAR PD_STAGE_1
+			DEBUGVAR PD_STAGE_2
+			DEBUGVAR PD_STAGE_3
+			Var SelectDrinkType = 0
+			
+			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		</EventOnClick>
+		</Menu>
+
+		; ==================> Len = 20
+		; - 12-05-02-0046 12-05-03-0046 
+		<Menu>
+		<State> Flag( 12-05-02-0046.Button,12-05-03-0046.Button,$Sum12050200461205030046) </State>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Pepsi_Plum.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Pepsi_Plum.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pepsi_Plum.png" </DisableImage>
+		<Name>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Pepsi Plum"
+				Else
+					Var return = "เป๊ปซี่บ๊วย"
+				EndIf
+			)
+		</Name>
+		<Description>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Pepsi, Ume & Ice"
+				Else
+					Var return = "เป๊ปซี่ บ๊วย โซดา  "
+				EndIf
+			)
+		</Description>
+		<HotState> "Disable2" </HotState>
+		<IceState> $12-05-02-0046.Button </IceState>
+		<BlendState> $12-05-03-0046.Button </BlendState>
+		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
+		<IcePrice> StringFmt(  $12-05-02-0046.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
+		<BlendPrice> StringFmt(  $12-05-03-0046.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<EventOnClick>
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pepsi_Plum.png"
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $##-##-##-####.Price
+			Var PriceD2 = $12-05-02-0046.Price
+			Var PriceD3 = $12-05-03-0046.Price
+			Var PD_CODE1 = "##-##-##-####"
+			Var PD_CODE2 = "12-05-02-0046"
+			Var PD_CODE3 = "12-05-03-0046"
+			Var PD_STAGE_1 = "Disable2"
+			Var PD_STAGE_2 = $12-05-02-0046.Button
+			Var PD_STAGE_3 = $12-05-03-0046.Button
+			Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0046, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+			DEBUGVAR OverlayMenuFilter
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-05-02-0046"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "-"
+				Else
+				Topping "Load" "12-05-03-0046"
+				EndIf
+			EndIf
+			Var menu_name_eng_hot = $##-##-##-####.NameE
+			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+			Var menu_name_thai_hot = $##-##-##-####.Name
+			Var menu_desc_thai_hot = $##-##-##-####.description
+			
+			Var menu_name_eng_cold = $12-05-02-0046.NameE
+			Var menu_desc_eng_cold = $12-05-02-0046.descriptionE
+			Var menu_name_thai_cold = $12-05-02-0046.Name
+			Var menu_desc_thai_cold = $12-05-02-0046.description
+			
+			Var menu_name_eng_blender = $12-05-03-0046.NameE
+			Var menu_desc_eng_blender = $12-05-03-0046.descriptionE
+			Var menu_name_thai_blender = $12-05-03-0046.Name
+			Var menu_desc_thai_blender = $12-05-03-0046.description
+			
+			DEBUGVAR PD_STAGE_1
+			DEBUGVAR PD_STAGE_2
+			DEBUGVAR PD_STAGE_3
+			Var SelectDrinkType = 0
+			
+			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		</EventOnClick>
+		</Menu>
+
+		; ==================> Len = 15
+		; - 12-05-02-0104 12-05-03-0104 
+		<Menu>
+		<State> Flag( 12-05-02-0104.Button,12-05-03-0104.Button,$Sum12050201041205030104) </State>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Pepsi_Plum.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Pepsi_Plum.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pepsi_Plum.png" </DisableImage>
+		<Name>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Pepsi Plum"
+				Else
+					Var return = "เป๊ปซี่บ๊วย"
+				EndIf
+			)
+		</Name>
+		<Description>
+			eval(
+				If show_eng = "true" Then
+					Var return = "Pepsi, Ume & Ice"
+				Else
+					Var return = "เป๊ปซี่ บ๊วย โซดา  "
+				EndIf
+			)
+		</Description>
+		<HotState> "Disable2" </HotState>
+		<IceState> $12-05-02-0104.Button </IceState>
+		<BlendState> $12-05-03-0104.Button </BlendState>
+		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
+		<IcePrice> StringFmt(  $12-05-02-0104.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
+		<BlendPrice> StringFmt(  $12-05-03-0104.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<EventOnClick>
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pepsi_Plum.png"
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $##-##-##-####.Price
+			Var PriceD2 = $12-05-02-0104.Price
+			Var PriceD3 = $12-05-03-0104.Price
+			Var PD_CODE1 = "##-##-##-####"
+			Var PD_CODE2 = "12-05-02-0104"
+			Var PD_CODE3 = "12-05-03-0104"
+			Var PD_STAGE_1 = "Disable2"
+			Var PD_STAGE_2 = $12-05-02-0104.Button
+			Var PD_STAGE_3 = $12-05-03-0104.Button
+			Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0104, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+			DEBUGVAR OverlayMenuFilter
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-05-02-0104"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "-"
+				Else
+				Topping "Load" "12-05-03-0104"
+				EndIf
+			EndIf
+			Var menu_name_eng_hot = $##-##-##-####.NameE
+			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+			Var menu_name_thai_hot = $##-##-##-####.Name
+			Var menu_desc_thai_hot = $##-##-##-####.description
+			
+			Var menu_name_eng_cold = $12-05-02-0104.NameE
+			Var menu_desc_eng_cold = $12-05-02-0104.descriptionE
+			Var menu_name_thai_cold = $12-05-02-0104.Name
+			Var menu_desc_thai_cold = $12-05-02-0104.description
+			
+			Var menu_name_eng_blender = $12-05-03-0104.NameE
+			Var menu_desc_eng_blender = $12-05-03-0104.descriptionE
+			Var menu_name_thai_blender = $12-05-03-0104.Name
+			Var menu_desc_thai_blender = $12-05-03-0104.description
+			
+			DEBUGVAR PD_STAGE_1
+			DEBUGVAR PD_STAGE_2
+			DEBUGVAR PD_STAGE_3
+			Var SelectDrinkType = 0
+			
+			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+		</EventOnClick>
+		</Menu>
+
 		; ==================> Len = 15
 		; - 12-05-02-0094 12-05-03-0094 
 		<Menu>
@@ -1613,222 +1829,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 20
-		; - 12-05-02-0046 12-05-03-0046 
-		<Menu>
-		<State> Flag( 12-05-02-0046.Button,12-05-03-0046.Button,$Sum12050200461205030046) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_plum.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_plum.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_plum.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi Plum"
-				Else
-					Var return = "เป๊ปซี่บ๊วย"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi, Ume & Ice"
-				Else
-					Var return = "เป๊ปซี่ บ๊วย โซดา  "
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0046.Button </IceState>
-		<BlendState> $12-05-03-0046.Button </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-05-02-0046.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $12-05-03-0046.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_plum.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0046.Price
-			Var PriceD3 = $12-05-03-0046.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0046"
-			Var PD_CODE3 = "12-05-03-0046"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0046.Button
-			Var PD_STAGE_3 = $12-05-03-0046.Button
-			Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0046, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0046"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "12-05-03-0046"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $12-05-02-0046.NameE
-			Var menu_desc_eng_cold = $12-05-02-0046.descriptionE
-			Var menu_name_thai_cold = $12-05-02-0046.Name
-			Var menu_desc_thai_cold = $12-05-02-0046.description
-			
-			Var menu_name_eng_blender = $12-05-03-0046.NameE
-			Var menu_desc_eng_blender = $12-05-03-0046.descriptionE
-			Var menu_name_thai_blender = $12-05-03-0046.Name
-			Var menu_desc_thai_blender = $12-05-03-0046.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
-		; ==================> Len = 15
-		; - 12-05-02-0104 12-05-03-0104 
-		<Menu>
-		<State> Flag( 12-05-02-0104.Button,12-05-03-0104.Button,$Sum12050201041205030104) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_plum.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_plum.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_plum.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi Plum"
-				Else
-					Var return = "เป๊ปซี่บ๊วย"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi, Ume & Ice"
-				Else
-					Var return = "เป๊ปซี่ บ๊วย โซดา  "
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0104.Button </IceState>
-		<BlendState> $12-05-03-0104.Button </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-05-02-0104.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $12-05-03-0104.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_plum.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0104.Price
-			Var PriceD3 = $12-05-03-0104.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0104"
-			Var PD_CODE3 = "12-05-03-0104"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0104.Button
-			Var PD_STAGE_3 = $12-05-03-0104.Button
-			Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0104, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0104"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "12-05-03-0104"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $12-05-02-0104.NameE
-			Var menu_desc_eng_cold = $12-05-02-0104.descriptionE
-			Var menu_name_thai_cold = $12-05-02-0104.Name
-			Var menu_desc_thai_cold = $12-05-02-0104.description
-			
-			Var menu_name_eng_blender = $12-05-03-0104.NameE
-			Var menu_desc_eng_blender = $12-05-03-0104.descriptionE
-			Var menu_name_thai_blender = $12-05-03-0104.Name
-			Var menu_desc_thai_blender = $12-05-03-0104.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 15
 		; - 12-05-02-0074 12-05-03-0074 
 		<Menu>
@@ -2481,9 +2481,9 @@
 		; - 12-05-02-0053 - 
 		<Menu>
 		<State> Flag( 12-05-02-0053.Button,$Sum1205020053) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Pepsi_Yuzu.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Pepsi_Yuzu.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pepsi_Yuzu.png" </DisableImage>
 		<Name>
 			eval(
 				If show_eng = "true" Then
@@ -2525,7 +2525,7 @@
 		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
 		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
 		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pepsi_Yuzu.png"
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
 			Var PriceD2 = $12-05-02-0053.Price
@@ -2585,114 +2585,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 15
-		; - 12-05-02-0106 - 
-		<Menu>
-		<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi Yuzu"
-				Else
-					Var return = "เป๊ปซี่ยูซุ"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Pepsi, Yuzu & Ice"
-				Else
-					Var return = "เป๊ปซี่ ยูซุ โซดา"
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0106.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-05-02-0106.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0106.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0106"
-			Var PD_CODE3 = "##-##-##-####"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0106.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0106"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "-"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $12-05-02-0106.NameE
-			Var menu_desc_eng_cold = $12-05-02-0106.descriptionE
-			Var menu_name_thai_cold = $12-05-02-0106.Name
-			Var menu_desc_thai_cold = $12-05-02-0106.description
-			
-			Var menu_name_eng_blender = $##-##-##-####.NameE
-			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-			Var menu_name_thai_blender = $##-##-##-####.Name
-			Var menu_desc_thai_blender = $##-##-##-####.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 15
 		; - 12-05-02-0076 - 
 		<Menu>
@@ -3777,9 +3669,9 @@
 		; - 12-05-02-0091 12-05-03-0091 
 		<Menu>
 		<State> Flag( 12-05-02-0091.Button,12-05-03-0091.Button,$Sum12050200911205030091) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_coconut.png" </IdleImage>
+		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Pepsi_Coconut.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </PressImage>
+		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Pepsi_Coconut.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" </DisableImage>
+		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pepsi_Coconut.png" </DisableImage>
 		<Name>
 			eval(
 				If show_eng = "true" Then
@@ -3821,7 +3713,7 @@
 		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
 		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
 		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pepsi_Coconut.png"
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price
 			Var PriceD2 = $12-05-02-0091.Price
@@ -3881,114 +3773,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 15
-		; - 12-05-02-0114 12-05-03-0114 
-		<Menu>
-		<State> Flag( 12-05-02-0114.Button,12-05-03-0114.Button,$Sum12050201141205030114) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_coconut.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_coconut.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Coconut Pepsi"
-				Else
-					Var return = "มะพร้าวน้ำหอมเป๊ปซี่"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Coconut, Pepsi and Soda"
-				Else
-					Var return = "มะพร้าว เป๊ปซี่ และโซดา"
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-05-02-0114.Button </IceState>
-		<BlendState> $12-05-03-0114.Button </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-05-02-0114.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $12-05-03-0114.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_coconut.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-05-02-0114.Price
-			Var PriceD3 = $12-05-03-0114.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-05-02-0114"
-			Var PD_CODE3 = "12-05-03-0114"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-05-02-0114.Button
-			Var PD_STAGE_3 = $12-05-03-0114.Button
-			Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0114, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-05-02-0114"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "12-05-03-0114"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $12-05-02-0114.NameE
-			Var menu_desc_eng_cold = $12-05-02-0114.descriptionE
-			Var menu_name_thai_cold = $12-05-02-0114.Name
-			Var menu_desc_thai_cold = $12-05-02-0114.description
-			
-			Var menu_name_eng_blender = $12-05-03-0114.NameE
-			Var menu_desc_eng_blender = $12-05-03-0114.descriptionE
-			Var menu_name_thai_blender = $12-05-03-0114.Name
-			Var menu_desc_thai_blender = $12-05-03-0114.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 20
 		; - 12-05-02-0103 - 
 		<Menu>

xml/v3/page_catalog_group_pro_coconut_milk.xml

@@ -108,9 +108,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake"
+					Var return = "Coconut Milk\nIce Cream"
 				Else
-					Var return = "กะทิเชค"
+					Var return = "เต่าบินไอติมถัง\nกะทิ"
 				EndIf
 			)
 		</Name>
@@ -216,9 +216,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Strawberry"
+					Var return = "Coconut Milk\nStrawberry Ice Cream"
 				Else
-					Var return = "กะทิเชคสตรอเบอรี"
+					Var return = "เต่าบินไอติมถัง\nสตรอเบอรี"
 				EndIf
 			)
 		</Name>
@@ -324,9 +324,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Cocoa"
+					Var return = "Coconut Milk\nCocoa Ice Cream"
 				Else
-					Var return = "กะทิเชคโกโก้"
+					Var return = "เต่าบินไอติมถัง\nโกโก้"
 				EndIf
 			)
 		</Name>
@@ -432,9 +432,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Matcha"
+					Var return = "Coconut Milk\nMatcha Ice Cream"
 				Else
-					Var return = "กะทิเชคมัทฉะญี่ปุ่น"
+					Var return = "เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น"
 				EndIf
 			)
 		</Name>
@@ -540,9 +540,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Coffee"
+					Var return = "Coconut Milk\nCoffee Ice Cream"
 				Else
-					Var return = "กะทิเชคกาแฟ"
+					Var return = "เต่าบินไอติมถัง\nกาแฟ"
 				EndIf
 			)
 		</Name>
@@ -647,9 +647,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Coffee"
+					Var return = "Coconut Milk\nCoffee Ice Cream"
 				Else
-					Var return = "กะทิเชคกาแฟ"
+					Var return = "เต่าบินไอติมถัง\nกาแฟ"
 				EndIf
 			)
 		</Name>

xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml

@@ -216,7 +216,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Northern Cocoa"
+					Var return = "Western Cocoa \nThai Milk Tea"
 				Else
 					Var return = "โกโก้หริกุญชัย"
 				EndIf
@@ -324,7 +324,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Northern Strawberry Tea"
+					Var return = "Northern Strawberry \nThai Milk Tea"
 				Else
 					Var return = "สตรอว์เบอร์รีล้านนา"
 				EndIf
@@ -432,7 +432,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Southern Coconut Thai Tea"
+					Var return = "Southern Coconut \nThai Milk Tea"
 				Else
 					Var return = "ชาไทยมะพร้าวศรีวิชัย"
 				EndIf
@@ -540,9 +540,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Northeastern Lychee Thai Tea"
+					Var return = "Northeastern Lychee \nThai Milk Tea"
 				Else
-					Var return = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
+					Var return = "ชาไทยลิ้นจี่\nศรีโคตรบูรณ์"
 				EndIf
 			)
 		</Name>
@@ -648,7 +648,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Western Ume Tea"
+					Var return = "Eastern Ume \nThai Milk Tea"
 				Else
 					Var return = "ชาบ๊วยทวารวดี"
 				EndIf
@@ -756,9 +756,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Tao Bin Thai Tea (Thai Milk Tea)"
+					Var return = "Tao Bin Thai Tea\n(Thai Milk Tea)"
 				Else
-					Var return = "ชาไทยเต่าบิน (ชานมไทย)"
+					Var return = "ชาไทยเต่าบิน\n(ชานมไทย)"
 				EndIf
 			)
 		</Name>

xml/v3/page_catalog_group_pro_matcha_every_day.xml

@@ -432,9 +432,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Matcha"
+					Var return = "Coconut Milk\nMatcha Ice Cream"
 				Else
-					Var return = "กะทิเชคมัทฉะญี่ปุ่น"
+					Var return = "เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น"
 				EndIf
 			)
 		</Name>

xml/v3/page_catalog_group_pro_pepsi_x_taobin.skt

@@ -0,0 +1,33 @@
+<?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/v3/menu_catalog_new.xml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

xml/v3/page_catalog_group_recommend.xml

@@ -124,7 +124,7 @@
 		; ==================> Len = 15
 		; - 12-02-02-0099 - 
 		<Menu>
-		<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
+		<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1202020099) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_pure_x3.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_pure_x3.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_pure_x3.png" </DisableImage>
@@ -232,16 +232,16 @@
 		; ==================> Len = 15
 		; - - 12-03-03-0103 
 		<Menu>
-		<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1203030103) </State>
+		<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Coconut_Milk_Smoothie.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Coconut_Milk_Smoothie.png" </DisableImage>
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake"
+					Var return = "Coconut Milk\nIce Cream"
 				Else
-					Var return = "กะทิเชค"
+					Var return = "เต่าบินไอติมถัง\nกะทิ"
 				EndIf
 			)
 		</Name>
@@ -340,16 +340,16 @@
 		; ==================> Len = 15
 		; - - 12-03-03-0106 
 		<Menu>
-		<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1203030106) </State>
+		<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_Coconut_Milk_Matcha_Smoothie.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Coconut_Milk_Matcha_Smoothie.png" </DisableImage>
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Matcha"
+					Var return = "Coconut Milk\nMatcha Ice Cream"
 				Else
-					Var return = "กะทิเชคมัทฉะญี่ปุ่น"
+					Var return = "เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น"
 				EndIf
 			)
 		</Name>
@@ -448,7 +448,7 @@
 		; ==================> Len = 15
 		; - 12-01-02-0090 - 
 		<Menu>
-		<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1201020090) </State>
+		<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>
@@ -555,7 +555,7 @@
 
 		; - 12-21-02-0090 - 
 		<Menu>
-		<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1221020090) </State>
+		<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
 		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Oliang.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Oliang.png" </DisableImage>

xml/v3/page_catalog_group_songkran.xml

@@ -446,114 +446,6 @@
 		</EventOnClick>
 		</Menu>
 
-		; ==================> Len = 15
-		; - 12-03-02-0026 - 
-		<Menu>
-		<State> Flag( 12-03-02-0026.Button,$Sum1203020026) </State>
-		<IdleImage> "ROOT/taobin_project/image/page_drink_n//bn_iced_mini_van_Ovaltine.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_mini_van_Ovaltine.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_mini_van_Ovaltine.png" </DisableImage>
-		<Name>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Mini Van Ovaltine"
-				Else
-					Var return = "โอวัลตินรถโรงเรียน"
-				EndIf
-			)
-		</Name>
-		<Description>
-			eval(
-				If show_eng = "true" Then
-					Var return = "Ovaltine, Sugar, milk"
-				Else
-					Var return = "โอวัลติน น้ำตาล และ นม"
-				EndIf
-			)
-		</Description>
-		<HotState> "Disable2" </HotState>
-		<IceState> $12-03-02-0026.Button </IceState>
-		<BlendState> "Disable2" </BlendState>
-		<HotPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </HotPrice>
-		<IcePrice> StringFmt(  $12-03-02-0026.Price , DisplayFormat, PreScaleConvertShow) </IcePrice>
-		<BlendPrice> StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) </BlendPrice>
-		<IceProcessingState>
-			eval(
-				If ICE_PROCESS_STATUS = 2 Then
-					If $Sum510201003951020200395102030039 = "Disable" Then
-						Var ice_tab_process_show = "Disable"
-					Else
-						Var ice_tab_process_show = "Enable"
-					EndIf
-				Else
-					Var ice_tab_process_show = "Invisible"
-				EndIf
-				Var return = ice_tab_process_show
-			)
-		</IceProcessingState>
-		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
-		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
-		<EventOnClick>
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_mini_van_Ovaltine.png"
-			Var OpenFromXML = CurrentXMLFileName2
-			Var PriceD1 = $##-##-##-####.Price
-			Var PriceD2 = $12-03-02-0026.Price
-			Var PriceD3 = $##-##-##-####.Price
-			Var PD_CODE1 = "##-##-##-####"
-			Var PD_CODE2 = "12-03-02-0026"
-			Var PD_CODE3 = "##-##-##-####"
-			Var PD_STAGE_1 = "Disable2"
-			Var PD_STAGE_2 = $12-03-02-0026.Button
-			Var PD_STAGE_3 = "Disable2"
-			Var OverlayMenuFilter !assigned xmlpro( 12-03-02-0026, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
-			DEBUGVAR OverlayMenuFilter
-			Var SelectCountDrinkType = 0
-			Var DefaultDrinkType = 0
-			If PD_STAGE_1 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 1
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 2
-			EndIf
-			If PD_STAGE_3 = "Enable" Then
-				Var SelectCountDrinkType = SelectCountDrinkType + 1
-				Var DefaultDrinkType = 3
-			EndIf
-			If PD_STAGE_2 = "Enable" Then
-				Topping "Load" "12-03-02-0026"
-			Else
-				If PD_STAGE_1 = "Enable" Then
-				Topping "Load" "-"
-				Else
-				Topping "Load" "-"
-				EndIf
-			EndIf
-			Var menu_name_eng_hot = $##-##-##-####.NameE
-			Var menu_desc_eng_hot = $##-##-##-####.descriptionE
-			Var menu_name_thai_hot = $##-##-##-####.Name
-			Var menu_desc_thai_hot = $##-##-##-####.description
-			
-			Var menu_name_eng_cold = $12-03-02-0026.NameE
-			Var menu_desc_eng_cold = $12-03-02-0026.descriptionE
-			Var menu_name_thai_cold = $12-03-02-0026.Name
-			Var menu_desc_thai_cold = $12-03-02-0026.description
-			
-			Var menu_name_eng_blender = $##-##-##-####.NameE
-			Var menu_desc_eng_blender = $##-##-##-####.descriptionE
-			Var menu_name_thai_blender = $##-##-##-####.Name
-			Var menu_desc_thai_blender = $##-##-##-####.description
-			
-			DEBUGVAR PD_STAGE_1
-			DEBUGVAR PD_STAGE_2
-			DEBUGVAR PD_STAGE_3
-			Var SelectDrinkType = 0
-			
-			Open "ROOT/taobin_project/xml/page_topping_select5.xml"
-		</EventOnClick>
-		</Menu>
-
 		; ==================> Len = 20
 		; - 12-02-02-0043 - 
 		<Menu>

xml/v3/page_catalog_group_tea.xml

@@ -656,7 +656,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Northern Cocoa"
+					Var return = "Western Cocoa Thai Milk Tea"
 				Else
 					Var return = "โกโก้หริกุญชัย"
 				EndIf
@@ -764,7 +764,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Northern Strawberry Tea"
+					Var return = "Northern Strawberry Thai Milk Tea"
 				Else
 					Var return = "สตรอว์เบอร์รีล้านนา"
 				EndIf
@@ -872,7 +872,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Southern Coconut Thai Tea"
+					Var return = "Southern Coconut Thai Milk Tea"
 				Else
 					Var return = "ชาไทยมะพร้าวศรีวิชัย"
 				EndIf
@@ -980,7 +980,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Northeastern Lychee Thai Tea"
+					Var return = "Northeastern Lychee Thai Milk Tea"
 				Else
 					Var return = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
 				EndIf
@@ -1088,7 +1088,7 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Western Ume Tea"
+					Var return = "Eastern Ume Thai Milk Tea"
 				Else
 					Var return = "ชาบ๊วยทวารวดี"
 				EndIf
@@ -1520,9 +1520,9 @@
 		<Name>
 			eval(
 				If show_eng = "true" Then
-					Var return = "Kati Shake Matcha"
+					Var return = "Coconut Milk\nMatcha Ice Cream"
 				Else
-					Var return = "กะทิเชคมัทฉะญี่ปุ่น"
+					Var return = "เต่าบินไอติมถัง\nมัทฉะญี่ปุ่น"
 				EndIf
 			)
 		</Name>

xml/v3/page_catalog_with_vending.xml

@@ -63,14 +63,8 @@
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
 
-		If SoundThaiIndex = 1 Then
+		If SongkranSoundCampaign = 1 Then
-			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/taobin_sawade.wav"
+			Var PlaySoundLag = GreetingSound[SoundCampaignIndex]
-		EndIf
-		If SoundThaiIndex = 2 Then
-			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/taobin_sawade.wav"
-		EndIf
-		If SoundThaiIndex = 3 Then
-			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/taobin_sawade.wav"
 		EndIf
 
 		Play PlaySoundLag