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

This commit is contained in:
Ittipat Lusuk 2025-03-10 11:31:16 +07:00
commit f6acf161ba
1197 changed files with 473794 additions and 58452 deletions

View file

@ -212,6 +212,8 @@
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
STRCONTAIN "1062" MaterialAvailable MatchaPowderEnable
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
;Var AppFastEnable = "false"
@ -251,6 +253,9 @@
DEBUGVAR WheyButtonState
DEBUGVAR WheyEnable
; Has disable menu
Var HasDisableMenu = "false"
; Dtac.
Var CAMPAIGN1 = "false"
@ -515,6 +520,7 @@
DEBUGVAR LangProcess
Var CatalogLayoutV3 = 0
; Check POS machine flag
Var ConnectWithPOSMachine = 0
@ -716,6 +722,10 @@
EndIf
; malay-cannot-see-bruh
Var UseVeryBigRemoveCupButton = "true"
; load credit
@ -1339,6 +1349,30 @@
Var CheckCupStateDoorCupClose = ""
; zone cup on arm
Var bnRemoveCup = RootPath + "image/main_page/bn_remove_cup.png"
Var bpRemoveCup = RootPath + "image/main_page/bp_remove_cup.png"
Var btnRemoveCupX = 780
Var btnRemoveCupY = 630
Var btnRemoveCupYNotPageBoard = 500
Var UseVeryBigRemoveCupButton = "false"
If UseVeryBigRemoveCupButton = "true" Then
Var btnRemoveCupX = 580
Var btnRemoveCupY = 530
Var btnRemoveCupYNotPageBoard = 400
Var bnRemoveCup = RootPath + "image/main_page/bn_remove_cup_beeg_af.png"
Var bpRemoveCup = RootPath + "image/main_page/bp_remove_cup_beeg_af.png"
EndIf
If CountryName = "Australia" Then
Var bnRemoveCup = CountryRootPath + "/image/main_page/bn_remove_cup.png"
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
EndIf
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
@ -1695,12 +1729,15 @@ PRICE "Reset" "-"
<EventUnitTest8>
Var buttonRemoveCup = "Enable"
DEBUGVAR buttonRemoveCup
DEBUGVAR bnRemoveCup
DEBUGVAR bpRemoveCup
</EventUnitTest8>
<EventUnitTest9>
Var XMLProfile = "Discount90Per"
CacheVarStr "put" XMLProfile
Var buttonRemoveCup = "Enable"
Var UseVeryBigRemoveCupButton = "Enable"
DEBUGVAR buttonRemoveCup
</EventUnitTest9>
@ -2079,6 +2116,13 @@ PRICE "Reset" "-"
PRICE "Reload" "-"
Var XMLProfilePrevious = XMLProfile
Var refresh_str = "-RefreshProf"
STRCONTAIN refresh_str XMLProfile HasRefreshProf
If HasRefreshProf = "true" Then
RebootWithCause "RefreshProf_ProMelon"
EndIf
EndIf
EndIf
@ -2169,12 +2213,16 @@ PRICE "Reset" "-"
If SpiralOnline = "true" Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
If CountryName = "Thailand" Then
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
If CatalogLayoutV3 = 1 Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
EndIf
EndIf
Else
If InternationalEnable = 1 Then
@ -2272,7 +2320,11 @@ PRICE "Reset" "-"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
If CatalogLayoutV3 = 1 Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
EndIf
EndIf
Else
If InternationalEnable = 1 Then
@ -2293,13 +2345,13 @@ PRICE "Reset" "-"
<Button>
<X> 780 </X>
<Y> 630 </Y>
<X> btnRemoveCupX </X>
<Y> btnRemoveCupY </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<Filename> bnRemoveCup </Filename>
<Filename> bpRemoveCup </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen