update new taobin credit 28 taobin

ui/lang.tsv

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

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_3_28.xml

@@ -602,27 +602,47 @@
 		Var Get15DiscountState = "Disable"
 	EndIf
 
-	Var PreviosCreditPhoneNumber = ""
-
-	If Seeker = "curr" Then
-		Var PreviosCreditPhoneNumber = Seeker.TNumberTaobinCredit
-	Else
-		If Seeker.TNumberTaobinCredit = PreviosCreditPhoneNumber Then
-			If Seeker.UseGet15Discount = 1 Then
-				Var Get15DiscountState = "Disable2"
-			EndIf
-		EndIf
-	EndIf
-
 	Var KeepBnBtnImage = "/bn_keep.png"
 	Var KeepBpBtnImage = "/bp_keep.png"
 
+	Var PreviousSeeker = "tempSeeker"
+	Var Seeker.UseGet15Discount = 0
+	Var PreviousSeeker.UseGetDrink5Bath = 0
+
+	If Seeker = "curr" Then
+		Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
+		Var PreviousSeeker.UseGet15Discount = 0
+	Else
+		
+		If PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Then
+			If PreviousSeeker.UseGet15Discount = 1 Then
+				Var Get15DiscountState = "Disable2"
+			EndIf
+		Else
+			Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
+			Var PreviousSeeker.UseGet15Discount = 0
+		EndIf
+	EndIf
+
 	If CoffeePoint >= 28 Then
 		Var KeepBnBtnImage = "/bn_close.png"
 		Var KeepBpBtnImage = "/bp_close.png"
+		Var Get15DiscountState = "Disable"
+		Var PreviousSeeker.UseGetDrink5Bath = 1
+	Else
+		If PreviousSeeker.UseGetDrink5Bath = 1 Then
+			Var Get15DiscountState = "Disable2"
+		EndIf
 	EndIf
 
-	
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.TNumberTaobinCredit
+	DEBUGVAR Seeker.UseGet15Discount
+
+	DEBUGVAR PreviousSeeker
+	DEBUGVAR PreviousSeeker.TNumberTaobinCredit
+	DEBUGVAR PreviousSeeker.UseGet15Discount
+
 	Var PointEndDate = ""
 	GetDateEndOfMonth PointEndDate
 	DEBUGVAR PointEndDate
@@ -646,7 +666,7 @@
 
 	
 
-	;Var Timeout = Timeout + 1
+	Var Timeout = Timeout + 1
 	If Timeout > 5 Then
 
     	; goto lid straw
@@ -656,8 +676,12 @@
 			Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
 		Else
 			If CoffeePoint >= 15 Then
-				Var Discount15Timeout = 1
+				If Get15DiscountState = "Disable2" Then
-				Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				Else
+					Var Discount15Timeout = 1
+					Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
@@ -826,6 +850,7 @@
 <EventClick> 
 
 	Var Seeker.UseGet15Discount = 1
+	Var PreviousSeeker.UseGet15Discount = 1
 	Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
 
 </EventClick>

xml/page_display_get_15_discount.xml

@@ -117,8 +117,10 @@
 <FilenameDisable2> Var( DirImage + "/disable2_get15discount.png" )</FilenameDisable2>
 <EventClick> 
 	; goto lid straw
-
+	Var Seeker.UseGet15Discount = 1
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	Var PreviousSeeker.UseGet15Discount = 1
+	Var Discount15Timeout = 0
+	Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
 
 </EventClick>
 </Button>
@@ -132,8 +134,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var Discount15Timeout = 0
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-	Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
 </EventClick>
 </Button>