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

inter/mys/image/event/image_template5

@@ -0,0 +1,6 @@
+normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png
+normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png
+press_eng=ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png
+press_thai=ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png
+disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png
+disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png

inter/mys/xml/event/dummy_layout_promotion.py

@@ -166,6 +166,9 @@ file_xml3.write( content_data)
 file_xml3.close()
 
 
+
+# NOTE: promotion_template4.inc, image_template4, promotion_onclick4.inc, out_put_file4.txt
+
 # promotion 4
 file_inc3 = open(directory_to_process + "/event/promotion_template4.inc", 'r')
 file_inc3_content = file_inc3.read()
@@ -214,6 +217,59 @@ file_xml3_out_content = file_xml3_out_content.strip()
 file_xml3_out_content = file_xml3_out_content.replace("\r", "")
 file_xml3_out_content = file_xml3_out_content.replace("\n", "")
 
+file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
+file_xml3.write( content_data)
+file_xml3.close()
+
+
+# promotion thai tea
+file_inc3 = open(directory_to_process + "/event/promotion_template5.inc", 'r')
+file_inc3_content = file_inc3.read()
+file_inc_img = open(directory_to_process + "/../image/event/image_template5", 'r')
+file_inc3_img_content = file_inc_img.read()
+
+# replace key.
+
+sp_key = file_inc3_img_content.split("\n")
+print("sp_key = " + str(len( sp_key)))
+for sp_line in sp_key:
+	sp_line = sp_line.strip()
+	key_val = sp_line.split("=")
+	print("Kenta420:", key_val)
+	if len( key_val) == 2:
+		print("k = " + key_val[0] + " val=" + key_val[1])
+		file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
+
+
+file_inc_event_click = open(directory_to_process + "/event/promotion_onclick5.inc", 'r')
+file_inc_event_click_content = file_inc_event_click.read()
+
+file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
+
+
+print(file_inc3_content)
+
+#print( file_inc_content)
+content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
+content_data = content_data_was_repack.replace(";BigLogoLayout", file_inc3_content)
+
+begin_text = content_data.index(";TAGESP")
+end_text = content_data.index(";TAGESP", begin_text + 7)
+#print("sub text = " + str(begin_text) + " end = " + str(end_text))
+tmp1 = content_data[: begin_text - 7]
+
+tmp3 = content_data[ end_text:-1]
+#print("tmp1=" + tmp1)
+#print("tmp3=" + tmp3)
+
+content_data = tmp1 + tmp3	
+
+file_xml3_out = open(directory_to_process + "/event/out_put_file5.txt", 'r')
+file_xml3_out_content = file_xml3_out.read()
+file_xml3_out_content = file_xml3_out_content.strip()
+file_xml3_out_content = file_xml3_out_content.replace("\r", "")
+file_xml3_out_content = file_xml3_out_content.replace("\n", "")
+
 file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
 file_xml3.write( content_data)
 file_xml3.close()

inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml

@@ -24,13 +24,17 @@
         If TelephoneNumber = "" Then
 
         Else
+			DEBUGVAR TelephoneNumber
             ; Telephone must not empty
 			If Seeker.CodeChannel = 1 Then
+				DEBUGVAR Seeker.CodeChannel
 				Var Seeker.UseFruityRayaCode = 1
 				Var Seeker.FruityRaya = 1
-			Else
+			Else				
 				Var Seeker.FruityRaya = 1
 				Var Seeker.UseFruityRayaCode = 0
+				DEBUGVAR Seeker.FruityRaya
+				DEBUGVAR Seeker.UseFruityRayaCode
             	AddData Cid TelephoneNumber param1 param2 param3
 			EndIf
         EndIf
@@ -54,8 +58,8 @@
 	Var ShowCountDownBrewing = CountDownBrewing
 
 	Var Timeout = Timeout + 1
-	If Timeout > 0 Then
+	If Timeout > 2 Then
-        
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 	EndIf
 
 	TimerReset

inter/mys/xml/event/out_put_file5.txt

@@ -0,0 +1 @@
+/event/promotion_thai_tea.lxml

inter/mys/xml/event/promotion_onclick5.inc

@@ -0,0 +1 @@
+    Open "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_thai_tea.lxml"

inter/mys/xml/event/promotion_template5.inc

@@ -0,0 +1,55 @@
+;
+;
+;
+;
+; Big button for mys event
+;
+;
+;
+
+<Button>
+    <X> 42 </X>
+    <Y> 520 </Y>
+    <State> BigButtonEnable </State>
+    <Filename> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = ###normal_eng
+        Else
+            Var return = ###normal_thai
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = ###press_eng    
+        Else
+            Var return = ###press_thai
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = ###disable_eng
+        Else
+            Var return = ###disable_thai
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+        ###EventOnClick
+        
+</EventOnClick>
+</Button>
+
+<EventUnitTest1>
+    Var BigButtonEnable = "Enable"  
+    Refresh
+</EventUnitTest1>
+<EventUnitTest2>
+    Var BigButtonEnable = "Invisible"
+    Refresh
+</EventUnitTest2>

inter/mys/xml/event/script_common_for_open_promotion_xml.ev

@@ -3,21 +3,22 @@
 
 ; zone promote
 DEBUGVAR FruityRayaEnable
+DEBUGVAR ProThaiTeaEnable
 
 If OpenFromPageBoard = 1 Then
 
-	If FruityRayaEnable = 1 Then
+	If ProThaiTeaEnable = 1 Then
 		Var BigButtonEnable = "Enable"  
-		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_fruit_raya.lxml" 
+		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml" 
 	    Var OpenFromPageBoard = 0
 	Else
 		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
 	EndIf
 Else
 
-	If FruityRayaEnable = 1 Then
+	If ProThaiTeaEnable = 1 Then
 		Var BigButtonEnable = "Enable"  
-		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_fruit_raya.lxml" 
+		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml" 
 	    Var OpenFromPageBoard = 0
 	Else
 		OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"

inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml

@@ -0,0 +1,148 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+
+    Var Timeout = 0
+	DEBUGVAR TelephoneNumber
+	DEBUGVAR FromProThaiTea
+	DEBUGVAR Seeker.VendingCode
+	DEBUGVAR Seeker.ProThaiTea
+	DEBUGVAR Seeker.UseProThaiTeaCode
+
+    Var Cid = 43
+    Var param1 = ""
+    Var param2 = ""
+    Var param3 = ""
+
+    If FromProThaiTea = 1 Then
+
+        If TelephoneNumber = "" Then
+
+        Else
+			DEBUGVAR TelephoneNumber
+            ; Telephone must not empty
+			If Seeker.CodeChannel = 1 Then
+				DEBUGVAR Seeker.CodeChannel
+				Var Seeker.UseProThaiTeaCode = 1
+				Var Seeker.ProThaiTea = 1
+			Else				
+				Var Seeker.ProThaiTea = 1
+				Var Seeker.UseProThaiTeaCode = 0
+				DEBUGVAR Seeker.ProThaiTea
+				DEBUGVAR Seeker.UseProThaiTeaCode
+            	AddData Cid TelephoneNumber param1 param2 param3
+			EndIf
+        EndIf
+
+    EndIf
+
+	; reset flag
+	Var FromProThaiTea = 0
+
+	; goto lid straw
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    Var CountDownBrewing = BREW_CNT
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+	Var Timeout = Timeout + 1
+	If Timeout > 2 Then
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout>
+
+
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+<EventActionOk>
+	;
+
+</EventActionOk>
+
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 380 </Y>
+;<Filename> "ROOT/taobin_project/image/display_get_free/alpha.png" </Filename>
+;</Image>
+
+<Image>
+<X> 0 </X>
+<Y> 560 </Y>
+<State> "Enable" </State>
+<Filename> Var( DirImage + img_popup6 )</Filename>
+</Image>
+
+
+
+
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> IMG_CNT </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+<Text>
+<X> 99 </X>
+<Y> 1300 </Y>
+<Align> center </Align>
+<Size> 48 </Size>
+<Color> 0x513C2F </Color>
+<Value> "Please wait for coupon from SMS ... "
+</Text>
+
+</Popup>

inter/mys/xml/event/tricker.ev

@@ -11,25 +11,27 @@ Var Propepsi99Enable = 0
 ; FruityRaya Promo
 Var FruityRayaEnable = 0
 Var FromFruityRaya = 0
-Var DisableUntilServerPartOK = 1
 
+; ThaiTea Promo
+Var ProThaiTeaEnable = 0
+Var FromProThaiTea = 0
 
-If SystemDateMonthInt = 3 Then
+If SystemDateMonthInt = 6 Then
-	If SystemDateDayInt >= 27 Then
+	If SystemDateDayInt >= 15 Then
-		Var FruityRayaEnable = 1
+		Var ProThaiTeaEnable = 1
-	EndIf
-EndIf
-
-If SystemDateMonthInt = 4 Then
-	Var FruityRayaEnable = 1
-EndIf
-
-If SystemDateMonthInt = 5 Then
-
-	If SystemDateDayInt < 10 Then
-		Var FruityRayaEnable = 1
 	Else
-		Var FruityRayaEnable = 0
+		Var ProThaiTeaEnable = 0
 	EndIf
+EndIf
 
+If SystemDateMonthInt = 7 Then
+	If SystemDateDayInt < 16 Then
+		Var ProThaiTeaEnable = 1
+	Else
+		Var ProThaiTeaEnable = 0
+	EndIf
+EndIf
+
+If BoxID = 177746 Then
+	Var ProThaiTeaEnable = 1
 EndIf

inter/mys/xml/page_catalog_group_pro_thai_tea.skt

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

inter/mys/xml/page_topping_select6.lxml

@@ -527,6 +527,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var FromFruityRaya = 0
+	Var FromProThaiTea = 0
 
 	;Open PreviseXMLFileName2
 	DEBUGVAR OpenFromXML

xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml

@@ -0,0 +1,564 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+;<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	
+
+	Var ShowErrorText = "Invisible"
+
+	Var Tel_Confirm_State = "Invisible"
+	Var ShowTextNumber = "Enable"
+	Var Timeout = 0
+	Var TelephoneNumber = ""
+	Var TelephoneNumberX = ""
+
+	Var TimeOutPlay = 0
+
+    If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
+		Var DirImage2 = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collect_point1"
+		Var DirImage2 = "ROOT/taobin_project/image/page_payment"
+		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	
+    
+	Var FailState = "Invisible"
+    Var FailPopupImage = "ROOT/taobin_project/image/event/energy_drink_1_bath/check_member_fail_th.png"
+
+	Var Tel_Confirm_Flag = 1
+
+	Var MaxNumber = 10
+
+	Var StepGetServer = 0
+	var OtpCode = ""
+
+	Var failTime = 0
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+		
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen > 0 Then
+		Var ShowTextNumber = "Invisible"
+	EndIf
+	
+	DEBUGVAR Timeout
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+
+        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+	EndIf
+
+
+	If FailState = "Enable" Then
+
+		Var failTime = failTime + 1
+		If failTime >= 5 Then
+			Var failTime = 0
+			Var FailState = "Invisible"
+			Var TelephoneNumber = ""
+			Var Tel_Confirm_State = "Invisible"
+			Var Timeout = 0
+		EndIf
+
+	EndIf
+
+
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<EventActionOk>
+
+    DEBUGVAR Ext1a
+    If StepGetServer = 1 Then
+
+        If Ext1a = "ok" Then
+            Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+        Else
+            Var load_gif_stage = "Invisible"
+            Var FailState = "Enable"
+            Var img_popup16 = "/img_popup16-1.png"
+        EndIf
+
+		Refresh
+    EndIf
+
+</EventActionOk>
+
+<EventActionError>
+    SAVELOG "GET ERROR!!!"
+</EventActionError>
+
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
+</Image>
+
+<Button>
+<X> 333 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "1"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "2"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "3"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "4"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "5"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "6"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "7"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "8"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "9"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1517 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "0"
+	Trim TelephoneNumber MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1517 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Trim TelephoneNumber  -1
+
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen < 10 Then 
+		Var Tel_Confirm_State = "Invisible"
+	EndIf
+		
+	
+	If TelNumLen = 0 Then 
+		Var ShowTextNumber = "Enable"
+	EndIf
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+
+<Text>
+<X> 0 </X>
+<Y> 873 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum-mask-1 </Format>
+</Text>
+
+<Button>
+<X> 218 </X>
+<Y> 1671 </Y>
+<Filename> Var( DirImage + "/bn_back.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_back.png") </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 		
+	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 577 </X>
+<Y> 1671 </Y>
+<State> Tel_Confirm_State </State>
+<Filename>  Var( DirImage + "/bn_positive.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_positive.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bn_positive.png") </FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	
+
+	If Tel_Confirm_Flag = 1 Then
+
+		Var Tel2DFlag = 0
+
+		Var Tel2D = TelephoneNumber 
+		Trim Tel2D 1
+
+		If Tel2D = "0" Then
+			Var Tel2DFlag = 1
+		EndIf
+
+
+		If Tel2DFlag = 1 Then
+			;Open "ROOT/taobin_project/xml/page_identityMember_consent.xml"  
+
+
+			Var Param1 = TelephoneNumber 
+			GETACCEXT Param1 33
+			Var StepGetServer = 1
+
+
+		Else 
+
+			If show_eng = "true" Then 
+				Var DirImage2 = "ROOT/taobin_project/image/collectiing_en"
+			Else
+				Var DirImage2 = "ROOT/taobin_project/image/collectiing"
+			EndIf
+
+			Var text_show_error = DirImage2 + "/text_show_error5.png"
+
+			Var ShowErrorText = "Enable"
+			Var TelephoneNumber = ""
+			Var Tel_Confirm_State = "Invisible"
+			Refresh
+
+			
+
+		EndIf
+
+	EndIf
+</EventClick>
+</Button>
+
+; Border Edit
+<Image>
+<X> 217 </X>
+<Y> 866 </Y>
+<Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
+</Image>
+
+<Image>
+<X> 157 </X>
+<Y> 868 </Y>
+<State> ShowTextNumber </State>
+<Filename> Var( DirImage + "/text_edit.png") </Filename>
+</Image>
+
+
+<Image>
+<X> 188 </X>
+<Y> 699 </Y>
+<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/text20.png" </Filename>
+</Image>
+
+<Image>
+<X> 152 </X>
+<Y> 955 </Y>
+<State> ShowErrorText </State>
+<Filename> text_show_error </Filename>
+</Image>
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> FailState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 249 </X>
+<Y> 751 </Y>
+<State> FailState </State>
+<Filename> FailPopupImage </Filename>
+</Image>
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+			
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+
+
+
+</Popup>

xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml

@@ -113,34 +113,6 @@
 
     Refresh
 
-    ; If StepGetServer = 1 Then
-
-    ;     If Ext1a = "ok" Then
-    ;         Var ChildrenFree = 1
-	; 		Open "ROOT/taobin_project/xml/page_payment.xml" 
-    ;     Else
-
-    ;         If Ext1a = "limit" Then
-    ;             Var load_gif_stage = "Invisible"
-    ;             Var FailState = "Enable"
-    ;             Var img_popup16 = "/img_popup16-3.png"
-
-    ;             WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "true"
-
-    ;         Else
-
-    ;             Var load_gif_stage = "Invisible"
-    ;             Var FailState = "Enable"
-    ;             Var img_popup16 = "/img_popup16-2.png"
-
-    ;         EndIf
-
-    ;         Refresh
-
-    ;     EndIf
-
-    ; EndIf
-
 </EventActionOk>
 
 <EventActionError>
@@ -347,7 +319,22 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-		Open "ROOT/taobin_project/xml/page_catalog2.xml"
+		DEBUGVAR OpenFromXML
+
+        Var FromPowerUpPro = 0
+        Var FromEnergyDrink1BathPro = 0
+        Var FromCoffeeDrink1BathPro = 0
+        Var FromNamHomCoconutPro = 0
+        
+        OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+        
+        DEBUGVAR OpenFromInstMenuTab
+        If OpenFromInstMenuTab > 0 Then
+            DEBUGVAR OpenFromInstMenuTab
+            TabMenuVisibleInst OpenFromInstMenuTab
+        EndIf
+
+        Open OpenFromXML
 	
 </EventClick>
 </Button>
@@ -398,7 +385,15 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+	Var FromEnergyDrink1BathPro = 0
+
+	If  Seeker = "next" Then 
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+	Else
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -412,7 +407,15 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+    Var FromEnergyDrink1BathPro = 0
+
+	If  Seeker = "next" Then 
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+	Else
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -534,7 +537,10 @@ eval(
 </EventUnitTest3>
 
 <EventUnitTest4>
-    GETACCEXT TestIDNum 33
+    Var LegitAge = "true"
+    Var StepGetServer = 1
+    Var IDNum =  "1104500029430"
+    GETACCEXT IDNum 33
 </EventUnitTest4>
 
 </Popup>

xml/event/ignore_gen_promotion_nam_hom_coconut.xml

@@ -13060,27 +13060,51 @@ LIMENADE SODA" </Value>
     <Filename>
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			EndIf
         Else
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+			EndIf
         EndIf
         )
      </Filename>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			EndIf
         Else
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+			EndIf
         EndIf
         )
      </FilenamePress>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			EndIf
         Else
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+			EndIf
         EndIf
         )
      </FilenameDisable>
@@ -13102,7 +13126,11 @@ LIMENADE SODA" </Value>
             If show_eng = "true" Then
                 Var return = "Invisible"
             Else
-                Var return  = "Enable"
+				If NamHomCoconutRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+                Else
+					Var return  = "Enable"
+				EndIf
             EndIf
         ) 
     </State>
@@ -13116,8 +13144,12 @@ LIMENADE SODA" </Value>
     <Height> 616 </Height>
     <State> 
         eval(
-            If show_eng = "true" Then
+            If show_eng = "true" then
-                Var return = "Enable"
+				If NamHomCoconutRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
+					Var return  = "Enable"
+				EndIf
             Else
                 Var return  = "Invisible"
             EndIf

xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml

@@ -94,20 +94,23 @@
             Var Seeker.IsAlreadyGetReward = Ext1c
             Var SuperSetOutOfStock = Ext1d
             Var BalanceEssenceTonerOutOfStock = Ext1e
-            Var CleansingGalOutOfStock = Ext1f
+            Var CleansingGelOutOfStock = Ext1f
-            Var ClearGalOutOfStock = Ext1g
+            Var TumbleBottleOutOfStock = Ext1g
+            Var ClearGelOutOfStock = Ext1h
 
             ;DEBUG
             ;Var SuperSetOutOfStock = 1
             ;Var BalanceEssenceTonerOutOfStock = 1
-            ;Var CleansingGalOutOfStock = 1
+            ;Var CleansingGelOutOfStock = 1
-            ;Var ClearGalOutOfStock = Ext1g
+            ;Var TumbleBottleOutOfStock = 1
+            ;Var ClearGelOutOfStock = 1
 
 
             DEBUGVAR SuperSetOutOfStock
             DEBUGVAR BalanceEssenceTonerOutOfStock
-            DEBUGVAR CleansingGalOutOfStock
+            DEBUGVAR CleansingGelOutOfStock
-            DEBUGVAR ClearGalOutOfStock
+            DEBUGVAR TumbleBottleOutOfStock
+            DEBUGVAR ClearGelOutOfStock
 
             If TaobinName = "" Then
                 Var Seeker.IsLineMember = 0 
@@ -153,21 +156,23 @@
             If SuperSetOutOfStock = 1 Then
                 If BalanceEssenceTonerOutOfStock = 1 Then
                     If CleansingGalOutOfStock = 1 Then
-                        If ClearGalOutOfStock = 1 Then
+                        If TumbleBottleOutOfStock = 1 Then
-                            SAVELOG "All reward out of stock skip to normal collect point."
+                            If ClearGalOutOfStock = 1 Then
+                                SAVELOG "All reward out of stock skip to normal collect point."
 
-                            WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
+                                WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
 
-                            If Seeker.CodeChannel = 1 Then
+                                If Seeker.CodeChannel = 1 Then
-                                If Seeker.CollectPointMain = 1 Then
+                                    If Seeker.CollectPointMain = 1 Then
+                                        GETACCEXT Param1 23
+                                        Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                                    Else
+                                        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                                    EndIf
+                                Else
                                     GETACCEXT Param1 23
                                     Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
-                                Else
-                                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
                                 EndIf
-                            Else
-                                GETACCEXT Param1 23
-                                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
                             EndIf
                         EndIf
                     EndIf
@@ -190,35 +195,16 @@
             Var PointState[8] = 0
             Var PointState[9] = 0
 
-            If show_eng = "true" Then
+            Var PointNameIndex[0] = -1
-                Var MenuPointName[0] = "Hat Yai\nBeach coconut"
+            Var PointNameIndex[1] = -1
-                Var MenuPointName[1] = "Bangsaen\nBeach Coconut"
+            Var PointNameIndex[2] = -1
-                Var MenuPointName[2] = "Jomtien\nBeach Coconut"
+            Var PointNameIndex[3] = -1
-                Var MenuPointName[3] = "Nang Ram\nBeach Coconut"
+            Var PointNameIndex[4] = -1
-                Var MenuPointName[4] = "Glass Sand\nBeach Coconut"
+            Var PointNameIndex[5] = -1
-                Var MenuPointName[5] = "Mae Pim\nBeach Coconut"
+            Var PointNameIndex[6] = -1
-                Var MenuPointName[6] = "Moonlight\nBeach Coconut"
+            Var PointNameIndex[7] = -1
-                Var MenuPointName[7] = "Pattaya\nBeach Coconut"
+            Var PointNameIndex[8] = -1
-                Var MenuPointName[8] = "Suan Son\nBeach Coconut"
+            Var PointNameIndex[9] = -1
-                Var MenuPointName[9] = "Laem Sing\nBeach Coconut"
-                Var MenuPointName[10] = "Toem Rak\nBeach Coconut"
-                Var MenuPointName[11] = "Long\nBeach Coconut"
-                Var MenuPointName[12] = "Hat\nBeach Coconut"
-            Else
-                Var MenuPointName[0] = "มะพร้าวหาดใหญ่(มาก)"
-                Var MenuPointName[1] = "มะพร้าวหาดบางแสน\n(ห้า)"
-                Var MenuPointName[2] = "มะพร้าวหาดจอมเทียน\n(พรรษา)"
-                Var MenuPointName[3] = "มะพร้าวหาดนางรำ\n(สวย)"
-                Var MenuPointName[4] = "มะพร้าวหาดทรายแก้ว\n(มังกร)"
-                Var MenuPointName[5] = "มะพร้าวหาดแม่พิมพ์\n(ดีด)"
-                Var MenuPointName[6] = "มะพร้าวหาดแสงจันทร์\n(ไรอะ)"
-                Var MenuPointName[7] = "มะพร้าวหาดพัทยา\n(พารา)"
-                Var MenuPointName[8] = "มะพร้าวหาดสวนสน\n(ใจไหม)"
-                Var MenuPointName[9] = "มะพร้าวหาดแหลมสิง\n(หไกรภพ)"
-                Var MenuPointName[10] = "มะพร้าวหาดเติมรัก(ฉันทำไม)"
-                Var MenuPointName[11] = "มะพร้าวหาดยาว\n(ไปยาวไป)"
-                Var MenuPointName[12] = "มะพร้าวหาด(ใกล้ฉัน)"
-            EndIf
 
 
 
@@ -522,79 +508,79 @@
             If MenuPoint[0] = 1 Then
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[0]
+                Var PointNameIndex[CurrentIndexPoint] = 0
             EndIf
 
             If MenuPoint[1] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[1]
+                Var PointNameIndex[CurrentIndexPoint] = 1
             EndIf
 
             If MenuPoint[2] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[2]
+                Var PointNameIndex[CurrentIndexPoint] = 2
             EndIf
 
             If MenuPoint[3] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[3]
+                Var PointNameIndex[CurrentIndexPoint] = 3
             EndIf
 
             If MenuPoint[4] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[4]
+                Var PointNameIndex[CurrentIndexPoint] = 4
             EndIf
 
             If MenuPoint[5] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[5]
+                Var PointNameIndex[CurrentIndexPoint] = 5
             EndIf
 
             If MenuPoint[6] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[6]
+                Var PointNameIndex[CurrentIndexPoint] = 6
             EndIf
 
             If MenuPoint[7] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[7]
+                Var PointNameIndex[CurrentIndexPoint] = 7
             EndIf
 
             If MenuPoint[8] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[8]
+                Var PointNameIndex[CurrentIndexPoint] = 8
             EndIf
 
             If MenuPoint[9] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[9]
+                Var PointNameIndex[CurrentIndexPoint] = 9
             EndIf
 
             If MenuPoint[10] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[10]
+                Var PointNameIndex[CurrentIndexPoint] = 10
             EndIf
 
             If MenuPoint[11] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[11]
+                Var PointNameIndex[CurrentIndexPoint] = 11
             EndIf
 
             If MenuPoint[12] = 1 Then	
                 Var CurrentIndexPoint = CurrentIndexPoint + 1
                 Var PointState[CurrentIndexPoint] = 1
-                Var PointState[CurrentIndexPoint].name = MenuPointName[12]
+                Var PointNameIndex[CurrentIndexPoint] = 12
             EndIf
 
             DEBUGVAR Seeker.selected_a_drink

xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_3.xml

@@ -74,6 +74,47 @@
 	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 PointNameIndex9 = PointNameIndex[9]
+
+	If show_eng = "true" Then
+		Var MenuPointName[0] = "Hat Yai\nBeach coconut"
+		Var MenuPointName[1] = "Bangsaen\nBeach Coconut"
+		Var MenuPointName[2] = "Jomtien\nBeach Coconut"
+		Var MenuPointName[3] = "Nang Ram\nBeach Coconut"
+		Var MenuPointName[4] = "Glass Sand\nBeach Coconut"
+		Var MenuPointName[5] = "Mae Pim\nBeach Coconut"
+		Var MenuPointName[6] = "Moonlight\nBeach Coconut"
+		Var MenuPointName[7] = "Pattaya\nBeach Coconut"
+		Var MenuPointName[8] = "Suan Son\nBeach Coconut"
+		Var MenuPointName[9] = "Laem Sing\nBeach Coconut"
+		Var MenuPointName[10] = "Toem Rak\nBeach Coconut"
+		Var MenuPointName[11] = "Long\nBeach Coconut"
+		Var MenuPointName[12] = "Hat\nBeach Coconut"
+	Else
+		Var MenuPointName[0] = "มะพร้าวหาดใหญ่(มาก)"
+		Var MenuPointName[1] = "มะพร้าวหาดบางแสน\n(ห้า)"
+		Var MenuPointName[2] = "มะพร้าวหาดจอมเทียน\n(พรรษา)"
+		Var MenuPointName[3] = "มะพร้าวหาดนางรำ\n(สวย)"
+		Var MenuPointName[4] = "มะพร้าวหาดทรายแก้ว\n(มังกร)"
+		Var MenuPointName[5] = "มะพร้าวหาดแม่พิมพ์\n(ดีด)"
+		Var MenuPointName[6] = "มะพร้าวหาดแสงจันทร์\n(ไรอะ)"
+		Var MenuPointName[7] = "มะพร้าวหาดพัทยา\n(พารา)"
+		Var MenuPointName[8] = "มะพร้าวหาดสวนสน\n(ใจไหม)"
+		Var MenuPointName[9] = "มะพร้าวหาดแหลมสิง\n(หไกรภพ)"
+		Var MenuPointName[10] = "มะพร้าวหาดเติมรัก(ฉันทำไม)"
+		Var MenuPointName[11] = "มะพร้าวหาดยาว\n(ไปยาวไป)"
+		Var MenuPointName[12] = "มะพร้าวหาด(ใกล้ฉัน)"
+	EndIf
+
 
 	If PointState[0] = 1 Then
 		Var PointCount = PointCount + 1
@@ -119,8 +160,8 @@
 	Var PointDiff = 10 - PointCount
 
 	If show_eng = "true" Then
-        Var MemberText = "สถานะสมาชิก"
+		Var MemberText = "HELLO PAL, WANNA FELL FRESH?"
-        Var MissionText = "ฝ่าไอร้อนพิชิตไอเท่มหน้าใส"
+        Var MissionText = "BEAT THE HEAT, GO!"
 
 		Var TaobinLevelDesc1 = "You have " + PointDiff
 		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " more fresh menus left to unlock CURA-MD"
@@ -131,8 +172,8 @@
 		Var text8_X = 224
 
 	Else
-        Var MemberText = "HELLO PAL, WANNA FELL FRESH?"
+        Var MemberText = "สถานะสมาชิก"
-        Var MissionText = "BEAT THE HEAT, GO!"
+        Var MissionText = "ฝ่าไอร้อนพิชิตไอเท่มหน้าใส"
 
 		Var TaobinLevelDesc1 = "เหลืออีก " + PointDiff
 		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " เมนูที่จะได้กดสุ่มรางวัลจาก CURA-MD"
@@ -168,7 +209,7 @@
 		Var CurrentPointCheck = "check"
 		Var val3 = "X"
 		AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
-        Var UpdatePoint = 1
+       Var UpdatePoint = 1
 	EndIf
 
 	
@@ -242,9 +283,10 @@
 <Text>
 <X> 243 </X>
 <Y> 722 </Y>
-<Width> 360 </Width>
+<Width> 380 </Width>
 <Height> 36 </Height>
 <Size> 24 </Size>
+<Color> 0x746253 </Color>
 <Font> KanitMediumTTF </Font>
 <Value> MemberText </Value>
 </Text>
@@ -256,6 +298,7 @@
 <Width> 360 </Width>
 <Height> 48 </Height>
 <Size> 32 </Size>
+<Color> 0x746253 </Color>
 <Font> KanitMediumTTF </Font>
 <Value> MissionText </Value>
 </Text>
@@ -282,9 +325,9 @@
 
 <Text>
 <X> 243 </X>
-<Y> 800 </Y>
+<Y> 815 </Y>
 <Size> 14 </Size>
-<Width> 90 </Width>
+<Width> 100 </Width>
 <Font> RobotoRegular </Font>
 <Color> 0x746253 </Color>
 <Value> TNumberTaobinMemberXXX </Value>
@@ -306,7 +349,7 @@
 <Text>
 <X> 247 </X>
 <Y> 970 </Y>
-<Size> 25 </Size>
+<Size> 20 </Size>
 <Width> 500 </Width>
 <Height> 30 </Height>
 <Font> RobotoBold </Font>
@@ -318,9 +361,8 @@
 <X> 247 </X>
 <Y> 1001 </Y>
 <Size> 20 </Size>
-<Width> 500 </Width>
+<Width> 600 </Width>
-<Height> 30 <Height>
+<Font> RobotoBold </Font>
-<Font> KanitRegularTTF </Font>
 <Color> 0x746253 </Color>
 <Value> TaobinLevelDesc2 </Value>
 </Text>
@@ -335,11 +377,20 @@
 <Text>
 <X> 234 </X>
 <Y> 1252 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[0] </Color>
-<Value> PointState[0].name </Value>
+<Value> MenuPointName[PointNameIndex0] </Value>
+<State> 
+        eval(
+             If PointNameIndex0 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -352,11 +403,20 @@
 <Text>
 <X> 388 </X>
 <Y> 1252 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[1] </Color>
-<Value> PointState[1].name </Value>
+<Value> MenuPointName[PointNameIndex1] </Value>
+<State> 
+        eval(
+             If PointNameIndex1 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -369,11 +429,20 @@
 <Text>
 <X> 542 </X>
 <Y> 1252 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[2] </Color>
-<Value> PointState[2].name </Value>
+<Value> MenuPointName[PointNameIndex2] </Value>
+<State> 
+        eval(
+             If PointNameIndex2 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -386,28 +455,46 @@
 <Text>
 <X> 696 </X>
 <Y> 1252 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[3] </Color>
-<Value> PointState[3].name </Value>
+<Value> MenuPointName[PointNameIndex3] </Value>
+<State> 
+        eval(
+             If PointNameIndex3 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
 <Image>
-<X> 76 </X>
+<X> 234 </X>
 <Y> 1295 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[4]) </Filename>
 </Image>
 
 <Text>
-<X> 76 </X>
+<X> 234 </X>
 <Y> 1434 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[4] </Color>
-<Value> PointState[4].name </Value>
+<Value> MenuPointName[PointNameIndex4] </Value>
+<State> 
+        eval(
+             If PointNameIndex4 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -421,11 +508,20 @@
 <Text>
 <X> 388 </X>
 <Y> 1434 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[5] </Color>
-<Value> PointState[5].name </Value>
+<Value> MenuPointName[PointNameIndex5] </Value>
+<State> 
+        eval(
+             If PointNameIndex5 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -438,11 +534,20 @@
 <Text>
 <X> 542 </X>
 <Y> 1434 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[6] </Color>
-<Value> PointState[6].name </Value>
+<Value> MenuPointName[PointNameIndex6] </Value>
+<State> 
+        eval(
+             If PointNameIndex6 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -455,11 +560,20 @@
 <Text>
 <X> 696 </X>
 <Y> 1434 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[7] </Color>
-<Value> PointState[7].name </Value>
+<Value> MenuPointName[PointNameIndex7] </Value>
+<State> 
+        eval(
+             If PointNameIndex7 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -472,11 +586,20 @@
 <Text>
 <X> 388 </X>
 <Y> 1616 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[8] </Color>
-<Value> PointState[8].name </Value>
+<Value> MenuPointName[PointNameIndex8] </Value>
+<State> 
+        eval(
+             If PointNameIndex8 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
@@ -489,18 +612,27 @@
 <Text>
 <X> 542 </X>
 <Y> 1616 </Y>
-<Size> 10 </Size>
+<Size> 12 </Size>
 <Width> 154 </Width>
 <Font> InterRegular </Font>
 <Color> taobinTextColorPoint[9] </Color>
-<Value> PointState[9].name </Value>
+<Value> MenuPointName[PointNameIndex9] </Value>
+<State> 
+        eval(
+             If PointNameIndex9 = -1 Then
+                     Var return = "Invisible"
+             Else
+                     Var return = "Enable"
+             EndIf
+             )
+ </State>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
 
 
 <Button>
-<X> 423 </X>
+<X> 413 </X>
 <Y> 1660 </Y>
 <State> showRandomBtnState </State>
 <Filename> RandomBtnImg </Filename>
@@ -525,7 +657,7 @@
 
 
 <Button>
-<X> 610 </X>
+<X> 413 </X>
 <Y> 1660 </Y>
 <State> showCloseBtnState </State>
 <Filename> CloseBtnImg </Filename>
@@ -574,7 +706,7 @@
 	Var PointState[8] = 1
 	Var PointState[9] = 1
 
-	Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_3.xml"
+	Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_3.xml"
 </EventUnitTest3>
 
 <EventUnitTest4>
@@ -583,7 +715,7 @@
 	Else
 		Var show_eng = "true"
 	EndIf
-	Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_3.xml"
+	Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_3.xml"
 </EventUnitTest4>
 
 

xml/event/nam_hom_coconut/page_nam_hom_coconut_random.xml

@@ -11,7 +11,7 @@
         Var DirImage = "ROOT/taobin_project/image/event/nam_hom_coconut/random"
 
         Var RandomStyle = 0
-        Random2 0 1 RandomStyle
+        Random2 0 2 RandomStyle
 
         If RandomStyle = 0 Then
             Var Text_X = 241
@@ -127,13 +127,13 @@
 
 	    Var ShowCountDownBrewing = CountDownBrewing
 
-        If Timeout > 15 Then
+       If Timeout > 15 Then
-            SAVELOG "Timeout 15 second auto random for you"
+           SAVELOG "Timeout 15 second auto random for you"
-            Function 2
+           Function 2
-        EndIf
+       EndIf
-        
+       
 
-        Var Timeout = Timeout + 1
+       Var Timeout = Timeout + 1
 
         TimerReset
 	    Refresh
@@ -210,9 +210,7 @@
         ; Random coupon
         Var randResultInt = 0
         DEBUGVAR MaxRandomIndex
-        Var MaxRandom = MaxRandomIndex - 1
+        Random2 0 MaxRandomIndex randResultInt
-        DEBUGVAR MaxRandom
-        Random2 0 MaxRandom randResultInt
 
         Var CodeType = ""
         

xml/event/nam_hom_coconut/page_nam_hom_coconut_random_result.xml

@@ -45,21 +45,55 @@
             Var RewardImage_Y = 864
         EndIf
 
+        Var AddData = 0
 
         Var CodeReward = CodeType
         Var var2 = "X"
         Var var3 = "X"
         Var PhoneNum = TelephoneNumber
         AddData 38 TelephoneNumber CodeReward var2 var3
-        GETACCEXT PhoneNum 34 
     </EventOpen>
 
     <EventActionOk>
         If Ext1a = "" Then
 
         Else
-            Var NamHomCoconutRewardRemain = Ext1a
+
-            DEBUGVAR NamHomCoconutRewardRemain
+            If AddData = 0 Then
+                Var AddData = 1
+                GETACCEXT PhoneNum 34
+            Else
+                SAVELOG "NamHomCoconutPro: Update RemainReward"
+
+                SPLIT2 Ext1a "/" RemainRewardSpl
+
+                Var SuperSetRemain = RemainRewardSpl[0]
+                Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
+                Var CleansingGalRemain = RemainRewardSpl[2]
+                Var TumbleBottleRemain = RemainRewardSpl[3]
+                Var ClearGalRemain = RemainRewardSpl[4]
+
+                INT SuperSetRemain
+                INT BalanceEssenceTonerRemain
+                INT CleansingGalRemain
+                INT TumbleBottleRemain
+                INT ClearGalRemain
+                
+                Var SumNamHomCoconutRemainReward = SuperSetRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGalRemain
+
+                If SumNamHomCoconutRemainReward = 0 Then
+                    SAVELOG "NamHomCoconutPro: All reward out of stock"
+
+                    WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
+                EndIf
+
+                Var NamHomCoconutRemainReward = SumNamHomCoconutRemainReward
+            
+            EndIf
         EndIf
 
     </EventActionOk>
@@ -73,21 +107,21 @@
 
 	    Var ShowCountDownBrewing = CountDownBrewing
 
-        If Timeout = 5 Then
+       If Timeout = 5 Then
-            If Seeker.CodeChannel = 1 Then
+           If Seeker.CodeChannel = 1 Then
-                If Seeker.CollectPointMain = 1 Then
+               If Seeker.CollectPointMain = 1 Then
-                    GETACCEXT Param1 23
+                   GETACCEXT Param1 23
-                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                   Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
-                Else
+               Else
-                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                   Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-                EndIf
+               EndIf
-            Else
+           Else
-                GETACCEXT Param1 23
+               GETACCEXT Param1 23
-                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+               Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
-            EndIf 
+           EndIf 
-        EndIf
+       EndIf
-
+       
-        Timeout = Timeout + 1
+       Var Timeout = Timeout + 1
         
         TimerReset
         Refresh
@@ -104,26 +138,23 @@
         <Filename> Var( DirImage + "/bg_reward.png") </Filename>
     </Image>
 
-    <Image>
-        <X> 126 </X>
-        <Y> 595 <Y>
-        <Filename> RewardText </Filename>
-    </Image>
-
-
-
     <Image> 
         <X> RewardImage_X </X>
         <Y> RewardImage_Y </Y>
         <Filename> RewardImage </Filename>
     </Image>
     
+    <Image>
+        <X> 126 </X>
+        <Y> 595 </Y>
+        <Filename> RewardText </Filename>
+    </Image>
 
     <Image> 
         <X> 229 </X>
         <Y> 1662 </Y>
-        <Filename> Var ( DirImage + "/reward_result_line_register_text.png") </Filename>
+        <Filename> Var( DirImage + "/reward_result_line_register_text.png") </Filename>
-    <Image>
+    </Image>
 
        ;
     <Image>

xml/event/promotion_energy_drink_1_bath.xml

@@ -13050,8 +13050,6 @@ LIMENADE SODA" </Value>
 
 
 
-<<<<<<< HEAD
-=======
 
 
 <Button>
@@ -13087,12 +13085,10 @@ LIMENADE SODA" </Value>
         )
      </FilenameDisable>
 <EventOnClick> 
-
+        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
-        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
         
 </EventOnClick>
 
->>>>>>> 3eb39e13631227c2112d7384cf82a0b86c464db5
 
 <Video>
     <X> 42 </X>

xml/event/promotion_template1.inc

@@ -32,8 +32,7 @@
         )
      </FilenameDisable>
 <EventOnClick> 
-
+        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
-        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
         
 </EventOnClick>
 

xml/event/script_common_for_open_promotion_xml.ev

@@ -56,7 +56,7 @@ Else
 		If CountEnablePromotion > 1 Then
 			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml"
 		Else
-			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_nam_hom_coconut.xml"
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/ignore_gen_promotion_nam_hom_coconut.xml"
 		EndIf
 	Else
 		If EnergyDrink1BathPro = 1 Then

xml/event/tricker.ev

@@ -106,6 +106,7 @@ Var FromWednesdayMelonPro = 0
 ; Enable Nam Hom Coconut, 3 - 21 June
 Var NamHomCoconutPro = 0
 Var FromNamHomCoconutPro = 0
+Var NamHomCoconutRewardOutOfStock = 0
 
 Var NewCollectPoint = 1
 
@@ -333,6 +334,7 @@ EndIf
 
 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
+	Var EnergyDrink1BathPro = 1
 	Var CoffeeDrink1BathPro = 0
 	Var NamHomCoconutPro = 1
 EndIf
@@ -493,6 +495,15 @@ EndIf
 Var CurrentMainVideoTemp = 0
 
 If NamHomCoconutPro = 1 Then
+
+	READ_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" coconutRewardOutOfStock
+	STRCONTAIN "1" coconutRewardOutOfStock coconutRewardOutOfStockContain
+	If coconutRewardOutOfStockContain = "true" Then
+		Var NamHomCoconutRewardOutOfStock = 1
+	EndIf
+
+	DEBUGVAR NamHomCoconutRewardOutOfStock
+
 	Var VideoMainPage = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_main_page.png"
 	Var CurrentMainVideoTemp = 1
 	Var CountDownShowButton = 0

xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml

@@ -573,33 +573,57 @@
     <Filename>
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			EndIf
         Else
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+			EndIf
         EndIf
         )
      </Filename>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			EndIf
         Else
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+			EndIf
         EndIf
         )
      </FilenamePress>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
+			EndIf
         Else
-            Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+            If NamHomCoconutRewardOutOfStock = 1 Then
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png"
+			Else
+            	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png"
+			EndIf
         EndIf
         )
      </FilenameDisable>
 <EventOnClick> 
 
-       Open "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml"
         
 </EventOnClick>
 
@@ -613,7 +637,11 @@
             If show_eng = "true" Then
                 Var return = "Invisible"
             Else
-                Var return  = "Enable"
+				If NamHomCoconutRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+                Else
+					Var return  = "Enable"
+				EndIf
             EndIf
         ) 
     </State>
@@ -625,8 +653,12 @@
     <Height> 616 </Height>
     <State> 
         eval(
-            If show_eng = "true" Then
+            If show_eng = "true" then
-                Var return = "Enable"
+				If NamHomCoconutRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
+					Var return  = "Enable"
+				EndIf
             Else
                 Var return  = "Invisible"
             EndIf
@@ -679,7 +711,7 @@
      </FilenameDisable>
 <EventOnClick> 
 
-       Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+       Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
         
 </EventOnClick>
 

xml/multi_ads/ads_path.ev

@@ -41,10 +41,6 @@ Var CurrentTotalCupInt = CurrentTotalCup
 INT CurrentTotalCupInt
 
 DEBUGVAR CurrentTotalCupInt
-If CurrentTotalCupInt < 55555 Then
-    Var XMLLiveInfoEnable = 0
-EndIf
-
 
 If XMLLiveInfoEnable = 0 Then
     Var showMultiAds = "false"

xml/page_board.xml

@@ -91,6 +91,7 @@
 
 	Var OpunMediumTTF = "ROOT/taobin_project/font/Opun/Opun-Medium.ttf"
 	Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf"
+	Var OpunBoldTTF = "ROOT/taobin_project/font/Opun/Opun-Bold.ttf"
 	
 	Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
 
@@ -1020,10 +1021,19 @@
 	Var SlientRefreshEnable = 0 
 
 	Var ShouldShowNamHomCoconutRemainReward = 0
+	Var ShowNamHomCoconutRemainReward = "Invisible"
+	Var GetNamHomCoconutRemainReward = 0
+	Var NamHomCoconutRemainReward_Y = 1071
+	Var NamHomCoconutRemainRewardNumber_Y = 1130
+	DEBUGVAR NamHomCoconutPro
+	DEBUGVAR CurrentMainVideo
 	If NamHomCoconutPro = 1 Then
-		If CurrentMainVideo = 0 Then
+		If CurrentMainVideo = 2 Then
 			Var ShouldShowNamHomCoconutRemainReward = 1
 		EndIf
+		Var GetNamHomCoconutRemainReward = 1
+		Var dummy_phone = "089999999"
+		GETACCEXT dummy_phone 34
 	EndIf
 
 	If EnergyDrink1BathPro = 1 Then
@@ -1048,6 +1058,62 @@
 
 </EventOpen>
 
+<EventActionOk>
+	If GetNamHomCoconutRemainReward = 1 Then
+		If Ext1a = "" Then
+			SAVELOG "Get Nam hom coconut remain reward error Ext1a is empty."
+		Else
+			DEBUGVAR Ext1a
+			
+			SPLIT2 Ext1a "/" RemainRewardSpl
+			
+			Var SuperSetRemain = RemainRewardSpl[0]
+			Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
+			Var CleansingGalRemain = RemainRewardSpl[2]
+			Var TumbleBottleRemain = RemainRewardSpl[3]
+			Var ClearGalRemain = RemainRewardSpl[4]
+
+			INT SuperSetRemain
+			INT BalanceEssenceTonerRemain
+			INT CleansingGalRemain
+			INT TumbleBottleRemain
+			INT ClearGalRemain
+			
+			Var SumNamHomCoconutRemainReward = SuperSetRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGalRemain
+
+			If ShouldShowNamHomCoconutRemainReward = 1 Then
+				Var ShowNamHomCoconutRemainReward = "Enable"
+			EndIf
+
+			;DEBUG
+			;Var SumNamHomCoconutRemainReward = 200
+
+			If SumNamHomCoconutRemainReward > 500 Then
+				Var ShowNamHomCoconutRemainReward = "Invisible"
+			Else
+				If SumNamHomCoconutRemainReward = 0 Then
+					SAVELOG "NamHomCoconutPro: All reward out of stock"
+
+					WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
+				EndIf
+			EndIf
+
+			Var NamHomCoconutRemainReward = SumNamHomCoconutRemainReward
+			DEBUGVAR NamHomCoconutRemainReward
+		EndIf
+	EndIf
+</EventActionOk>
+
+<EventActionError>
+	If GetNamHomCoconutRemainReward = 1 Then
+		SAVELOG "Get Nam hom coconut remain reward requet error."
+	EndIf
+</EventActionError>
+
 <EventUnitTest1>
 	Var XMLProfile = "AllPriceUp05"
 	Open CurrentXMLFileName0
@@ -1458,6 +1524,27 @@
 </Video>
 
 
+<Image>
+	<X> 224 </X>
+	<Y> NamHomCoconutRemainReward_Y </Y>
+	<State> ShowNamHomCoconutRemainReward </State>
+	<Filename> "ROOT/taobin_project/image/event/nam_hom_coconut/reward_remain.png" </Filename>
+</Image>
+
+<Text>
+    <X> 379 </X>
+    <Y> NamHomCoconutRemainRewardNumber_Y </Y>
+	<State> ShowNamHomCoconutRemainReward </State>
+    <Width> 224 </Width>
+    <Height> 112 </Height>
+    <Font> OpunBoldTTF </Font>
+    <Size> 100 </Size>
+    <Color> 0xFF0000 </Color>
+    <Align> center-vertical-horizontal </Align>
+    <Value> NamHomCoconutRemainReward </Value>    
+</Text>
+
+
 
 
 <Button>

xml/page_brewing3.xml

@@ -273,6 +273,29 @@
 		EndIf
 	EndIf
 
+	If EnergyDrink1BathPro = 1 Then
+		If FromEnergyDrink1BathPro = 1 Then
+			SAVELOG "Adding Energy drink 1 Bath pro quota"
+			Var Param1 = ""
+			Var Param2 = ""
+			Var Param3 = ""
+
+			If IDNum = "" Then
+
+			Else
+				AddData 44 TelephoneNumber IDNum Param1 Param2
+			EndIf
+
+			; clear id
+			Var IDNum = ""
+			Var FromEnergyDrink1BathPro = 0
+			Var AddData = 0
+			Var DisableFromPowerup = "true"
+		Else
+			Var DisableFromPowerup = ""
+		EndIf
+	EndIf
+
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
 		Var TelephoneNumberProblem = TelephoneNumberGOTFree

xml/page_collect_point_1.xml

@@ -133,6 +133,8 @@
 	DEBUGVAR FromLipitPro
 	DEBUGVAR FruityRayaEnable
 	DEBUGVAR FromFruityRaya
+	DEBUGVAR ProThaiTeaEnable
+	DEBUGVAR FromProThaiTea
 	
 	If Seeker.TNumberTaobinCredit = "" Then
 	
@@ -194,6 +196,14 @@
 
 			EndIf
 
+			DEBUGVAR ProThaiTeaEnable
+			DEBUGVAR FromProThaiTea
+			If ProThaiTeaEnable = 1 Then
+				If FromProThaiTea = 1 Then
+					Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
+				EndIf
+			EndIf
+
 			If PepweenEnable = 1 Then
 				If PepweenCollectPoint = 0 Then
 					GETACCEXT TelephoneNumber 31
@@ -226,6 +236,27 @@
 				EndIf
 			EndIf
 
+			DEBUGVAR NamHomCoconutPro
+			DEBUGVAR FromNamHomCoconutPro
+			DEBUGVAR Seeker.CodeChannel
+			If NamHomCoconutPro = 1 Then
+				If FromNamHomCoconutPro = 1 Then
+					If Seeker.CodeChannel = 1 Then
+						If Seeker.CollectPointPromotion = 1 Then
+							If NamHomCoconutRewardOutOfStock = 0 Then
+								GETACCEXT TelephoneNumber 32
+								Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
+							EndIf
+						EndIf
+					Else
+						If NamHomCoconutRewardOutOfStock = 0 Then
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
+						EndIf
+					EndIf
+				EndIf
+			EndIf
+
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 
@@ -283,6 +314,14 @@
 
 		EndIf
 
+		DEBUGVAR ProThaiTeaEnable
+			DEBUGVAR FromProThaiTea
+			If ProThaiTeaEnable = 1 Then
+				If FromProThaiTea = 1 Then
+					Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
+				EndIf
+			EndIf
+
 		If ProBadValentineEnable = 1 Then
 			If FromBadValentinePro = 1 Then
 				GETACCEXT TelephoneNumber 32
@@ -308,6 +347,27 @@
 			EndIf
 		EndIf
 
+		DEBUGVAR NamHomCoconutPro
+		DEBUGVAR FromNamHomCoconutPro
+		DEBUGVAR Seeker.CodeChannel
+		If NamHomCoconutPro = 1 Then
+			If FromNamHomCoconutPro = 1 Then
+				If Seeker.CodeChannel = 1 Then
+					If Seeker.CollectPointPromotion = 1 Then
+						If NamHomCoconutRewardOutOfStock = 0 Then
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
+						EndIf
+					EndIf
+				Else
+					If NamHomCoconutRewardOutOfStock = 0 Then
+						GETACCEXT TelephoneNumber 32
+						Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
+					EndIf
+				EndIf
+			EndIf
+		EndIf
+
 		If PepweenCollectPoint = 0 Then
 			GETACCEXT TelephoneNumber 31
 			Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
@@ -803,6 +863,14 @@
 
 			EndIf
 
+			DEBUGVAR ProThaiTeaEnable
+			DEBUGVAR FromProThaiTea
+			If ProThaiTeaEnable = 1 Then
+				If FromProThaiTea = 1 Then
+					Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
+				EndIf
+			EndIf
+
 			If MyMintEnable = 1 Then
 				If FromMyMintPro = 1 Then
 					GETACCEXT TelephoneNumber 32
@@ -835,6 +903,27 @@
 				EndIf
 			EndIf
 
+			DEBUGVAR NamHomCoconutPro
+			DEBUGVAR FromNamHomCoconutPro
+			DEBUGVAR Seeker.CodeChannel
+			If NamHomCoconutPro = 1 Then
+				If FromNamHomCoconutPro = 1 Then
+					If Seeker.CodeChannel = 1 Then
+						If Seeker.CollectPointPromotion = 1 Then
+							If NamHomCoconutRewardOutOfStock = 0 Then
+								GETACCEXT TelephoneNumber 32
+								Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
+							EndIf
+						EndIf
+					Else
+						If NamHomCoconutRewardOutOfStock = 0 Then
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
+						EndIf
+					EndIf
+				EndIf
+			EndIf
+
 			If PepweenCollectPoint = 0 Then
 				GETACCEXT TelephoneNumber 31
 				Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
@@ -886,7 +975,7 @@
 <X> 236 </X>
 <Y> 699 </Y>
 <State> eval(
-	If FromFruityRaya = 1 Then
+	If FromProThaiTea = 1 Then
 		Var return = "Invisible"
 	Else
 		Var return = "Enable"
@@ -899,7 +988,7 @@
 <X> 236 </X>
 <Y> 699 </Y>
 <State> eval(
-	If FromFruityRaya = 1 Then
+	If FromProThaiTea = 1 Then
 		Var return = "Enable"
 	Else
 		Var return = "Invisible"

xml/page_payment.xml

@@ -94,6 +94,7 @@
 		Var PriceDrink = OriginalPrice
 	EndIf
 
+
 	DEBUGVAR PriceDrink
 	DEBUGVAR PromotionPriceDrink
 
@@ -381,6 +382,17 @@
 
 	EndIf
 
+	If FromEnergyDrink1BathPro = 1 Then
+		Var PriceDiff = PriceDrink - 1
+		Var Seeker.VendingCode = "FIX1"
+		Var Seeker.IntVendingCampaign = PriceDiff
+		Var Seeker.FreeVendingCampaign = 0
+		Var Seeker.CodeChannel = 1
+		Var Seeker.CodeNumber = IDNum
+		Var Seeker.VendingCampaignRI3 = PriceDiff
+		Var Seeker.CampaignPPrice = 1
+	EndIf
+
 	If ChildrenFree = 1 Then
 
 		Var RemainAmountStr = "Free###size=150"
@@ -421,6 +433,11 @@
 		Var Seeker.FreeVendingCampaign = 0
 	EndIf
 
+	; mys pro thai tea
+	If FromProThaiTea = 1 Then
+		Var Seeker.VendingCode = "RM0"
+		Var Seeker.FreeVendingCampaign = 0
+	EndIf
 
 	; Oreo free 
 	If PromotionIDOreoBuyTwoSaveMore = 1 Then

xml/page_topping_select7.xml

@@ -574,7 +574,11 @@
 			Else
 				If DoorCupPosition = "bottom" Then
 					OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-					Open "ROOT/taobin_project/xml/page_payment.xml" 
+					If FromEnergyDrink1BathPro = 1 Then
+						Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml"
+					Else
+						Open "ROOT/taobin_project/xml/page_payment.xml" 
+					EndIf
 				EndIf
 			EndIf
 
@@ -6235,6 +6239,7 @@
 	EndIf
 
 	Var FromPowerUpPro = 0
+	Var FromEnergyDrink1BathPro = 0
 
 	If  Seeker = "next" Then 
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
@@ -6927,7 +6932,368 @@
 </EventClick>
 </Button>
 
+<Text>
+<X> 924 </X>
+<Y> 1804 </Y>
+<Font> KanitTTF </Font>
+<Size> 36 </Size>
+<Width> 1080 </Width>
+<Color> 0xFFFFFF </Color>
+<State> ShowNormalNextButton </State>
+<Animation>
+	<Style> "shake-text" </Style>
+	<OnEvent> "OnValueChange" </OnEvent>
+</Animation>
+<Value> PriceDrinkTmpShow </Value>
+</Text>
 
+; energy drink 1 bath
+<Button>
+<X> 673 </X>
+<Y> 1785 </Y>
+<State> ShowGetEnergyDrinkIn1BathButton </State>
+<Filename> Var( DirImage + "/bn_powerup1baht.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_powerup1baht.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	;Var Seeker = "curr"
+
+
+	Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
+	
+	__CMD "statement" 0 StatementCheckMenu "-"
+
+	
+	DEBUGVAR PriceDrinkTmp
+	
+	;Var Seeker.PriceDrink = PriceDrinkTmp
+	
+	Var PriceDrink = PriceDrinkTmp
+	
+	Var PromotionPriceDrink = PriceDrink
+
+	DEBUGVAR PriceDrink
+
+	SAVELOG "USER press next ( topping ) - new"
+
+	If SugarState1 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index1
+		EndIf
+	EndIf
+
+	If SugarState2 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index2
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index1
+		EndIf
+
+	EndIf
+
+	If SugarState3 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index3
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index2
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index1
+		EndIf
+
+	EndIf
+
+	If SugarState3 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index3
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index2
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index1
+		EndIf
+
+	EndIf
+
+	If SugarState4 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index4
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index3
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index2
+		EndIf
+
+	EndIf
+
+	If SugarState5 = "PressForever" Then
+		If ShiftSugarStep = 1 Then
+			Var topping1 = toppingID1index5
+		EndIf
+		If ShiftSugarStep = 2 Then
+			Var topping1 = toppingID1index4
+		EndIf
+		If ShiftSugarStep = 3 Then
+			Var topping1 = toppingID1index3
+		EndIf
+
+	EndIf
+
+	If showCustomCoffee = "Enable" Then
+		If showCoffeeWater = "Enable" Then
+			If CustomCoffeeWaterState[0] = "PressForever" Then
+				Var topping7 = toppingID7index1
+			EndIf
+			If CustomCoffeeWaterState[1] = "PressForever" Then
+				Var topping7 = toppingID7index2
+			EndIf
+			If CustomCoffeeWaterState[2] = "PressForever" Then
+				Var topping7 = toppingID7index3
+			EndIf
+			If CustomCoffeeWaterState[3] = "PressForever" Then
+				Var topping7 = toppingID7index4
+			EndIf
+			If CustomCoffeeWaterState[4] = "PressForever" Then
+				Var topping7 = toppingID7index5
+			EndIf
+		Else
+			Var topping7 = 0
+		EndIf
+	
+		If showCoffeeQuantity = "Enable" Then
+			If CustomCoffeeQuantityState[0] = "PressForever" Then
+				Var topping2 = toppingID2index1
+			EndIf
+			If CustomCoffeeQuantityState[1] = "PressForever" Then
+				Var topping2 = toppingID2index2
+			EndIf
+			If CustomCoffeeQuantityState[2] = "PressForever" Then
+				Var topping2 = toppingID2index3
+			EndIf
+		Else
+			If toppingID2index3 = "" Then
+			Else
+				Var topping2 = 0
+			EndIf
+		EndIf
+
+		If showCoffeeLevel = "Enable" Then
+			If CustomCoffeeLevelState[0] = "PressForever" Then
+				Var topping9 = toppingID9index1
+			EndIf
+			If CustomCoffeeLevelState[1] = "PressForever" Then
+				Var topping9 = toppingID9index2
+			EndIf
+			If CustomCoffeeLevelState[2] = "PressForever" Then
+				Var topping9 = toppingID9index3
+			EndIf
+			If CustomCoffeeLevelState[3] = "PressForever" Then
+				Var topping9 = toppingID9index4
+			EndIf
+		Else
+			Var topping9 = 0
+		EndIf
+
+		If showCoffeeTamping = "Enable" Then
+			If CustomCoffeeTampingState[0] = "PressForever" Then
+				Var topping8 = toppingID8index1
+			EndIf
+			If CustomCoffeeTampingState[1] = "PressForever" Then
+				Var topping8 = toppingID8index2
+			EndIf
+			If CustomCoffeeTampingState[2] = "PressForever" Then
+				Var topping8 = toppingID8index3
+			EndIf
+		Else
+			Var topping8 = 0
+		EndIf
+	Else
+		If toppingID2index3 = "" Then
+		Else
+			Var topping2 = 0
+		EndIf
+		Var topping7 = 0
+		Var topping8 = 0
+		Var topping9 = 0
+		Var topping10 = 0
+	EndIf
+
+
+	Var Seeker.topping1 = topping1
+	Var Seeker.topping2 = topping2
+	Var Seeker.topping3 = topping3
+	Var Seeker.topping6 = topping6
+	Var Seeker.topping7 = topping7
+	Var Seeker.topping8 = topping8
+	Var Seeker.topping9 = topping9
+	Var Seeker.topping10 = topping10
+
+	Var Seeker.get_a_straw = StrawState
+	Var Seeker.get_a_lid = LidState
+
+
+	DEBUGVAR Seeker.topping1
+	DEBUGVAR Seeker.topping2
+	DEBUGVAR Seeker.topping3
+	DEBUGVAR Seeker.topping6
+	DEBUGVAR Seeker.topping7
+	DEBUGVAR Seeker.topping8
+	DEBUGVAR Seeker.topping9
+	DEBUGVAR Seeker.topping10
+	DEBUGVAR Seeker.get_a_straw
+	DEBUGVAR Seeker.get_a_lid
+
+	DEBUGVAR LidState
+	DEBUGVAR StrawState
+	DEBUGVAR UserSelectProductCode
+
+
+	If StrawState = "Press" Then
+		Machine StrawOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	If LidState = "Press" Then
+		Machine LidOrder	
+		Var LedLidBlink = "true"
+		Var bg_lidProblem_ST = "Enable" 
+	Else
+		If LidState = "Disable" Then
+			Var bg_lidProblem_ST = "Disable"
+		Else
+			Var bg_lidProblem_ST = "Invisible"
+		EndIf
+	EndIf
+	
+	If SelectDrinkType = 0 Then
+		
+	Else
+		Var StrawState = "Enable"
+		Var LidState = "Enable"
+	EndIf
+	; 
+	
+
+	DEBUGVAR PromotionIDCurrentOrder
+	
+	
+	Var SelectDrink = UserSelectProductCode
+	
+	Var Seeker.selected_a_drink = UserSelectProductCode
+	DEBUGVAR Seeker.selected_a_drink
+
+	; Set drink 
+
+	If Seeker = "curr" Then
+		Topping "Select" UserSelectProductCode
+
+		; Set option toppinng and pack 
+		Topping "Select1-ID" topping1
+		Topping "Select2-ID" topping2
+		Topping "Select3-ID" topping3
+		Topping "Select6-ID" topping6
+		Topping "Select7-ID" topping7
+		Topping "Select8-ID" topping8
+		Topping "Select9-ID" topping9
+		Topping "Select10-ID" topping10
+
+		; Pack
+		Topping "Pack" ExtendDataCurr
+
+		
+
+	Else
+		Topping "SetNextOrder" UserSelectProductCode
+
+
+		Topping "__select" UserSelectProductCode
+		; Set option toppinng and pack 
+		Topping "__select1-id" topping1
+		Topping "__select2-id" topping2
+		Topping "__select3-id" topping3
+		Topping "__select6-id" topping6
+		Topping "__select7-id" topping7
+		Topping "__select8-id" topping8
+		Topping "__select9-id" topping9
+		Topping "__select10-id" topping10
+		; Pack
+		Topping "__pack" ExtendDataNext
+
+		Var NextUserSelectDrinkFromPaid = UserSelectProductCode
+		Var NextUserSelecttopping1Paid = topping1
+		Var NextUserSelecttopping2Paid = topping2
+		Var NextUserSelecttopping3Paid = topping3
+		Var NextUserSelecttopping6Paid = topping6
+		Var NextUserSelecttopping7Paid = topping7
+		Var NextUserSelecttopping8Paid = topping8
+		Var NextUserSelecttopping9Paid = topping9
+		Var NextUserSelecttopping10Paid = topping10
+
+
+
+	EndIf
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.ExtendData 
+
+	Var Seeker.PictureDrink = PictureDrink
+	Var Seeker.showname = showname
+
+	DEBUGVAR MenuCautionImageStage0
+	DEBUGVAR CustomerFilterEnable
+	DEBUGVAR CustomerFilterType
+
+	
+	GetLongTimeInMinute LastTimeClickOrder
+
+	If CART_COUNT  = 0 Then
+		If UserSelectProductCode = "-" Then
+
+		Else
+
+			
+			If SelectDrinkType = 1 Then
+				; Move to MenuReady
+				;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				;Open "ROOT/taobin_project/xml/page_payment.xml" 
+			EndIf
+		EndIf
+
+		If SelectDrinkType = 0 Then
+			Var high_light_drink_type = "Enable"
+		EndIf
+	Else
+		
+		If CART1_STATUS = "EMPTY" Then
+			Cart "AddMenuID" 1
+		Else
+			If CART2_STATUS = "EMPTY" Then
+				Cart "AddMenuID" 2
+			Else
+				If CART3_STATUS = "EMPTY" Then
+					Cart "AddMenuID" 3
+				EndIf
+			EndIf
+		EndIf
+
+		Var CartUpdate = "true"
+		Var ButtonNext = "true"
+
+	EndIf
+
+	Var LastTimeClickOrder = 0
+
+	
+	; policy
+
+</EventClick>
+</Button>
 
 
 
@@ -7409,19 +7775,7 @@
 
 
 
-<Text>
+
-<X> 924 </X>
-<Y> 1804 </Y>
-<Font> KanitTTF </Font>
-<Size> 36 </Size>
-<Width> 1080 </Width>
-<Color> 0xFFFFFF </Color>
-<Animation>
-	<Style> "shake-text" </Style>
-	<OnEvent> "OnValueChange" </OnEvent>
-</Animation>
-<Value> PriceDrinkTmpShow </Value>
-</Text>
 
 
 ; next2 button Protect 
@@ -7458,354 +7812,7 @@
 
 ; zone
 
-; energy drink 1 bath
-<Button>
-<X> 673 </X>
-<Y> 1785 </Y>
-<State> ShowGetEnergyDrinkIn1BathButton </State>
-<Filename> Var( DirImage + "/bn_powerup1baht.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_powerup1baht.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
 
-	;Var Seeker = "curr"
-
-
-	Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
-	
-	__CMD "statement" 0 StatementCheckMenu "-"
-
-	
-	DEBUGVAR PriceDrinkTmp
-	
-	;Var Seeker.PriceDrink = PriceDrinkTmp
-	
-	Var PriceDrink = PriceDrinkTmp
-	
-	Var PromotionPriceDrink = PriceDrink
-
-	DEBUGVAR PriceDrink
-
-	SAVELOG "USER press next ( topping ) - new"
-
-	If SugarState1 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index1
-		EndIf
-	EndIf
-
-	If SugarState2 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState3 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState3 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState4 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index4
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index2
-		EndIf
-
-	EndIf
-
-	If SugarState5 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index5
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index4
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index3
-		EndIf
-
-	EndIf
-
-	If showCustomCoffee = "Enable" Then
-		If showCoffeeWater = "Enable" Then
-			If CustomCoffeeWaterState[0] = "PressForever" Then
-				Var topping7 = toppingID7index1
-			EndIf
-			If CustomCoffeeWaterState[1] = "PressForever" Then
-				Var topping7 = toppingID7index2
-			EndIf
-			If CustomCoffeeWaterState[2] = "PressForever" Then
-				Var topping7 = toppingID7index3
-			EndIf
-			If CustomCoffeeWaterState[3] = "PressForever" Then
-				Var topping7 = toppingID7index4
-			EndIf
-			If CustomCoffeeWaterState[4] = "PressForever" Then
-				Var topping7 = toppingID7index5
-			EndIf
-		Else
-			Var topping7 = 0
-		EndIf
-	
-		If showCoffeeQuantity = "Enable" Then
-			If CustomCoffeeQuantityState[0] = "PressForever" Then
-				Var topping2 = toppingID2index1
-			EndIf
-			If CustomCoffeeQuantityState[1] = "PressForever" Then
-				Var topping2 = toppingID2index2
-			EndIf
-			If CustomCoffeeQuantityState[2] = "PressForever" Then
-				Var topping2 = toppingID2index3
-			EndIf
-		Else
-			If toppingID2index3 = "" Then
-			Else
-				Var topping2 = 0
-			EndIf
-		EndIf
-
-		If showCoffeeLevel = "Enable" Then
-			If CustomCoffeeLevelState[0] = "PressForever" Then
-				Var topping9 = toppingID9index1
-			EndIf
-			If CustomCoffeeLevelState[1] = "PressForever" Then
-				Var topping9 = toppingID9index2
-			EndIf
-			If CustomCoffeeLevelState[2] = "PressForever" Then
-				Var topping9 = toppingID9index3
-			EndIf
-			If CustomCoffeeLevelState[3] = "PressForever" Then
-				Var topping9 = toppingID9index4
-			EndIf
-		Else
-			Var topping9 = 0
-		EndIf
-
-		If showCoffeeTamping = "Enable" Then
-			If CustomCoffeeTampingState[0] = "PressForever" Then
-				Var topping8 = toppingID8index1
-			EndIf
-			If CustomCoffeeTampingState[1] = "PressForever" Then
-				Var topping8 = toppingID8index2
-			EndIf
-			If CustomCoffeeTampingState[2] = "PressForever" Then
-				Var topping8 = toppingID8index3
-			EndIf
-		Else
-			Var topping8 = 0
-		EndIf
-	Else
-		If toppingID2index3 = "" Then
-		Else
-			Var topping2 = 0
-		EndIf
-		Var topping7 = 0
-		Var topping8 = 0
-		Var topping9 = 0
-		Var topping10 = 0
-	EndIf
-
-
-	Var Seeker.topping1 = topping1
-	Var Seeker.topping2 = topping2
-	Var Seeker.topping3 = topping3
-	Var Seeker.topping6 = topping6
-	Var Seeker.topping7 = topping7
-	Var Seeker.topping8 = topping8
-	Var Seeker.topping9 = topping9
-	Var Seeker.topping10 = topping10
-
-	Var Seeker.get_a_straw = StrawState
-	Var Seeker.get_a_lid = LidState
-
-
-	DEBUGVAR Seeker.topping1
-	DEBUGVAR Seeker.topping2
-	DEBUGVAR Seeker.topping3
-	DEBUGVAR Seeker.topping6
-	DEBUGVAR Seeker.topping7
-	DEBUGVAR Seeker.topping8
-	DEBUGVAR Seeker.topping9
-	DEBUGVAR Seeker.topping10
-	DEBUGVAR Seeker.get_a_straw
-	DEBUGVAR Seeker.get_a_lid
-
-	DEBUGVAR LidState
-	DEBUGVAR StrawState
-	DEBUGVAR UserSelectProductCode
-
-
-	If StrawState = "Press" Then
-		Machine StrawOrder	
-		Var LedLidBlink = "true"
-	EndIf
-
-	If LidState = "Press" Then
-		Machine LidOrder	
-		Var LedLidBlink = "true"
-		Var bg_lidProblem_ST = "Enable" 
-	Else
-		If LidState = "Disable" Then
-			Var bg_lidProblem_ST = "Disable"
-		Else
-			Var bg_lidProblem_ST = "Invisible"
-		EndIf
-	EndIf
-	
-	If SelectDrinkType = 0 Then
-		
-	Else
-		Var StrawState = "Enable"
-		Var LidState = "Enable"
-	EndIf
-	; 
-	
-
-	DEBUGVAR PromotionIDCurrentOrder
-	
-	
-	Var SelectDrink = UserSelectProductCode
-	
-	Var Seeker.selected_a_drink = UserSelectProductCode
-	DEBUGVAR Seeker.selected_a_drink
-
-	; Set drink 
-
-	If Seeker = "curr" Then
-		Topping "Select" UserSelectProductCode
-
-		; Set option toppinng and pack 
-		Topping "Select1-ID" topping1
-		Topping "Select2-ID" topping2
-		Topping "Select3-ID" topping3
-		Topping "Select6-ID" topping6
-		Topping "Select7-ID" topping7
-		Topping "Select8-ID" topping8
-		Topping "Select9-ID" topping9
-		Topping "Select10-ID" topping10
-
-		; Pack
-		Topping "Pack" ExtendDataCurr
-
-		
-
-	Else
-		Topping "SetNextOrder" UserSelectProductCode
-
-
-		Topping "__select" UserSelectProductCode
-		; Set option toppinng and pack 
-		Topping "__select1-id" topping1
-		Topping "__select2-id" topping2
-		Topping "__select3-id" topping3
-		Topping "__select6-id" topping6
-		Topping "__select7-id" topping7
-		Topping "__select8-id" topping8
-		Topping "__select9-id" topping9
-		Topping "__select10-id" topping10
-		; Pack
-		Topping "__pack" ExtendDataNext
-
-		Var NextUserSelectDrinkFromPaid = UserSelectProductCode
-		Var NextUserSelecttopping1Paid = topping1
-		Var NextUserSelecttopping2Paid = topping2
-		Var NextUserSelecttopping3Paid = topping3
-		Var NextUserSelecttopping6Paid = topping6
-		Var NextUserSelecttopping7Paid = topping7
-		Var NextUserSelecttopping8Paid = topping8
-		Var NextUserSelecttopping9Paid = topping9
-		Var NextUserSelecttopping10Paid = topping10
-
-
-
-	EndIf
-	DEBUGVAR Seeker
-	DEBUGVAR Seeker.ExtendData 
-
-	Var Seeker.PictureDrink = PictureDrink
-	Var Seeker.showname = showname
-
-	DEBUGVAR MenuCautionImageStage0
-	DEBUGVAR CustomerFilterEnable
-	DEBUGVAR CustomerFilterType
-
-	
-	GetLongTimeInMinute LastTimeClickOrder
-
-	If CART_COUNT  = 0 Then
-		If UserSelectProductCode = "-" Then
-
-		Else
-
-			
-			If SelectDrinkType = 1 Then
-				; Move to MenuReady
-				;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				;Open "ROOT/taobin_project/xml/page_payment.xml" 
-			EndIf
-		EndIf
-
-		If SelectDrinkType = 0 Then
-			Var high_light_drink_type = "Enable"
-		EndIf
-	Else
-		
-		If CART1_STATUS = "EMPTY" Then
-			Cart "AddMenuID" 1
-		Else
-			If CART2_STATUS = "EMPTY" Then
-				Cart "AddMenuID" 2
-			Else
-				If CART3_STATUS = "EMPTY" Then
-					Cart "AddMenuID" 3
-				EndIf
-			EndIf
-		EndIf
-
-		Var CartUpdate = "true"
-		Var ButtonNext = "true"
-
-	EndIf
-
-	Var LastTimeClickOrder = 0
-
-	
-	; policy
-	Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_powerup_consent.xml"
-
-</EventClick>
-</Button>
 
 <Image>
 <X> 0 </X>

xml_main/startup.xml

@@ -113,7 +113,7 @@
 ;Oreo
 Var OreoGuarantee = 0
 
-	Var CurrentMainVideo = 0
+	Var CurrentMainVideo = 2
 </EventOpen>
 
 <Text>