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

before merage

Browse source
This commit is contained in:
wanlop run 2025-07-08 10:55:32 +07:00
parent 1151958d14
commit 059b1ab86c
8 changed files with 80 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/event/tricker.ev
View file

@ -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

2
xml/function2.inc
View file

@ -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"

2
xml/page_board.xml
View file

@ -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"

45
xml/page_thankyouConti.xml
View file

@ -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

18
xml/page_topping_select8.xml
View file

@ -4065,23 +4065,7 @@
<EventCart>
;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
</EventCart>

45
xml/test_all_syntax.xml
View file

@ -59,6 +59,10 @@
SAVELOG "=========== END ==========="
Var $12-03-03-0094.Price = 35
Var $12-03-03-0094.Discount = 15
</EventOpen>
<Timeout> 120000 </Timeout>
@ -75,5 +79,46 @@
</EventTimeout>
<Text>
<X>200</X>
<Y>200</Y>
<Value> "Value must be ฿15 "
</Value>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
</Text>
<Text>
<X>480</X>
<Y>200</Y>
<Value>
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)
)
</Value>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
</Text>
</Page>

4
xml_main/startup.xml
View file

@ -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
</EventOpen>

4
xml_main/startup_dev.xml
View file

@ -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