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

inter/aus/xml/event/promotion_2.xml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/aus/xml/event/promotion_3.xml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/aus/xml/event/promotion_pepsi_099.lxml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/aus/xml/event/promotion_westfield.lxml

@@ -12124,8 +12124,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/aus/xml/event/promotion_winter_warmers.lxml

@@ -12124,8 +12124,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/aus/xml/page_catalog_cocktail.lxml

@@ -689,8 +689,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
 	Machine DoorLidOpen

inter/aus/xml/page_catalog_group_recommend.lxml

@@ -1,49 +1,49 @@
-
+
-
+
-<Popup>
+<Popup>
-<Cache> "Enable" </Cache>
+<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
+<Width> 1080 </Width>
-<Height> 1920 </Height>
+<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
+;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
+<Volume> SoundVolume </Volume>
-<EventOpen>
+<EventOpen>
-	; On open
+	; On open
-    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"    
-    
+    
-    Var Menu1Selected = "PressForever"
+    Var Menu1Selected = "PressForever"
-
+
-    Var OreoBigButtonEnable = "Enable"
+    Var OreoBigButtonEnable = "Enable"
-
+
-    If $12-01-01-0001.Button = "Invisible" Then
+    If $12-01-01-0001.Button = "Invisible" Then
-        Var esp102101001Enable = "Invisible"
+        Var esp102101001Enable = "Invisible"
-        Var esp122101001Enable = "Enable"
+        Var esp122101001Enable = "Enable"
-
+
-    Else
+    Else
-        Var esp102101001Enable = "Enable"
+        Var esp102101001Enable = "Enable"
-        Var esp122101001Enable = "Invisible"
+        Var esp122101001Enable = "Invisible"
-
+
-    EndIf
+    EndIf
-    
+    
-    SAVELOG PreviseXMLFileName2
+    SAVELOG PreviseXMLFileName2
-
+
-    Var Timeout = 0
+    Var Timeout = 0
-
+
-    If show_eng = "true" Then 
+    If show_eng = "true" Then 
-    
+    
-        Var text_unavailable = "UNAVAILABLE###size=16"
+        Var text_unavailable = "UNAVAILABLE###size=16"
-    Else
+    Else
-        Var text_unavailable = "หมด###size=32"
+        Var text_unavailable = "หมด###size=32"
-    
+    
-    EndIf
+    EndIf
-
+
-    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
-
+
-
+
-</EventOpen>
+</EventOpen>
-
+
-
+
-;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
+;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
-
+
 <FrameScroll> 
 <Max> 16 </Max>
 <X> 10 </X>
@@ -12083,28 +12083,28 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
+
-
+
-
+
-<Button>
+<Button>
-<X> 780 </X>
+<X> 780 </X>
-<Y> 500 </Y>
+<Y> 500 </Y>
-<State> buttonRemoveCup </State>
+<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
+;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
+<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
-<EventClick> 
+<EventClick> 
-    Machine RemoveCup
+    Machine RemoveCup
-    Machine DoorLidOpen
+    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Invisible"
-</EventClick>
+</EventClick>
-</Button>
+</Button>
-
+
-
+
-
+
-;BigLogoLayout
+;BigLogoLayout
-
+
-</Popup>
+</Popup>
-
+
-
+

inter/aus/xml/page_catalog_westfield.lxml

@@ -700,8 +700,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
 	Machine DoorLidOpen

inter/aus/xml/page_catalog_winter_warmers.lxml

@@ -700,8 +700,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
 	Machine DoorLidOpen

inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml

@@ -12123,8 +12123,8 @@ LIMENADE SODA</LanguageSlot3>
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/mys/xml/event/promotion_2.xml

@@ -12362,8 +12362,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/mys/xml/event/promotion_3.xml

@@ -12362,8 +12362,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/mys/xml/event/promotion_fruit_raya.lxml

@@ -12062,8 +12062,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/mys/xml/event/promotion_pepsi_099.lxml

@@ -12362,8 +12362,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/mys/xml/event/promotion_thai_tea.lxml

@@ -12376,8 +12376,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -1,174 +1,174 @@
-
+
-
+
-<Popup>
+<Popup>
-<Cache> "Enable" </Cache>
+<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
+<Width> 1080 </Width>
-<Height> 1920 </Height>
+<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
+;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
+<Volume> SoundVolume </Volume>
-<EventOpen>
+<EventOpen>
-	; On open
+	; On open
-	    Var NextPage = "-"
+	    Var NextPage = "-"
-
+
-    DEBUGVAR ICE_PROCESS_STATUS
+    DEBUGVAR ICE_PROCESS_STATUS
-    DEBUGVAR ICE_PROCESS_TXT
+    DEBUGVAR ICE_PROCESS_TXT
-
+
-
+
-    DEBUGVAR LanguageShow
+    DEBUGVAR LanguageShow
-    DEBUGVAR CountryName
+    DEBUGVAR CountryName
-    
+    
-    If LanguageShow = "ENG" Then 
+    If LanguageShow = "ENG" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+        Var ice_tab_text =  "Ice will be ready at "
-        
+        
-    EndIf
+    EndIf
-    If LanguageShow = "THAI" Then 
+    If LanguageShow = "THAI" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
-        Var DirImage = "ROOT/taobin_project/image/page3"
+        Var DirImage = "ROOT/taobin_project/image/page3"
-    EndIf
+    EndIf
-
+
-    ;inter-image
+    ;inter-image
-    If CountryName = "Malaysia" Then
+    If CountryName = "Malaysia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
+    EndIf
-    
+    
-
+
-    ;inter-image
+    ;inter-image
-    If CountryName = "Australia" Then
+    If CountryName = "Australia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
+    EndIf
-    
+    
-
+
-    If ICE_PROCESS_STATUS = 2 Then
+    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
+        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
+    Else
-        Var ice_tab_process_show = "Invisible"
+        Var ice_tab_process_show = "Invisible"
-    EndIf
+    EndIf
-
+
-
+
-    ; SpiralOnline
+    ; SpiralOnline
-  
+  
-        Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-
+
-        Var Menu1Selected2 = "Invisible"
+        Var Menu1Selected2 = "Invisible"
-        Var Menu2Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
-        Var Menu3Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
-        Var Menu4Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
-        
+        
-        Var Menu6Selected2 = "Invisible"
+        Var Menu6Selected2 = "Invisible"
-        Var Menu7Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
-        Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-        Var Menu11Selected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
-
+
-        Var Menu21Selected2 = "Invisible"
+        Var Menu21Selected2 = "Invisible"
-
+
-        Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-        If SpiralOnline = "true" Then 
+        If SpiralOnline = "true" Then 
-            If Seeker =  "curr" Then
+            If Seeker =  "curr" Then
-                Var MenuVSelected2 = "Enable"
+                Var MenuVSelected2 = "Enable"
-            EndIf
+            EndIf
-        EndIf 
+        EndIf 
-        
+        
-        ; init default
+        ; init default
-        Var Menu1Selected = "Enable"
+        Var Menu1Selected = "Enable"
-        Var Menu2Selected = "Enable"
+        Var Menu2Selected = "Enable"
-        Var Menu3Selected = "Enable"
+        Var Menu3Selected = "Enable"
-        Var Menu4Selected = "Enable"
+        Var Menu4Selected = "Enable"
-        ; 5 fruit
+        ; 5 fruit
-        Var Menu5Selected = "Invisible"
+        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Enable"
+        Var Menu6Selected = "Enable"
-        Var Menu7Selected = "Enable"
+        Var Menu7Selected = "Enable"
-        ; 8 cocktail
+        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
+        Var Menu8Selected = "Invisible"
-
+
-        If CocktailShow = "true" Then 
+        If CocktailShow = "true" Then 
-            Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-            Var Menu8Selected = "Enable"
+            Var Menu8Selected = "Enable"
-        EndIf
+        EndIf
-
+
-            
+            
-        If AppFastEnable = "true" Then
+        If AppFastEnable = "true" Then
-            Var Menu11Selected = "Enable" 
+            Var Menu11Selected = "Enable" 
-            Var Menu21Selected = "Invisible" 
+            Var Menu21Selected = "Invisible" 
-            Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-        Else
+        Else
-            If MenuKidEnable = "true" Then
+            If MenuKidEnable = "true" Then
-                Var Menu11Selected = "Invisible" 
+                Var Menu11Selected = "Invisible" 
-                Var Menu21Selected = "Enable"
+                Var Menu21Selected = "Enable"
-                Var Menu7Selected = "Invisible"
+                Var Menu7Selected = "Invisible"
-            Else
+            Else
-                Var Menu11Selected = "Invisible"
+                Var Menu11Selected = "Invisible"
-                Var Menu21Selected = "Invisible" 
+                Var Menu21Selected = "Invisible" 
-                Var Menu7Selected = "Enable"
+                Var Menu7Selected = "Enable"
-            EndIf
+            EndIf
-        EndIf
+        EndIf
-
+
-        If CocktailShow = "true" Then
+        If CocktailShow = "true" Then
-            Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-        EndIf 
+        EndIf 
-
+
-        If RecipeTag1 = "HealthTurnOn" Then
+        If RecipeTag1 = "HealthTurnOn" Then
-            Var Menu22Selected = "Enable"
+            Var Menu22Selected = "Enable"
-        Else
+        Else
-            Var Menu22Selected = "Invisible"
+            Var Menu22Selected = "Invisible"
-        EndIf
+        EndIf
-        ;
+        ;
-        
+        
-
+
-    
+    
-    Var Menu1Selected = "PressForever"
+    Var Menu1Selected = "PressForever"
-
+
-    Var OreoBigButtonEnable = "Enable"
+    Var OreoBigButtonEnable = "Enable"
-
+
-    If $12-01-01-0001.Button = "Invisible" Then
+    If $12-01-01-0001.Button = "Invisible" Then
-        Var esp102101001Enable = "Invisible"
+        Var esp102101001Enable = "Invisible"
-        Var esp122101001Enable = "Enable"
+        Var esp122101001Enable = "Enable"
-
+
-    Else
+    Else
-        Var esp102101001Enable = "Enable"
+        Var esp102101001Enable = "Enable"
-        Var esp122101001Enable = "Invisible"
+        Var esp122101001Enable = "Invisible"
-
+
-    EndIf
+    EndIf
-    
+    
-    SAVELOG PreviseXMLFileName2
+    SAVELOG PreviseXMLFileName2
-
+
-    Var Timeout = 0
+    Var Timeout = 0
-
+
-    If show_eng = "true" Then 
+    If show_eng = "true" Then 
-    
+    
-        Var text_unavailable = "UNAVAILABLE###size=16"
+        Var text_unavailable = "UNAVAILABLE###size=16"
-    Else
+    Else
-        Var text_unavailable = "หมด###size=32"
+        Var text_unavailable = "หมด###size=32"
-    
+    
-    EndIf
+    EndIf
-
+
-    
+    
-    If show_eng = "true" Then 
+    If show_eng = "true" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
+
-    Else
+    Else
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-    EndIf
+    EndIf
-
+
-</EventOpen>
+</EventOpen>
-
+
-
+
-;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
+;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
-
+
-
+
 <FrameScroll> 
 <Max> 4 </Max>
 <X> 10 </X>
@@ -46160,27 +46160,27 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
+
-
+
-
+
-
+
-;BigLogoLayout
+;BigLogoLayout
-
+
-<Button>
+<Button>
-<X> 780 </X>
+<X> 780 </X>
-<Y> 500 </Y>
+<Y> 500 </Y>
-<State> buttonRemoveCup </State>
+<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
+;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
+<Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
-<EventClick> 
+<EventClick> 
-    Machine RemoveCup
+    Machine RemoveCup
-    Machine DoorLidOpen
+    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Invisible"
-</EventClick>
+</EventClick>
-</Button>
+</Button>
-
+
-</Popup>
+</Popup>
-
+
-
+

inter/sgp/xml/event/promotion_2.xml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/event/promotion_3.xml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/event/promotion_pepsi_099.lxml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml

@@ -2455,8 +2455,8 @@ eval(
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml

@@ -2455,8 +2455,8 @@ eval(
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml

@@ -2430,8 +2430,8 @@ eval(
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/page_catalog_group_recommend.lxml

@@ -12605,8 +12605,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -1,174 +1,174 @@
-
+
-
+
-<Popup>
+<Popup>
-<Cache> "Enable" </Cache>
+<Cache> "Enable" </Cache>
-<Width> 1080 </Width>
+<Width> 1080 </Width>
-<Height> 1920 </Height>
+<Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
+;<Background> "0xeae6e1" </Background>
-<Volume> SoundVolume </Volume>
+<Volume> SoundVolume </Volume>
-<EventOpen>
+<EventOpen>
-	; On open
+	; On open
-	    Var NextPage = "-"
+	    Var NextPage = "-"
-
+
-    DEBUGVAR ICE_PROCESS_STATUS
+    DEBUGVAR ICE_PROCESS_STATUS
-    DEBUGVAR ICE_PROCESS_TXT
+    DEBUGVAR ICE_PROCESS_TXT
-
+
-
+
-    DEBUGVAR LanguageShow
+    DEBUGVAR LanguageShow
-    DEBUGVAR CountryName
+    DEBUGVAR CountryName
-    
+    
-    If LanguageShow = "ENG" Then 
+    If LanguageShow = "ENG" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+        Var ice_tab_text =  "Ice will be ready at "
-        
+        
-    EndIf
+    EndIf
-    If LanguageShow = "THAI" Then 
+    If LanguageShow = "THAI" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
-        Var DirImage = "ROOT/taobin_project/image/page3"
+        Var DirImage = "ROOT/taobin_project/image/page3"
-    EndIf
+    EndIf
-
+
-    ;inter-image
+    ;inter-image
-    If CountryName = "Malaysia" Then
+    If CountryName = "Malaysia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
+    EndIf
-    
+    
-
+
-    ;inter-image
+    ;inter-image
-    If CountryName = "Australia" Then
+    If CountryName = "Australia" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var ice_tab_text =  "Ice will be ready at "
+        Var ice_tab_text =  "Ice will be ready at "
-    EndIf
+    EndIf
-    
+    
-
+
-    If ICE_PROCESS_STATUS = 2 Then
+    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
+        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
+    Else
-        Var ice_tab_process_show = "Invisible"
+        Var ice_tab_process_show = "Invisible"
-    EndIf
+    EndIf
-
+
-
+
-    ; SpiralOnline
+    ; SpiralOnline
-  
+  
-        Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-
+
-        Var Menu1Selected2 = "Invisible"
+        Var Menu1Selected2 = "Invisible"
-        Var Menu2Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
-        Var Menu3Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
-        Var Menu4Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
-        
+        
-        Var Menu6Selected2 = "Invisible"
+        Var Menu6Selected2 = "Invisible"
-        Var Menu7Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
-        Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-        Var Menu11Selected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
-
+
-        Var Menu21Selected2 = "Invisible"
+        Var Menu21Selected2 = "Invisible"
-
+
-        Var MenuVSelected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
-        If SpiralOnline = "true" Then 
+        If SpiralOnline = "true" Then 
-            If Seeker =  "curr" Then
+            If Seeker =  "curr" Then
-                Var MenuVSelected2 = "Enable"
+                Var MenuVSelected2 = "Enable"
-            EndIf
+            EndIf
-        EndIf 
+        EndIf 
-        
+        
-        ; init default
+        ; init default
-        Var Menu1Selected = "Enable"
+        Var Menu1Selected = "Enable"
-        Var Menu2Selected = "Enable"
+        Var Menu2Selected = "Enable"
-        Var Menu3Selected = "Enable"
+        Var Menu3Selected = "Enable"
-        Var Menu4Selected = "Enable"
+        Var Menu4Selected = "Enable"
-        ; 5 fruit
+        ; 5 fruit
-        Var Menu5Selected = "Invisible"
+        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Enable"
+        Var Menu6Selected = "Enable"
-        Var Menu7Selected = "Enable"
+        Var Menu7Selected = "Enable"
-        ; 8 cocktail
+        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
+        Var Menu8Selected = "Invisible"
-
+
-        If CocktailShow = "true" Then 
+        If CocktailShow = "true" Then 
-            Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-            Var Menu8Selected = "Enable"
+            Var Menu8Selected = "Enable"
-        EndIf
+        EndIf
-
+
-            
+            
-        If AppFastEnable = "true" Then
+        If AppFastEnable = "true" Then
-            Var Menu11Selected = "Enable" 
+            Var Menu11Selected = "Enable" 
-            Var Menu21Selected = "Invisible" 
+            Var Menu21Selected = "Invisible" 
-            Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-        Else
+        Else
-            If MenuKidEnable = "true" Then
+            If MenuKidEnable = "true" Then
-                Var Menu11Selected = "Invisible" 
+                Var Menu11Selected = "Invisible" 
-                Var Menu21Selected = "Enable"
+                Var Menu21Selected = "Enable"
-                Var Menu7Selected = "Invisible"
+                Var Menu7Selected = "Invisible"
-            Else
+            Else
-                Var Menu11Selected = "Invisible"
+                Var Menu11Selected = "Invisible"
-                Var Menu21Selected = "Invisible" 
+                Var Menu21Selected = "Invisible" 
-                Var Menu7Selected = "Enable"
+                Var Menu7Selected = "Enable"
-            EndIf
+            EndIf
-        EndIf
+        EndIf
-
+
-        If CocktailShow = "true" Then
+        If CocktailShow = "true" Then
-            Var Menu7Selected = "Invisible"
+            Var Menu7Selected = "Invisible"
-        EndIf 
+        EndIf 
-
+
-        If RecipeTag1 = "HealthTurnOn" Then
+        If RecipeTag1 = "HealthTurnOn" Then
-            Var Menu22Selected = "Enable"
+            Var Menu22Selected = "Enable"
-        Else
+        Else
-            Var Menu22Selected = "Invisible"
+            Var Menu22Selected = "Invisible"
-        EndIf
+        EndIf
-        ;
+        ;
-        
+        
-
+
-    
+    
-    Var Menu1Selected = "PressForever"
+    Var Menu1Selected = "PressForever"
-
+
-    Var OreoBigButtonEnable = "Enable"
+    Var OreoBigButtonEnable = "Enable"
-
+
-    If $52-01-01-0001.Button = "Invisible" Then
+    If $52-01-01-0001.Button = "Invisible" Then
-        Var esp102101001Enable = "Invisible"
+        Var esp102101001Enable = "Invisible"
-        Var esp122101001Enable = "Enable"
+        Var esp122101001Enable = "Enable"
-
+
-    Else
+    Else
-        Var esp102101001Enable = "Enable"
+        Var esp102101001Enable = "Enable"
-        Var esp122101001Enable = "Invisible"
+        Var esp122101001Enable = "Invisible"
-
+
-    EndIf
+    EndIf
-    
+    
-    SAVELOG PreviseXMLFileName2
+    SAVELOG PreviseXMLFileName2
-
+
-    Var Timeout = 0
+    Var Timeout = 0
-
+
-    If show_eng = "true" Then 
+    If show_eng = "true" Then 
-    
+    
-        Var text_unavailable = "UNAVAILABLE###size=16"
+        Var text_unavailable = "UNAVAILABLE###size=16"
-    Else
+    Else
-        Var text_unavailable = "หมด###size=32"
+        Var text_unavailable = "หมด###size=32"
-    
+    
-    EndIf
+    EndIf
-
+
-    
+    
-    If show_eng = "true" Then 
+    If show_eng = "true" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
+
-    Else
+    Else
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-    EndIf
+    EndIf
-
+
-</EventOpen>
+</EventOpen>
-
+
-
+
-;include="ROOT/taobin_project/inter/sgp/xml/menu_catalog_new.lxml"
+;include="ROOT/taobin_project/inter/sgp/xml/menu_catalog_new.lxml"
-
+
-
+
 <FrameScroll> 
 <Max> 4 </Max>
 <X> 10 </X>
@@ -311,7 +311,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0003"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -320,7 +320,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0001"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -609,7 +609,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0004"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")
@@ -618,7 +618,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0002"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")
@@ -627,7 +627,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-21-03-0002"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")
@@ -916,7 +916,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0076"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")
@@ -1201,7 +1201,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0025"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")
@@ -1210,7 +1210,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-05-03-0025"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png")
@@ -1518,7 +1518,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0003"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -1527,7 +1527,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0001"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -1816,7 +1816,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0004"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")
@@ -1825,7 +1825,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0002"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")
@@ -1834,7 +1834,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-21-03-0002"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")
@@ -2123,7 +2123,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0076"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")
@@ -2408,7 +2408,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0025"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")
@@ -2417,7 +2417,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-05-03-0025"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png")
@@ -2725,7 +2725,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0003"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -2734,7 +2734,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0001"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -3023,7 +3023,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0004"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")
@@ -3032,7 +3032,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0002"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")
@@ -3041,7 +3041,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-21-03-0002"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")
@@ -3330,7 +3330,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0076"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")
@@ -3615,7 +3615,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0025"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")
@@ -3624,7 +3624,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-05-03-0025"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png")
@@ -3932,7 +3932,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0003"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -3941,7 +3941,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0001"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")
@@ -4230,7 +4230,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_1 = "Enable" Then
 			Var OverlayMenuFilter1 = "52-21-01-0004"
 			Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png")
@@ -4239,7 +4239,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-21-02-0002"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")
@@ -4248,7 +4248,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-21-03-0002"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png")
@@ -4537,7 +4537,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0076"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png")
@@ -4822,7 +4822,7 @@
 		Var OverlayMenuFilter1 = ""
 		Var OverlayMenuFilter2 = ""
 		Var OverlayMenuFilter3 = ""
-
+
 		If PD_STAGE_2 = "Enable" Then
 			Var OverlayMenuFilter2 = "52-05-02-0025"
 			Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png")
@@ -4831,7 +4831,7 @@
 		Else
 			Var OverlayMenuFilter = ""
 		EndIf
-
+
 		If PD_STAGE_3 = "Enable" Then
 			Var OverlayMenuFilter3 = "52-05-03-0025"
 			Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png")
@@ -5024,27 +5024,27 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
-
+
-
+
-
+
-
+
-;BigLogoLayout
+;BigLogoLayout
-
+
-<Button>
+<Button>
-<X> 780 </X>
+<X> 780 </X>
-<Y> 500 </Y>
+<Y> 500 </Y>
-<State> buttonRemoveCup </State>
+<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
+;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
+<Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
-<EventClick> 
+<EventClick> 
-    Machine RemoveCup
+    Machine RemoveCup
-    Machine DoorLidOpen
+    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Invisible"
-</EventClick>
+</EventClick>
-</Button>
+</Button>
-
+
-</Popup>
+</Popup>
-
+
-
+

inter/sgp/xml/page_collect_point_2.lxml

@@ -174,9 +174,18 @@
 				DEBUGVAR CatchNotMember
 
 				If CatchNotMember = 1 Then
+
+					Var MemberErrText = Param1 + ", member=false"
+				    DEBUGVAR MemberErrText
+					Var MemberErrText = ""
+
+					DEBUGVAR TaobinName
 					Var TaobinName = ""
+
 					DEBUGVAR MemberPrompt
-					Open MemberPrompt
+					Var CatchNotMember = 0
+
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 				EndIf
 
 

inter/uae_dubai/xml/event/promotion_2.xml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/uae_dubai/xml/event/promotion_3.xml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

inter/uae_dubai/xml/event/promotion_pepsi_099.lxml

@@ -12223,8 +12223,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
+<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

xml/event/tricker.ev

@@ -127,10 +127,10 @@ Var New_Payment = 0
 
 Var XMLLiveInfoEnable = 0
 
-Var CheckMemberPageCampaign = 0
+Var LuckyDrawCampaign = 0
 
 If SystemDateMonthInt = 1 Then
-	Var CheckMemberPageCampaign = 1
+	Var LuckyDrawCampaign = 1
 EndIf
 
 If SystemDateMonthInt = 5 Then
@@ -195,7 +195,7 @@ If SystemDateMonthInt = 6 Then
 	EndIf
 
 	If SystemDateDayInt >= 17 Then
-		Var CheckMemberPageCampaign = 1
+		Var LuckyDrawCampaign = 1
 	EndIf
 EndIf
 
@@ -223,7 +223,7 @@ If SystemDateMonthInt = 7 Then
 EndIf
 
 If SystemDateMonthInt >= 7 Then
-	Var CheckMemberPageCampaign = 1
+	Var LuckyDrawCampaign = 1
 EndIf
 
 

xml/page_check_member.xml

@@ -42,7 +42,8 @@
 	EndIf
 
 	
-
+	Var luckyDrawTicket = 0
+	Var luckyDrawAlredyGotReward = 0
 	
 
 	Var StepX = 2
@@ -130,9 +131,10 @@
 			INT CoffeePointRank
 			Var CoffeePointRankTmp = CoffeePointRank
 
-			If CheckMemberPageCampaign = 1 Then
+			If LuckyDrawCampaign = 1 Then
-				Var luckeyDrawTicket = Ext1h
+				Var luckyDrawTicket = Ext1h
-				INT luckeyDrawTicket
+				INT luckyDrawTicket
+				Var luckyDrawAlredyGotReward = Ext1i
 			EndIf
 
 

xml/page_check_member1.xml

@@ -32,6 +32,8 @@
 
 	Var Xtext = 246
 
+	Var luckyDrawTicket = 0
+	Var luckyDrawAlredyGotReward = 0
 	
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
@@ -90,9 +92,10 @@
 			Var CoffeePointRankTmp = CoffeePointRank
 
 
-			If CheckMemberPageCampaign = 1 Then
+			If LuckyDrawCampaign = 1 Then
 				Var luckyDrawTicket = Ext1h
 				INT luckyDrawTicket
+				Var luckyDrawAlredyGotReward = Ext1i
 			EndIf
 
 

xml/page_check_member2.xml

@@ -8,7 +8,7 @@
 <EventOpen>
 	; On open
 
-    If CheckMemberPageCampaign = 1 Then
+    If LuckyDrawCampaign = 1 Then
         Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
     EndIf
 

xml/page_check_member2_campaign.xml

@@ -755,6 +755,15 @@
     DEBUGVAR SystemDate
     DEBUGVAR targetDate
     DEBUGVAR dayDiff
+
+
+    Var ShowLuckyDrawTicketState = "Enable"
+    Var ShowLuckyDrawAlreadyGotRewardState = "Invisible"
+    If luckyDrawAlredyGotReward = 1 Then
+        Var ShowLuckyDrawTicketState = "Invisible"
+        Var ShowLuckyDrawAlreadyGotRewardState = "Enable"
+    EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -1028,18 +1037,21 @@
 
 
 <Image>
-<X> 142 </X>
+<X> 142 </X
 <Y> 1036 </Y>
+<State> ShowLuckyDrawTicketState </State>
 <Filename> Var( DirImageCampaign + "/luckydraw_detail_container.png" ) </Filename>
 </Image>
 
 <Image>
 <X> prize_x </X>
 <Y> 1046 </Y>
+<State> ShowLuckyDrawTicketState </State>
 <Filename> Var( "ROOT/taobin_project/image/display_point_campaign" + prizeImg ) </Filename>
 </Image>
 
 <Text>
+    <State> ShowLuckyDrawTicketState </State>
     <X> dayDiff_X </X>
     <Y> dayDiff_Y </Y>
     <Width> 40 </Width>
@@ -1051,6 +1063,7 @@
 </Text>
 
 <Text>
+    <State> ShowLuckyDrawTicketState </State>
     <X> 620 </X>
     <Y> 1076 </Y>
     <Width> 164 </Width>
@@ -1062,6 +1075,26 @@
     <Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value>
 </Text>
 
+<Text>
+    <State> ShowLuckyDrawAlreadyGotRewardState </State>
+    <X> 334 </X>
+    <Y> 1057 </Y>
+    <Font> KanitSemiBoldTTF </Font>
+    <Width> 390 </Width>
+    <Size> 24 </Size>
+    <Color> 0x84776F </Color>
+    <Align> center-vertical-horizontal </Align>
+    <Value>
+        eval(
+            If show_eng = "true" Then
+                Var return = "You already got Lucky Draw reward."
+            Else
+                Var return = "คุณได้รับรางวัล Lucky Draw ไปแล้ว"
+            EndIf
+        )
+    </Value>
+</Text>
+
 
 <Text>
 <X> 142 </X>

xml/page_collect_point_1.xml

@@ -777,7 +777,7 @@
 	;Open "ROOT/taobin_project/xml/page_catalog.xml"  
 	SAVELOG "collect_point1-p589."
 		
-	If CheckMemberPageCampaign = 1 Then
+	If LuckyDrawCampaign = 1 Then
 		Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 	Else
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"

xml/page_collect_point_2.xml

@@ -43,6 +43,8 @@
 		Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 
 	EndIf
+
+	Var GetLuckyDraw = 0
 		
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -111,143 +113,171 @@
 			
 		Else
 
-			If Ext1a = "ok" Then
+			If GetLuckyDraw = 1 Then
-
+				If Ext1a = "ok" Then
-				Var TaobinName = Ext1d
+					DEBUGVAR Ext1h
-				Var TaobinCoupons = Ext1g
+					DEBUGVAR Ext1i
-				Var TaobinExpire = Ext1f
+					Var luckyDrawTicket = Ext1h
-				Var TaobinLevel = Ext1e
+					INT luckyDrawTicket
-				Var TaobinPDPA = Ext1h
+					Var luckyDrawAlredyGotReward = Ext1i
-
+					If luckyDrawAlredyGotReward = 1 Then
-				Var TaobinPromoX = Ext1j
+						Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
-
+					Else
-				DEBUGVAR TaobinPDPA
+						Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
-
-				Var PointTaobinTmp = Ext1i
-
-				DEBUGVAR PointTaobinTmp
-				INT PointTaobinTmp
-
-				INT TaobinPDPA
-
-				If TaobinName = "-" Then
-					Var Seeker.IsLineMember = 0
-				Else
-					Var Seeker.IsLineMember = 1
-				EndIf
-				
-
-				Var TelephoneNumber = TelephoneNumberX
-				Var TNumberTaobinMemberXXX = TelephoneNumber
-
-				;Var PointTaobinTmp = 4
-				
-				Var PointTaobin = PointTaobinTmp
-				Var pTaobin = PointTaobin
-
-				DEBUGVAR  TaobinLevel
-
-				If TaobinLevel = "1" Then
-					Var pTaobin = PayAmount / 20
-				Else
-					Var pTaobin = PayAmount / 15
-				EndIf
-
-				If pTaobin > 0 Then
-					Var pTaobinX = PointTaobin / pTaobin
-					If pTaobinX >= 2 Then
-						Var Point2X = 1
 					EndIf
+				Else
+					
+					Var Seeker.TaobinErrorNetwork = 1
+					
+					Var Seeker.PointTaobinStr = ParamCP
+					Var TelephoneNumber = TelephoneNumberX
+					Var Seeker.TNumberTaobinMember = TelephoneNumber
+					Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 				EndIf
-
+			EndIf
-
-				Var Seeker.PointTaobinStr = ParamCP
-				Var Seeker.TNumberTaobinMember = TelephoneNumberX
-				
-
-				Var CoffeePointRank = Ext1b
-				INT CoffeePointRank
-
-				Var CoffeePoint1 = Ext1c
-				INT CoffeePoint1
 			
-				Var CoffeePoint = PointTaobin + CoffeePoint1
-				Var CoffeePointOld = CoffeePoint1
 
-				If TaobinLevel = 1 Then
+			If GetLuckyDraw = 0 Then
-					Var CoffeePointRank = CoffeePointRank + 0
+				If Ext1a = "ok" Then
-				Else
-					Var CoffeePointRank = CoffeePointRank + PointTaobin
-				EndIf 
 
-				Var CoffeePointRankTmp = CoffeePointRank
+					Var TaobinName = Ext1d
+					Var TaobinCoupons = Ext1g
+					Var TaobinExpire = Ext1f
+					Var TaobinLevel = Ext1e
+					Var TaobinPDPA = Ext1h
 
+					Var TaobinPromoX = Ext1j
 
-				DEBUGVAR Seeker.PointTaobinStr
+					DEBUGVAR TaobinPDPA
-				DEBUGVAR Seeker.TNumberTaobinMember
-				If TaobinPDPA = 0 Then
 
-					;inter-xml-open
+					Var PointTaobinTmp = Ext1i
-					If CountryName = "Malaysia" Then
+
-						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+					DEBUGVAR PointTaobinTmp
+					INT PointTaobinTmp
+
+					INT TaobinPDPA
+
+					If TaobinName = "-" Then
+						Var Seeker.IsLineMember = 0
+					Else
+						Var Seeker.IsLineMember = 1
+					EndIf
+					
+
+					Var TelephoneNumber = TelephoneNumberX
+					Var TNumberTaobinMemberXXX = TelephoneNumber
+
+					;Var PointTaobinTmp = 4
+					
+					Var PointTaobin = PointTaobinTmp
+					Var pTaobin = PointTaobin
+
+					DEBUGVAR  TaobinLevel
+
+					If TaobinLevel = "1" Then
+						Var pTaobin = PayAmount / 20
+					Else
+						Var pTaobin = PayAmount / 15
 					EndIf
 
-					;inter-xml-open
+					If pTaobin > 0 Then
-					If CountryName = "Indonesia" Then
+						Var pTaobinX = PointTaobin / pTaobin
-						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+						If pTaobinX >= 2 Then
+							Var Point2X = 1
+						EndIf
+					EndIf
+
+
+					Var Seeker.PointTaobinStr = ParamCP
+					Var Seeker.TNumberTaobinMember = TelephoneNumberX
+					
+
+					Var CoffeePointRank = Ext1b
+					INT CoffeePointRank
+
+					Var CoffeePoint1 = Ext1c
+					INT CoffeePoint1
+				
+					Var CoffeePoint = PointTaobin + CoffeePoint1
+					Var CoffeePointOld = CoffeePoint1
+
+					If TaobinLevel = 1 Then
+						Var CoffeePointRank = CoffeePointRank + 0
+					Else
+						Var CoffeePointRank = CoffeePointRank + PointTaobin
 					EndIf 
 
-					;inter-xml-open
+					Var CoffeePointRankTmp = CoffeePointRank
-					If CountryName = "Australia" Then
 
-						If NewCollectPointFlag = 1 Then
+
-							Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
+					DEBUGVAR Seeker.PointTaobinStr
-							Open pageCollectPoint
+					DEBUGVAR Seeker.TNumberTaobinMember
-						Else
+					If TaobinPDPA = 0 Then
+
+						;inter-xml-open
+						If CountryName = "Malaysia" Then
 							Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 						EndIf
+
+						;inter-xml-open
+						If CountryName = "Indonesia" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+						EndIf 
+
+						;inter-xml-open
+						If CountryName = "Australia" Then
+
+							If NewCollectPointFlag = 1 Then
+								Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
+								Open pageCollectPoint
+							Else
+								Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+							EndIf
+							
+						EndIf
+
+						;inter-xml-open
+						If CountryName = "Singapore" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+						EndIf 
+
+						Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+					EndIf
+
+					If PayAmount >= 20 Then
+
+						If TaobinPromoX = "p2.no_otp" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" 
+						EndIf
+
+						If TaobinPromoX = "p2.unused" Then
+							Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" 
+						EndIf
 						
 					EndIf
 
-					;inter-xml-open
+					If NewCollectPoint = 1 Then
-					If CountryName = "Singapore" Then
+						If LuckyDrawCampaign = 1 Then
+							Var GetLuckyDraw = 1
+							GETACCEXT TelephoneNumber 14
+						Else
+							Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+						EndIf
+					Else
 						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
-					EndIf 
-
-					Open "ROOT/taobin_project/xml/page_show_consent.xml" 
-				EndIf
-
-				If PayAmount >= 20 Then
-
-					If TaobinPromoX = "p2.no_otp" Then
-						Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" 
 					EndIf
 
-					If TaobinPromoX = "p2.unused" Then
-						Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml" 
-					EndIf
-					
-				EndIf
 
-				If NewCollectPoint = 1 Then
-					Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
 				Else
-					Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+					
+					Var Seeker.TaobinErrorNetwork = 1
+					
+					Var Seeker.PointTaobinStr = ParamCP
+					Var TelephoneNumber = TelephoneNumberX
+					Var Seeker.TNumberTaobinMember = TelephoneNumber
+					Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 				EndIf
-
-
-			Else
-				
-				Var Seeker.TaobinErrorNetwork = 1
-				
-				Var Seeker.PointTaobinStr = ParamCP
-				Var TelephoneNumber = TelephoneNumberX
-				Var Seeker.TNumberTaobinMember = TelephoneNumber
-				Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 			EndIf
-			
-	
-			
 
 		EndIf
 	EndIf

xml/page_collect_point_3_28.xml

@@ -683,7 +683,7 @@
 				Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
 			Else
 				If Seeker.IsLineMember = 0 Then
-					If CheckMemberPageCampaign = 1 Then
+					If LuckyDrawCampaign = 1 Then
 						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 					Else
 						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -694,7 +694,7 @@
 			EndIf
 		Else
 			If Seeker.IsLineMember = 0 Then
-				If CheckMemberPageCampaign = 1 Then
+				If LuckyDrawCampaign = 1 Then
 					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 				Else
 					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -843,7 +843,7 @@
 			Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
 		Else
 			If Seeker.IsLineMember = 0 Then
-				If CheckMemberPageCampaign = 1 Then
+				If LuckyDrawCampaign = 1 Then
 					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 				Else
 					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -854,7 +854,7 @@
 		EndIf
 	Else
 		If Seeker.IsLineMember = 0 Then
-			If CheckMemberPageCampaign = 1 Then
+			If LuckyDrawCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -1232,7 +1232,7 @@
 </EventUnitTest2>
 
 <EventUnitTest4>
-	If CheckMemberPageCampaign = 1 Then
+	If LuckyDrawCampaign = 1 Then
 		Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 	Else
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"

xml/page_display_get_15_discount.xml

@@ -30,19 +30,19 @@
 
 	Var Timeout = Timeout + 1
 
-	If FromCheckMemberPoint = 1 Then
+	If Timeout > 10 Then
-		If Timeout > 10 Then
+		If FromCheckMemberPoint = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
-		EndIf
+		Else
-	Else
+			If Seeker.IsLineMember = 0 Then
-		If Seeker.IsLineMember = 0 Then
+				If LuckyDrawCampaign = 1 Then
-			If CheckMemberPageCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
-		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
 	EndIf
 
@@ -157,7 +157,7 @@
 	If FromCheckMemberPoint = 1 Then
 		Open "ROOT/taobin_project/xml/page_check_member2.xml"
 	Else
-		If CheckMemberPageCampaign = 1 Then
+		If LuckyDrawCampaign = 1 Then
 			Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 		Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -181,7 +181,7 @@
 		Open "ROOT/taobin_project/xml/page_check_member2.xml"
 	Else
 		If Seeker.IsLineMember = 0 Then
-			If CheckMemberPageCampaign = 1 Then
+			If LuckyDrawCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"

xml/page_display_get_drink_5_baht.xml

@@ -53,7 +53,7 @@
 				Open "ROOT/taobin_project/xml/page_check_member2.xml"
 			Else
 				If Seeker.IsLineMember = 0 Then
-					If CheckMemberPageCampaign = 1 Then
+					If LuckyDrawCampaign = 1 Then
 						Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 					Else
 						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@@ -157,7 +157,7 @@
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
 		Else
 			If Seeker.IsLineMember = 0 Then
-				If CheckMemberPageCampaign = 1 Then
+				If LuckyDrawCampaign = 1 Then
 					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
 				Else
 					Open "ROOT/taobin_project/xml/page_lid_straw.xml"

xml/page_payment.xml

@@ -145,6 +145,8 @@
 	Var Seeker.CreditCard = 0
 	Var Seeker.CreditCardRef = ""
 
+	Var Seeker.UseCreditPayFullDrinkPrice = 0
+
 	Var Seeker.IntVendingCredit = 0
 	
 	Var Seeker.StoreCreditFlag = 0

xml/page_payment_credit3-0.xml

@@ -90,6 +90,8 @@
 		Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
 		Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
 
+		Var Seeker.CreditEnoughRefID = PointCrm
+
 		CoinVending OFF
 
 		Var Seeker.TNumberTaobinCredit = TelephoneNumber
@@ -98,6 +100,7 @@
 		Var Seeker.StoreCreditFlag = 1
 		Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount
 		Var VendingCreditRemain = "" + SumCreditAmount
+		Var Seeker.UseCreditPayFullDrinkPrice = 1
 
 		If CART_COUNT >= 1 Then 
 

xml/page_payment_credit3-TopupCash.xml

@@ -78,8 +78,6 @@
 	Var ChangeTimeout = 0
 	Var CancelCounter = 0
 
-	CoinVending XBILL
-
 
     Var ServiceAmount2 = CreditAmount
     Var ServiceCharge = 0
@@ -95,6 +93,24 @@
 
 	Var warning_price_state = "Enable"
 	
+	If CoinAmount > 0 Then
+	
+		Var SumAmount = CreditAmount + CoinAmount
+
+
+		If SumAmount >= PayAmountSubDiscount Then
+			Var confirmButtonState = "Enable"
+			Var alphaState2 = "Invisible"
+			Var warning_price_state = "Invisible"
+		Else
+			Var warning_price_state = "Enable"
+		EndIf
+
+		Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
+		Var showRemaining = charOfBaht + RemainAmountStr
+		
+	EndIf
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -112,7 +128,6 @@
 					AddData 24 TelephoneNumber  BmiYear PointCrm GetScore
 				EndIf
 
-				CoinVending OFF
 				Var CancelFlag = 1
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
@@ -154,6 +169,7 @@
 
                 Var TelephoneNumber = Seeker.TNumberTaobinCredit
                 Var PayO2 = Var Seeker.CoffeePinNumber
+				Var ServiceAmount2 = CoinAmount
                     
                 Var VendingDiscount = 0
                 Var VendingCampaign = 0
@@ -163,6 +179,8 @@
 
                 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
                 Var PayCredit = 1
+				
+				CoinVending OFF
                 
                 If Seeker = "curr" Then
                     Open "ROOT/taobin_project/xml/page_catalog.xml"  
@@ -212,14 +230,6 @@
 	
 	EndIf
 	
-	
-
-
-    
-
-
-	
-
 	TimerReset
 	Refresh
 </EventTimeout> 
@@ -381,7 +391,6 @@
 				AddData 24 TelephoneNumber  BmiYear PointCrm GetScore
 			EndIf
 
-			CoinVending OFF
 			Var CancelCounter = 0
 			Var CancelFlag = 1
 			If CoinAmount = 0 Then

xml/page_show_consent.xml

@@ -30,7 +30,7 @@
 	EndIf
 
 	Var consentImg = "/img_popup2.png"
-	If CheckMemberPageCampaign = 1 Then
+	If LuckyDrawCampaign = 1 Then
 		Var consentImg = "/img_popup3.png"
 	EndIf
 
@@ -59,7 +59,11 @@
 		;GETACCEXT TelephoneNumber 14
 		; goto lid straw
 		If NewCollectPoint = 1 Then
-			Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+			If LuckyDrawCampaign = 1 Then
+				Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+			EndIf
 		Else
 			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 		EndIf
@@ -130,7 +134,11 @@
 	If UnitTestType = "1" Then
 		Var CoffeePoint = 10
 		If NewCollectPoint = 1 Then
-			Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+			If LuckyDrawCampaign = 1 Then
+				Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+			EndIf
 		Else
 			Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 		EndIf
@@ -142,7 +150,11 @@
     ;GETACCEXT TelephoneNumber 14
 	; goto lid straw
 	If NewCollectPoint = 1 Then
-		Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+		If LuckyDrawCampaign = 1 Then
+			Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+		EndIf
 	Else
 		Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 	EndIf

xml/page_thankyou.xml

@@ -22,6 +22,8 @@
 	Var GotoStoreCredit0 = 0
 	Var StoreCreditAmount = 0
 
+	Var DetectCoinAmount = 0
+
 	Var buttonRemoveCup = "Invisible"
 
 	Var MachineState_Result = 0
@@ -215,24 +217,33 @@
 						EndIf
 
 					Else
+						DEBUGVAR Seeker.UseCreditPayFullDrinkPrice
 
-						If Seeker.IntVendingCampaign < PayAmount Then 
+						If Seeker.UseCreditPayFullDrinkPrice = 1 Then
-							Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
+							If CoinAmount > 0 Then
-							Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
+								Var StoreCreditAmount = CoinAmount
+								Var DetectCoinAmount = 1
+							EndIf
+						Else
+							If Seeker.IntVendingCampaign < PayAmount Then 
+								Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
+								Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
 
-							If SumCoinAmount >= PayAmount Then 
+								If SumCoinAmount >= PayAmount Then 
-								Var Canout = SumCoinAmount - PayAmount
+									Var Canout = SumCoinAmount - PayAmount
-								If Canout > 0 Then
+									If Canout > 0 Then
-									
+										
-										;Change Canout	
+											;Change Canout	
-										;Var ChangeFlag2 = 1
+											;Var ChangeFlag2 = 1
-										Var GotoStoreCredit0 = 1
+											Var GotoStoreCredit0 = 1
-										Var StoreCreditAmount = Canout
+											Var StoreCreditAmount = Canout
-									
+										
+									EndIf
 								EndIf
 							EndIf
 						EndIf
 
+
 					EndIf
 
 
@@ -409,16 +420,32 @@
 
 					DEBUGVAR Seeker.CurrCreditAmount
 					DEBUGVAR Seeker.CreditNotEnoughRefID
+					DEBUGVAR Seeker.CreditEnoughRefID
 
 					If Seeker.CreditNotEnoughRefID = "" Then
 						Var CurrAmount = Seeker.CurrCreditAmount
-						If CoinAmount > 0 Then
-							Var CurrAmount = CurrAmount + CoinAmount
-						EndIf
 						Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
 						Var CurrPinNum = Seeker.CurrCreditPinNum
-						Var RefID = ""
+
-						AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
+						If DetectCoinAmount = 1 Then
+							Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
+
+							If CurrAmount >= ServiceAmountSupCampain Then
+
+								Var creditToTopup = CurrAmount - ServiceAmountSupCampain
+								Var RefID = "0/" + Seeker.CreditEnoughRefID
+								Var Seeker.CreditReferenceTmp = RefID
+
+								AddData 41 CurrTelePhoneNum creditToTopup CurrPinNum RefID
+							Else
+								Var RefID = ""
+								AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
+							EndIf
+						Else
+							Var RefID = ""
+							AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
+						EndIf
+
 					Else
 
 						Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign