THAI INTER: Smoothie, Help center
This commit is contained in:
parent
aaeb2fa8bc
commit
f9fea323bc
76 changed files with 3713 additions and 117 deletions
|
|
@ -430,7 +430,11 @@
|
|||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
If SmoothieToPayment = 1 Then
|
||||
; do nothing
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
Else
|
||||
|
|
@ -441,7 +445,11 @@
|
|||
Var PaidPaymentFromNextStage = 1
|
||||
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -457,7 +465,11 @@
|
|||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
If SmoothieToPayment = 1 Then
|
||||
; do nothing
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
Else
|
||||
|
|
@ -468,7 +480,11 @@
|
|||
Var PaidPaymentFromNextStage = 1
|
||||
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -1290,6 +1306,17 @@
|
|||
Var X_CASH3 = 664 - 113
|
||||
EndIf
|
||||
|
||||
Var FromSmoothieProcess = "Invisible"
|
||||
Var FromPaymentCash = "Enable"
|
||||
Var FromBrewingProcess = "Invisible"
|
||||
|
||||
If EnableHelperShow = 1 Then
|
||||
Var Showhelper = "Enable"
|
||||
Else
|
||||
Var Showhelper = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
@ -1370,7 +1397,11 @@
|
|||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
If SmoothieToPayment = 1 Then
|
||||
; do nothing
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
;Var TxRef1 = ""
|
||||
;CreateTxRef1 TxRef1
|
||||
EndIf
|
||||
|
|
@ -1378,7 +1409,11 @@
|
|||
|
||||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
Var BrewingTextThai = "เตรียมแก้ว"
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -1924,12 +1959,20 @@
|
|||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
If SmoothieToPayment = 1 Then
|
||||
; do nothing
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
EndIf
|
||||
Var Seeker.CreditCard = 1
|
||||
Var Seeker.CreditCardRef = CreditCardRef
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -2170,8 +2213,12 @@
|
|||
|
||||
|
||||
If TestLoopMakeDrink = 1 Then
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -2202,7 +2249,11 @@
|
|||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
If SmoothieToPayment = 1 Then
|
||||
; do nothing
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
Var TxRef1 = ""
|
||||
CreateTxRef1 TxRef1
|
||||
Else
|
||||
|
|
@ -2213,7 +2264,11 @@
|
|||
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
If CancelFlag = 0 Then
|
||||
|
|
@ -2754,7 +2809,25 @@
|
|||
EndIf
|
||||
</EventVDCancle>
|
||||
|
||||
; helper button
|
||||
<Button>
|
||||
<X> 990 </X>
|
||||
<Y> 430 </Y>
|
||||
<State> Showhelper </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_payment/helper.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_payment/helper.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var OpenFromXML = "ROOT/taobin_project/xml/page_payment_cash.xml"
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
|
||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||
;RootLayoutVisible 15 "show"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<Image>
|
||||
|
|
@ -2885,8 +2958,12 @@
|
|||
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
|
||||
Var MachineStage = "make-drink"
|
||||
Var BrewingTextThai = "เตรียมแก้ว"
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
EndIf
|
||||
|
|
@ -3737,11 +3814,19 @@ eval(
|
|||
If IgnoreNetCore = "true" Then
|
||||
If Seeker = "curr" Then
|
||||
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
If SmoothieToPayment = 1 Then
|
||||
; do nothing
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
EndIf
|
||||
Else
|
||||
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -3758,9 +3843,12 @@ eval(
|
|||
</Text>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
</EventUnitTest1>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue