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

THAI INTER: Merge branch masterpiece -> th_mmr

Browse source
This commit is contained in:
Ittipat Lusuk 2024-12-12 17:35:05 +07:00
commit 3c994e2ed1
548 changed files with 161156 additions and 52934 deletions
Download patch file Download diff file Expand all files Collapse all files

64
xml/page_lid_straw.xml
View file

@ -81,7 +81,12 @@
Var PicturePath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var PicturePath = PicturePath + "/image/page_doing/"
Var PictureBegin = "txt_"
Var PictureEnd = "_en.png"
If LanguageShow = "ENG" Then
Var PictureEnd = "_en.png"
Else
Var PictureEnd = ".png"
EndIf
EndIf
If show_eng = "false" Then
@ -171,6 +176,7 @@
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
@ -190,6 +196,9 @@
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Open "ROOT/taobin_project/inter/whatthecup/uae_dubai/xml/page_get_yourchange-UAE_blue.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf
@ -217,11 +226,11 @@
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
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Open Brew3Inter
EndIf
Else
@ -236,6 +245,9 @@
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Open "ROOT/taobin_project/inter/whatthecup/uae_dubai/xml/page_get_yourchange-UAE_blue.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf
@ -252,50 +264,17 @@
Var LidState = "Invisible"
EndIf
STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam
DEBUGVAR IgnoreLidStraw
DEBUGVAR Service_LidStraw
If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false"
SAVELOG "Ignore lid straw because recipe disable"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
If Service_LidStraw = "Disable" Then
SAVELOG "Service_LidStraw"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
DEBUGVAR StrawAutoRelease1
DEBUGVAR CountryName
DEBUGVAR InternationalEnable
Var UserPressButton = "false"
SAVELOG "page_lid_straw.xml"
;inter-xml-open
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_brewing3.xml"
@ -303,6 +282,7 @@
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf