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

xml/event/lipit/page_collect_point_pro_lipit_3.xml

@@ -17,6 +17,7 @@
 
 	Var PointMaskState = "Invisible"
 	Var showRandomBtnState = "Invisible"
+	Var showCloseBtnState = "Enable"
 
     Var CoffeePointStr = CoffeePoint
 
@@ -191,6 +192,7 @@
 
 	If PointCount = 10 Then
 		Var showRandomBtnState = "Enable"
+		Var showCloseBtnState = "Invisible"
 	EndIf
 
 	Var CurrentPointSlot = newPointIndex + 1
@@ -578,6 +580,25 @@
 </Button>
 
 
+<Button>
+<X> 610 </X>
+<Y> 1660 </Y>
+<State> showCloseBtnState </State>
+<Filename> Var( DirImage + "/bn_close.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+	Var CurrentPointCheck = "check"
+	Var val3 = "X"
+	AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+	Var UpdatePoint = 1
+
+</EventClick>
+</Button>
+
 
 ;
 <Image>

xml/page_brewing3.xml

@@ -243,6 +243,24 @@
 		EndIf
 	EndIf
 
+	If FreeEnergyDrink = 1 Then
+		If FromPowerUpPro = 1 Then
+				; AddData
+
+			; +1 in quota in this id card
+			Var Param1 = ""
+			Var Param2 = ""
+			Var Param3 = ""
+
+			AddData 44 TelephoneNumber IDNum Param1 Param2
+			; clear id
+			Var IDNum = ""
+			Var FromPowerUpPro = 0
+			Var AddData = 0
+			Var DisableFromPowerup = "true"
+		EndIf
+	EndIf
+
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
 		Var TelephoneNumberProblem = TelephoneNumberGOTFree
@@ -314,6 +332,11 @@
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 	EndIf
 
+	If DisableFromPowerup = "true" Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+	EndIf
+
 	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
 		Var EnableGetMoreStrawFileName = "Enable"
 		Var SelectMenuBetweenBrewEnable1Blink = "Enable"
@@ -1407,6 +1430,11 @@
 		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
 	EndIf
 
+	If DisableFromPowerup = "true" Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+	EndIf
+
 	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
 		If SelectMenuBetweenBrewEnable1Blink = "Enable" Then 
 			Var SelectMenuBetweenBrewEnable1Blink = "Invisible"

xml/page_payment_cash-MYR.xml

@@ -6,6 +6,10 @@
 <Volume> SoundVolume </Volume>
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
+
+	; force 
+	; TODO: test
+	CoinVending OFF
 	
 
 	Var cash_disable = "0"

xml/page_thankyou.xml

@@ -277,23 +277,6 @@
 		SAVELOG BrewTime
 		Var ShowCountDownBrewing = CountDownBrewing
 
-		If FreeEnergyDrink = 1 Then
-			If FromPowerUpPro = 1 Then
-					; AddData
-
-				; +1 in quota in this id card
-				Var Param1 = ""
-				Var Param2 = ""
-				Var Param3 = ""
-				Var TelephoneNumber = "0899999999"
-
-				AddData 44 TelephoneNumber IDNum Param1 Param2
-				; clear id
-				Var IDNum = ""
-				Var FromPowerUpPro = 0
-			EndIf
-		EndIf
-
 
 		If RoadShow = "true" Then