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

Merge remote-tracking branch 'origin/masterpiece' into th_inter

Browse source
This commit is contained in:
Ittipat Lusuk 2025-03-21 14:28:50 +07:00
commit e2b89832a2
32 changed files with 4757 additions and 4310 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_payment.xml
View file

@ -204,6 +204,10 @@
Var PlaySoundLag = RootPathSoundBackToSchool + "payment.wav"
EndIf
If CountryName = "HongKong" Then
Var PlaySongLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
End
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
EndIf
@ -357,7 +361,7 @@
EndIf
EndIf
</EventOpen>
<Timeout> 900 </Timeout>

55
xml/page_thankyou.xml
View file

@ -134,26 +134,9 @@
DEBUGVAR SaveTheWorldCount
If SaveTheWorldCount = 2 Then
If LedLidBlink = "no" Then
Var SaveTheWorldST = "Enable"
EndIf
Var video_id_to_ran = 3
Var video_name_to_play = "taobin_save_world"
Random2 1 3 video_id_to_ran
Var ThankyouST = "Invisible"
Else
Var video_id_to_ran = 2
Var video_name_to_play = "taobin_thank"
Random2 1 2 video_id_to_ran
Var ThankyouST = "Enable"
EndIf
@ -162,40 +145,16 @@
Var show_video = 1
Var SaveTheWorldST = "Invisible"
If CountryName = "Thailand" Then
Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
; ================= Video thankyou =============================
If InternationalEnable = 1 Then
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
Else
If InternationalEnable = 1 Then
Var video_file_name = "ROOT/taobin_project/inter/common/video/" + video_name_to_play
Else
Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
EndIf
Var video_file_name = video_file_name + video_id_to_ran
Var video_file_name = video_file_name + ".mp4"
If SaveTheWorldCount < 2 Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
Else
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
EndIf
Else
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
EndIf
Else
If InternationalEnable = 1 Then
If UsePepsiTheme = 1 Then
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
EndIf
EndIf
EndIf
; ================== End video thankyou =========================

4
xml/page_topping_select8.xml
View file

@ -8816,7 +8816,7 @@
If toppingID6index2Status = "Enable" Then
Var showOreoAddEnable = "Enable"
Else
Var showOreoAddEnable = "Disible"
Var showOreoAddEnable = "Disable"
EndIf
EndIf
EndIf
@ -8890,7 +8890,7 @@
If toppingID6index2Status = "Enable" Then
Var showOreoAddEnable = "Enable"
Else
Var showOreoAddEnable = "Disible"
Var showOreoAddEnable = "Disable"
EndIf
EndIf
EndIf