Fix recommend not auto open
This commit is contained in:
parent
c9ae570ef0
commit
3eacf4e3f7
16 changed files with 1102 additions and 1082 deletions
|
|
@ -57,6 +57,9 @@ Else
|
|||
EndIf
|
||||
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
|
||||
DEBUGVAR NextPage
|
||||
|
||||
SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
|
||||
EndIf
|
||||
|
|
@ -81,3 +84,4 @@ If OpenFromMulti = 1 Then
|
|||
TabMenuVisibleInst 99
|
||||
EndIf
|
||||
Var OpenFromMulti = 0
|
||||
|
||||
|
|
|
|||
|
|
@ -2581,7 +2581,7 @@ PRICE "Reset" "-"
|
|||
<EventClick>
|
||||
|
||||
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
SAVELOG " NEXT PAGE NEXT PAGE NEXT PAGE "
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@
|
|||
If Seeker.SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -247,7 +248,7 @@
|
|||
|
||||
EndIf
|
||||
Else
|
||||
; seeker is curr ent
|
||||
; seeker currr
|
||||
|
||||
|
||||
DEBUGVAR ChangeFlag2
|
||||
|
|
@ -267,12 +268,8 @@
|
|||
If New_Payment = 1 Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
|
||||
EndIf
|
||||
If Seeker.SmoothieToPayment = 1 Then
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
Else
|
||||
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
|
||||
Open Brew3Inter
|
||||
|
|
@ -282,13 +279,8 @@
|
|||
If New_Payment = 1 Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
|
||||
EndIf
|
||||
If Seeker.SmoothieToPayment = 1 Then
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
Else
|
||||
If UsePepsiTheme = 1 Then
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
SAVELOG " spiral sell v3"
|
||||
|
||||
Var Timeout = 0
|
||||
Var LastMakeSpiralResult = 0
|
||||
|
|
@ -17,8 +18,7 @@
|
|||
SPIRAL_SELL ServiceCredit SpiralRef
|
||||
|
||||
Var TimeOutSmoothiesProcess = 120
|
||||
Var Seeker.SmoothieToPayment = SmoothieToPayment
|
||||
Var NextSmoothie = 0
|
||||
|
||||
DEBUGVAR Seeker.SmoothieToPayment
|
||||
|
||||
</EventOpen>
|
||||
|
|
@ -54,7 +54,15 @@
|
|||
DEBUGVAR SpiralPayDetail
|
||||
Var Seeker.sprial_pay_detail = SpiralPayDetail
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
If Seeker = "next" Then
|
||||
Var NextOrder = "true"
|
||||
Var NextSmoothie = 1
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
|
||||
EndIf
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
EndIf
|
||||
|
||||
If LastMakeSpiralResult = 2 Then
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@
|
|||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
SAVELOG "Thank you conti version TCT8"
|
||||
SAVELOG "Thank you conti version TCV9"
|
||||
SAVELOG "Support NextSmoothie and fix bug next"
|
||||
|
||||
DEBUGVAR NextSmoothie
|
||||
|
|
@ -355,17 +355,15 @@
|
|||
EndIf
|
||||
|
||||
; smoothie next
|
||||
If NextSmoothie = 1 Then
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR Seeker.SmoothieToPayment
|
||||
Var NextSmoothie = 0
|
||||
If Seeker.SmoothieToPayment = 1 Then
|
||||
Var TimeOutSmoothiesProcess = 120
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR Seeker.SmoothieToPayment
|
||||
Var NextSmoothie = 0
|
||||
If Seeker.SmoothieToPayment = 1 Then
|
||||
Var TimeOutSmoothiesProcess = 120
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
|
||||
|
|
|
|||
|
|
@ -19,8 +19,10 @@ Else
|
|||
Var DrinkPaid = SelectDrink
|
||||
Var PaidPaymentFromNextStage = 1
|
||||
EndIf
|
||||
|
||||
If Seeker.SmoothieToPayment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue