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

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

Browse source
This commit is contained in:
wanlop run 2025-05-13 14:15:44 +07:00
commit 2151bf0ae5
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inter/tha/xml/page_topping_frozen_fruit_select.lxml
View file

@ -772,6 +772,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Text> <Text>
<State> NextButtonState </State>
<X> 420 </X> <X> 420 </X>
<Y> 1442 </Y> <Y> 1442 </Y>
<Width> 250 </Width> <Width> 250 </Width>

18
xml/page_payment_cash.xml
View file

@ -447,7 +447,7 @@
If New_Payment = 1 Then If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf EndIf
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
; do nothing ; do nothing
Else Else
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
@ -462,7 +462,7 @@
Var PaidPaymentFromNextStage = 1 Var PaidPaymentFromNextStage = 1
EndIf EndIf
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else Else
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -2172,7 +2172,7 @@
If TestLoopMakeDrink = 1 Then If TestLoopMakeDrink = 1 Then
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else Else
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
@ -2208,7 +2208,7 @@
If New_Payment = 1 Then If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf EndIf
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
; do nothing ; do nothing
Else Else
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
@ -2223,7 +2223,7 @@
EndIf EndIf
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else Else
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -2917,7 +2917,7 @@
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var MachineStage = "make-drink" Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว" Var BrewingTextThai = "เตรียมแก้ว"
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else Else
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
@ -3775,7 +3775,7 @@ eval(
If IgnoreNetCore = "true" Then If IgnoreNetCore = "true" Then
If Seeker = "curr" Then If Seeker = "curr" Then
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
; do nothing ; do nothing
Else Else
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID
@ -3783,7 +3783,7 @@ eval(
Else Else
EndIf EndIf
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else Else
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -3804,7 +3804,7 @@ eval(
</Text> </Text>
<EventUnitTest1> <EventUnitTest1>
If SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else Else
MakeDrinkV1 SelectDrink SelectSugarID MakeDrinkV1 SelectDrink SelectSugarID

2
xml/page_topping_select8.xml
View file

@ -8053,7 +8053,7 @@
<Y> CustomEspressoTextY </Y> <Y> CustomEspressoTextY </Y>
<State> showEspressoLevel </State> <State> showEspressoLevel </State>
<Language> <Language>
<ID> 002059 </ID> <ID> 002058 </ID>
</Language> </Language>
</Text> </Text>