diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
index ce939317..10e4a0ab 100644
--- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
@@ -7,14 +7,14 @@
; "0xeae6e1"
SoundVolume
- ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; soda and other
Var Menu1Selected = "PressForever"
Var Timeout = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
-
+
SetInstanceIgnoreTouch
@@ -25,7 +25,7 @@
DEBUGVAR SlientRefreshIndex
TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
-
+
RefreshAll
@@ -41,17 +41,17 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
-
+
GetVisible inst_show_exclude_group
-
+
If inst_show_exclude_group_counter = "" Then
Var inst_show_exclude_group_counter = 45
EndIf
-
+
If inst_show_exclude_group = 1 Then
If inst_show_exclude_group_counter > 0 Then
-
+
Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
If inst_show_exclude_group_counter = 0 Then
@@ -61,7 +61,22 @@
EndIf
EndIf
-
+ If NextPage = "-" Then
+
+ Else
+ If CupOnArm = "true" Then
+ If Timeout > 9 Then
+ SAVELOG "COA9"
+ Open NextPage
+ EndIf
+ Else
+ If Timeout > 30 Then
+ SAVELOG "COA30"
+ Open NextPage
+ EndIf
+ EndIf
+ EndIf
+
TimerReset
@@ -161,7 +176,7 @@
; ==================> Len = 3
- ; - 12-02-02-0099 -
+ ; - 12-02-02-0099 -
; ==================> Len = 3
- ; - - 12-03-03-0103
+ ; - - 12-03-03-0103
; ==================> Len = 3
- ; - - 12-03-03-0106
+ ; - - 12-03-03-0106
; ==================> Len = 3
- ; - 12-01-02-0090 -
+ ; - 12-01-02-0090 -
; ==================> Len = 3
- ; - 12-21-02-0090 -
+ ; - 12-21-02-0090 -
; ==================> Len = 3
- ; - - 12-02-03-0057
+ ; - - 12-02-03-0057
; ==================> Len = 3
- ; - - 12-02-03-0058
+ ; - - 12-02-03-0058
; ==================> Len = 3
- ; - - 12-01-03-0078
+ ; - - 12-01-03-0078
; ==================> Len = 3
- ; - - 12-21-03-0078
+ ; - - 12-21-03-0078
; ==================> Len = 3
- ; - 12-01-02-0090 -
+ ; - 12-01-02-0090 -
; ==================> Len = 3
- ; - 12-21-02-0090 -
+ ; - 12-21-02-0090 -
; ==================> Len = 3
- ; - - 12-03-03-0009
+ ; - - 12-03-03-0009
; ==================> Len = 3
- ; - 12-05-02-0133 -
+ ; - 12-05-02-0133 -
; ==================> Len = 3
- ; 12-02-01-0103 12-02-02-0103 12-02-03-0103
+ ; 12-02-01-0103 12-02-02-0103 12-02-03-0103
; ==================> Len = 3
- ; 12-02-01-0104 12-02-02-0104 12-02-03-0104
+ ; 12-02-01-0104 12-02-02-0104 12-02-03-0104
; ==================> Len = 3
- ; 12-02-01-0026 12-02-02-0026 12-02-03-0026
+ ; 12-02-01-0026 12-02-02-0026 12-02-03-0026
; ==================> Len = 3
- ; 12-02-01-0039 12-02-02-0039 12-02-03-0039
+ ; 12-02-01-0039 12-02-02-0039 12-02-03-0039
; ==================> Len = 3
- ; 12-02-01-0024 12-02-02-0024 12-02-03-0024
+ ; 12-02-01-0024 12-02-02-0024 12-02-03-0024
; ==================> Len = 3
- ; - 12-03-02-0067 12-03-03-0067
+ ; - 12-03-02-0067 12-03-03-0067
; ==================> Len = 3
- ; - - 12-03-03-0094
+ ; - - 12-03-03-0094
; ==================> Len = 3
- ; 12-01-01-0003 12-01-02-0001 -
+ ; 12-01-01-0003 12-01-02-0001 -
; ==================> Len = 3
- ; 12-21-01-0003 12-21-02-0001 -
+ ; 12-21-01-0003 12-21-02-0001 -
; ==================> Len = 3
- ; - 12-05-02-0143 12-05-03-0143
+ ; - 12-05-02-0143 12-05-03-0143
; ==================> Len = 3
- ; - - 12-05-03-0092
+ ; - - 12-05-03-0092
; ==================> Len = 3
- ; - 12-03-02-0058 12-03-03-0058
+ ; - 12-03-02-0058 12-03-03-0058
; ==================> Len = 3
- ; - 12-99-02-0003 -
+ ; - 12-99-02-0003 -
; ==================> Len = 3
- ; - - 12-03-03-0029
+ ; - - 12-03-03-0029
; ==================> Len = 3
- ; 12-03-01-0024 12-03-02-0024 12-03-03-0024
+ ; 12-03-01-0024 12-03-02-0024 12-03-03-0024
; ==================> Len = 3
- ; - - 12-03-03-0041
+ ; - - 12-03-03-0041
; ==================> Len = 3
- ; - - 12-03-03-0042
+ ; - - 12-03-03-0042
; ==================> Len = 3
- ; - - 12-03-03-0043
+ ; - - 12-03-03-0043
; ==================> Len = 3
- ; - - 12-03-03-0061
+ ; - - 12-03-03-0061
; ==================> Len = 3
- ; - 12-02-62-0026 12-02-63-0026
+ ; - 12-02-62-0026 12-02-63-0026
; ==================> Len = 3
- ; - 12-02-62-0039 12-02-63-0039
+ ; - 12-02-62-0039 12-02-63-0039
; ==================> Len = 3
- ; - 12-02-62-0047 12-02-63-0047
+ ; - 12-02-62-0047 12-02-63-0047
; ==================> Len = 3
- ; - 12-02-62-0025 12-02-63-0025
+ ; - 12-02-62-0025 12-02-63-0025
; ==================> Len = 3
- ; TAOTIM - 12-41-03-0028
+ ; TAOTIM - 12-41-03-0028
; ==================> Len = 3
- ; - 12-03-82-0011 12-03-83-0011
+ ; - 12-03-82-0011 12-03-83-0011
; ==================> Len = 3
- ; - 12-03-82-0041 12-03-83-0041
+ ; - 12-03-82-0041 12-03-83-0041
; ==================> Len = 3
- ; - 12-03-82-0042 12-03-83-0042
+ ; - 12-03-82-0042 12-03-83-0042
; ==================> Len = 3
- ; - 12-03-82-0043 12-03-83-0043
+ ; - 12-03-82-0043 12-03-83-0043
; ==================> Len = 3
- ; 12-02-01-0037 12-02-02-0037 12-02-03-0037
+ ; 12-02-01-0037 12-02-02-0037 12-02-03-0037
; ==================> Len = 3
- ; 12-03-01-0022 12-03-02-0022 12-03-03-0022
+ ; 12-03-01-0022 12-03-02-0022 12-03-03-0022
; ==================> Len = 3
- ; 12-01-01-0081 12-01-02-0081 -
+ ; 12-01-01-0081 12-01-02-0081 -
; ==================> Len = 3
- ; 12-21-01-0081 12-21-02-0081 -
+ ; 12-21-01-0081 12-21-02-0081 -
; ==================> Len = 3
- ; 12-01-01-0014 12-01-02-0011 -
+ ; 12-01-01-0014 12-01-02-0011 -
; ==================> Len = 3
- ; 12-01-01-0019 12-01-02-0019 -
+ ; 12-01-01-0019 12-01-02-0019 -
; ==================> Len = 3
- ; 12-01-01-0021 12-01-02-0021 -
+ ; 12-01-01-0021 12-01-02-0021 -
; ==================> Len = 3
- ; 12-01-01-0025 12-01-02-0025 -
+ ; 12-01-01-0025 12-01-02-0025 -
; ==================> Len = 3
- ; 12-01-01-0023 12-01-02-0023 -
+ ; 12-01-01-0023 12-01-02-0023 -
; ==================> Len = 3
- ; 12-01-01-0027 12-01-02-0027 -
+ ; 12-01-01-0027 12-01-02-0027 -
; ==================> Len = 3
- ; 12-01-01-0032 12-01-02-0032 -
+ ; 12-01-01-0032 12-01-02-0032 -
; ==================> Len = 3
- ; 12-01-01-0035 12-01-02-0035 -
+ ; 12-01-01-0035 12-01-02-0035 -
; ==================> Len = 3
- ; 12-01-01-0038 12-01-02-0038 -
+ ; 12-01-01-0038 12-01-02-0038 -
; ==================> Len = 3
- ; 12-01-01-0044 12-01-02-0044 -
+ ; 12-01-01-0044 12-01-02-0044 -
; ==================> Len = 3
- ; 12-01-01-0047 12-01-02-0047 -
+ ; 12-01-01-0047 12-01-02-0047 -
; ==================> Len = 3
- ; 12-01-01-0050 12-01-02-0050 -
+ ; 12-01-01-0050 12-01-02-0050 -
; ==================> Len = 3
- ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
+ ; 12-02-01-0045 12-02-02-0045 12-02-03-0046
; ==================> Len = 3
- ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
+ ; 12-02-01-0046 12-02-02-0046 12-02-03-0047
; ==================> Len = 3
- ; 12-03-01-0001 12-03-02-0001 12-03-03-0001
+ ; 12-03-01-0001 12-03-02-0001 12-03-03-0001
; ==================> Len = 3
- ; - 12-03-02-0006 12-03-03-0006
+ ; - 12-03-02-0006 12-03-03-0006
; ==================> Len = 3
- ; - - 12-03-03-0011
+ ; - - 12-03-03-0011
; ==================> Len = 3
- ; - 12-05-02-0007 12-05-03-0007
+ ; - 12-05-02-0007 12-05-03-0007
; ==================> Len = 3
- ; - 12-05-02-0046 12-05-03-0046
+ ; - 12-05-02-0046 12-05-03-0046
; ==================> Len = 3
- ; - 12-05-02-0025 12-05-03-0025
+ ; - 12-05-02-0025 12-05-03-0025
diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml
index 8707ca43..91f962b1 100644
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@@ -225,7 +225,7 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
- If NextSmoothie = 1 Then
+ If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
@@ -247,7 +247,7 @@
EndIf
Else
- ; seeker
+ ; seeker is curr ent
DEBUGVAR ChangeFlag2
@@ -267,8 +267,12 @@
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
-
- Open "ROOT/taobin_project/xml/page_brewing3.xml"
+ 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
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
@@ -278,8 +282,13 @@
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
+ If Seeker.SmoothieToPayment = 1 Then
- Open "ROOT/taobin_project/xml/page_brewing3.xml"
+ 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
EndIf
Else
If UsePepsiTheme = 1 Then
diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml
index 30032632..8a52c6c5 100644
--- a/xml/page_spiral_sell.xml
+++ b/xml/page_spiral_sell.xml
@@ -54,14 +54,6 @@
DEBUGVAR SpiralPayDetail
Var Seeker.sprial_pay_detail = SpiralPayDetail
- If Seeker = "next" Then
- Var NextOrder = "true"
- Var NextSmoothie = 1
-
- Open "ROOT/taobin_project/xml/page_thankyou.xml"
- EndIf
-
- OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
diff --git a/xml/process/payment.ev b/xml/process/payment.ev
index a96dda06..f9ee1e91 100644
--- a/xml/process/payment.ev
+++ b/xml/process/payment.ev
@@ -1,4 +1,4 @@
-DEBUGVAR "MIGGAZE0"
+DEBUGVAR " payment ev evaluate "
If Seeker.PayWithQR = 1 Then
Var ServiceAmount2 = Seeker.ServiceAmount2
diff --git a/xml/sometime/make_drink.xml b/xml/sometime/make_drink.xml
index f632a4c6..71c46ff6 100644
--- a/xml/sometime/make_drink.xml
+++ b/xml/sometime/make_drink.xml
@@ -1,4 +1,4 @@
-SAVELOG "[MAKE_DRINK]"
+SAVELOG "[MAKE_DRINK] V2"
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
If Seeker = "curr" Then
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index fdbc1bc3..5b4813b3 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "9.88"
- Var XMLPageVersionInt = 988
+ Var XMLPageVersion = "9.89"
+ Var XMLPageVersionInt = 989
Var CurrentMainVideo = 2
diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml
index c284067c..cbf68e87 100644
--- a/xml_main/startup_dev.xml
+++ b/xml_main/startup_dev.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "10.88"
- Var XMLPageVersionInt = 1088
+ Var XMLPageVersion = "10.89"
+ Var XMLPageVersionInt = 1089
;Oreo
Var OreoGuarantee = 0