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

merge from masterpiece

Browse source
This commit is contained in:
Pakin 2025-04-04 14:34:43 +07:00
parent 845c5f1637
commit 736af0e6dc
65 changed files with 481100 additions and 1087 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_advert2.xml
View file

@ -12,4 +12,4 @@
</Page>
</Page>

2
xml/page_board.xml
View file

@ -1020,6 +1020,8 @@
;Var EnablePepsiFullscreen = 1
Var New_PaymentInter = 0
EndIf
;inter-page-board

10
xml/page_get_yourchange.xml
View file

@ -173,9 +173,15 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
If New_PaymentInter = 1 Then
; TODO: change script
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
If Seeker = "next" Then
;CoinBack
Open Brew3ConInter
@ -263,4 +269,4 @@
<Value> StoreCreditAmountStr </Value>
</Text>
</Popup>
</Popup>

21
xml/page_lid_straw.xml
View file

@ -264,9 +264,19 @@
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
If New_PaymentInter = 1 Then
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
EndIf
EndIf
EndIf
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
@ -281,6 +291,11 @@
Else
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
If New_PaymentInter = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
EndIf
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
@ -302,11 +317,11 @@
Var LidState = "Invisible"
EndIf
DEBUGVAR CountryName
DEBUGVAR InternationalEnable
Var UserPressButton = "false"
SAVELOG "page_lid_straw.xml"

32
xml/page_payment.xml
View file

@ -307,6 +307,12 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@ -356,6 +362,32 @@
EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkEN
Var param3 = DiscountCampaignCode
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.NameDrinkEN "###" 1 PureName
Var param2 = PureName
EndIf
If ConnectWithPOSMachine = 1 Then
Var WaitPOSStatus = 1
Var TimeWaitPOSStatus = 0
Var POS_SELL_STATUS = "-"
GetPOSStatus param1 param2 param3
EndIf
EndIf
</EventOpen>
<Timeout> 900 </Timeout>

19
xml/test_video_loop.xml
View file

@ -39,7 +39,7 @@
Var HeadVideoFilename = AdvTaobinHome + video_menu_0
DEBUGVAR video_main_5
EndIf
If HeadVideoFilename = "-" Then
DEBUGVAR HeadVideoFilename
Var HeadVideoFilename = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
@ -47,6 +47,13 @@
Var HeadVideoFilename = HeadVideoFilename + ".mp4"
If CountryName = "Singapore" Then
If UsePepsiTheme = 1 Then
Var HeadVideoFilename = DefaultLargeBanner + ".mp4"
EndIf
EndIf
DEBUGVAR VideoAdvIndex
DEBUGVAR HeadVideoFilename
@ -57,15 +64,15 @@
If VideoAdvIndex >= video_main_count Then
Var VideoAdvIndex = 0
EndIf
EndIf
Open "ROOT/taobin_project/xml/video_loop2.xml"
</EventOpen>
<Timeout> 5000 </Timeout>
<EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
<EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
</EventSecurity>
@ -77,7 +84,7 @@
<Height> 200 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClickLong>
<EventClickLong>
OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
</EventClickLong>