HKG: Updated page_drink_fail & payment buttons

inter/hkg/xml/page_drinkfail_hkg.lxml

@@ -17,35 +17,8 @@
     Var MachineErrorDetailAll = MachineErrorDetail + " / "
 	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
-	
-
 	DEBUGVAR TelephoneNumberProblem
 	
-    ; try-get-user
-    Var payload = "HKG/" + TelephoneNumberProblem
-    Var payload = payload + "/-"
-    Var payload = payload + "/-"
-    Var payload = payload + "/-"
-    Var payload = payload + "/-"
-
-    DEBUGVAR payload
-
-    Var Seeker.IsMember = 0
-    Var SendProblemOfMember = 0
-    Var ShowQRByNoMember = "Invisible"
-
-    Var TaobinName = ""
-    
-    If TelephoneNumberProblem = "" Then
-        Var ShowQRByNoMember = "Enable"
-    Else
-        GETACCEXT payload 35
-    EndIf
-
-
-    Var StepX = 1
-    Var Ext1a = ""
-	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -56,38 +29,6 @@
 
 	If Timeout > 30 Then
 
-        If SendProblemOfMember = 1 Then
-
-            DEBUGVAR TelephoneNumberProblem
-
-            StrLen TelephoneNumberProblem TelNumLen
-            If TelNumLen >= MinPhoneNumber Then  
-
-                Var ProblemID = 7
-
-                Var ChooseProblem = "taobin purchasing problems"
-
-                If Seeker.PayWithQR = 1 Then
-                    Var  VendingTSIDProblem = VendingTSIDTmp
-                    If Seeker.CampaignPayChanel = "promptpay" Then
-                        Var ProblemID = 8
-                        Var ChooseProblem = "taobin purchasing problems(Void Failed)"
-                    EndIf
-                Else
-                    Var VendingTSIDProblem = VendingTSID
-                EndIf
-
-                
-                PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
-
-            EndIf
-
-        EndIf
-
-
-
-
-
         If MachineStage = "remove-cup" Then
 			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 		Else
@@ -114,62 +55,6 @@
 
 ;include="ROOT/taobin_project/inc/video.inc"
 
-<EventActionOk>
-
-If StepX = 1 Then
-    If Ext1a = "ok" Then
-        Var TaobinName = Ext1d
-
-        If TaobinName = "" Then
-            Var Seeker.IsMember = 0
-        Else
-            If TaobinName = "-" Then
-                Var Seeker.IsMember = 0
-            Else
-                Var Seeker.IsMember = 1
-            EndIf
-        EndIf
-
-        DEBUGVAR Seeker.IsMember
-
-        If Seeker.IsMember = 1 Then
-            SAVELOG "Already member, will send problem"
-            Var SendProblemOfMember = 1
-        Else
-            SAVELOG "Not member, show QR"
-            Var SendProblemOfMember = 0
-            Var ShowQRByNoMember = "Enable"
-        EndIf
-
-    Else
-        Var Seeker.IsMember = 0
-        SAVELOG "StepX.error, show QR"
-        Var ShowQRByNoMember = "Enable"
-    EndIf
-
-EndIf
-
-
-</EventActionOk>
-
-<EventActionError>
-
-If StepX = 1 Then
-
-    SAVELOG "ActionError show QR"
-    Var ShowQRByNoMember = "Enable"
-
-EndIf
-
-
-</EventActionError>
-
-
-
-
-
-
-
 
 <Image>
 <X> 43 </X>
@@ -180,15 +65,14 @@ EndIf
 <Image>
 <X> 429 </X>
 <Y> 1301 </Y>
-<State> ShowQRByNoMember </State>
 <Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
 </Image>
 
-;<Image>
+<Image>
-;<X> 190 </X>
+<X> 190 </X>
-;<Y> 1548 </Y>
+<Y> 1548 </Y>
-;<Filename> Var( DirImage + "/text13.png" ) </Filename>
+<Filename> Var( DirImage + "/text13.png" ) </Filename>
-;</Image>
+</Image>
 
 
 <Button>
@@ -196,42 +80,8 @@ EndIf
 <Y> 1720 </Y>
 <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>
 
-	StrLen TelephoneNumberProblem TelNumLen
-
-    If SendProblemOfMember = 1 Then
-
-        If TelNumLen >= MinPhoneNumber Then 
-
-            Var ProblemID = 7
-
-            Var ChooseProblem = "taobin purchasing problems" 
-
-            If Seeker.PayWithQR = 1 Then
-                Var  VendingTSIDProblem = VendingTSIDTmp
-
-                If Seeker.CampaignPayChanel = "promptpay" Then
-                    Var ProblemID = 8
-                    Var ChooseProblem = "taobin purchasing problems(Void Failed)"
-                EndIf
-            Else
-                Var VendingTSIDProblem = VendingTSID
-            EndIf
-
-            
-            PROBLEM2  TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem 
-
-        EndIf
-
-    EndIf
-
-
-
-
-			
 	If MachineStage = "remove-cup" Then
 		Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 	Else

inter/hkg/xml/page_remove_cup.lxml

@@ -18,13 +18,14 @@
 		
 	LED LedDoorDoor 5 255 255 255 255
 
-	Var CheckCupStateDoorCupClose = ""
+	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
-	Var CheckCupStateDoorCupCloseCnt = 0
 
-	DEBUGVAR DoorCupPosition
+	Var ShowMenuNameAndImage = "Invisible"
-	If DoorCupPosition = "bottom" Then
+	Var RemoveCupOnArmID = -1
-		Var buttonRemoveCup = "Enable"
+	Var remove_cup_name = ""
-	EndIf
+	Var remove_cup_image = ""
+
+	RootLayoutVisible 3 "show"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -34,53 +35,48 @@
 	Var MachineErrorDetailAll = MachineErrorDetail + " / "
 	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
-
+	If InternationalEnable = 1 Then
-	If MachineStage = "show-menu" Then
+		Var MachineErrorDetailAll = MachineErrorDetailEng
-		Open "ROOT/taobin_project/xml/page_board.xml"
-
 	EndIf
+
+	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
+	If HaveCup = "false" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+	If CupOnArm = "true" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+
 	If MachineStage = "close-maintenance" Then
-		Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+
 	EndIf
 
-	Var Timeout = Timeout + 1
+	;include=ROOT/taobin_project/inc/remove_cup_step.inc
-	DEBUGVAR Timeout
-	If Timeout > 5 Then
-		Var Timeout = 0
 
-		DEBUGVAR DoorCupPosition
+
+	Var RemoveCupOnArmID = 0
+	If RemoveCupOnArmID > 0 Then
 		If DoorCupPosition = "bottom" Then
-			Var buttonRemoveCup = "Enable"
+			Var ShowMenuNameAndImage = "Invisible"
+			Var RemoveCupOnArmID = -1
+		Else
+			DEBUGVAR RemoveCupOnArmID
+			DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
+			DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
+
+			Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
+			Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
+			Var ShowMenuNameAndImage = "Enable"
 		EndIf
 	EndIf
 
-	; Logic have differrent drinkfail3.xml 
-	; protect lock 
-	; 
-
-	If CheckCupStateDoorCupCloseCnt > 0 Then
-		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-	EndIf
-
-	If CheckCupStateDoorCupCloseCnt = 0 Then
-		Var CheckCupStateDoorCupClose = ""
-	EndIf
-
-	DEBUGVAR HaveCup
-
-	If HaveCup = "true" Then
-
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CheckCupStateDoorCupClose
-
-
 	Refresh
 	TimerReset
 
@@ -116,13 +112,7 @@
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
 <EventClick> 
-
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
-
-	Machine RemoveCup
-	Machine DoorLidOpen
-	Var buttonRemoveCup = "Invisible"
-   Var CheckCupStateDoorCupClose = "reset"
-   Var CheckCupStateDoorCupCloseCnt = 30
 </EventClick>
 <Language>
   <ID> 000411 </ID>
@@ -133,6 +123,37 @@
 </Language>
 </Button>
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> remove_cup_image </Filename>
+</Image>
+
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" remove_cup_name SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
 
 <Text>
 <X> 5 </X>

xml/page_payment_cash-HKG.xml

@@ -343,8 +343,8 @@
 	Var SwitchingQRCodeToCreditCard = 0
 	Var SwitchingContDown = 0
 
-	Var FirstTimeDelayEnableButton = 1
+	;Var FirstTimeDelayEnableButton = 1
-	Var FirstTimeDelayEnableButtonCountDown = 5
+	;Var FirstTimeDelayEnableButtonCountDown = 5
 
     ;If CoinInFlag = 0 Then
     ;    If CancelFlag = 0 Then
@@ -476,7 +476,7 @@
 
 	;Disable taobin credit
 
-	Var TopRowY = 1276
+	Var TopRowY = 1297
 	Var BotRowY = 1499
 
 	Var PayState4 = "Invisible"
@@ -1144,17 +1144,17 @@
 
 	EndIf
 
-    If FirstTimeDelayEnableButton = 1 Then
+    ;If FirstTimeDelayEnableButton = 1 Then
-        If FirstTimeDelayEnableButtonCountDown = 0 Then
+    ;    If FirstTimeDelayEnableButtonCountDown = 0 Then
-            Var CreditCardButtonState = "Enable"
+    ;        Var CreditCardButtonState = "Enable"
-            Var QRCodeButtonState = "Enable"
+    ;        Var QRCodeButtonState = "Enable"
-            Var LOADING_STATE = "Invisible"
+    ;        Var LOADING_STATE = "Invisible"
-			Var AlphaLoadingState = "Invisible"
+	;		Var AlphaLoadingState = "Invisible"
-            Var FirstTimeDelayEnableButton = 0
+    ;        Var FirstTimeDelayEnableButton = 0
-        Else
+    ;    Else
-            Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
+    ;        Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
-        EndIf
+    ;    EndIf
-    EndIf
+    ;EndIf
 
     If EnablingCreditCard = 1 Then
 
@@ -1182,11 +1182,15 @@
             Var QRErrorState = "Invisible"
             Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
             Var VendingCashless = "-"
-            If FirstTimeDelayEnableButton = 0 Then
+            
-                Var LOADING_STATE = "Invisible"
+			;If FirstTimeDelayEnableButton = 0 Then
-				Var AlphaPopupLoadingState = "Invisible"
+            ;   Var LOADING_STATE = "Invisible"
-            EndIf
+			;	Var AlphaPopupLoadingState = "Invisible"
-            Var EnablingCountDown = 0
+            ;EndIf
+            
+			Var LOADING_STATE = "Invisible"
+			Var AlphaPopupLoadingState = "Invisible"
+			Var EnablingCountDown = 0
             Var EnablingCreditCard = 0
         Else
             Var EnablingCountDown = EnablingCountDown - 1
@@ -1675,7 +1679,7 @@
 ;</Button>
 
 <Button>
-<X> 327 </X>
+<X> 223 </X>
 <Y> TopRowY </Y>
 <State> CreditCardButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
@@ -1729,7 +1733,7 @@ EndIf
 </Button>
 
 <Button>
-<X> 551 </X>
+<X> 566 </X>
 <Y> TopRowY </Y>
 <State> QRCodeButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
@@ -2495,7 +2499,6 @@ eval(
 <Align> Center </Align>
 <State> LOADING_STATE </State>
 <Value> "Just Moment, Please" </Value>
-;<Filename> Var( DirImage + "/loadingText.png" )</Filename>
 </Text>
 
 <GIF>
@@ -2504,7 +2507,7 @@ eval(
 <Width> 94 </Width>
 <Height> 94 </Height>
 <State> LOADING_STATE </State>
-<Filename> Var( DirImage + "/loading.gif" )</Filename>
+<Filename> "ROOT/taobin_project/image/page_payment/loading.gif"</Filename>
 </GIF>
 
 
@@ -2513,17 +2516,6 @@ eval(
 	Open "/media/bt/xml/security_alarm.xml"
 </EventSecurity>
 
-;<Text>
-;<X> 0 </X>
-;<Y> 1880 </Y>
-;<Size> 14 </Size>
-;<Align> "Left" </Align>
-;<Width> 1080 </Width>
-;<Font> KanitThinTTF </Font>
-;<Color> 0x513C2F </Color>
-;<Value> SelectDrink </Value>
-;</Text>
-
 
 
 <Button>