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

xml/default_color_settings.ev

@@ -4,4 +4,5 @@ Var WelcomeColor = "0xEE8C62"
 Var BackgroundColor = "0xeae6e1"
 Var HeadlineColor = "0x513C2F"
 Var SubHeadlineColor = "0x6F5F51"
-Var PopupBodyTextColor = "0xB78F24"
+Var PopupBodyTextColor = "0xB78F24"
+Var BodyTextColor = HeadlineColor

xml/event/collect_promotion_point_condition.ev

@@ -0,0 +1,11 @@
+If RobinsonBeautyPro = 1 Then
+    If Seeker.VendingCode = "MKF" Then
+        Var Seeker.CollectPointPromotion = 1
+    EndIf
+EndIf
+
+If JemilaPro = 1 Then
+    If Seeker.VendingCode = "MKF" Then
+        Var Seeker.CollectPointPromotion = 1
+    EndIf
+EndIf

xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_7up_lucky_draw_x2.xml
+/event/promotion_jemila.xml

xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-                Var BigButtonEnable = "Invisible"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_jemila.xml"

xml/event/promotion_template2.inc

@@ -33,47 +33,10 @@
      </FilenameDisable>
 <EventOnClick> 
 
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_7up_lucky_draw_x2_ignore.xml"
+        ###EventOnClick
         
 </EventOnClick>
 
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        ) 
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4" </Filename>
-</Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        ) 
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4" </Filename>
-</Video>
-
 </Button>
 
 <EventUnitTest1>

xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml

@@ -158,16 +158,16 @@
             Var PointState[8] = 0
             Var PointState[9] = 0
 
-            Var PointNameIndex[0] = -1
-            Var PointNameIndex[1] = -1
-            Var PointNameIndex[2] = -1
-            Var PointNameIndex[3] = -1
-            Var PointNameIndex[4] = -1
-            Var PointNameIndex[5] = -1
-            Var PointNameIndex[6] = -1
-            Var PointNameIndex[7] = -1
-            Var PointNameIndex[8] = -1
-            Var PointNameIndex[9] = -1
+            Var PointImage[0] = "/no_point.png"
+            Var PointImage[1] = "/no_point.png"
+            Var PointImage[2] = "/no_point.png"
+            Var PointImage[3] = "/no_point.png"
+            Var PointImage[4] = "/no_point.png"
+            Var PointImage[5] = "/no_point.png"
+            Var PointImage[6] = "/no_point.png"
+            Var PointImage[7] = "/no_point.png"
+            Var PointImage[8] = "/no_point.png"
+            Var PointImage[9] = "/no_point.png"
 
 
 
@@ -337,61 +337,101 @@
             If MenuPoint[0] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 0
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_1_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_1.png"
+                EndIf
             EndIf
 
             If MenuPoint[1] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 1
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_2_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_2.png"
+                EndIf
             EndIf
 
             If MenuPoint[2] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 2
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_3_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_3.png"
+                EndIf
             EndIf
 
             If MenuPoint[3] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 3
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_4_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_4.png"
+                EndIf
             EndIf
 
             If MenuPoint[4] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 4
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_5_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_5.png"
+                EndIf
             EndIf
 
             If MenuPoint[5] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 5
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_6_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_6.png"
+                EndIf
             EndIf
 
             If MenuPoint[6] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 6
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_7_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_7.png"
+                EndIf
             EndIf
 
             If MenuPoint[7] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 7
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_8_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_8.png"
+                EndIf
             EndIf
 
             If MenuPoint[8] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 8
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_9_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_9.png"
+                EndIf
             EndIf
 
             If MenuPoint[9] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointNameIndex[CurrentIndexPoint] = 9
+                If show_eng = "true" Then
+                    Var PointImage[CurrentIndexPoint] = "/point_10_en.png"
+                Else
+                    Var PointImage[CurrentIndexPoint] = "/point_10.png"
+                EndIf
             EndIf
 
             DEBUGVAR Seeker.selected_a_drink

xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml

@@ -35,16 +35,6 @@
 	Var CheckCoupons = 0
 	Var MakeDrinkState = 0
 
-	Var taobinImgPoint[0] = "/no_point.png"
-	Var taobinImgPoint[1]= "/no_point.png"
-	Var taobinImgPoint[2]= "/no_point.png"
-	Var taobinImgPoint[3]= "/no_point.png"
-	Var taobinImgPoint[4]= "/no_point.png"
-	Var taobinImgPoint[5]= "/no_point.png"
-	Var taobinImgPoint[6]= "/no_point.png"
-	Var taobinImgPoint[7]= "/no_point.png"
-	Var taobinImgPoint[8]= "/no_point.png"
-
 	Var PointCount = 0
 
 	DEBUGVAR PointState[0]
@@ -56,96 +46,47 @@
 	DEBUGVAR PointState[6]
 	DEBUGVAR PointState[7]
 	DEBUGVAR PointState[8]
+	DEBUGVAR PointState[9]
 
-	Var PointNameIndex0 = PointNameIndex[0]
-	Var PointNameIndex1 = PointNameIndex[1]
-	Var PointNameIndex2 = PointNameIndex[2]
-	Var PointNameIndex3 = PointNameIndex[3]
-	Var PointNameIndex4 = PointNameIndex[4]
-	Var PointNameIndex5 = PointNameIndex[5]
-	Var PointNameIndex6 = PointNameIndex[6]
-	Var PointNameIndex7 = PointNameIndex[7]
-	Var PointNameIndex8 = PointNameIndex[8]
+	Var taobinImgPoint[0] = PointImage[0]
+	Var taobinImgPoint[1] = PointImage[1]
+	Var taobinImgPoint[2] = PointImage[2]
+	Var taobinImgPoint[3] = PointImage[3]
+	Var taobinImgPoint[4] = PointImage[4]
+	Var taobinImgPoint[5] = PointImage[5]
+	Var taobinImgPoint[6] = PointImage[6]
+	Var taobinImgPoint[7] = PointImage[7]
+	Var taobinImgPoint[8] = PointImage[8]
 
 	If PointState[0] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[0] = "/point_1_en.png"
-        Else
-		    Var taobinImgPoint[0] = "/point_1.png"
-        EndIf
 	EndIf
 	If PointState[1] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[1] = "/point_2_en.png"
-        Else
-		    Var taobinImgPoint[1] = "/point_2.png"
-        EndIf
 	EndIf
 	If PointState[2] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[2] = "/point_3_en.png"
-        Else
-		    Var taobinImgPoint[2] = "/point_3.png"
-        EndIf
 	EndIf
 	If PointState[3] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[3] = "/point_4_en.png"
-        Else
-		    Var taobinImgPoint[3] = "/point_4.png"
-        EndIf
 	EndIf
 	If PointState[4] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[4] = "/point_5_en.png"
-        Else
-		    Var taobinImgPoint[4] = "/point_5.png"
-        EndIf
 	EndIf
 	If PointState[5] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[5] = "/point_6_en.png"
-        Else
-		    Var taobinImgPoint[5] = "/point_6.png"
-        EndIf
 	EndIf
 	If PointState[6] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[6] = "/point_7_en.png"
-        Else
-		    Var taobinImgPoint[6] = "/point_7.png"
-        EndIf
 	EndIf
 	If PointState[7] = 1 Then
 		Var PointCount = PointCount + 1
-        If show_eng = "true" Then
-            Var taobinImgPoint[7] = "/point_8_en.png"
-        Else
-		    Var taobinImgPoint[7] = "/point_8.png"
-        EndIf
 	EndIf
 	If PointState[8] = 1 Then
 		Var PointCount = PointCount + 1
-		If MenuPoint[9] = 1 Then
-			If show_eng = "true" Then
-				Var taobinImgPoint[8] = "/point_10_en.png"
-			Else
-				Var taobinImgPoint[8] = "/point_10.png"
-			EndIf
-		Else
-			If show_eng = "true" Then
-				Var taobinImgPoint[8] = "/point_9_en.png"
-			Else
-				Var taobinImgPoint[8] = "/point_9.png"
-			EndIf
-		EndIf
+	EndIf
+	If PointState[9] = 1 Then
+		Var PointCount = PointCount + 1
 	EndIf
 
 	Var PointDiff = 9 - PointCount
@@ -176,7 +117,7 @@
 		
 	EndIf
 
-    If PointCount = 9 Then
+    If PointCount >= 9 Then
         Var CloseBtnImg = PointRootDir + "/bn_random.png"
     EndIf
 

xml/event/robinson_beauty/page_robinson_beauty_random_result.xml

@@ -24,10 +24,10 @@
         If CodeType = "138" Then
             Var RewardText = DirImage + "/reward_lip_tint_oil_name.png"
             Var RewardImage = DirImage + "/reward_lip_tint_oil.png"
-            Var RewardText_X = 18
-            Var RewardText_Y = 923
-            Var RewardImage_X = 169
-            Var RewardImage_Y = 578
+            Var RewardText_X = 169
+            Var RewardText_Y = 578
+            Var RewardImage_X = 18
+            Var RewardImage_Y = 923
         EndIf
 
         If CodeType = "139" Then

xml/event/script_common_for_open_promotion_xml.ev

@@ -6,6 +6,7 @@ DEBUGVAR OpenFromPageBoard
 
 DEBUGVAR MomCocoaPro
 DEBUGVAR RobinsonBeautyPro
+DEBUGVAR JemilaPro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -26,6 +27,10 @@ Else
 	Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
 	; zone promote
 
+	If JemilaPro = 1 Then
+		Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_jemila.xml"
+	EndIf
+
 	If RobinsonBeautyPro = 1 Then
 		Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_robinson_beauty.xml"
 	Else

xml/event/tricker.ev

@@ -129,6 +129,9 @@ Var Seeker.BuyMomCocoaProFlag = 0
 Var RobinsonBeautyPro = 0
 Var FromRobinsonBeautyPro = 0
 
+; Enable Jemila promotion, 1 - 18 Oct
+Var JemilaPro = 0
+
 Var NewCollectPoint = 1
 Var ShouldCollectPromotionPoint = 0
 
@@ -198,6 +201,12 @@ If SystemDateMonthInt = 9 Then
 	EndIf
 EndIf
 
+If SystemDateMonthInt = 10 Then
+	If SystemDateDayInt <= 18 Then
+		Var JemilaPro = 1
+	EndIf
+EndIf
+
 
 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
@@ -211,9 +220,26 @@ If BoxID = 105005 Then
 	Var RobinsonBeautyPro = 1
 EndIf
 
+If BoxID = 172331 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf
 
+If BoxID = 172232 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf
 
-
+If BoxID = 172053 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf
 
 Var XMLLiveInfoEnable = 1
 
@@ -288,6 +314,7 @@ If taobin_nopro = "true" Then
 	Var PassionMintPro = 0
 	Var MomCocoaPro = 0
 	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 0
 	
 	Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
 
@@ -364,11 +391,12 @@ If BoxID = 200000 Then
 	Var NewFlowPaymentCode = 1
 EndIf
 
-If BoxID > 200000 Then
-	If BoxID < 200030 Then
-		Var New_Payment = 1
-		Var NewFlowPaymentCode = 1
-	EndIf
-EndIf
-
+;
+;If BoxID > 200000 Then
+;	If BoxID < 200030 Then
+;		Var New_Payment = 1
+;		Var NewFlowPaymentCode = 1
+;	EndIf
+;EndIf
+;
 

xml/menutab/page_catalog.xml

@@ -212,6 +212,8 @@
 
 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
 
+	TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
+
 	; zone cup on arm
 	If CupOnArm = "true" Then
 

xml/menutab/page_catalog_group_pro_jemila.skt

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

xml/menutab/page_catalog_group_pro_robinson_beauty.xml

@@ -585,7 +585,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 9
+; menu_new_list 10
 	; ==================> Len = 12
 	; - - 12-05-03-0064 
 <Block>
@@ -3377,6 +3377,259 @@ CHEE TEA" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; - - - 
+	; ==================> Len = 12
+	; - - 12-05-03-0115 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-05-03-0115.Button,$Sum1205030115) </State> 
+	<Button>
+	<State> $Sum1205030115 </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_7UP_Lychee_SODA_robinson_beauty.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_7UP_Lychee_SODA_robinson_beauty.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_7UP_Lychee_SODA_robinson_beauty.png" </FilenameDisable>
+	<OverlayImage> xmlpro( 12-05-03-0115, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "ROBINSON UP CHEE SMOOTHIE"
+		Var NameDrinkTH = "โรบินสันอัพชี่"
+		Var DrinkDescriptionTH = "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา "
+		Var DrinkDescription = "7Up Lychee Lime Soda"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_7UP_Lychee_SODA_robinson_beauty.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		GetInstanceIDMenuTab OpenFromInstMenuTab
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $12-05-03-0115.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "12-05-03-0115"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = $12-05-03-0115.Button
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0115, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		DEBUGVAR OverlayMenuFilter
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "12-05-03-0115"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $12-05-03-0115.NameE
+		Var menu_desc_eng_blender = $12-05-03-0115.descriptionE
+		Var menu_name_thai_blender = $12-05-03-0115.Name
+		Var menu_desc_thai_blender = $12-05-03-0115.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		TabMenuVisibleInst 99
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "โรบินสันอัพชี่" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "ROBINSON UP CHEE SMOOTHIE" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "7Up Lychee Lime Soda" </Value>
+	</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> 50 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</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> 115 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $12-05-03-0115.Button </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-05-03-0115.Button </State>
+	<Value> Var( "฿" + $12-05-03-0115.Price ) </Value>
+	</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 $Sum1205030115 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-05-03-0115.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>
+	<Font> MITRegularTTF </Font>
+	<Color> 0x5A5A5A </Color>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum1205030115 </State> 
+	<Value> text_unavailable </Value>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; - - - 
 </FrameScroll>

xml/open_page_collect_point.ev

@@ -6,6 +6,10 @@ If CountryName = "Australia" Then
     Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
 EndIf
 
+If CountryName = "Malaysia" Then
+    Var PageCollectPoint1 = "ROOT/taobin_project/inter/mys/xml/page_collect_point_1.lxml"
+EndIf
+
 If CountryName = "Singapore" Then
     ; ask-if-member-yet
     Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"

xml/page_NewBrewing3.xml

@@ -286,13 +286,6 @@
 		RootLayoutVisible 3 "hide"
 	EndIf
 
-	If adver_brewing_en = 1 Then
-		Var adver_brewing_playing = 1
-		Var adver_brewing_play_index = 2
-		Var adver_brewing_count_down = 10
-		Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
-		Var PictureFile = brew_txt1
-	EndIf
 
 	Var CampaignEnable = 0
 
@@ -304,7 +297,7 @@
 
 	If bg_lidProblem_ST = "Enable" Then
 		Var EnableTopupCreditBetweenBrew = "Invisible"
-		Var EnableGetMore
+		Var GetLidButtonState = "Invisible"
 	EndIf
 
 	If bg_strawProblem_ST = "Enable" Then
@@ -491,6 +484,22 @@
 		EndIf
 	EndIf
 
+	If adver_brewing_en = 1 Then
+		Var adver_brewing_playing = 1
+		Var adver_brewing_play_index = 2
+		Var adver_brewing_count_down = 10
+		Var brew_vdo1 = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
+	
+		TRY "ROOT/taobin_project/video/script3_first_brewing.ev"
+
+
+		Var VideoPlayFile = brew_vdo1
+		Var PictureFile = brew_txt1
+		
+	
+
+	EndIf
+
 	
 </EventOpen>
 <EventLanguageOnChange>
@@ -810,6 +819,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@@ -846,6 +857,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID

xml/page_NewBrewing3Conti.xml

@@ -370,6 +370,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@@ -406,6 +408,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID

xml/page_NewCannotConti.xml

@@ -359,6 +359,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@@ -393,6 +395,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID

xml/page_board.xml

@@ -1349,23 +1349,8 @@
 </EventUnitTest3>
 
 <EventUnitTest4>
-	Var XMLProfile = "School-Tier3"
-	PRICE "Reset" "-"
-	PRICE "Load" "-"
-	PRICE "CheckAndApply" XMLProfile
+	Var XMLProfile = "ProfileIncrease15"
 
-	DEBUGVAR ProfileIndex[0]
-	DEBUGVAR ProfileIndex[1]
-	DEBUGVAR ProfileIndex[2]
-	DEBUGVAR ProfileIndex[3]
-	DEBUGVAR ProfileIndex[4]
-	DEBUGVAR ProfileIndex[5]
-	DEBUGVAR ProfileIndex[6]
-	DEBUGVAR ProfileIndex[7]
-	DEBUGVAR ProfileIndex[8]
-	DEBUGVAR ProfileIndex[9]
-	DEBUGVAR ProfileIndex[10]
-	PRICE "Reload" ""
 </EventUnitTest4>
 
 <EventUnitTest5>

xml/page_brewing3.xml

@@ -383,22 +383,7 @@
 
 
 	Var CreditCardVoid = 0
-	If InternationalEnable = 1 Then
-		Var adver_brewing_en = 0
-		RootLayoutVisible 3 "hide"
-	EndIf
 
-	If adver_brewing_en = 1 Then
-		Var adver_brewing_playing = 1
-		Var adver_brewing_play_index = 2
-		Var adver_brewing_count_down = 10
-		Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
-		Var PictureFile = brew_txt1
-		
-		TRY "ROOT/taobin_project/video/script3_frist_brewing.ev"	
-
-	
-	EndIf
 
 	Var CampaignEnable = 0
 
@@ -409,7 +394,7 @@
 
 	If bg_lidProblem_ST = "Enable" Then
 		Var EnableTopupCreditBetweenBrew = "Invisible"
-		Var EnableGetMore
+		Var GetLidButtonState = "Invisible"
 	EndIf
 
 	If bg_strawProblem_ST = "Enable" Then
@@ -594,7 +579,32 @@
 		EndIf
 	EndIf
 
+		
+
+
+	If InternationalEnable = 1 Then
+		Var adver_brewing_en = 0
+		RootLayoutVisible 3 "hide"
+	EndIf
+
+
+	If adver_brewing_en = 1 Then
+		Var adver_brewing_playing = 1
+		Var adver_brewing_play_index = 2
+		Var adver_brewing_count_down = 10
+		Var brew_vdo1 = "ROOT/taobin_project/image/page_doing/tao_adv1.png"
 	
+		TRY "ROOT/taobin_project/video/script3_first_brewing.ev"
+
+
+		Var VideoPlayFile = brew_vdo1
+		Var PictureFile = brew_txt1
+		
+	
+
+	EndIf
+
+
 </EventOpen>
 <EventLanguageOnChange>
 	Var XPosiShowCountDownBrew = 768
@@ -1456,8 +1466,6 @@
 					Var PictureFile = brew_txt2
 					Var PictureFileTextDesctionState = "Invisible"
 
-					Var SelectMenuBetweenBrewEnable1Blink = "Invisible" 
-					Var SelectMenuBetweenBrewEnable1Text = "Invisible" 
 				EndIf
 
 				

xml/page_catalog_group_pro_jemila.skt

@@ -0,0 +1,54 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+    Var FromMyMintPro = 0
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<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/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+
+
+;BigLogoLayout
+
+</Popup>
+
+

xml/page_catalog_group_pro_robinson_beauty.xml

@@ -55,8 +55,8 @@
 	<EventOnClick> 
 		Var NameDrink = "ICED REVLON STRAW CHEE SODA"
 		Var NameDrinkTH = "เรฟลอนสตรอว์ชี่ โซดา"
-		Var DrinkDescriptionTH = "Straw + Lychee + Soda"
-		Var DrinkDescription = "Straw + Lychee + Soda"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_straw_soda_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -139,7 +139,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -161,7 +161,7 @@ STRAW CHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -291,38 +291,38 @@ STRAW CHEE SODA" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - 12-99-05-0059 - 
+	; - 12-99-05-0073 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-99-05-0059.Button,$Sum1299050059) </State> 
+	<State> Flag( 12-99-05-0073.Button,$Sum1299050073) </State> 
 	<Button>
-	<State> $Sum1299050059 </State> 
+	<State> $Sum1299050073 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-99-05-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-99-05-0073, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "ICED ARTY PEP LYCHEE SODA"
 		Var NameDrinkTH = "อาร์ตี้เป๊ปลิ้นจี่โซดา"
-		Var DrinkDescriptionTH = "Lychee + Pepsi + Lime"
-		Var DrinkDescription = "Lychee + Pepsi + Lime"
+		Var DrinkDescriptionTH = "น้ำเชื่ื่อมลิ้นจี่ เป๊ปซี่ ผงมะนาว และโซดา"
+		Var DrinkDescription = "Lychee Syrup, Pepsi , Lime &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Lychee_Lime_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-99-05-0059.Price
+		Var PriceD2 = $12-99-05-0073.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-99-05-0059"
+		Var PD_CODE2 = "12-99-05-0073"
 		Var PD_CODE3 = "##-##-##-####"
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-99-05-0059.Button
+		Var PD_STAGE_2 = $12-99-05-0073.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-99-05-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-99-05-0073, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -339,7 +339,7 @@ STRAW CHEE SODA" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-99-05-0059"
+			Topping "Load" "12-99-05-0073"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -352,10 +352,10 @@ STRAW CHEE SODA" </Value>
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-		Var menu_name_eng_cold = $12-99-05-0059.NameE
-		Var menu_desc_eng_cold = $12-99-05-0059.descriptionE
-		Var menu_name_thai_cold = $12-99-05-0059.Name
-		Var menu_desc_thai_cold = $12-99-05-0059.description
+		Var menu_name_eng_cold = $12-99-05-0073.NameE
+		Var menu_desc_eng_cold = $12-99-05-0073.descriptionE
+		Var menu_name_thai_cold = $12-99-05-0073.Name
+		Var menu_desc_thai_cold = $12-99-05-0073.description
 		
 		Var menu_name_eng_blender = $##-##-##-####.NameE
 		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@@ -392,7 +392,7 @@ STRAW CHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Pepsi + Lime" </Value>
+	<Value> "น้ำเชื่ื่อมลิ้นจี่ เป๊ปซี่ ผงมะนาว และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -414,7 +414,7 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Pepsi + Lime" </Value>
+	<Value> "Lychee Syrup, Pepsi , Lime &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -444,7 +444,7 @@ LYCHEE SODA" </Value>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-99-05-0059.Button </State>
+	<State> $12-99-05-0073.Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -454,8 +454,8 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-99-05-0059.Button </State>
-	<Value> StringFmt( $12-99-05-0059.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-99-05-0073.Button </State>
+	<Value> StringFmt( $12-99-05-0073.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -498,9 +498,9 @@ LYCHEE SODA" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1299050059 = "Disable" Then
+			If $Sum1299050073 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-99-05-0059.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-99-05-0073.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -537,7 +537,7 @@ LYCHEE SODA" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1299050059 </State> 
+	<State> $Sum1299050073 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -562,8 +562,8 @@ LYCHEE SODA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SIVANNA STRAW CHEE TEA"
 		Var NameDrinkTH = "ซีเวนน่าสตรอว์ ชี่ชาไทย"
-		Var DrinkDescriptionTH = "Straw + lychee + Thai tea"
-		Var DrinkDescription = "Straw + lychee + Thai tea"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และชาไทย"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Thai Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Thaitea_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -646,7 +646,7 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + lychee + Thai tea" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และชาไทย" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -668,7 +668,7 @@ STRAW CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + lychee + Thai tea" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Thai Tea" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -816,8 +816,8 @@ STRAW CHEE TEA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED ESTEE LYCHEE STRAW CANO"
 		Var NameDrinkTH = "เอสเต้ดับเบิ้ลลิ้นจี่ สตอว์กาโน่"
-		Var DrinkDescriptionTH = "Lychee + Straw + Americano"
-		Var DrinkDescription = "Lychee + Straw + Americano"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Espresso"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Americano_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -900,7 +900,7 @@ STRAW CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -922,7 +922,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Espresso" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1068,8 +1068,8 @@ STRAW CANO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED ESTEE LYCHEE STRAW CANO"
 		Var NameDrinkTH = "เอสเต้ดับเบิ้ลลิ้นจี่ สตอว์กาโน่"
-		Var DrinkDescriptionTH = "Lychee + Straw + Americano"
-		Var DrinkDescription = "Lychee + Straw + Americano"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Espresso"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Americano_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1152,7 +1152,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1174,7 +1174,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Espresso" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1321,8 +1321,8 @@ STRAW CANO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CLARINS PLUM CARA MILK"
 		Var NameDrinkTH = "คลาแรงส์พลัม คารามิลล์"
-		Var DrinkDescriptionTH = "Plum + Caramel + Milk"
-		Var DrinkDescription = "Plum + Caramel + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง"
+		Var DrinkDescription = "Ume Syrup, Caramel Syrup, Milk ,Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Plum_Milk_caramel_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1405,7 +1405,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Plum + Caramel + Milk" </Value>
+	<Value> "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1427,7 +1427,7 @@ PLUM CARA MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Plum + Caramel + Milk" </Value>
+	<Value> "Ume Syrup, Caramel Syrup, Milk ,Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1575,8 +1575,8 @@ PLUM CARA MILK" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CALVIN KLEIN COCOA CHEE"
 		Var NameDrinkTH = "คลาวิน ไคลน์ โกโก้ชี่"
-		Var DrinkDescriptionTH = "Cocoa + Lychee + Milk"
-		Var DrinkDescription = "Cocoa + Lychee + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โกโก้  และนม "
+		Var DrinkDescription = "Lychee Syrup, Cocoa , Milk "
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1658,7 +1658,7 @@ PLUM CARA MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cocoa + Lychee + Milk" </Value>
+	<Value> "น้ำเชื่อมลิ้นจี่ โกโก้  และนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1680,7 +1680,7 @@ KLEIN COCOA CHEE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cocoa + Lychee + Milk" </Value>
+	<Value> "Lychee Syrup, Cocoa , Milk " </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1828,8 +1828,8 @@ KLEIN COCOA CHEE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED RO STRAW MATCHA"
 		Var NameDrinkTH = "โรสตรอว์มัทฉะ"
-		Var DrinkDescriptionTH = "Straw + Matcha + Milk"
-		Var DrinkDescription = "Straw + Matcha + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ ชาเขียว และนม "
+		Var DrinkDescription = "Strawberry Syrup , Matcha, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Matcha_milk_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1911,7 +1911,7 @@ KLEIN COCOA CHEE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Matcha + Milk" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ ชาเขียว และนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1933,7 +1933,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + Matcha + Milk" </Value>
+	<Value> "Strawberry Syrup , Matcha, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2081,8 +2081,8 @@ MATCHA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED BIN STRAW CAFE LATTE"
 		Var NameDrinkTH = "บินสตรอว์คาเฟ่ลาเต้"
-		Var DrinkDescriptionTH = "Cafe latte + Straw"
-		Var DrinkDescription = "Cafe latte + Straw"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม "
+		Var DrinkDescription = "Strawberry Syrup , Espresso, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_LATTE_Straw_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2164,7 +2164,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2186,7 +2186,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "Strawberry Syrup , Espresso, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2332,8 +2332,8 @@ CAFE LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED BIN STRAW CAFE LATTE"
 		Var NameDrinkTH = "บินสตรอว์คาเฟ่ลาเต้"
-		Var DrinkDescriptionTH = "Cafe latte + Straw"
-		Var DrinkDescription = "Cafe latte + Straw"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม "
+		Var DrinkDescription = "Strawberry Syrup , Espresso, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_LATTE_Straw_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2415,7 +2415,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2437,7 +2437,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "Strawberry Syrup , Espresso, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2584,8 +2584,8 @@ CAFE LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SON JAS CHEE TEA"
 		Var NameDrinkTH = "สันจัสชี่"
-		Var DrinkDescriptionTH = "Jasmine tea + Lychee"
-		Var DrinkDescription = "Jasmine tea + Lychee"
+		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ"
+		Var DrinkDescription = "Lychee Syrup, Jasmine Tea, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_HOT_JASMINE_Lychee_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2667,7 +2667,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Jasmine tea + Lychee" </Value>
+	<Value> "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2689,7 +2689,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine tea + Lychee" </Value>
+	<Value> "Lychee Syrup, Jasmine Tea, Water" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2837,8 +2837,8 @@ CHEE TEA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ROBINSON UP CHEE SMOOTHIE"
 		Var NameDrinkTH = "โรบินสันอัพชี่"
-		Var DrinkDescriptionTH = "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา "
-		Var DrinkDescription = "7Up Lychee Lime Soda"
+		Var DrinkDescriptionTH = "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา "
+		Var DrinkDescription = "7Up, Lychee Syrup, Lime &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_7UP_Lychee_SODA_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2920,7 +2920,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " </Value>
+	<Value> "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2941,7 +2941,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "7Up Lychee Lime Soda" </Value>
+	<Value> "7Up, Lychee Syrup, Lime &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_payment_cash-MYR.xml

@@ -770,6 +770,7 @@
 	;DEBUGVAR alphaState3
 
 	DEBUGVAR CashlessPayFlag
+	DEBUGVAR ReadyForBrew
 
 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
@@ -1716,6 +1717,7 @@ If alphaState = "Invisible" Then
 			DEBUGVAR VendingCashless
 
             Var ReqPayInfoFromCashOther = 2
+			WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
         EndIf
 	EndIf
 

xml/page_payment_cash.xml

@@ -2897,27 +2897,6 @@
 <Filename> Var( DirImage + "/img_popup4.png" )</Filename>
 </Image>
 
-<Image>
-<X> 838 </X>
-<Y> 1350 </Y>
-<State> eval(  
-	 Var return = "Invisible"
-
-	 If AdultState1 = "Enable" Then
-	 	If AdultState2 = "Invisible" Then
-	 		Var return = "Enable"
-	 	EndIf
- 	EndIf
- 	DEBUGVAR return
-	)  
-</State>
-<Animation>
-	<Style> "Bounce" </Style>
-	<OnEvent> "TimerSec=3" </OnEvent>
-</Animation>
-<Filename> "ROOT/taobin_project/image/anmi/arrow_1.png" </Filename>
-</Image>
-
 <Button>
 <X> 360 </X>
 <Y> 1373 </Y>

xml/page_payment_code.xml

@@ -237,6 +237,8 @@
 						EndIf
 					EndIf
 
+					TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
+
 
 					;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 					Var Seeker.VendingCampaign = PayAmount

xml/topview2.xml

@@ -85,9 +85,12 @@
 		EndIf
 
 	EndIf
+	If CountryRootPath = "" Then
 
-	Var exhaust_fan_schedule = CountryRootPath + "/hardware/exhaust_fan_schedule.ev"
-
+		Var exhaust_fan_schedule = "ROOT/taobin_project/inter/tha/hardware/exhaust_fan_schedule.ev"
+	Else
+		Var exhaust_fan_schedule = CountryRootPath + "/hardware/exhaust_fan_schedule.ev"
+	EndIf
 	TRY exhaust_fan_schedule
 </EventOpen>
 <Timeout> 1000 </Timeout>

xml/verify_number.ev

@@ -17,4 +17,10 @@ EndIf
 
 If Tel2D = "09" Then
     Var Tel2DFlag = 1
+EndIf
+
+If InternationalEnable = 1 Then
+    Var VerifyFile = CountryRootPath + "/xml/verify_number.ev"
+
+    TRY VerifyFile
 EndIf