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

animation01/sync_1.file

@@ -1,4 +1,4 @@
-total 241228
+total 249484
 -rw-rw---- 1 root sdcard_rw   948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw  3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw  3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4
@@ -51,11 +51,12 @@ total 241228
 -rw-rw---- 1 root sdcard_rw  2287421 2023-12-07 10:26 TaoBin2_draft02_art60.mp4
 -rw-rw---- 1 root sdcard_rw  3824693 2024-04-25 15:27 TaoBin2_draft02_art61.mp4
 -rw-rw---- 1 root sdcard_rw  1797839 2024-04-25 17:00 TaoBin2_draft02_art62.mp4
+-rw-rw---- 1 root sdcard_rw  8448873 2024-09-25 13:35 TaoBin2_draft02_art63.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2023-09-18 18:44 TaoBin2_draft02_art7.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2023-09-18 18:44 TaoBin2_draft02_art70.mp4
 -rw-rw---- 1 root sdcard_rw  3998856 2023-09-18 18:44 TaoBin2_draft02_art8.mp4
 -rw-rw---- 1 root sdcard_rw  3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4
 -rw-rw---- 1 root sdcard_rw  9159813 2024-09-04 13:55 TaoBinShowCoffeeProcess.mp4
 -rw-rw---- 1 root sdcard_rw      326 2024-08-26 13:31 last-cmd
--rw-rw---- 1 root sdcard_rw    71508 2024-09-21 19:45 play_list.tsv
+-rw-rw---- 1 root sdcard_rw    71508 2024-09-27 14:02 play_list.tsv
--rw-rw---- 1 root sdcard_rw        0 2024-09-21 20:47 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2021-03-18 15:06 sync_1.file

inc/remove_cup_button.inc

@@ -7,3 +7,4 @@ Var DoorCupPosition = "-"
 
 Var CheckCupStateDoorCupClose = "reset"
 Var CheckCupStateDoorCupCloseCnt = 30
+Var TimeoutForProtectButtonHideLongTime = 0

inc/remove_cup_event_open.inc

@@ -4,9 +4,11 @@
     Var CheckCupStateDoorCupCloseCnt = 0
     Var CoundUpDelayCertainStage = 0
     Var TimeoutForProtectButtonHideLongTime = 0
+    Var TiemoutForDoorCupOpenLongTime = 0
     Var Timeout = 0
     
 
+
     If show_eng = "true" Then 
 
     Else

inc/remove_cup_step.inc

@@ -1,9 +1,10 @@
 
 
 DEBUGVAR TimeoutForProtectButtonHideLongTime
+DEBUGVAR TiemoutForDoorCupOpenLongTime
 
 Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1
-If TimeoutForProtectButtonHideLongTime > 120 Then
+If TimeoutForProtectButtonHideLongTime > 45 Then
     Var TimeoutForProtectButtonHideLongTime = 0
 
     If buttonRemoveCup = "Enable" Then
@@ -17,6 +18,18 @@ If TimeoutForProtectButtonHideLongTime > 120 Then
 EndIf
 
 
+Var TiemoutForDoorCupOpenLongTime = TiemoutForDoorCupOpenLongTime + 1
+If TiemoutForDoorCupOpenLongTime > 120 Then
+    Var TiemoutForDoorCupOpenLongTime = 0
+
+    If DoorCupPosition = "bottom" Then
+        Var TiemoutForDoorCupOpenLongTime = 0
+    Else
+        Machine DoorClose
+    EndIf
+EndIf
+
+
 If show_eng = "true" Then 
 
 Else
@@ -31,13 +44,22 @@ Else
                     EndIf
                 EndIf
             EndIf
+            If CupArmMove = "false" Then
+                If DoorCupPosition = "bottom" Then
+                    If InternationalEnable = 1 Then
+                        
+                    Else
+                        Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
+                    EndIf
+                EndIf
+            EndIf
         EndIf
     EndIf
 EndIf
 
 Var Timeout = Timeout + 1
 
-If Timeout > 15 Then
+
     Var Timeout = 0
 
     DEBUGVAR HaveCup
@@ -46,11 +68,11 @@ If Timeout > 15 Then
     DEBUGVAR CupChecking
     DEBUGVAR CupArmMove
     DEBUGVAR buttonRemoveCup
-EndIf
+
 
 Var TimeoutInstance0 = TimeoutInstance0 + 1
 
-If TimeoutInstance0 > 600 Then
+If TimeoutInstance0 > 360 Then
     Var TimeoutInstance0 = 0
     SAVELOG "Check Cup all"
     Machine CheckCupAll
@@ -69,6 +91,11 @@ If CheckCupStateDoorCupCloseCnt > 0 Then
     EndIf
     
 EndIf
+
+
+
+
+
 If HaveCup = "true" Then
 
     If CheckCupStateDoorCupClose = "" Then

inc/select_drink_current.inc

@@ -1,4 +1,5 @@
 
+    
     Topping "Select" Seeker.selected_a_drink
 
     ; Set option toppinng and pack 
@@ -17,4 +18,8 @@
     ; Pack
     Topping "Pack" ExtendDataCurr
 
+    If SaveOrderNameAndPictureEnable = 1 Then
+        Menu "set-name" Seeker.showname
+        Menu "set-image" Seeker.PictureDrink
+    EndIf
 

inc/video.inc

@@ -19,6 +19,7 @@
         Var DefaultNormBanner = PepsiNormBanner
     EndIf
     
+
     If showMultiAds = "true" Then
 
 
@@ -47,6 +48,11 @@
             Var CountDownPauseVideo2 = 0
         EndIf
         
+
+        ; Default. Do not edit here.
+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
+
         DEBUGVAR CurrentXMLFileName2
         DEBUGVAR PreviousFileName
         DEBUGVAR CountDownPauseVideo2
@@ -54,6 +60,7 @@
         DEBUGVAR CountryName
 
 
+
         If CountryName = "Singapore" Then
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
 
@@ -77,10 +84,6 @@
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 EndIf
             EndIf
-
-        Else
-                Var AdvTaobinMenu = DefaultNormBanner
-                Var DisplayAds = AdvTaobinMenu + ".mp4"
         EndIf
 
         If CountryName = "Malaysia" Then
@@ -108,7 +111,7 @@
             EndIf
         EndIf
 
-
+    ; showMultiAds=false
     Else
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then
@@ -126,7 +129,6 @@
 
                 If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
 
-                    DEBUGVAR CurrentXMLFileName2
                     DEBUGVAR CurrentXMLFileName2
                     DEBUGVAR PreviseXMLFileName2
                     DEBUGVAR CurrPageInst0
@@ -237,6 +239,10 @@
             Var ads_idx = 0
         EndIf
               
+        ; Default. Do not edit here.
+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
+
         If CountryName = "Singapore" Then
             DEBUGVAR CountryName
             DEBUGVAR CurrentXMLFileName2
@@ -268,8 +274,6 @@
 
             EndIf
         Else
-            Var AdvTaobinMenu = DefaultNormBanner
-            Var DisplayAds = AdvTaobinMenu + ".mp4"
 
             If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
                 Var AdvTaobinMenu = DefaultLargeBanner

inter/aus/xml/page_catalog_group_milk.lxml

@@ -9549,6 +9549,820 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 51-03-01-0077 51-03-02-0077 51-03-03-0077 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-03-01-0077.Button,51-03-02-0077.Button,51-03-03-0077.Button,$Sum510301007751030200775103030077) </State> 
+	<Button>
+	<State> $Sum510301007751030200775103030077 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_Bananoffee_milkshake.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_Bananoffee_milkshake.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_Bananoffee_milkshake.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_Bananoffee_milkshake.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $51-03-01-0077.Price
+		Var PriceD2 = $51-03-02-0077.Price
+		Var PriceD3 = $51-03-03-0077.Price
+		Var PD_CODE1 = "51-03-01-0077"
+		Var PD_CODE2 = "51-03-02-0077"
+		Var PD_CODE3 = "51-03-03-0077"
+		; begin lang 
+		Var aliasName[0] = "BANANOFFEE\nMILKSHAKE"
+		Var aliasDesc[0] = "Tokyo Banana Syrup, Milk, Caramel Syrup"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		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] = "Hot BANANOFFEE MILKSHAKE"
+		Var NameLang[0][1] = "-"
+		Var NameLang[0][2] = "-"
+		Var NameLang[0][3] = "-"
+		Var NameLang[0][4] = "-"
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = "Tokyo Banana Syrup, Milk, Caramel Syrup"
+		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 BANANOFFEE MILKSHAKE"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Tokyo Banana Syrup, Milk, Caramel Syrup"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "BANANOFFEE MILKSHAKE frappe"
+		Var NameLang[2][1] = "-"
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "-"
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Tokyo Banana Syrup, Milk, Caramel Syrup"
+		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 = $51-03-01-0077.Button
+		Var PD_STAGE_2 = $51-03-02-0077.Button
+		Var PD_STAGE_3 = $51-03-03-0077.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" "51-03-02-0077"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "51-03-01-0077"
+			Else
+			Topping "Load" "51-03-03-0077"
+			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> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>BANANOFFEE\nMILKSHAKE</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>BANANOFFEE\nMILKSHAKE</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Tokyo Banana Syrup, Milk, Caramel Syrup</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Tokyo Banana Syrup, Milk, Caramel Syrup</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></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> $51-03-01-0077.Button </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> $51-03-01-0077.Button </State>
+	<Value> StringFmt(  $51-03-01-0077.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> $51-03-02-0077.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> $51-03-02-0077.Button </State>
+	<Value> StringFmt( $51-03-02-0077.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> $51-03-03-0077.Button </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> $51-03-03-0077.Button </State>
+	<Value> StringFmt(  $51-03-03-0077.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum510301007751030200775103030077 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</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 $Sum510301007751030200775103030077 = "Disable" Then
+				STRCONTAIN "ERR" $51-03-01-0077.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-03-02-0077.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-03-03-0077.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> 0xDE794E </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> $Sum510301007751030200775103030077 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - - 51-03-03-0078 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-03-03-0078.Button,$Sum5103030078) </State> 
+	<Button>
+	<State> $Sum5103030078 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Bananoffee_Pie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Bananoffee_Pie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Bananoffee_Pie.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Bananoffee_Pie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $51-03-03-0078.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "51-03-03-0078"
+		; begin lang 
+		Var aliasName[0] = "BANANOFFEE\nPIE"
+		Var aliasDesc[0] = "Tokyo Banana Syrup, Milk, Caramel Syrup, Biscof"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		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] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "BANANOFFEE PIE"
+		Var NameLang[2][1] = "-"
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "-"
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Tokyo Banana Syrup, Milk, Caramel Syrup, Biscof"
+		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 = "Disable2"
+		Var PD_STAGE_3 = $51-03-03-0078.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" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "51-03-03-0078"
+			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> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>BANANOFFEE\nPIE</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>BANANOFFEE\nPIE</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Tokyo Banana Syrup, Milk, Caramel Syrup, Biscof</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Tokyo Banana Syrup, Milk, Caramel Syrup, Biscof</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></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> "Invisible" </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> "Invisible" </State>
+	<Value> StringFmt( $-.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> $51-03-03-0078.Button </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> $51-03-03-0078.Button </State>
+	<Value> StringFmt(  $51-03-03-0078.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 $Sum5103030078 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-03-03-0078.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> 0xDE794E </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> $Sum5103030078 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - - 51-03-03-0079 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-03-03-0079.Button,$Sum5103030079) </State> 
+	<Button>
+	<State> $Sum5103030079 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Choc_caramel_crumble.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Choc_caramel_crumble.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Choc_caramel_crumble.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Choc_caramel_crumble.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $51-03-03-0079.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "51-03-03-0079"
+		; begin lang 
+		Var aliasName[0] = "CHOC CARAMEL\nCRUMBLE"
+		Var aliasDesc[0] = "Cocoa, Milk,Sugar,\nCaramel Syrup, Biscof"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		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] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "CHOC CARAMEL CRUMBLE"
+		Var NameLang[2][1] = "-"
+		Var NameLang[2][2] = "-"
+		Var NameLang[2][3] = "-"
+		Var NameLang[2][4] = "-"
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Cocoa, Milk,Sugar,\nCaramel Syrup, Biscof"
+		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 = "Disable2"
+		Var PD_STAGE_3 = $51-03-03-0079.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" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "51-03-03-0079"
+			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> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>CHOC CARAMEL\nCRUMBLE</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>CHOC CARAMEL\nCRUMBLE</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Cocoa, Milk,Sugar,\nCaramel Syrup, Biscof</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Cocoa, Milk,Sugar,\nCaramel Syrup, Biscof</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></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> "Invisible" </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> "Invisible" </State>
+	<Value> StringFmt( $-.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> $51-03-03-0079.Button </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> $51-03-03-0079.Button </State>
+	<Value> StringFmt(  $51-03-03-0079.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 $Sum5103030079 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-03-03-0079.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> 0xDE794E </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> $Sum5103030079 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart

inter/aus/xml/page_catalog_group_whey.lxml

@@ -4633,6 +4633,546 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 51-04-02-0060 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-04-02-0060.Button,$Sum5104020060) </State> 
+	<Button>
+	<State> $Sum5104020060 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Vanilla.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Vanilla.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Vanilla.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Vanilla.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $51-04-02-0060.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "51-04-02-0060"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "VANILLA PROTEIN SHAKE"
+		Var aliasDesc[0] = "Whey protein, Milk,\nVanilla Syrup"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		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] = "VANILLA PROTEIN SHAKE"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Whey protein, Espresso\n& Milk, Caramel Syrup  "
+		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 = $51-04-02-0060.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" "51-04-02-0060"
+		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> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>VANILLA PROTEIN SHAKE</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>VANILLA PROTEIN SHAKE</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Whey protein, Milk,\nVanilla Syrup</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Whey protein, Milk,\nVanilla Syrup</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></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> $51-04-02-0060.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> $51-04-02-0060.Button </State>
+	<Value> StringFmt( $51-04-02-0060.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 $Sum5104020060 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-04-02-0060.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> 0xDE794E </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> $Sum5104020060 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 51-04-02-0059 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-04-02-0059.Button,$Sum5104020059) </State> 
+	<Button>
+	<State> $Sum5104020059 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_espresso_caramel.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_espresso_caramel.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_espresso_caramel.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_espresso_caramel.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $51-04-02-0059.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "51-04-02-0059"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "ESPRESSO CARAMEL\nPROTEIN SHAKE"
+		Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Caramel Syrup  "
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		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] = "ESPRESSO CARAMEL PROTEIN SHAKE"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Whey protein, Milk,\nVanilla Syrup"
+		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 = $51-04-02-0059.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" "51-04-02-0059"
+		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> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>ESPRESSO CARAMEL\nPROTEIN SHAKE</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>ESPRESSO CARAMEL\nPROTEIN SHAKE</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Whey protein, Espresso\n& Milk, Caramel Syrup  </LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Whey protein, Espresso\n& Milk, Caramel Syrup  </LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6></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> $51-04-02-0059.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> $51-04-02-0059.Button </State>
+	<Value> StringFmt( $51-04-02-0059.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 $Sum5104020059 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-04-02-0059.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> 0xDE794E </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> $Sum5104020059 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart

inter/uae_dubai/menu/lang.tsv

@@ -1076,7 +1076,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. เลือกทิศทาง

inter/uae_dubai/xml/page_catalog_group_coffee.lxml

@@ -14665,7 +14665,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] = ""
@@ -18239,7 +18239,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

@@ -1848,7 +1848,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] = ""
@@ -2122,7 +2122,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] = ""

menu/new-layout.tsv

@@ -34,7 +34,7 @@ IGNORE		เป๊ปซี่นม	Pepsi milk	เป๊ปซี่ นม	Peps
 
 		อเมริกาโน	AMERICANO	กาแฟ และน้ำ 	Espresso, Water	12-01-01-0003	12-01-02-0001	-	bn_hot_america_no.png	-	-	-	posi1	#REF!	#REF!	-	#REF!	#REF!
 		อเมริกาโน	AMERICANO	กาแฟ และน้ำ 	Espresso, Water	12-21-01-0003	12-21-02-0001	-	bn_hot_america_no.png	-	-	-	posi1
-		กาแฟดำ	STRONG COFFEE	กาแฟ และน้ำ 	Dark shot Espresso, Water	12-01-01-0081	12-01-01-0081	-	bn_hot_blackcoffee.png	12-21-01-0081	12-21-02-0081	-	posi1
+		กาแฟดำ	BLACK COFFEE	กาแฟ และน้ำ 	Dark shot Espresso, Water	12-01-01-0081	12-01-02-0081	-	bn_hot_blackcoffee.png	12-21-01-0081	12-21-02-0081	-	posi1
 		อเมริกาโน  \nGuji Queen Berry	AMERICANO \nETHIOPAI GUJI	กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้	กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้	12-01-01-0014	12-01-02-0011	-	bn_hot_americano_light.png	-	-	-	posi2	#REF!	#REF!	-	#REF!	#REF!
 		อเมริกาโน  \nBLUE DADDY	BLUE DADDY \nAMERICANO	Washed process \nหอมบลูเบอร์รี และดอกไม้	Washed process \nNote: Blue Berry & Floral	12-01-01-0019	12-01-02-0019	-	bn_hot_americano_light_bluedaddy.png	-	-	-	posi2	#REF!	#REF!	-	#REF!	#REF!
 		อเมริกาโน \nMOZART	MOZART  \nAMERICANO	Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ	Raisin Honey process  \nNote: Strawberry & Floral	12-01-01-0021	12-01-02-0021	-	bn_hot_americano_light_mozart.png	-	-	-	posi2	#REF!	#REF!	-	#REF!	#REF!
@@ -72,7 +72,7 @@ Name=Coffee,file=page_catalog_group_coffee.skt
 		เอสเพรสโซ่	ESPRESSO	กาแฟ (30 ml)	Espresso (30 ml)	12-01-01-9901	-	-	bn_hot_espresso.png	12-21-01-9901	-	-	posi1	#REF!	-	-	#REF!	NN
 		ดับเบิลเอสเพรสโซ่	DOUBLE \nESPRESSO	กาแฟ (60 ml)	Espresso (60 ml)	12-11-01-9901	-	-	bn_hot_double_espresso.png	12-31-01-9901	-	-	posi1	#REF!	-	-	#REF!	NN
 		อเมริกาโน	AMERICANO	กาแฟ และน้ำ 	Espresso, Water	12-01-01-0003	12-01-02-0001	-	bn_hot_america_no.png	12-21-01-0003	12-21-02-0001	-	posi1	#REF!	#REF!	-	#REF!	#REF!
-		กาแฟดำ	STRONG COFFEE	กาแฟ และน้ำ 	Dark shot Espresso, Water	12-01-01-0081	12-01-02-0081	-	bn_hot_blackcoffee.png	12-21-01-0081	12-21-02-0081	-	posi2
+		กาแฟดำ	BLACK COFFEE	กาแฟ และน้ำ 	Dark shot Espresso, Water	12-01-01-0081	12-01-02-0081	-	bn_hot_blackcoffee.png	12-21-01-0081	12-21-02-0081	-	posi2
 		เอสเพรสโซ่ช็อต \nGuji Queen Berry	ESPRESSO \nETHIOPAI GUJI	กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้	Light roast natural process: \nStrawberry, Orange, Floral	12-01-01-0013	-	-	bn_hot_espresso_light.png	-	-	-	posi2	#REF!	-	-	#REF!	NN
 		เอสเพรสโซ่ช็อต  \nBLUE DADDY	BLUE DADDY \nESPRESSO	Washed process \nหอมบลูเบอร์รี และดอกไม้	Washed process \nNote: Blue Berry & Floral	12-01-01-0020	-	-	bn_hot_espresso_light_bluedaddy.png	-	-	-	posi2	#REF!	-	-	#REF!	NN
 		เอสเพรสโซ่ช็อต  \nCHOPIN	CHOPIN  \nESPRESSO	Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ	Raisin Honey process  \nNote: Strawberry & Floral	12-01-01-0043	-	-	bn_hot_espresso_light_chopin.png	-	-	-	posi2	#REF!	-	-	#REF!	NN
@@ -550,6 +550,23 @@ Name=Health,file=page_catalog_group_health.skt
 		ชาดำ	BLACK TEA	ชาไทย และน้ำ	Thai tea and Water	12-02-01-1039	12-02-02-1039	-	bn_thai_black_tea_SingPark_Healthy.png	-	-	-	posi1
 		ชาดำมะนาว	BLACK TEA  LIMENADE	ชาไทย ผงมะนาว และน้ำ	Thai tea, Limenade and Water	12-02-01-1040	12-02-02-1040	-	bn_limeblack_tea_SingPark_Healthy.png	-	-	-	posi1
 										-	-	-
+		เจมิลานม	JEMILA MILK	เจมิลา นม และน้ำแข็ง	Jemila, Milk and Ice	-	12-03-02-0075	12-03-03-0075	bn_iced_milk_jemila.png	-	-	-	posi1
+		เจมิลาออรจินอล	JEMILA ORIGINAL	เจมิลา น้ำ และน้ำแข็ง	Jemila, Water and Ice	-	12-05-02-0124	12-05-03-0124	bn_water_roomtemp_jemila.png	-	-	-	posi1
+		เจมิลาชาไทย	JEMILA THAI TEA	เจมิลา ชาไทย และน้ำแข็ง	Jemila, Thai tea and Ice	-	12-02-02-0068	12-02-03-0068	bn_hot_thai_tea_jemila.png	-	-	-	posi1
+		เจมิลาโซดา	JEMILA SODA	เจมิลา โซดา และน้ำแข็ง	Jemila, Soda and Ice	-	12-05-02-0125	-	bn_soda_jemila.png	-	-	-	posi1
+		เจมิลากาโน่	JEMILA AMERICANO	เจมิลา กาแฟ และน้ำแข็ง	Jemila, Espresso and Ice	-	12-01-02-0075	-	bn_hot_america_no_jemila.png	-	12-21-02-0075	-	posi1
+		เจมิลาโกโก้	JEMILA COCOA	เจมิลา โกโก้ และน้ำแข็ง	Jemila, Cocoa and Ice	-	12-03-02-0076	12-03-03-0076	bn_iced_cocoa_jemila.png	-	-	-	posi1
+		เจมิลาขิง	JEMILA GINGER	เจมิลา ขิง และน้ำแข็ง	Jemila, Ginger and Ice	-	12-02-02-0069	12-02-03-0069	bn_hot_Ginger_tea_jemila.png	-	-	-	posi1
+		เจมิลาเซเว่นอัพโซดา	JEMILA 7UP SODA	เจมิลา 7up และน้ำแข็ง	Jemila, 7 up and Ice	-	12-05-02-0126	12-05-03-0126	bn_iced_7up_jemila.png	-	-	-	posi1
+		เจมิลามะนาว	JEMILA LIME	เจมิลา มะนาว และน้ำแข็ง	Jemila, Lime and Ice	-	12-05-02-0127	12-05-03-0127	bn_iced_lemonade_jemila.png	-	-	-	posi1
+		เจมิลามะลิ	JEMILA JASMINE	เจมิลา ชามะลิ และน้ำแข็ง	Jemila, Jasmine tea and Ice	-	12-02-02-0070	12-02-03-0070	bn_jasmine_tea_jemila.png	-	-	-	posi1
+
+
+
+
+
+
+
 Name=Health,file=page_catalog_group_songkran.skt
 		โอเลี้ยงจ้ำบ๊ะ	SEXY DANCE\nAMERICANO	กาแฟ น้ำ และ น้ำแดง	Espresso, Salak Syrup,\nwater	-	12-01-02-0053	-	bn_iced_sexy_dance_americano.png	-	-	-	posi1
 		โอยั๊วะเมียงู	SNAKE WIFE\nAMERICANO	กาแฟ น้ำ และ กล้วย	Espresso, Tokyo Banana Syrup,\n Water	-	12-01-02-0054	-	bn_iced_snake_wife_americano.png	-	-	-	posi1
@@ -930,33 +947,33 @@ Name=banana_and_mint_lucky_draw_x3,file=page_catalog_group_pro_banana_mint_lucky
 		เต่าทรงพลังโตเกียวบานาน่าโซดาเย็น	TOKYO BANANA POWER DRINK SODA	น้ำเชื่อมกล้วย เต่าทรงพลัง (มีคาเฟอีน)	Banana Syrup, Medicine drink, Soda and Ice	-	12-05-02-0078	-		-	-	-	posi1
 
 Name=jemila,file=page_catalog_group_pro_jemila.skt
-		หงส์ ดราก้อนมิลค์	HONG'S DRAGON\nMILK	เจมิลา นม และน้ำแข็ง	Jemila, Milk and Ice	-	12-03-02-0075	12-03-03-0075	bn_iced_milk_jemila.png	-	-	-	posi1
+		หงส์ ดราก้อนมิลค์	HONG'S DRAGON\nMILK	เจมิลา นม และน้ำแข็ง	Jemila, Milk and Ice	-	12-03-02-0075	12-03-03-0075	bn_iced_milk_jemila_pro.png	-	-	-	posi1
-		มุนินทร์ดริ๊งก์	MUNIN'S FAVORITE\nDRINK	เจมิลา น้ำ และน้ำแข็ง	Jemila, Water and Ice	-	12-05-02-0124	12-05-03-0124	bn_water_roomtemp_jemila.png	-	-	-	posi1
+		มุนินทร์ดริ๊งก์	MUNIN'S FAVORITE\nDRINK	เจมิลา น้ำ และน้ำแข็ง	Jemila, Water and Ice	-	12-05-02-0124	12-05-03-0124	bn_water_roomtemp_jemila_pro.png	-	-	-	posi1
-		มุตตาดื่ม	MUTA  DRINK	เจมิลา ชาไทย และน้ำแข็ง	Jemila, Thai tea and Ice	-	12-02-02-0068	12-02-03-0068	bn_hot_thai_milk_tea_jemila.png	-	-	-	posi1
+		มุตตาดื่ม	MUTA  DRINK	เจมิลา ชาไทย และน้ำแข็ง	Jemila, Thai tea and Ice	-	12-02-02-0068	12-02-03-0068	bn_hot_thai_tea_jemila_pro.png	-	-	-	posi1
-		ใจเริงซ่าพอตัว	JAI RERNG QUITE\nFIZZY	เจมิลา โซดา และน้ำแข็ง	Jemila, Soda and Ice	-	12-05-02-0125	-	bn_soda_jemila.png	-	-	-	posi1
+		ใจเริงซ่าพอตัว	JAI RERNG QUITE\nFIZZY	เจมิลา โซดา และน้ำแข็ง	Jemila, Soda and Ice	-	12-05-02-0125	-	bn_soda_jemila_pro.png	-	-	-	posi1
-		ประกายดาวขอเข้ม ๆ	PRAGLAIDAO WANT\nIT STRONG	เจมิลา กาแฟ และน้ำแข็ง	Jemila, Espresso and Ice	-	12-01-02-0075	-	bn_hot_america_no_jemila.png	-	12-21-02-0075	-	posi1
+		ประกายดาวขอเข้ม ๆ	PRAGLAIDAO WANT\nIT STRONG	เจมิลา กาแฟ และน้ำแข็ง	Jemila, Espresso and Ice	-	12-01-02-0075	-	bn_hot_america_no_jemila_pro.png	-	12-21-02-0075	-	posi1
-		เกล้ามาศมหัศจรรย์	GAOMART 'S\nMIRACLES	เจมิลา โกโก้ และน้ำแข็ง	Jemila, Cocoa and Ice	-	12-03-02-0076	12-03-03-0076	bn_iced_cocoa_jemila.png	-	-	-	posi1
+		เกล้ามาศมหัศจรรย์	GAOMART 'S\nMIRACLES	เจมิลา โกโก้ และน้ำแข็ง	Jemila, Cocoa and Ice	-	12-03-02-0076	12-03-03-0076	bn_iced_cocoa_jemila_pro.png	-	-	-	posi1
-		ภัทรลดาจิงเจอ	PATRADA'S  GINGER	เจมิลา ขิง และน้ำแข็ง	Jemila, Ginger and Ice	-	12-02-02-0069	12-02-03-0069	bn_hot_Ginger_tea_jemila.png	-	-	-	posi1
+		ภัทรลดาจิงเจอ	PATRADA'S  GINGER	เจมิลา ขิง และน้ำแข็ง	Jemila, Ginger and Ice	-	12-02-02-0069	12-02-03-0069	bn_hot_Ginger_tea_jemila_pro.png	-	-	-	posi1
-		ราวีน่าเซเว่นอัพ	RAVEENA'S 7UP\nSODA	เจมิลา 7up และน้ำแข็ง	Jemila, 7 up and Ice	-	12-05-02-0126	12-05-03-0126	bn_iced_7up_jemila.png	-	-	-	posi1
+		ราวีน่าเซเว่นอัพ	RAVEENA'S 7UP\nSODA	เจมิลา 7up และน้ำแข็ง	Jemila, 7 up and Ice	-	12-05-02-0126	12-05-03-0126	bn_iced_7up_jemila_pro.png	-	-	-	posi1
-		ขวัญอุมามะนาว	KWANUMA'S LIME	เจมิลา มะนาว และน้ำแข็ง	Jemila, Lime and Ice	-	12-05-02-0127	12-05-03-0127	bn_iced_lemonade_jemila.png	-	-	-	posi1
+		ขวัญอุมามะนาว	KWANUMA'S LIME	เจมิลา มะนาว และน้ำแข็ง	Jemila, Lime and Ice	-	12-05-02-0127	12-05-03-0127	bn_iced_lemonade_jemila_pro.png	-	-	-	posi1
-		รวินทร์วรกานต์มะลิ	RAVINWORAGARN'S\nJASMINE	เจมิลา ชามะลิ และน้ำแข็ง	Jemila, Jasmine tea and Ice	-	12-02-02-0070	12-02-03-0070	bn_jasmine_tea_jemila.png	-	-	-	posi1
+		รวินทร์วรกานต์มะลิ	RAVINWORAGARN'S\nJASMINE	เจมิลา ชามะลิ และน้ำแข็ง	Jemila, Jasmine tea and Ice	-	12-02-02-0070	12-02-03-0070	bn_jasmine_tea_jemila_pro.png	-	-	-	posi1
-
-Name = halloween
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+Name=halloween,file=page_catalog_group_pro_halloween.skt
+		โหด โฉด สยอง	BRUTAL, WICKED, HORRIFYING		Matcha, 7Up,  Lime and Soda	-	12-02-02-0080						posi1
+		ปอบเมืองลับแล	LIVER OF THE LOST		Strawberry syrup, Energy drink syrup, 7Up and Lime	-	-	12-05-03-0128					posi1
+		หมู่บ้านเลี้ยงผี	THE VILLAGE THAT FEEDS GHOSTS		Strawberry syrup, Milk, 7Up and Lime	-	-	12-03-03-0084					posi1
+		วิวาห์อาถรรพ์	CURSED CUISINE		Lychee syrup, Milk, 7Up and Lime	-	-	12-03-03-0085					posi1
+		เสน่ห์-บาตรแตก	Broken Bowl Charm		Thai tea, Strawberry syrup and 7Up	-	12-02-02-0081	-					posi1
+		เมตามหาโสมม	Foul Metta		Jasmine tea, Ume syrup, 7Up  and Soda	-	12-02-02-0082	-					posi1
+		Ghost House กินอยู่กับผี	GHOSTLY GRUB		Ginger, Strawberry Syrup and 7Up	12-02-01-0079	-	-					posi1
+		ผงกระดูกสัมภเวสี	BONE-CHILLING BITES		Caramel syrup,  Milk, 7Up and Ovaltine	-	-	12-03-03-0081					posi1
+		Cast แสดงเพื่อนผี	PHANTOM ACTRESS		Coffee, 7Up, Lime and Soda	-	12-01-02-0082	-					posi1
+		ไสยเวทย์สังหาร	SPOOKY SPELLS		Pepsi, Thai tea , Milk and Ice	-	12-03-02-0080	-					posi1
+		Mortuary ห้องเก็บเธอ	MORTUARY: STORING HER		Pepsi, Caramel,  Milk and Ice	-	-	12-03-03-0080					posi1
+		โค้งต้องคำสาป	CURSED CURVE		Pepsi,  Lime, Ginger, Jasmin tea 	12-02-01-0078	-	-					posi1
+		เสกซากผี	SUMMONING THE CORPSE		Strawberry syrup, Coffee, 7Up and Soda	-	12-01-02-0083	-					posi1
+		คนทรงผี	SPIRIT MEDIUM		Caramel syrup, Milk, 7Up and Ice	-	-	12-03-03-0082					posi1
+		เลี้ยงลูกผี	RAISING A GHOST CHILD		Strawberry syrup, Milk, 7Up, Lime and  Ovaltine	-	-	12-03-03-0083					posi1
 
 Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt
 		ลาเต้	LATTE	กาแฟ นม และ ฟองนม	Espresso, Milk, Foamed milk	-	12-21-62-0002	12-21-63-0002

ui/lang.tsv

@@ -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

@@ -6,14 +6,25 @@ If BrewingAdvertiseShowSlot = "" Then
 EndIf
 
 
-If SystemDateMonthInt = 9 Then
+If SystemDateMonthInt = 10 Then
-	Var ShopeePayLaterOn = 1
-
-    If SystemDateDayInt > 14 Then
 
+    If SystemDateDayInt > 21 Then
+        Var EDC_ThailandOn = 1
     EndIf
 EndIf
 
+If SystemDateMonthInt = 11 Then
+
+    Var EDC_ThailandOn = 1
+EndIf
+
+If SystemDateMonthInt = 12 Then
+
+    Var EDC_ThailandOn = 1
+EndIf
+
+
+
 If BoxID = 175599 Then
 	Var ShopeePayLaterOn = 0
 EndIf
@@ -33,6 +44,7 @@ EndIf
 ;
 ;
 
+
 Var BrewingAdvertiseEnable[0] = 0
 Var BrewingAdvertiseEnable[1] = 0
 Var BrewingAdvertiseEnable[2] = 0
@@ -113,7 +125,7 @@ If brewing_adv13_size = "" Then
 	GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv13_size	
 EndIf
 
-DEBUGVAR brewing_adv_size
+DEBUGVAR brewing_adv13_size
 If brewing_adv13_size = 9295686 Then
 	If EDC_ThailandOn = 1 Then
 		Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
@@ -137,7 +149,7 @@ If brewing_adv14_size = "" Then
 	GetFileSizeK "taobin_project/video/brewing_adv14.mp4" brewing_adv14_size	
 EndIf
 
-DEBUGVAR brewing_adv_size
+DEBUGVAR brewing_adv14_size
 If brewing_adv14_size = 9673549 Then
 	Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
 	Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv14.mp4";
@@ -154,6 +166,35 @@ If brewing_adv14_size = 9673549 Then
 EndIf
 
 
+If brewing_adv15_size = "" Then
+	GetFileSizeK "taobin_project/video/brewing_adv15.mp4" brewing_adv15_size	
+EndIf
+
+
+DEBUGVAR brewing_adv15_size
+If brewing_adv15_size = 8455461 Then
+	If JemilaPro = 1 Then
+		Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1
+		Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv15.mp4";
+		If show_eng = "true" Then
+			Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv15_en.png"
+		Else
+			Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv15.png"
+		EndIf
+
+		Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15
+		Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0
+		
+		Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1
+	EndIf
+EndIf
+
+
+
+
+
+
+
 DEBUGVAR BrewingAdvertiseShowSlot
 
 Var brew_vdo1 = BrewingAdvertiseVideo[BrewingAdvertiseShowSlot]

video/sync_1.file

@@ -1,8 +1,9 @@
-total 175976
+total 184336
 -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
 -rw-rw---- 1 root sdcard_rw  9673549 2024-07-25 10:29 brewing_adv14.mp4
+-rw-rw---- 1 root sdcard_rw  8455461 2024-10-04 09:52 brewing_adv15.mp4
 -rw-rw---- 1 root sdcard_rw  9526548 2023-09-18 18:44 brewing_adv3.mp4
 -rw-rw---- 1 root sdcard_rw  9368231 2024-07-19 15:00 brewing_adv4.mp4
 -rw-rw---- 1 root sdcard_rw    23569 2023-09-18 18:44 brewing_txt_adv1.png
@@ -14,6 +15,8 @@ total 175976
 -rw-rw---- 1 root sdcard_rw    48681 2024-08-29 11:30 brewing_txt_adv13_en.png
 -rw-rw---- 1 root sdcard_rw    44623 2024-09-17 14:17 brewing_txt_adv14.png
 -rw-rw---- 1 root sdcard_rw    41395 2024-09-17 14:18 brewing_txt_adv14_en.png
+-rw-rw---- 1 root sdcard_rw    44262 2024-10-04 14:41 brewing_txt_adv15.png
+-rw-rw---- 1 root sdcard_rw    43432 2024-10-04 14:41 brewing_txt_adv15_en.png
 -rw-rw---- 1 root sdcard_rw    28097 2023-09-18 18:44 brewing_txt_adv1_en.png
 -rw-rw---- 1 root sdcard_rw    30982 2023-09-18 18:44 brewing_txt_adv3.png
 -rw-rw---- 1 root sdcard_rw    35550 2023-09-18 18:44 brewing_txt_adv3_en.png
@@ -24,8 +27,8 @@ total 175976
 -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     6217 2024-09-17 14:24 script3_first_brewing.ev
+-rw-rw---- 1 root sdcard_rw     7200 2024-10-04 13:58 script3_first_brewing.ev
--rw-rw---- 1 root sdcard_rw        0 2024-09-25 12:12 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2024-10-04 14:41 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