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

2024-10-22 14:41:54 +07:00 · 2024-10-22 14:41:54 +07:00 · 44235333d1
commit 44235333d1
parent 33147a9041 17fe3d0998
19 changed files with 4561 additions and 729 deletions
--- a/inc/video.inc
+++ b/inc/video.inc
@ -103,7 +103,7 @@
            If ProReducedPriceEnable = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
            EndIf
-            If ProYuzu250Enable = 1 Then
+            If IgnoreProfileFromRunEV = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
            EndIf
            If UseSlideShowVideo = 1 Then
@ -198,7 +198,7 @@
        If ProReducedPriceEnable = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
        EndIf
-        If ProYuzu250Enable = 1 Then
+        If IgnoreProfileFromRunEV = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
        EndIf
        If UseSlideShowVideo = 1 Then
@ -297,7 +297,7 @@
            If ProReducedPriceEnable = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
            EndIf
-            If ProYuzu250Enable = 1 Then
+            If IgnoreProfileFromRunEV = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
            EndIf
            If UseSlideShowVideo = 1 Then
@ -355,7 +355,7 @@
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
        EndIf

-        If ProYuzu250Enable = 1 Then
+        If IgnoreProfileFromRunEV = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
        EndIf

--- a/inter/mys/xml/event/event_profile.ev
+++ b/inter/mys/xml/event/event_profile.ev
@ -7,14 +7,14 @@ STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce

 DEBUGVAR HasProYuzu250Concat
 DEBUGVAR ProReducedPriceEnable
-DEBUGVAR ProYuzu250Enable
+DEBUGVAR IgnoreProfileFromRunEV

 If ProReducedPriceEnable = 1 Then

 Else
    DEBUGVAR "Case pro reduce end"
    ; case-pro-reduce-end
-    If ProYuzu250Enable = 1 Then
+    If IgnoreProfileFromRunEV = 1 Then
        DEBUGVAR "Pro yuzu ongoing"
        ; concat-profile
        If HasProYuzu250Concat = "true" Then
@ -32,6 +32,12 @@ Else
                    DEBUGVAR XMLProfilePreEvent
                    Var XMLProfile = XMLProfilePreEvent + "-"
                    Var XMLProfile = XMLProfile + "PromoYuzu250"
+
+                    ; case-local-profile
+                    If XMLProfile = "Discount50-PromoYuzu250" Then
+                        DEBUGVAR "Restore Discount50 profile, also concat Yuzu"
+                        Var XMLProfile = "NoDis50ForProYuzu25"
+                    EndIf
                EndIf

            Else
@ -40,6 +46,12 @@ Else

                Var XMLProfile = XMLProfile + "-"
                Var XMLProfile = XMLProfile + "PromoYuzu250"
+
+                ; case-local-profile
+                If XMLProfile = "Discount50-PromoYuzu250" Then
+                    DEBUGVAR "No pro reduce but Discount50, concat pro yuzu"
+                    Var XMLProfile = "NoDis50ForProYuzu25"
+                EndIf
            EndIf
        EndIf
    Else
--- a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev
+++ b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev
@ -5,12 +5,12 @@
 DEBUGVAR FruityRayaEnable
 DEBUGVAR ProThaiTeaEnable
 DEBUGVAR ProYuzuEnable
-DEBUGVAR ProYuzu250Enable
+DEBUGVAR IgnoreProfileFromRunEV

 If OpenFromPageBoard = 1 Then

 	; has-ongoing-pro
-	If ProYuzu250Enable = 1 Then
+	If IgnoreProfileFromRunEV = 1 Then
        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"

 		Var OpenFromPageBoard = 0
@ -20,7 +20,7 @@ If OpenFromPageBoard = 1 Then
 Else

 	    ; has-ongoing-pro
-    If ProYuzu250Enable = 1 Then
+    If IgnoreProfileFromRunEV = 1 Then
        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"

        Var OpenFromPageBoard = 0
--- a/inter/mys/xml/event/tricker.ev
+++ b/inter/mys/xml/event/tricker.ev
@ -21,7 +21,7 @@ Var ProYuzuEnable = 0
 Var FromProYuzu = 0

 ; Yuzu Promo
-Var ProYuzu250Enable = 0
+Var IgnoreProfileFromRunEV = 0
 Var FromProYuzu250 = 0


@ -63,7 +63,7 @@ If SystemDateMonthInt = 10 Then
 		Var ProReducedPriceEnable = 1
 	EndIf

-    Var ProYuzu250Enable = 1
+    Var IgnoreProfileFromRunEV = 1
 EndIf

 If SystemDateMonthInt = 11 Then
@ -71,11 +71,11 @@ If SystemDateMonthInt = 11 Then
 		Var ProReducedPriceEnable = 1
 	EndIf

-    Var ProYuzu250Enable = 1
+    Var IgnoreProfileFromRunEV = 1
 EndIf

 If SystemDateMonthInt = 12 Then
-    Var ProYuzu250Enable = 1
+    Var IgnoreProfileFromRunEV = 1

    If SetProReduceByBO = 1 Then
        Var ProReducedPriceEnable = 0
@ -85,9 +85,9 @@ EndIf

 If SystemDateMonthInt = 1 Then
    If SystemDateDayInt < 16 Then
-        Var ProYuzu250Enable = 1
+        Var IgnoreProfileFromRunEV = 1
    Else
-        Var ProYuzu250Enable = 0
+        Var IgnoreProfileFromRunEV = 0
    EndIf
 EndIf

@ -114,7 +114,7 @@ If BoxID = 177746 Then
 	Var UseSlideShowVideo = 0

    ;Var ProReducedPriceEnable = 0
-	;Var ProYuzu250Enable = 1
+	;Var IgnoreProfileFromRunEV = 1
 EndIf

 If BoxID = 210037 Then
--- a/inter/mys/xml/page_catalog_group_forkid.lxml
+++ b/inter/mys/xml/page_catalog_group_forkid.lxml
@ -2353,11 +2353,11 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "SMOOTHIE STRAWKOKO"
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milk, Mango Syrup, and Iced"
+		Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup"
 		Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = "Susu, Sirap Mangga, Ais"
+		Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
--- a/inter/mys/xml/page_catalog_group_fruity_raya.lxml
+++ b/inter/mys/xml/page_catalog_group_fruity_raya.lxml
@ -2876,11 +2876,11 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "SMOOTHIE STRAWKOKO"
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milk, Mango Syrup, and Iced"
+		Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup"
 		Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = "Susu, Sirap Mangga, Ais"
+		Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
--- a/inter/mys/xml/page_catalog_group_milk.lxml
+++ b/inter/mys/xml/page_catalog_group_milk.lxml
@ -2610,11 +2610,11 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "SMOOTHIE STRAWKOKO"
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milk, Mango Syrup, and Iced"
+		Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup"
 		Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = "Susu, Sirap Mangga, Ais"
+		Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi"
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
--- a/inter/sgp/xml/page_collect_point_1.lxml
+++ b/inter/sgp/xml/page_collect_point_1.lxml
@ -1188,7 +1188,7 @@


 	Var TaobinLevel = "2"
-	Var CoffeePoint = 55
+	Var CoffeePoint = 54


 </EventUnitTest1>
--- a/inter/sgp/xml/page_collect_point_2.lxml
+++ b/inter/sgp/xml/page_collect_point_2.lxml
@ -43,11 +43,12 @@
 		Var Seeker.TNumberTaobinMember= TelephoneNumber

        Var TaobinLevel = 2
-        Var CoffeePointRank = 55
+        Var CoffeePointRank = 54
        DEBUGVAR TaobinLevel

 		; reset
 		Var DebugBypassCollectPt2 = 0
+		Var DebugCupSGP = 1

 		Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
 	EndIf
@ -143,6 +144,8 @@
 				Var TelephoneNumber = TelephoneNumberX

 			If UseSGPCollectFlag = 1 Then
+				DEBUGVAR Param1
+				DEBUGVAR "ActionOk GETACCEXT 35"
 				GETACCEXT Param1 35
 			Else
    			GETACCEXT TelephoneNumber 14
--- a/inter/sgp/xml/page_collect_point_3.lxml
+++ b/inter/sgp/xml/page_collect_point_3.lxml
@ -52,6 +52,10 @@
 	Var pImage = pImage / 55
 	Var pImageStr = "/taobinPoint55.png"

+	If DebugCupSGP = 1 Then
+		Var pImageStr = "/taobinPoint55_debug.png"
+	EndIf
+
 	If UsePepsiTheme = 1 Then
 		Var pImageStr = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member" + pImageStr
 	Else
@ -276,7 +280,10 @@

 				Var TaobinLevelDesc1More = "SILVER LEVEL"
            	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 150
+				; reset-rank
+				DEBUGVAR CoffeePointRank
+				Var CoffeePointRank = 0
+				DEBUGVAR CoffeePointRank

 			EndIf

@ -285,14 +292,19 @@
        If TaobinLevel = "3" Then
            ;Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp

-            Var PointDiff = 350 - CoffeePointRank
-            Var TaobinLevelDesc2 = "Earn " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"
+            ;Var PointDiff = 350 - CoffeePointRank
+            ;Var TaobinLevelDesc2 = "Earn " + PointDiff
+            ;Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
+            ;Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"

            Var TaobinLeveImg = "/WTCLevel2.png"
+			Var TaobinLevelDesc1 =  "CUPPING"
+			Var TaobinLevelDesc1Cont = "BETTER!"

-			If CoffeePointRank > 349 Then
+
+			Var TaobinLevelDesc1More = "SILVER LEVEL"
+
+			If CoffeePointRank > 199 Then
 				Var TaobinLeveImg = "/WTCLevel3.png"

 				Var TaobinLevelDesc1 =  "CUPPING"
@ -300,7 +312,10 @@

 				Var TaobinLevelDesc1More = "GOLD LEVEL"
            	Var TaobinLevelDesc2 = ""
-				Var CoffeePointRank = CoffeePointRank - 350
+				;Var CoffeePointRank = CoffeePointRank - 199
+				DEBUGVAR CoffeePointRank
+				Var CoffeePointRank = 0
+				DEBUGVAR CoffeePointRank

 			EndIf

@ -312,18 +327,28 @@
            Var TaobinLevelDesc2 = ""

            Var TaobinLeveImg = "/WTCLevel3.png"
+
+			Var TaobinLevelDesc1 =  "CUPPING"
+			Var TaobinLevelDesc1Cont = "BEST!"
+
+			Var TaobinLevelDesc1More = "GOLD LEVEL"
+			Var TaobinLevelDesc2 = ""
        EndIf

 	EndIf

-
+	DEBUGVAR TaobinLevel
+	DEBUGVAR TaobinLevelDesc1
+	DEBUGVAR TaobinLevelDesc1Cont
+	DEBUGVAR TaobinLevelDesc1More
+	DEBUGVAR CoffeePointRank


 	Var CheckCoupons = 0
 	Var MakeDrinkState = 0

 	; X Y taobin
-	Var ShellXCol1 = 170
+	Var ShellXCol1 = 168
 	Var ShellXCol2 = 268
 	Var ShellXCol3 = 367
 	Var ShellXCol4 = 467
@ -333,19 +358,19 @@
 	Var ShellXCol8 = 860

 	; 1-8
-	Var ShellYRow1 = 1042
+	Var ShellYRow1 = 1045
 	; 9-16
 	Var ShellYRow2 = 1125
 	; 17-24
-	Var ShellYRow3 = 1213
+	Var ShellYRow3 = 1208
 	; 25-32
 	Var ShellYRow4 = 1292
 	; 33-40
 	Var ShellYRow5 = 1375
 	; 41-48
-	Var ShellYRow6 = 1458
+	Var ShellYRow6 = 1453
 	; 49-55
-	Var ShellYRow7 = 1541
+	Var ShellYRow7 = 1536


 	Var taobinP1 = "Invisible"
@ -939,7 +964,7 @@
 		Var Timeout = 0
 	EndIf

-	If Timeout > 5 Then
+	If Timeout > 25 Then

    	; goto lid straw
    	If CoffeePoint > 54 Then
@ -1528,8 +1553,8 @@

 ; free
 <Button>
-<X> 740 </X>
-<Y> 1535 </Y>
+<X> 745 </X>
+<Y> 1525 </Y>
 <Filename> Free1 </Filename>
 </Button>

--- a/inter/uae_dubai/menu/lang.tsv
+++ b/inter/uae_dubai/menu/lang.tsv
@ -1,12 +1,13 @@
 TextID	Note	English	arabic

-		Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center	Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center
+		Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center	Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center
 000001	Page catalog head	Welcome	مرحباً
-		Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center
+		Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center	Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center
 000002		Please Select Drink Type	الرجاء تحديد نوع المشروب


-		Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
+		Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30
+		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30
 000003	Page catalog body	Our Specialty	تخصصنا
 000004		Vending\nMachine	آلة البيع\n
 000005		Coffee	قهوة
@ -23,8 +24,8 @@ TextID	Note	English	arabic
 000013		UNAVAILABLE	غير متوفره


-		Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All
-		Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All
+		Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All	Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All
+		Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All	Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All
 000014		our specialty	تخصصنا
 000015		Coffee	قهوة
 000016		Tea	شاي
@ -39,89 +40,89 @@ TextID	Note	English	arabic


 	page_toopping_select
-		Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center
-		Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center
-		Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center
+		Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center
+		Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center
 000040		Not sweet	ليس لطيفا
 000041		Little	قليل
 000042		Less	أقل
 000043		Perfect	ممتاز
 000044		Extra	إضافي
 000045		Sweetest	أحلى
-		Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center
+		Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center
 		Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center
-		Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center
+		Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center
 000046		0%	0%
 000047		20%	20%
 000048		40%	40%
 000049		60%	60%
 000050		80%	80%
 000051		100%	100%
-		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
-		Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center	Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center
+		Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center	Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center
 000052		No added sugar	السكر لا تضاف
 000053		Less sweet	أقل حلاوة
 000054		Healthy sweet	صحي حلو
 000055		Just right	مجرد حق

-		Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center
+		Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center
 		Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center
-000056		#ERROR!	#ERROR!
-000057		#ERROR!	#ERROR!
-000058		#ERROR!	#ERROR!
-000059		#ERROR!	#ERROR!
+000056		=+ SUGAR 0 g (0 cal)	=+ سكر 0 جم (0 سعر حراري)
+000057		=+ SUGAR 3 g (11 cal)	=+ سكر3 جم (11 سعر حراري)
+000058		=+ SUGAR 7 g (26 cal)	=+ سكر 7 جم (26 سعر حراري)
+000059		=+ SUGAR 10 g (38 cal)	=+ سكر 10 جم (38 سعر حراري)

-000060		#ERROR!	#ERROR!
-000061		#ERROR!	#ERROR!
-000062		#ERROR!	#ERROR!
-000063		#ERROR!	#ERROR!
+000060		=+ SUGAR 0 g (0 cal)	=+ سكر 0 جم (0 سعر حراري)
+000061		=+ SUGAR 2 g (8 cal)	=+ سكر 2 جم (8 سعر حراري)
+000062		=+ SUGAR 5 g (19 cal)	=+ سكر 5 جم (19 سعر حراري)
+000063		=+ SUGAR 7 g (26 cal)	=+ سكر 7 جم (26 سعر حراري)

-		Font=Kanit,Type=Medium,Size=36,Color=0xDE794E	Font=Kanit,Type=Medium,Size=36,Color=0xDE794E
+		Font=Kanit,Type=Medium,Size=36,Color=0x0025FF	Font=Kanit,Type=Medium,Size=36,Color=0x0025FF
 000064		Extra topping	تتصدر اضافية
 000065		Sweetness level	مستوى الحلاوة
 000066		Straw and Lid	القش والغطاء
 000067		Drink Type	نوع الشراب
 000103		Vegan substitution	استبدال نباتي
 	Text 
-		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
+		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF	Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
 000070		I want a straw	أريد القش
 000071		I want a lid	أريد غطاء

-		Font=Opun,Type=Medium,Size=10,Color=0xDE794E	Font=Opun,Type=Medium,Size=10,Color=0xDE794E
+		Font=Opun,Type=Medium,Size=10,Color=0x8092FF	Font=Opun,Type=Medium,Size=10,Color=0x8092FF
 000072		Ice will be ready at	سيكون الثلج جاهزًا في

 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
-		Font=Kanit,Type=Regular,Size=36,Color=0x746253	Font=Kanit,Type=Regular,Size=36,Color=0x746253
+		Font=Kanit,Type=Regular,Size=36,Color=0x746253	Font=Kanit,Type=Regular,Size=36,Color=0x746254
 000073		Pay now	ادفع الآن
-		Font=Kanit,Type=Regular,Size=36,Color=0x746253	Font=Kanit,Type=Regular,Size=36,Color=0x746253
+		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF	Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
 000074		Cancel	يلغي
 		Font=Kanit,Type=Light,Size=36,Color=0xFF0000	Font=Kanit,Type=Light,Size=36,Color=0xFF0000
 000075		Please choose drink type	الرجاء اختيار نوع المشروب


-		Font=Kanit,Type=Regular,Size=28,Color=0x513C2F	Font=Kanit,Type=Regular,Size=28,Color=0x513C2F
-		Font=Kanit,Type=Medium,Size=28,Color=0x513C2F	Font=Kanit,Type=Medium,Size=28,Color=0x513C2F
-		Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D	Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D
-		Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF	Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF
+		Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF	Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF
+		Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF	Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF
+		Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF	Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF
+		Font=Kanit,Type=Regular,Size=28,Color=0x8092FF	Font=Kanit,Type=Regular,Size=28,Color=0x8092FF
 000081		Hot	حار
 000082		Iced	مثلج
 000083		Blend	يمزج
-		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
+		Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF	Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF
 000084		Normal	طبيعي




 	Left of check box
-		Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30	Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30
+		Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=30	Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=31
 000090		Out of straw	من القش
 000091		Out of lid	خارج الغطاء
 000092		Only smoothie\n avalible	يتوفر عصير\n فقط
 000093		Extra shot unavalible for\nsmoothie	اللقطة الإضافية غير متاحة\nللعصير

 	Text topping extra
-		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
+		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=47
 000100		1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15]	جرعة واحدة من قهوة الإسبريسو\n[ستتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15]
 000101		Add extra Oreo crunchy	أضف كمية إضافية من الأوريو المقرمش
 000102		1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15]	جرعة واحدة من قهوة الإسبريسو ذات الأصل الواحد\n[ستتم إضافة دقيقة واحدة إلى العملية.###Font=KanitLight,Size=15]
@ -141,8 +142,8 @@ TextID	Note	English	arabic
 000401		Notify us about straw problem	أخبرنا عن مشكلة القش


-		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center
-		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,Align=Center
+		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=31
+		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=31
 000402		Get another straw	احصل على قشة أخرى
 000403		Get a lid	احصل على غطاء
 000404		In progress	في تَقَدم
@ -157,11 +158,12 @@ TextID	Note	English	arabic
 000407		Order next drink	اطلب المشروب التالي
 		Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center	Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center
 000408		Next customer can order while waiting	يمكن للعميل التالي الطلب أثناء الانتظار
-		Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90	Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
+		Font=Roboto,Type=Bold,Size=80,Color=0x0025FF,Align=Center,LineHeight=90	Font=Roboto,Type=Bold,Size=80,Color=0x0025FF,Align=Center,LineHeight=91
 000409		The Previous Drink\nHas Not Been Collected	لم يتم جمع المشروب السابق\n
-		Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50
+		Font=Roboto,Type=Regular,Size=36,Color=0x0025FF,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=36,Color=0x0025FF,Align=Center,LineHeight=51
 000410		Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink.	الرجاء الضغط على الزر أدناه لفتح الباب.\nأخرج المشروب.\nوابدأ في تقديم مشروبك.
-		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=51
+		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=51
 000411		Press Here	اضغط هنا


@ -1076,7 +1078,7 @@ TextID	Note	English	arabic
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@ -1089,7 +1091,7 @@ TextID	Note	English	arabic
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
--- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
@ -18219,7 +18219,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE"
-		Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي"
+		Var NameLang[2][1] = "شاي تايلاندي كافيه لاتيه سموثي"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
@ -22810,6 +22810,546 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 53-01-02-0068 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 53-01-02-0068.Button,$Sum5301020068) </State> 
+	<Button>
+	<State> $Sum5301020068 </State> 
+	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_hot_americano_Coconut.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_hot_americano_Coconut.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_hot_americano_Coconut.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/uae_dubai/image/page_drink_picture2_n/" + "bn_hot_americano_Coconut.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $53-01-02-0068.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "53-01-02-0068"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "COCONUT\nAMERICANO"
+		Var aliasDesc[0] = "Espresso, Coconut Syrup, Sugar, Water"
+		Var aliasName[1] = "COCONUT\nAMERICANO"
+		Var aliasDesc[1] = "Espresso, Coconut Syrup, Sugar, Water"
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "-"
+		Var aliasDesc[5] = "-"
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "Iced COCONUT AMERICANO"
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Espresso, Coconut Syrup, Sugar, Water"
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $53-01-02-0068.Button
+		Var PD_STAGE_3 = "Disable2"
+		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" "53-01-02-0068"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> HeadlineColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>COCONUT\nAMERICANO</LanguageSlot1>
+		<LanguageSlot2>COCONUT\nAMERICANO</LanguageSlot2>
+		<LanguageSlot3>COCONUT\nAMERICANO</LanguageSlot3>
+		<LanguageSlot4>COCONUT\nAMERICANO</LanguageSlot4>
+		<LanguageSlot5>COCONUT\nAMERICANO</LanguageSlot5>
+		<LanguageSlot6>COCONUT\nAMERICANO</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> BodyTextColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot1>
+		<LanguageSlot2>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot2>
+		<LanguageSlot3>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot3>
+		<LanguageSlot4>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot4>
+		<LanguageSlot5>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot5>
+		<LanguageSlot6>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $53-01-02-0068.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $53-01-02-0068.Button </State>
+	<Value> StringFmt( $53-01-02-0068.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5301020068 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $53-01-02-0068.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> WTCMediumBlueColor </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5301020068 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 53-21-02-0068 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 53-21-02-0068.Button,$Sum5321020068) </State> 
+	<Button>
+	<State> $Sum5321020068 </State> 
+	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_hot_americano_Coconut.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_hot_americano_Coconut.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_hot_americano_Coconut.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/uae_dubai/image/page_drink_picture2_n/" + "bn_hot_americano_Coconut.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $53-21-02-0068.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "53-21-02-0068"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "COCONUT\nAMERICANO"
+		Var aliasDesc[0] = "Espresso, Coconut Syrup, Sugar, Water"
+		Var aliasName[1] = "COCONUT\nAMERICANO"
+		Var aliasDesc[1] = "Espresso, Coconut Syrup, Sugar, Water"
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "-"
+		Var aliasDesc[5] = "-"
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "Iced COCONUT AMERICANO"
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Espresso, Coconut Syrup, Sugar, Water"
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $53-21-02-0068.Button
+		Var PD_STAGE_3 = "Disable2"
+		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" "53-21-02-0068"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> HeadlineColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>COCONUT\nAMERICANO</LanguageSlot1>
+		<LanguageSlot2>COCONUT\nAMERICANO</LanguageSlot2>
+		<LanguageSlot3>COCONUT\nAMERICANO</LanguageSlot3>
+		<LanguageSlot4>COCONUT\nAMERICANO</LanguageSlot4>
+		<LanguageSlot5>COCONUT\nAMERICANO</LanguageSlot5>
+		<LanguageSlot6>COCONUT\nAMERICANO</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> BodyTextColor </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot1>
+		<LanguageSlot2>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot2>
+		<LanguageSlot3>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot3>
+		<LanguageSlot4>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot4>
+		<LanguageSlot5>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot5>
+		<LanguageSlot6>Espresso, Coconut Syrup, Sugar, Water</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $53-21-02-0068.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $53-21-02-0068.Button </State>
+	<Value> StringFmt( $53-21-02-0068.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5321020068 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $53-21-02-0068.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> WTCMediumBlueColor </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5321020068 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart
--- a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
@ -2937,7 +2937,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO"
-		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية"
+		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
--- a/inter/uae_dubai/xml/page_catalog_group_health.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml
@ -4288,7 +4288,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Matcha and Hot water"
-		Var DescLang[0][1] = "ماتشا وماء ساخن"
+		Var DescLang[0][1] = "ماتشا والماء الساخن"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@ -5384,7 +5384,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@ -5396,7 +5396,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
--- a/inter/uae_dubai/xml/page_catalog_group_milk.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_milk.lxml
@ -3738,7 +3738,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO"
-		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية"
+		Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
--- a/inter/uae_dubai/xml/page_catalog_group_other.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml
--- a/inter/uae_dubai/xml/page_catalog_group_tea.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_tea.lxml
--- a/inter/whatthecup/sgp/image/page_member/points_alert.png
+++ b/inter/whatthecup/sgp/image/page_member/points_alert.png
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1195,10 +1195,11 @@
 		EndIf
 	EndIf

-	If ProYuzu250Enable = "" Then
-		Var ProYuzu250Enable = 0
+	If IgnoreProfileFromRunEV = "" Then
+		Var IgnoreProfileFromRunEV = 0
 	EndIf
-	If ProYuzu250Enable = 0 Then
+
+	If IgnoreProfileFromRunEV = 0 Then
 		TRY "ROOT/taobin_project/xml/profile/run.ev"
 	EndIf

@ -1328,7 +1329,12 @@
    ; lang-lock-until-done
 	If LangProcess = "Done" Then
 	    Var ShowButtonClick = "Enable"
-        ;Var ShowButtonClickFull = "Enable"
+
+		If UsePepsiTheme = 1 Then
+			Var ShowButtonClickFull = "Enable"
+		EndIf
+
+
    Else
        Var ShowButtonClick = "Invisible"
        Var ShowButtonClickFull = "Invisible"