pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pakin 2025-02-20 08:40:02 +07:00
commit 4cb42e148e
157 changed files with 24010 additions and 1712 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inter/aus/xml/page_brewing3.lxml
View file

@ -1172,8 +1172,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1182,8 +1182,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1251,7 +1251,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

10
inter/aus/xml/page_brewing3Conti.xml
View file

@ -678,8 +678,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -690,8 +690,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -770,7 +770,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Var ChangeOK = 2

12
inter/aus/xml/page_member_topup.lxml
View file

@ -80,9 +80,9 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
Else
CashlessReq OFF
CashlessReq OFF ""
EndIf
VendingQR OFF
@ -163,7 +163,7 @@
EndIf
If VendingCashless = "OK" Then
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Var PayCreditChannel = "credit-card"
@ -184,7 +184,7 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -492,10 +492,10 @@
SAVELOG "Canceling credit card"
Var QR_POPUP = "/img_popup8-2.png"
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf

128
inter/aus/xml/page_remove_cup.lxml
View file

@ -18,68 +18,66 @@
LED LedDoorDoor 5 255 255 255 255
Var CheckCupStateDoorCupClose = ""
Var CheckCupStateDoorCupCloseCnt = 0
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
DEBUGVAR DoorCupPosition
If DoorCupPosition = "bottom" Then
Var buttonRemoveCup = "Enable"
EndIf
Var ShowMenuNameAndImage = "Invisible"
Var RemoveCupOnArmID = -1
Var remove_cup_name = ""
Var remove_cup_image = ""
RootLayoutVisible 3 "show"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetailEng
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_board.xml"
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
If InternationalEnable = 1 Then
Var MachineErrorDetailAll = MachineErrorDetailEng
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
DEBUGVAR Timeout
If Timeout > 5 Then
Var Timeout = 0
;include=ROOT/taobin_project/inc/remove_cup_step.inc
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
@ -115,13 +113,7 @@
<Volume> SoundVolume </Volume>
<State> buttonRemoveCup </State>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
Var CheckCupStateDoorCupClose = "reset"
Var CheckCupStateDoorCupCloseCnt = 30
;include=ROOT/taobin_project/inc/remove_cup_button.inc
</EventClick>
<Language>
<ID> 000411 </ID>
@ -133,6 +125,38 @@
</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>
<Y> 1868 </Y>

439
inter/aus/xml/page_topping_select6.lxml
View file

@ -1270,6 +1270,8 @@
EndIf
DEBUGVAR RecipeTag2
DEBUGVAR NoSugarStepRight2
DEBUGVAR TOPPING1
;
If TOPPING1 = "Sugar" Then
Var SugarZeroCalOption = "Enable"
@ -1318,6 +1320,17 @@
Var SugarZeroCalOption = "Invisible"
EndIf
; No 2 right steps
If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
Else
Var SugarState5 = "Disable"
EndIf
EndIf
EndIf
@ -1374,6 +1387,18 @@
DEBUGVAR toppingID1Default
DEBUGVAR SugarState1
; No 2 right steps
If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
Else
Var SugarState5 = "Disable"
EndIf
EndIf
EndIf
@ -1422,6 +1447,17 @@
Var SugarState2 = "PressForever"
EndIf
; No 2 right steps
If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
Else
Var SugarState5 = "Disable"
EndIf
EndIf
EndIf
If TOPPING1 = "Powder Sugar Premix 50" Then
@ -1466,6 +1502,18 @@
Var SugarState3 = "PressForever"
EndIf
; No 2 right steps
If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
Else
Var SugarState5 = "Disable"
EndIf
EndIf
EndIf
If TOPPING1 = "Powder Sugar Premix 25" Then
@ -1511,6 +1559,18 @@
If sugar_default_flag = 0 Then
Var SugarState2 = "PressForever"
EndIf
; No 2 right steps
If NoSugarStepRight2 = "true" Then
If RecipeTag2 = "Topping6Step" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
Else
Var SugarState5 = "Disable"
EndIf
EndIf
EndIf
Var SugarModeUpdateWhenChangeDrinkType = 0
@ -2336,6 +2396,14 @@
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
Var topping1 = toppingID1index1
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
EndIf
Var SugarZeroCalOption = "Invisible"
@ -2392,6 +2460,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -2402,6 +2479,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index1
EndIf
@ -2456,6 +2542,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -2466,6 +2561,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -2518,6 +2622,15 @@
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -2528,6 +2641,15 @@
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -2536,6 +2658,15 @@
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -2588,6 +2719,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index5
EndIf
@ -2598,6 +2738,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -2606,6 +2755,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -2658,6 +2816,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "PressForever"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index6
EndIf
@ -2668,6 +2835,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "PressForever"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index5
EndIf
@ -2676,6 +2852,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "PressForever"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -2782,6 +2967,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index1
EndIf
@ -2838,6 +3031,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -2890,6 +3091,14 @@
Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index3
Var SugarZeroCalCheck = "Enable"
@ -2943,6 +3152,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index4
Var SugarZeroCalCheck = "Enable"
@ -3050,6 +3267,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index1
EndIf
@ -3107,6 +3332,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -3159,6 +3392,14 @@
Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -3211,6 +3452,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -3446,6 +3695,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index1
EndIf
@ -3509,6 +3767,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -3519,6 +3786,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index1
; select no sugar
@ -3586,6 +3862,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -3596,6 +3881,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index2
; select no sugar
@ -3662,6 +3956,15 @@
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -3672,6 +3975,15 @@
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -3680,6 +3992,15 @@
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index2
; select no sugar
@ -3747,6 +4068,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index5
EndIf
@ -3757,6 +4087,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -3765,6 +4104,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
Var SugarState6 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -3821,6 +4169,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "PressForever"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index6
EndIf
@ -3831,6 +4188,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "PressForever"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index5
EndIf
@ -3839,6 +4205,15 @@
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var SugarState6 = "PressForever"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
Var SugarState6 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -4057,6 +4432,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index1
EndIf
@ -4114,6 +4497,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -4170,6 +4561,14 @@
Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -4225,6 +4624,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf
@ -4445,6 +4852,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index1
EndIf
@ -4505,6 +4920,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index2
EndIf
@ -4560,6 +4983,14 @@
Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index3
EndIf
@ -4614,6 +5045,14 @@
Var SugarState3 = "Enable"
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
; No 2 right steps
If NoSugarStepRight2 = "true" Then
Var SugarState5 = "Disable"
EndIf
Var topping1 = toppingID1index4
EndIf

BIN
inter/hkg/image/page_payment/bd_credit_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
inter/hkg/image/page_payment/bd_credit_card_ezlink.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
inter/hkg/image/page_payment/bd_pay_with_credit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
inter/hkg/image/page_payment/bd_qr_code.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
inter/hkg/image/page_payment/bn_credit_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
inter/hkg/image/page_payment/bn_credit_card_ezlink.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
inter/hkg/image/page_payment/bn_pay_with_ccard.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
inter/hkg/image/page_payment/bn_qr_code.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
inter/hkg/image/page_payment/bp_credit_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
inter/hkg/image/page_payment/bp_pay_with_ccard.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
inter/hkg/image/page_payment/bp_qr_code.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
inter/hkg/image/page_payment/img_use_qr_code.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 33 KiB

12
inter/hkg/xml/page_brewing3.lxml
View file

@ -444,7 +444,7 @@
Var XPercent = 0
EndIf
CashlessReq SUCCESS
CashlessReq SUCCESS ""
</EventOpen>
<EventLanguageOnChange>
@ -989,8 +989,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -999,8 +999,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1063,7 +1063,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

10
inter/hkg/xml/page_brewing3Conti.xml
View file

@ -709,8 +709,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -721,8 +721,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -798,7 +798,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

14
inter/hkg/xml/page_member_topup.lxml
View file

@ -69,9 +69,9 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
Else
CashlessReq OFF
CashlessReq OFF ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -90,7 +90,7 @@
<EventActionOk>
If VendingCashless = "OK" Then
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
Open ToppupSuccessPage
@ -108,7 +108,7 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -277,7 +277,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -332,11 +332,11 @@
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR LOADING_STATE

8
inter/mys/xml/page_brewing3Conti_event.lxml
View file

@ -512,8 +512,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -524,8 +524,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2

10
inter/mys/xml/page_brewing3_event.lxml
View file

@ -602,8 +602,8 @@
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -613,8 +613,8 @@
If Seeker.CreditCard = 1 Then
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -673,7 +673,7 @@
If Seeker.CreditCard = 1 Then
;DEBUGVAR "Credit::void.switch(app: finexus)"
;WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
;CashlessReq FAIL
;CashlessReq FAIL ""
;Var ChangeFlag = 1
;Var CreditCardVoid = 1

14
inter/mys/xml/page_member_topup.lxml
View file

@ -69,9 +69,9 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
Else
CashlessReq OFF
CashlessReq OFF ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -90,7 +90,7 @@
<EventActionOk>
If VendingCashless = "OK" Then
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
Open ToppupSuccessPage
@ -108,7 +108,7 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -277,7 +277,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -332,11 +332,11 @@
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR LOADING_STATE

2
inter/mys/xml/page_void_credit_card.lxml
View file

@ -14,7 +14,7 @@
DEBUGVAR "Credit::void.switch(app: finexus)"
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
</EventOpen>

2
inter/mys/xml/page_void_credit_cardConti.lxml
View file

@ -14,7 +14,7 @@
DEBUGVAR "Credit::void.switch(app: finexus).next(true)"
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
</EventOpen>

10
inter/sgp/xml/page_brewing3.lxml
View file

@ -1020,8 +1020,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1030,8 +1030,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1094,7 +1094,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

10
inter/sgp/xml/page_brewing3Conti.xml
View file

@ -709,8 +709,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -721,8 +721,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
Var PayDetail2 = Seeker.PayDetail2
@ -798,7 +798,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

12
inter/sgp/xml/page_brewing3_blue.lxml
View file

@ -472,7 +472,7 @@
Var XPercent = 0
EndIf
CashlessReq SUCCESS
CashlessReq SUCCESS ""
</EventOpen>
<EventLanguageOnChange>
@ -1048,8 +1048,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1058,8 +1058,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1122,7 +1122,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

14
inter/sgp/xml/page_member_topup.lxml
View file

@ -69,9 +69,9 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
Else
CashlessReq OFF
CashlessReq OFF ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -90,7 +90,7 @@
<EventActionOk>
If VendingCashless = "OK" Then
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
Open ToppupSuccessPage
@ -108,7 +108,7 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -277,7 +277,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -332,11 +332,11 @@
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR LOADING_STATE

17
inter/tha/animation01/play_list.tsv
View file

@ -1283,9 +1283,14 @@ Yuzu Fizzy 11-99-05-0049 1 27 28 24 100 7:40 32
กาแฟชานมไต้หวันร้อน 12-21-01-0030 1 2 3 4 5 10 24 100 7:40 32
กาแฟชานมไต้หวันเย็น 12-21-02-0030 1 2 3 4 5 10 23 24 100 7:40 32
กาแฟชานมไต้หวันปั่น 12-21-03-0030 1 2 3 4 5 10 23 41 24 100 7:40 32
ชานมไต้หวันร้อน 12-02-01-0025 1 1 6 70 10 24 100 7:40 32
ชานมไต้หวันเย็น 12-02-02-0025 1 1 6 70 10 23 24 100 7:40 32
ชานมไต้หวันปั่น 12-02-03-0025 1 1 6 70 10 23 41 24 100 7:40 32
ชานมไต้หวันโกโก้ร้อน 12-02-01-0089 1 1 6 70 15 10 24 100 7:40 32
ชานมไต้หวันโกโก้เย็น 12-02-02-0089 1 1 6 70 15 10 23 24 100 7:40 32
ชานมไต้หวันโกโก้ปั่น 12-02-03-0089 1 1 6 70 15 10 23 41 24 100 7:40 32
ชานมไต้หวันร้อน 12-02-01-0025 1 6 70 10 24 100 7:40 32
ชานมไต้หวันเย็น 12-02-02-0025 1 6 70 10 23 24 100 7:40 32
ชานมไต้หวันปั่น 12-02-03-0025 1 6 70 10 23 41 24 100 7:40 32
ชานมไต้หวันโกโก้ร้อน 12-02-01-0089 1 6 70 15 10 24 100 7:40 32
ชานมไต้หวันโกโก้เย็น 12-02-02-0089 1 6 70 15 10 23 24 100 7:40 32
ชานมไต้หวันโกโก้ปั่น 12-02-03-0089 1 6 70 15 10 23 41 24 100 7:40 32
เก๊กฮวยร้อน 12-02-01-0066 1 24 100 7:40 32
เก๊กฮวยเย็น 12-02-02-0066 1 23 24 100 7:40 32
เก๊กฮวยปั่น 12-02-03-0066 1 23 41 24 100 7:40 32
เก๊กฮวยนมเย็น 12-02-02-0090 1 6 70 23 24 100 7:40 32

Can't render this file because it has a wrong number of fields in line 40.

10
inter/uae_dubai/xml/page_brewing3.lxml
View file

@ -1163,8 +1163,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1173,8 +1173,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1231,7 +1231,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

10
inter/uae_dubai/xml/page_brewing3Conti.xml
View file

@ -666,8 +666,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -678,8 +678,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -750,7 +750,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

10
inter/uae_dubai/xml/page_brewing3Conti_blue.lxml
View file

@ -712,8 +712,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -724,8 +724,8 @@
If Seeker.CreditCard = 1 Then
CashlessReq SUCCESS
;CashlessReq FAIL
CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -796,7 +796,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
CashlessReq FAIL
CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

12
inter/uae_dubai/xml/page_brewing3_blue.lxml
View file

@ -475,7 +475,7 @@
Var XPercent = 0
EndIf
;CashlessReq SUCCESS
;CashlessReq SUCCESS ""
; 945_disable_straw_lid
@ -1078,8 +1078,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1088,8 +1088,8 @@
If Seeker.CreditCard = 1 Then
;CashlessReq SUCCESS
;CashlessReq FAIL
;CashlessReq SUCCESS ""
;CashlessReq FAIL ""
EndIf
@ -1146,7 +1146,7 @@
If Seeker.PayWithQR = 0 Then
If Seeker.CreditCard = 1 Then
;CashlessReq FAIL
;CashlessReq FAIL ""
Var ChangeFlag = 1
Var CreditCardVoid = 1
Else

14
inter/uae_dubai/xml/page_member_topup.lxml
View file

@ -69,9 +69,9 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
Else
CashlessReq OFF
CashlessReq OFF ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -90,7 +90,7 @@
<EventActionOk>
If VendingCashless = "OK" Then
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
Open ToppupSuccessPage
@ -108,7 +108,7 @@
Var LOADING_STATE = "Invisible"
EndIf
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -277,7 +277,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@ -332,11 +332,11 @@
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR LOADING_STATE

60
inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
View file

@ -24,7 +24,7 @@
Var PreScaleCanculate = 100
DEBUGVAR VendingCashless
CashlessReq FAIL
CashlessReq FAIL ""
Var CashlessPayFlag = 0
@ -844,7 +844,7 @@
If CancelFlag = 1 Then
DEBUGVAR CancelFlag
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1050,19 +1050,19 @@
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1527,18 +1527,18 @@
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -1756,18 +1756,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -1858,24 +1858,24 @@ EndIf
;CoinVending ON
;VendingQR OFF
CashlessReq OFF
CashlessReq OFF ""
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -1969,18 +1969,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -2038,18 +2038,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
@ -2092,18 +2092,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
@ -2216,19 +2216,19 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR UserChoosePayment
@ -2303,18 +2303,18 @@ EndIf
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
DEBUGVAR UserChoosePayment

18
inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml
View file

@ -788,7 +788,7 @@
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
CashlessReq SUCCESS ""
Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -796,8 +796,8 @@
If VendingCashless = "END" Then
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF"
CashlessReq OFF
DEBUGVAR "CashlessReq OFF """
CashlessReq OFF ""
EndIf
EndIf
@ -1043,7 +1043,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelCounter = 0
@ -1494,7 +1494,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelContinue = 0
@ -1718,7 +1718,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Var CancelContinue = 0
@ -1820,7 +1820,7 @@
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
Refresh
@ -2001,13 +2001,13 @@
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
CashlessReq FAIL ""
EndIf