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

ui/lang.tsv

@@ -710,11 +710,11 @@
 800634		OK	รับทราบ
 800635		Main Disc Not Close!!!	ฐานจานหมุนไม่ได้ล็อค!!!
 800636		Main Disc lock may loose, Please lock Main Disc before Full Test.	ฐานจานหมุนอาจหลวม หรือลืมล็อค
-800637		Powder Disc	ผง
+800637		Powder Disc	ตำแหน่งผง
 800638		ICE	น้ำแข็ง
 800639		Door Cup	ประตูรับแก้ว
 800640		Powder Channel  (falling powder!)	ชุดผง (ช่องจ่าย)  (ผงหล่น!)
-800641		Arm Disc	แขน
+800641		Arm Disc	ตำแหน่งแขน
 800642		Door Lid/Straw	ประตูรับหลอดรับฝา
 800643		Whipper	หัวชง
 800644		Start	เริ่ม
@@ -725,8 +725,8 @@
 800649		Fail	ล้มเหลว
 800650		Testing List :	รายการทดสอบ :
 800651		Connection	การสื่อสาร
-800652		Tray	ถาดหมุน
-800653		ESP Module	เครื่องทำกาแฟ
+800652		Tray	ถาดกาแฟ
+800653		ESP Module	ตำแหนงเครื่องอัดกาแฟ
 
 	Test (New UI)
 800700		Active	ทำงาน

xml/event/tricker.ev

@@ -53,6 +53,8 @@ Var From15THBPro = 0
 Var MyMintEnable = 0
 Var FromMyMintPro = 0
 
+Var NewCollectPoint = 1;
+
 If SystemDateMonthInt = 10 Then
 
 
@@ -123,6 +125,7 @@ If ConfigNumer = 1581 Then
 EndIf
 
 If BoxID = 105005 Then
+	Var NewCollectPoint = 1
 	Var MyMintEnable = 1
 	Var pro15THBEnable = 0
 EndIf

xml/page_brewing3.xml

@@ -1113,6 +1113,17 @@
 
 			If AddData = 1 Then
 				Var Cid = 26
+				DEBUGVAR "Brewing3"
+				DEBUGVAR Seeker
+				DEBUGVAR Seeker.UseGet15Discount
+				If NewCollectPoint = 1 Then
+					If Seeker.UseGet15Discount = 1 Then
+						Var Cid = 39
+					Else
+						Var Cid = 40
+					EndIf
+				EndIf
+
 				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 			
@@ -1217,6 +1228,15 @@
 
 			If AddData = 1 Then
 				Var Cid = 26
+
+				If NewCollectPoint = 1 Then
+					If Seeker.UseGet15Discount = 1 Then
+						Var Cid = 39
+					Else
+						Var Cid = 40
+					EndIf
+				EndIf
+				
 				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 

xml/page_brewing3Conti.xml

@@ -594,6 +594,17 @@
 
 			If AddData = 1 Then
 				Var Cid = 26
+				DEBUGVAR "Brewing3Conti"
+				DEBUGVAR Seeker
+				DEBUGVAR Seeker.UseGet15Discount
+				If NewCollectPoint = 1 Then
+					If Seeker.UseGet15Discount = 1 Then
+						Var Cid = 39
+					Else
+						Var Cid = 40
+					EndIf
+				EndIf
+
 				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 
@@ -704,6 +715,15 @@
 
 			If AddData = 1 Then
 				Var Cid = 26
+
+				If NewCollectPoint = 1 Then
+					If Seeker.UseGet15Discount = 1 Then
+						Var Cid = 39
+					Else
+						Var Cid = 40
+					EndIf
+				EndIf
+
 				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 

xml/page_collect_point_2.xml

@@ -207,7 +207,12 @@
 					
 				EndIf
 
-				Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+				If NewCollectPoint = 1 Then
+					Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+				EndIf
+
 
 			Else
 				

xml/page_display_get_15_discount.xml

@@ -0,0 +1,159 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	Var Timeout = 0
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_get_discount_en"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_discount"
+	EndIf
+
+	DEBUGVAR Discount15Timeout
+
+	Var PopUpState1 = "Enable"
+	Var PopUpState2 = "Invisible"
+	Var PopUpErrorState = "Invisible"
+
+	If Discount15Timeout = 1 Then
+		Var PopUpState2 = "Enable"
+		Var PopUpState1 = "Invisible"
+	EndIf
+
+	If PayOfflineMode = 1 Then
+		Var PopUpErrorState = "Enable"
+		Var PopUpState1 = "Invisible"
+		Var PopUpState2 = "Invisible
+	EndIf
+	 
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 5 Then
+    	; goto lid straw
+
+		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>
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> Var( DirImage + "/alpha.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> PopUpState1 </State>
+<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> PopUpState2 </State>
+<Filename> Var( DirImage + "/img_popup2.png" )</Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> PopUpErrorState </State>
+<Filename> Var( DirImage + "/img_popup_15discount_error.png" )</Filename>
+</Image>
+
+<Button>
+<X> 220 </X>
+<Y> 1680 </Y>
+<State>PopUpState2</State>
+<Filename> Var( DirImage + "/bn_get15discount.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_get15discount.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_get15discount.png" )</FilenameDisable>
+<FilenameDisable2> Var( DirImage + "/disable2_get15discount.png" )</FilenameDisable2>
+<EventClick> 
+	; goto lid straw
+	Var Seeker.UseGet15Discount = 1
+	Var PreviousSeeker.UseGet15Discount = 1
+	Var Discount15Timeout = 0
+	Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 560 </X>
+<Y> 1680 </Y>
+<State>PopUpState2</State>
+<Filename> Var( DirImage + "/bn_keep.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_keep.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+</EventClick>
+</Button>
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<State>PopUpState1</State>
+<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+</EventClick>
+</Button>
+
+
+</Popup>
+	

xml/page_display_get_drink_5_baht.xml

@@ -0,0 +1,144 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	Var Timeout = 0
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_get_discount_en"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_discount"
+	EndIf
+
+	Var PopUpState1 = "Enable"
+	Var PopUpState2 = "Invisible"
+	Var PopUpErrorState = "Invisible"
+
+	If PayOfflineMode = 1 Then
+		Var PopUpErrorState = "Enable"
+		Var PopUpState1 = "Invisible"
+		Var PopUpState2 = "Invisible
+	EndIf
+	 
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 5 Then
+    	; goto lid straw
+		If PopUpState1 = "Enable" Then
+			Var Timeout = 0
+			Var PopUpState1 = "Invisible"
+			Var PopUpState2 = "Enable"
+
+			If PayOfflineMode = 1 Then
+				Var PopUpErrorState = "Enable"
+				Var PopUpState1 = "Invisible"
+				Var PopUpState2 = "Invisible
+			EndIf
+		Else
+			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		EndIf
+	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>
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> Var( DirImage + "/alpha.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> PopUpState1 </State>
+<Filename> Var( DirImage + "/img_popup3.png" )</Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> PopUpState2 </State>
+<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> PopUpErrorState </State>
+<Filename> Var( DirImage + "/img_popup_drink5baht_error.png" )</Filename>
+</Image>
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+	If PopUpState1 = "Enable" Then
+		Var Timeout = 0
+		Var PopUpState1 = "Invisible"
+		Var PopUpState2 = "Enable"
+
+		If PayOfflineMode = 1 Then
+			Var PopUpErrorState = "Enable"
+			Var PopUpState1 = "Invisible"
+			Var PopUpState2 = "Invisible
+		EndIf
+		
+		Refresh
+	Else
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+</EventClick>
+</Button>
+
+
+</Popup>
+