Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2024-12-03 15:08:26 +07:00
commit 6ea6c9dc10
9221 changed files with 673077 additions and 21007 deletions

View file

@ -141,6 +141,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"
@ -186,8 +187,12 @@
EndIf
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
Else
If New_Payment = 1 Then
@ -220,45 +225,24 @@
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
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
If Service_LidStraw = "Disable" Then
SAVELOG "Service_LidStraw"
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
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
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
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
@ -278,8 +262,12 @@
If Timeout > 10 Then
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
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