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

@ -232,17 +232,26 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Else
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
If CountryName = "Thailand" Then
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Else
;obsolete
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
EndIf
EndIf
EndIf