Merge branch 'masterpiece' into sgp_blue

adv/sync_1.file

@@ -1,5 +1,5 @@
-total 245024
+total 248844
--rw-rw---- 1 root sdcard_rw        0 2024-08-28 10:42 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2024-09-13 10:15 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  3647528 2023-09-18 18:44 taobin_adv_01.mp4
 -rw-rw---- 1 root sdcard_rw  8456105 2024-03-18 16:14 taobin_adv_02.mp4
@@ -26,12 +26,12 @@ total 245024
 -rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4
 -rw-rw---- 1 root sdcard_rw  7482104 2024-04-11 15:57 taobin_adv_menu_03.mp4
 -rw-rw---- 1 root sdcard_rw  8099405 2024-08-20 17:10 taobin_adv_menu_04.mp4
--rw-rw---- 1 root sdcard_rw  3877835 2024-07-12 17:16 taobin_adv_menu_05.mp4
+-rw-rw---- 1 root sdcard_rw  5209838 2024-08-30 17:36 taobin_adv_menu_05.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4
 -rw-rw---- 1 root sdcard_rw 13259746 2023-11-06 22:07 taobin_adv_menu_07.mp4
 -rw-rw---- 1 root sdcard_rw  1422061 2024-08-19 16:55 taobin_adv_menu_08.mp4
 -rw-rw---- 1 root sdcard_rw  3876868 2024-05-29 09:16 taobin_adv_menu_09.mp4
--rw-rw---- 1 root sdcard_rw  9357158 2024-08-27 15:54 taobin_adv_menu_10.mp4
+-rw-rw---- 1 root sdcard_rw 11866329 2024-09-02 15:56 taobin_adv_menu_10.mp4
 -rw-rw---- 1 root sdcard_rw  1421871 2024-02-22 08:57 taobin_adv_menu_11.mp4
 -rw-rw---- 1 root sdcard_rw  1151618 2024-06-14 16:56 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw   258907 2023-09-18 18:44 taobin_adv_menu_13.mp4

inter/mys/image/event/image_template1

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
-normal_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
-press_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+press_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
-press_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
+press_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
-disable_eng=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
+disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png
-disable_thai=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
+disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_yuzu_250/pro_yuzu_250.png

inter/mys/xml/event/event_profile.ev

@@ -0,0 +1,33 @@
+TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/tricker.ev"
+
+Var XMLProfilePreEvent = XMLProfile
+DEBUGVAR XMLProfile
+STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
+STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
+
+DEBUGVAR HasProYuzu250Concat
+DEBUGVAR ProReducedPriceEnable
+DEBUGVAR ProYuzu250Enable
+
+If ProReducedPriceEnable = 1 Then
+
+Else
+    ; case-pro-reduce-end
+    If ProYuzu250Enable = 1 Then
+        ; concat-profile
+        If HasProYuzu250Concat = "true" Then
+
+        Else
+        
+            If IsProfileReduce = "true" Then
+        
+            Else
+                CacheVarStr "put" XMLProfilePreEvent
+
+                Var XMLProfile = XMLProfile + "-"
+                Var XMLProfile = XMLProfile + "PromoYuzu250"
+            EndIf
+        EndIf
+    EndIf
+
+EndIf

inter/mys/xml/event/out_put_file1.txt

@@ -1 +1 @@
-/event/promotion_pepsi_099.lxml
+/event/promotion_yuzu_250.lxml

inter/mys/xml/event/promotion_onclick1.inc

@@ -1,84 +1 @@
-Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi.png"
+    Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu_250.lxml"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = 99
-		Var PriceD3 = $12-05-03-0007.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0007"
-		Var PD_CODE3 = "12-05-03-0007"
-		; begin lang 
-		Var aliasName[0] = "PEPSI"
-		Var aliasDesc[0] = "Pepsi & Ice"
-		Var aliasName[1] = "เป๊ปซี่น้ำแข็ง"
-		Var aliasDesc[1] = "เป๊ปซี่"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
-		Var aliasName[4] = "PEPSI"
-		Var aliasDesc[4] = "Pepsi, Ais"
-		Var NameLang[0][0] = ""
-		Var NameLang[0][1] = ""
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = ""
-		Var DescLang[0][0] = ""
-		Var DescLang[0][1] = ""
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = ""
-		Var NameLang[1][0] = "PEPSI"
-		Var NameLang[1][1] = "เป๊ปซี่น้ำแข็ง"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "PEPSI"
-		Var DescLang[1][0] = "Pepsi, Ice"
-		Var DescLang[1][1] = "เป๊ปซี่ และน้ำแข็ง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Pepsi, Ais"
-		Var NameLang[2][0] = "TAO SLUSHIE"
-		Var NameLang[2][1] = "เต่าสลัชชี่"
-		Var NameLang[2][2] = ""
-		Var NameLang[2][3] = ""
-		Var NameLang[2][4] = "TAO SLUSHIE"
-		Var DescLang[2][0] = "Pepsi, Ice"
-		Var DescLang[2][1] = "เป๊ปซี่ และน้ำแข็ง"
-		Var DescLang[2][2] = ""
-		Var DescLang[2][3] = ""
-		Var DescLang[2][4] = "Pepsi, Ais"
-		; end lang 
-		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0007.Button
-		Var PD_STAGE_3 = $12-05-03-0007.Button
-		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-0007"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "12-05-03-0007"
-			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"

inter/mys/xml/event/script_common_for_open_promotion_xml.ev

@@ -5,36 +5,13 @@
 DEBUGVAR FruityRayaEnable
 DEBUGVAR ProThaiTeaEnable
 DEBUGVAR ProYuzuEnable
-
+DEBUGVAR ProYuzu250Enable
-Var CountEnablePromotion = 0
-Var PromotionState1 = "Invisible"
-Var PromotionState2 = "Invisible"
-
-If ProThaiTeaEnable = 1 Then
-	Var PromotionState1 = "Enable"
-	Var CountEnablePromotion = CountEnablePromotion + 1
-EndIf
-
-If ProYuzuEnable = 1 Then
-	Var PromotionState2 = "Enable"
-	Var CountEnablePromotion = CountEnablePromotion + 1
-EndIf
-
-DEBUGVAR CountEnablePromotion
 
 If OpenFromPageBoard = 1 Then
 
 	; has-ongoing-pro
-	If CountEnablePromotion >= 1 Then
+	If ProYuzu250Enable = 1 Then
-		Var BigButtonEnable = "Enable"
+        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
-
-		If CountEnablePromotion = 1 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
-		EndIf
-
-		If CountEnablePromotion = 2 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
-		EndIf
 
 		Var OpenFromPageBoard = 0
 	Else
@@ -42,21 +19,13 @@ If OpenFromPageBoard = 1 Then
 	EndIf
 Else
 
-	; has-ongoing-pro
+	    ; has-ongoing-pro
-	If CountEnablePromotion >= 1 Then
+    If ProYuzu250Enable = 1 Then
-		Var BigButtonEnable = "Enable"
+        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
 
-		If CountEnablePromotion = 1 Then
+        Var OpenFromPageBoard = 0
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
+    Else
-		EndIf
+        OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
-
+    EndIf
-		If CountEnablePromotion = 2 Then
-			OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
-		EndIf
-
-		Var OpenFromPageBoard = 0
-	Else
-		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
-	EndIf
 EndIf
 Var OpenFromPageBoard = 0

inter/mys/xml/event/tricker.ev

@@ -20,6 +20,10 @@ Var FromProThaiTea = 0
 Var ProYuzuEnable = 0
 Var FromProYuzu = 0
 
+; Yuzu Promo
+Var ProYuzu250Enable = 0
+Var FromProYuzu250 = 0
+
 
 ; Pro free oreo topping
 Var PromotionOreoToppingFreeEnable = 0
@@ -40,37 +44,6 @@ Var EnablePayLaterMode = 0
 ; Slide show Video
 Var UseSlideShowVideo = 0
 
-If SystemDateMonthInt = 6 Then
-	If SystemDateDayInt >= 15 Then
-		Var ProThaiTeaEnable = 1
-	Else
-		Var ProThaiTeaEnable = 0
-	EndIf
-EndIf
-
-
-If SystemDateMonthInt = 7 Then
-    Var ProThaiTeaEnable = 1
-
-    If SystemDateDayInt >= 15 Then
-		Var ProYuzuEnable = 1
-    Else
-    	Var ProYuzuEnable = 0
-    EndIf
-EndIf
-
-If SystemDateMonthInt = 8 Then
-	If SystemDateDayInt < 31 Then
-		Var ProThaiTeaEnable = 1
-		Var ProYuzuEnable = 1
-	Else
-		Var ProThaiTeaEnable = 0
-		Var ProYuzuEnable = 0
-
-		Var PromotionOreoToppingFreeEnable = 1
-	EndIf
-EndIf
-
 If SystemDateMonthInt = 9 Then
 	If SystemDateDayInt < 17 Then
 		Var PromotionOreoToppingFreeEnable = 1
@@ -86,16 +59,29 @@ If SystemDateMonthInt = 10 Then
 	If SetProReduceByBO = 1 Then
 		Var ProReducedPriceEnable = 1
 	EndIf
+ 
+    Var ProYuzu250Enable = 1
 EndIf
 
 If SystemDateMonthInt = 11 Then
 	If SetProReduceByBO = 1 Then
 		Var ProReducedPriceEnable = 1
 	EndIf
+    
+    Var ProYuzu250Enable = 1
 EndIf
 
+If SystemDateMonthInt = 12 Then
+    Var ProYuzu250Enable = 1
+EndIf
 
-
+If SystemDateMonthInt = 1 Then
+    If SystemDateDayInt < 16 Then
+        Var ProYuzu250Enable = 1
+    Else
+        Var ProYuzu250Enable = 0
+    EndIf
+EndIf
 
 If BoxID = 177746 Then
 	Var ProThaiTeaEnable = 1
@@ -107,6 +93,9 @@ If BoxID = 177746 Then
 	;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
 
 	Var UseSlideShowVideo = 0
+
+    Var ProReducedPriceEnable = 0
+	Var ProYuzu250Enable = 1
 EndIf
 
 If BoxID = 210037 Then

inter/mys/xml/menu_new_layout_gen_v2.py

@@ -189,9 +189,12 @@
         if "thai_tea" in current_file_name:
           out_xml( '\t\tVar FromProThaiTea = 1 \r\n')
         
-        if "yuzu" in current_file_name:
+        if "yuzu" in current_file_name and "250" not in current_file_name:
           out_xml( '\t\tVar FromProYuzu = 1 \r\n')
         
+        if "yuzu_250" in current_file_name:
+          out_xml( '\t\tVar FromProYuzu250 = 1 \r\n')
+
         
         out_xml( '\t\t\r\n')
         out_xml( '\t\t\r\n')

inter/mys/xml/page_catalog_group_pro_yuzu_250.skt

@@ -0,0 +1,46 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    
+    Var FromProYuzu250 = 0
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.xml
+    ?>
+
+</EventOpen>
+
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

inter/mys/xml/page_collect_point_1.lxml

@@ -127,15 +127,12 @@
 	
 	DEBUGVAR PepweenCollectPoint
 
-	DEBUGVAR ProBadValentineEnable
-	DEBUGVAR FromBadValentinePro
-	DEBUGVAR LipitPro
-	DEBUGVAR FromLipitPro
 	DEBUGVAR FruityRayaEnable
 	DEBUGVAR FromFruityRaya
 	DEBUGVAR ProThaiTeaEnable
 	DEBUGVAR FromProThaiTea
 	DEBUGVAR FromProYuzu
+	DEBUGVAR FromProYuzu250
 	
 	If Seeker.TNumberTaobinCredit = "" Then
 	

inter/uae_dubai/menu/lang.tsv

@@ -1018,7 +1018,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. เลือกทิศทาง
@@ -1031,7 +1031,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. ทดสอบการบด

inter/uae_dubai/xml/event/tricker.ev

@@ -6,6 +6,7 @@
 
 ; Reset flag away.
 
+Var SettingIgnoreCollectPoint = 1
 
 DEBUGVAR Propepsi99Enable
 DEBUGVAR DisplayFormatFull

inter/uae_dubai/xml/page_catalog_group_coffee.lxml

@@ -3469,7 +3469,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -6755,7 +6755,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -7023,7 +7023,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7035,7 +7035,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -10311,7 +10311,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -14645,7 +14645,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -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] = ""

inter/uae_dubai/xml/page_catalog_group_health.lxml

@@ -1828,7 +1828,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -2102,7 +2102,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][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] = ""
@@ -7040,7 +7040,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice"
-		Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج"
+		Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_other.lxml

@@ -955,15 +955,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 53-05-02-0062 53-05-03-0062 
+	; - 53-05-02-0062 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0062.Button,53-05-03-0062.Button,$Sum53050200625305030062) </State> 
+	<State> Flag( 53-05-02-0062.Button,$Sum5305020062) </State> 
 	<Button>
-	<State> $Sum53050200625305030062 </State> 
+	<State> $Sum5305020062 </State> 
 	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@@ -974,10 +974,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $53-05-02-0062.Price
-		Var PriceD3 = $53-05-03-0062.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "53-05-02-0062"
-		Var PD_CODE3 = "53-05-03-0062"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black"
 		Var aliasDesc[0] = "Pepsi Black, Ice"
@@ -1015,13 +1015,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI  Black Smoothie"
+		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] = "Pepsi, Ice"
+		Var DescLang[2][0] = ""
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -1030,7 +1030,7 @@
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $53-05-02-0062.Button
-		Var PD_STAGE_3 = $53-05-03-0062.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -1051,7 +1051,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "53-05-03-0062"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -1144,7 +1144,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $53-05-03-0062.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -1154,8 +1154,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $53-05-03-0062.Button </State>
+	<State> "Invisible" </State>
-	<Value> StringFmt(  $53-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1180,10 +1180,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum53050200625305030062 = "Disable" Then
+			If $Sum5305020062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $53-05-02-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0062.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -1217,7 +1217,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum53050200625305030062 </State> 
+	<State> $Sum5305020062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
@@ -5870,7 +5870,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Pepsi, Banana Syrup& Ice"
-		Var DescLang[1][1] = "بيبسي، شراب موز و ثلج"
+		Var DescLang[1][1] = "بيبسي، شراب الموز والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -6085,15 +6085,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 53-05-02-0074 53-05-03-0074 
+	; - 53-05-02-0074 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0074.Button,53-05-03-0074.Button,$Sum53050200745305030074) </State> 
+	<State> Flag( 53-05-02-0074.Button,$Sum5305020074) </State> 
 	<Button>
-	<State> $Sum53050200745305030074 </State> 
+	<State> $Sum5305020074 </State> 
 	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_plum.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_plum.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_plum.png" </FilenameDisable>
@@ -6104,10 +6104,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $53-05-02-0074.Price
-		Var PriceD3 = $53-05-03-0074.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "53-05-02-0074"
-		Var PD_CODE3 = "53-05-03-0074"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black PLUM"
 		Var aliasDesc[0] = "Pepsi Black, Ume Syrup & Ice"
@@ -6145,13 +6145,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI Black PLUM Smoothie"
+		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] = "Pepsi Black, Ume Syrup & Ice"
+		Var DescLang[2][0] = ""
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -6160,7 +6160,7 @@
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $53-05-02-0074.Button
-		Var PD_STAGE_3 = $53-05-03-0074.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -6181,7 +6181,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "53-05-03-0074"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6274,7 +6274,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $53-05-03-0074.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -6284,8 +6284,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $53-05-03-0074.Button </State>
+	<State> "Invisible" </State>
-	<Value> StringFmt(  $53-05-03-0074.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6310,10 +6310,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum53050200745305030074 = "Disable" Then
+			If $Sum5305020074 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $53-05-02-0074.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0074.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -6347,7 +6347,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum53050200745305030074 </State> 
+	<State> $Sum5305020074 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
@@ -6355,15 +6355,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 53-05-02-0075 53-05-03-0075 
+	; - 53-05-02-0075 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0075.Button,53-05-03-0075.Button,$Sum53050200755305030075) </State> 
+	<State> Flag( 53-05-02-0075.Button,$Sum5305020075) </State> 
 	<Button>
-	<State> $Sum53050200755305030075 </State> 
+	<State> $Sum5305020075 </State> 
 	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
@@ -6374,10 +6374,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $53-05-02-0075.Price
-		Var PriceD3 = $53-05-03-0075.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "53-05-02-0075"
-		Var PD_CODE3 = "53-05-03-0075"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black MELON"
 		Var aliasDesc[0] = "Pepsi Black, Melon Syrup& Ice"
@@ -6415,13 +6415,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI Black MELON Smoothie"
+		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] = "Pepsi Black, Melon Syrup& Ice"
+		Var DescLang[2][0] = ""
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -6430,7 +6430,7 @@
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $53-05-02-0075.Button
-		Var PD_STAGE_3 = $53-05-03-0075.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -6451,7 +6451,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "53-05-03-0075"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6544,7 +6544,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $53-05-03-0075.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -6554,8 +6554,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $53-05-03-0075.Button </State>
+	<State> "Invisible" </State>
-	<Value> StringFmt(  $53-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6580,10 +6580,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum53050200755305030075 = "Disable" Then
+			If $Sum5305020075 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $53-05-02-0075.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0075.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -6617,7 +6617,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum53050200755305030075 </State> 
+	<State> $Sum5305020075 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>

inter/uae_dubai/xml/page_catalog_group_recommend.lxml

@@ -6201,7 +6201,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -6469,7 +6469,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -6481,7 +6481,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -5582,7 +5582,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -5850,7 +5850,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -5862,7 +5862,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_tea.lxml

@@ -2923,7 +2923,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[0][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[0][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -2935,7 +2935,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[1][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[1][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -2947,7 +2947,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[2][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[2][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""
@@ -11143,7 +11143,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] = ""
@@ -11155,7 +11155,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] = ""

inter/uae_dubai/xml/page_topping_select6.lxml

@@ -485,7 +485,6 @@
 		Var topping_shot_price_x = 630
 		Var text_x_add_oreo_price = 510
 		Var text_show_normal_x = 408
-		Var text_show_blend_x = 872
 		Var text_milk_choice_price_x = 265
 		Var SugarZeroCalPrice_X = 540
 
@@ -498,7 +497,6 @@
 		Var topping_shot_price_x = 630
 		Var text_x_add_oreo_price = 600
 		Var text_show_normal_x = 528
-		Var text_show_blend_x = 872
 		Var text_milk_choice_price_x = 295
 		Var SugarZeroCalPrice_X = 540
 	EndIf
@@ -1773,7 +1771,7 @@
 ; x for blend rng.
 
 <Text>
-<X> text_show_blend_x </X>
+<X> 860 </X>
 <Y> 85 </Y>
 <Font> KanitRegularTTF </Font>
 <Size> 23 </Size>

ui/lang.tsv

@@ -835,9 +835,9 @@
 800771		Type number.	ใส่ตัวเลข
 800772
 800773		Exhaust Fan Test	ทดสอบพัดลมดูดอากาศ
-800774
+800774		Check Cam powder	ตรวจสอบลูกเบี้ยว
-800775
+800775		Cam powder test pass	ทดสอบผ่าน
-800776
+800776		Cam powder test fail	ทดสอบไม่ผ่าน
 
 810000
 810001		Start	เริ่มทำงาน
@@ -896,7 +896,7 @@
 
 
 810100		Waste Water Tank	ถังน้ำทิ้ง
-810101		Coffee Grounds Compressor	เครื่องอัดกาแฟ
+810101		Espresso Module	เครื่องอัดกาแฟ
 810102		Ice Module	ชุดทำน้ำแข็ง
 810103		Whipper Module	ชุดหัวชง
 810104		Washing Cup	ถ้วยล้าง
@@ -1063,7 +1063,7 @@
 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. เลือกทิศทาง
@@ -1076,7 +1076,7 @@
 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. ทดสอบการบด

video/script3_first_brewing.ev

@@ -35,7 +35,7 @@ EndIf
 ;
 ;
 ;
-Var EDC_ThailandOn = 1
+;Var EDC_ThailandOn = 1
 
 ;
 ;

video/sync_1.file

@@ -1,4 +1,4 @@
-total 166420
+total 166416
 -rw-rw---- 1 root sdcard_rw  9358730 2024-08-21 16:00 brewing_adv11.mp4
 -rw-rw---- 1 root sdcard_rw  3687715 2024-08-19 16:53 brewing_adv12.mp4
 -rw-rw---- 1 root sdcard_rw  9295686 2024-08-27 11:33 brewing_adv13.mp4
@@ -21,8 +21,8 @@ total 166420
 -rw-rw---- 1 root sdcard_rw     1217 2024-07-25 11:20 script1.ev
 -rw-rw---- 1 root sdcard_rw      288 2024-07-24 21:21 script2.ev
 -rw-rw---- 1 root sdcard_rw     1401 2024-09-02 10:37 script3_brew.ev
--rw-rw---- 1 root sdcard_rw     5591 2024-09-05 12:29 script3_first_brewing.ev
+-rw-rw---- 1 root sdcard_rw     5592 2024-09-13 10:20 script3_first_brewing.ev
--rw-rw---- 1 root sdcard_rw        0 2024-09-05 12:29 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2024-09-13 10:20 sync_1.file
 -rw-rw---- 1 root sdcard_rw  4806758 2023-09-18 18:44 taobin_save_world1.mp4
 -rw-rw---- 1 root sdcard_rw  6428830 2023-09-18 18:44 taobin_save_world2.mp4
 -rw-rw---- 1 root sdcard_rw  4634942 2023-09-18 18:44 taobin_save_world3.mp4

xml/event/tricker.ev

@@ -374,6 +374,11 @@ If BoxID = 173149 Then
 	Var New_Payment = 1
 	Var NewFlowPaymentCode = 1
 EndIf
+If BoxID = 172053 Then
+	Var New_Payment = 1
+	Var NewFlowPaymentCode = 1
+EndIf
+
 If BoxID = 200001 Then
 	Var New_Payment = 1
 	Var NewFlowPaymentCode = 1
@@ -394,7 +399,7 @@ EndIf
 
 ;
 If BoxID > 200000 Then
-	If BoxID < 200015 Then
+	If BoxID < 200120 Then
 		Var New_Payment = 1
 		Var NewFlowPaymentCode = 1
 	EndIf

xml/page_NewBrewing3.xml

@@ -15,9 +15,11 @@
 	Var CountUpWhenBREW_CNT = 0
 	DEBUGVAR TxRef1
 
-	SAVELOG "page_brewing3.xml"
+	SAVELOG "page_Newbrewing3.xml"
 	DEBUGVAR MachineStage
 
+	Machine NewPaymentOpenBrewingXML
+
 	Var PictureFileTextDesctionState = "Enable"
 
 

xml/page_before_check_member.xml

@@ -9,6 +9,7 @@
 
         Var OpenTopupCredit = 0
         Var OpenCheckCoupon = 0
+        Var ChangeMemberPassword = 0
 
         
         ; Default language (Thai).
@@ -95,12 +96,14 @@
     <Button>
         <X> 286 </X>
         <Y> 824 </Y>
-        <Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_topup_credit" + Extension ) </Filename>
+        <Filename> Var( "ROOT/taobin_project/image/before_member/bn_topup_credit" + Extension ) </Filename>
-        <FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenamePress>
+        <FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenamePress>
-        <FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenameDisable>
+        <FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenameDisable>
         <EventClick>
 
             Var OpenTopupCredit = 1
+            Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต"
+            Var CheckMemberTitleEN = "Please enter your mobile number\nto topup Tao bin credit."
             Open "ROOT/taobin_project/xml/page_check_member.xml"
 
         </EventClick>
@@ -109,12 +112,30 @@
     <Button>
         <X> 286 </X>
         <Y> 976 </Y>
-        <Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_check_coupon" + Extension ) </Filename>
+        <Filename> Var( "ROOT/taobin_project/image/before_member/bn_check_coupon" + Extension ) </Filename>
-        <FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenamePress>
+        <FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenamePress>
-        <FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenameDisable>
+        <FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenameDisable>
         <EventClick>
 
             Var OpenCheckCoupon = 1
+            Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ"
+            Var CheckMemberTitleEN = "Please enter your mobile number\nto check reward point."
+            Open "ROOT/taobin_project/xml/page_check_member.xml"
+
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 286 </X>
+        <Y> 1128 </Y>
+        <Filename> Var( "ROOT/taobin_project/image/before_member/bn_change_pass" + Extension ) </Filename>
+        <FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenamePress>
+        <FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenameDisable>
+        <EventClick>
+
+            Var ChangeMemberPassword = 1
+            Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน"
+            Var CheckMemberTitleEN = "Please enter your mobile number\nto change password."
             Open "ROOT/taobin_project/xml/page_check_member.xml"
 
         </EventClick>

xml/page_board.xml

@@ -704,6 +704,10 @@
 		If BoxID = 200002 Then
 			Var UseSlideShowVideo = 1
 		EndIf
+
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/event_profile.ev"
+
+
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 
 	EndIf
@@ -1266,7 +1270,7 @@
 	DEBUGVAR CountDownPauseVideo2
 	Var TimeProfilePrice = 0
 	
-
+	;Machine NewPaymentOpenBrewingXMLEnable
 </EventOpen>
 
 <EventActionOk>

xml/page_catalog.lxml

@@ -18,6 +18,7 @@
 		Var FromFruityRaya = 0
 		Var FromProThaiTea = 0
 		Var FromProYuzu = 0
+		Var FromProYuzu250 = 0
 	EndIf
 
 	If UsePepsiTheme = 1 Then

xml/page_check_member.xml

@@ -24,21 +24,25 @@
 	
 
     If show_eng = "true" Then 
+
+		Var CheckMemberTitle = CheckMemberTitleEN
+
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
 		Var Xtext19 = 154
-	Else
-		Var DirImage = "ROOT/taobin_project/image/collectiing"
-	EndIf
 		
-	If show_eng = "true" Then 
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 		
-	
+		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
 	Else
+		Var CheckMemberTitle = CheckMemberTitleTH
+
+		Var DirImage = "ROOT/taobin_project/image/collectiing"
+		
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 		
+		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
 	EndIf
 
 	
@@ -50,12 +54,6 @@
 
 	Var TaobinCredit = 0
 
-	  If show_eng = "true" Then 
-		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
-	Else
-		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
-	EndIf
-
 	Var show_eng_button_stage = "Enable"
 
 	;inter-max-number
@@ -191,6 +189,11 @@
 			;Open "ROOT/taobin_project/xml/page_check_member1.xml" 
 
 			If Ext1a = "ok" Then
+				
+				If ChangeMemberPassword = 1 Then
+					Open "ROOT/taobin_project/xml/page_payment_changePin1.xml"
+				EndIf
+
 				Open "ROOT/taobin_project/xml/page_check_member1.xml" 
 			Else
 				If Ext1a = "new customer" Then
@@ -632,11 +635,22 @@
 
 	
 
-<Image>
+;<Image>
-<X> Xtext19 </X>
+;<X> Xtext19 </X>
-<Y> 521 </Y>
+;<Y> 521 </Y>
-<Filename> Var( DirImage + "/text_19.png" )</Filename>
+;<Filename> Var( DirImage + "/text_19.png" )</Filename>
-</Image>
+;</Image>
+
+<Text>
+	<X> 0 </X>
+	<Y> 521 </Y>
+	<Width> 1080 </Width>
+	<Align> Center </Align>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x513C2F </Color>
+	<Size> 51 </Size>
+	<Value> CheckMemberTitle </Value>
+</Text>
 
 <Image>
 <X> 430 </X>

xml/page_get_yourchange.xml

@@ -78,6 +78,11 @@
 		Var imgGetChange = "/imgGetChange-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "UnitedArabEmirates Dubai" Then
+		Var imgGetChange = "/imgGetChange-UAE_DUBAI.png"
+	EndIf
+
 	;INT StoreCreditAmount
 	Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )
 

xml/page_payment_cash-UAE.xml

@@ -384,6 +384,10 @@
 		Var SELLONLINE = 1
 	EndIf
 
+	If IgnoreNetCore = "true" Then
+		Var SELLONLINE = 1
+	EndIf
+
 	If SELLONLINE = 0 Then
 			SAVELOG "Cash only NetworkStatus down"
 			

xml/page_payment_changePin1.xml

@@ -738,7 +738,11 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 

xml/page_payment_changePin2.xml

@@ -52,7 +52,11 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
         If ReqFlag = 0 Then
-           Open "ROOT/taobin_project/xml/page_check_member2.xml"
+          	If ChangeMemberPassword = 1 Then
+				Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			EndIf
         EndIf
         Open "ROOT/taobin_project/xml/page_payment_changePinFailed.xml"
 	EndIf
@@ -750,7 +754,11 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+    If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 

xml/page_payment_changePinFailed.xml

@@ -29,7 +29,11 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-		Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		If ChangeMemberPassword = 1 Then
+			Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		EndIf
 	EndIf
 
     TimerReset
@@ -103,7 +107,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+    If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 

xml/page_payment_changePinSMS.xml

@@ -40,7 +40,11 @@
 		If PinSMSFlag = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member1.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			If ChangeMemberPassword = 1 Then
+				Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			EndIf
 		EndIf
 	EndIf
 
@@ -105,7 +109,11 @@
      	If PinSMSFlag = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member1.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			If ChangeMemberPassword = 1 Then
+				Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			EndIf
 		EndIf
 </EventClick>
 </Button>

xml/page_payment_changePinSuccess.xml

@@ -29,7 +29,11 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-		Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		If ChangeMemberPassword = 1 Then
+			Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		EndIf
 	EndIf
 
     TimerReset
@@ -101,7 +105,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
   
-     Open "ROOT/taobin_project/xml/page_check_member2.xml"
+    If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 

xml/page_payment_credit.xml

@@ -633,7 +633,12 @@
 
 	Var Tel2DFlag = 0
 
-	TRY "ROOT/taobin_project/xml/verify_number.ev"
+	If InternationalEnable = 1 Then
+		Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
+		TRY verifyNumberEV
+	Else
+		TRY "ROOT/taobin_project/xml/verify_number.ev"
+	EndIf
 	
 	
 	If Tel2DFlag = 1 Then

xml/page_show_error.lxml

@@ -213,6 +213,9 @@
 		If LanguageShow = "MALAY" Then
 			Var DirImage = CountryRootPath + "image/vending_error_en"
 		EndIf
+		If LanguageShow = "UAE_DUBAI" Then
+			Var DirImage = CountryRootPath + "image/vending_error_en"
+		EndIf
 	EndIf
 
 	If NeedUpgrade = "true" Then
@@ -231,6 +234,9 @@
 		If LanguageShow = "MALAY" Then
 			Var DirImage = CountryRootPath + "image/vending_error_en"
 		EndIf
+		If LanguageShow = "UAE_DUBAI" Then
+			Var DirImage = CountryRootPath + "image/vending_error_en"
+		EndIf
 	EndIf
 
 	DEBUGVAR MachineStage
@@ -253,6 +259,9 @@
 			If LanguageShow = "MALAY" Then
 				Var DirImage = CountryRootPath + "image/vending_error_en"
 			EndIf
+			If LanguageShow = "UAE_DUBAI" Then
+				Var DirImage = CountryRootPath + "image/vending_error_en"
+			EndIf
 		Else
 			Var show_error_normal = "Enable"
 			Var show_error_sp1 = "Invisible"
@@ -272,6 +281,9 @@
 			If LanguageShow = "MALAY" Then
 				Var DirImage = CountryRootPath + "image/close_en"
 			EndIf
+			If LanguageShow = "UAE_DUBAI" Then
+				Var DirImage = CountryRootPath + "image/close_en"
+			EndIf
 		EndIf
 	EndIf
 

xml/vending_tasks_pre_main.xml

@@ -31,6 +31,9 @@
 
     If Timeout > 60 Then
         StatusLog "exit"
+
+        __CMD "cancel-pw-newui" "-" "-" "-"
+
         Open "ROOT/taobin_project/xml/page_board.xml"
     EndIf
 
@@ -43,6 +46,8 @@
 
     DEBUGVAR tmpPassPhrase
 
+    __CMD "still-stay-on-pre-main" "-" "-" "-"
+ 
 
     Refresh
     TimerReset
@@ -70,6 +75,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
+    __CMD "cancel-pw-newui" "-" "-" "-"
+
 	Open "ROOT/taobin_project/xml/vending_info2.xml"
 
 </EventClick>
@@ -218,6 +225,9 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
     StatusLog "exit"
+
+    __CMD "cancel-pw-newui" "-" "-" "-"
+
 	Open "ROOT/taobin_project/xml/page_board.xml"
 </EventClick>
 </Button>

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.91"
+	Var XMLPageVersion = "8.92"
-	Var XMLPageVersionInt = 891
+	Var XMLPageVersionInt = 892
 ;Oreo
 Var OreoGuarantee = 0