diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev
index 9c6781f1..f5bc37c5 100644
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@@ -314,6 +314,11 @@ If taobin_nopro = "true" Then
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
Var Discount7_7Pro = 0
+
+ Var AmericanoPro = 0
+ Var TaiwaneseTeaPro = 0
+
+
EndIf
; zone block logic follow ingredent
diff --git a/xml/function2.inc b/xml/function2.inc
index 9c9e8315..4bc6cc89 100644
--- a/xml/function2.inc
+++ b/xml/function2.inc
@@ -406,7 +406,7 @@
Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
Var strMulti6_1 = "TPID=321,multiply=1"
Var DisableUsingCode = "true"
-
+ Else
;Var PriceDrinkTmp = PriceDrinkNoTop
Var strMulti6_1 = "TPID=320,multiply=0"
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 4f85743c..ea53c23b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1380,7 +1380,6 @@
Var WebAppShow = "Invisible"
Var ENABLE_UAE_DUBAI = "Invisible"
- Var LanguageShow = "THAI"
EnableLanguage "ENG"
EnableLanguage "THAI"
@@ -1390,7 +1389,6 @@
EnableLanguage "MSC"
EndIf
- SetLanguage "THAI"
LanguageControl "UpdateList" "-"
Var show_eng = "false"
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index 8da80440..2743c6e1 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -167,7 +167,7 @@
Var buttonRemoveCup = "Invisible"
- Var thankyouContiVersion = "TC13 "
+ Var thankyouContiVersion = "TC15 "
SAVELOG "Thank you conti version " + thankyouContiVersion
SAVELOG "Support NextSmoothie and fix bug next"
SAVELOG "MenuErrorCode"
@@ -297,8 +297,9 @@
EndIf
EndIf
-
- __CMD "check-cup" Seeker.selected_a_drink "-" "-"
+ If New_Payment = 1 Then
+ __CMD "check-cup" Seeker.selected_a_drink "-" "-"
+ EndIf
; old condition
If HaveCup = "false" Then
@@ -434,32 +435,34 @@
DEBUGVAR MenuErrorCode
If MenuReadyForCup = "YES" Then
-
+
If DoorCupPosition = "bottom" Then
+ ; new payment not enable. use have cup false only.
+ If New_Payment = 1 Then
+ Var VideoPlayFile = VideoPath
+ Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+ Var VideoPlayFile = VideoPlayFile + "1"
+ Var VideoPlayFile = VideoPlayFile + VideoFileEnd
- Var VideoPlayFile = VideoPath
- Var VideoPlayFile = VideoPlayFile + VideoFileBegin
- Var VideoPlayFile = VideoPlayFile + "1"
- Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+ Var PictureFile = PicturePath
+ Var PictureFile = PictureFile + PictureBegin
+ Var PictureFile = PictureFile + "1"
+ Var PictureFile = PictureFile + PictureEnd
- Var PictureFile = PicturePath
- Var PictureFile = PictureFile + PictureBegin
- Var PictureFile = PictureFile + "1"
- Var PictureFile = PictureFile + PictureEnd
+ DEBUGVAR CountDownForShowMenuNextOrderToBrew
+ DEBUGVAR Seeker.selected_a_drink
- DEBUGVAR CountDownForShowMenuNextOrderToBrew
- DEBUGVAR Seeker.selected_a_drink
+ If CountDownForShowMenuNextOrderToBrew = 3 Then
- If CountDownForShowMenuNextOrderToBrew = 3 Then
-
- EndIf
+ EndIf
- If CountDownForShowMenuNextOrderToBrew = 0 Then
- Var CountDownThankyou = 0
- Else
- Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1
+ If CountDownForShowMenuNextOrderToBrew = 0 Then
+ Var CountDownThankyou = 0
+ Else
+ Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1
+ EndIf
EndIf
Else
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index 4ede3573..be57cdae 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -4065,23 +4065,7 @@
;Var BugFlag = 1
- If CartUpdate = "true" Then
- Var CartUpdate = "-"
-
-
- If CART_COUNT = 3 Then
- OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
- Open "ROOT/taobin_project/xml/page_payment_multi.xml"
- Else
- If ButtonNext = "true" Then
- OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
- Open "ROOT/taobin_project/xml/page_payment_multi.xml"
- Else
- OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
- Open "ROOT/taobin_project/xml/page_catalog.xml"
- EndIf
- EndIf
- EndIf
+
diff --git a/xml/test_all_syntax.xml b/xml/test_all_syntax.xml
index 4028343b..166f13ce 100644
--- a/xml/test_all_syntax.xml
+++ b/xml/test_all_syntax.xml
@@ -59,6 +59,10 @@
SAVELOG "=========== END ==========="
+ Var $12-03-03-0094.Price = 35
+ Var $12-03-03-0094.Discount = 15
+
+
120000
@@ -75,5 +79,46 @@
+
+200
+200
+ "Value must be ฿15 "
+
+ 30
+ fontType1
+ 0x000000
+
+
+
+480
+200
+
+
+ eval(
+ SAVELOG " ============ This is test express recursive ==========="
+ If $12-03-03-0094.Price = -1 Then
+ Var priceFormat = "Free"
+ Else
+ If $12-03-03-0094.Discount = "" Then
+ Var priceFormat = $12-03-03-0094.Price
+ Else
+ If $12-03-03-0094.Discount > 0 Then
+ Var priceFormat = $12-03-03-0094.Discount
+ Else
+ Var priceFormat = $12-03-03-0094.Price
+ EndIf
+ EndIf
+ EndIf
+
+ DEBUGVAR priceFormat
+ Var return !assigned StringFmt( priceFormat, DisplayFormat, PreScaleConvertShow)
+
+ )
+
+
+ 30
+ fontType1
+ 0x000000
+
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index f610f428..2de53868 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "10.14"
- Var XMLPageVersionInt = 1014
+ Var XMLPageVersion = "10.15"
+ Var XMLPageVersionInt = 1015
Var CurrentMainVideo = 2
diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml
index ac7fed1c..ec806792 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 = "11.14"
- Var XMLPageVersionInt = 1114
+ Var XMLPageVersion = "11.15"
+ Var XMLPageVersionInt = 1115
;Oreo
Var OreoGuarantee = 0