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

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

Browse source
This commit is contained in:
thanawat saiyota 2024-09-18 15:11:34 +07:00
commit 76dbe9dd39
17 changed files with 311 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_board.xml
View file

@ -924,7 +924,7 @@
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
; Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Var = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"

4
xml/page_get_yourchange.xml
View file

@ -18,6 +18,10 @@
If CountryName = "HongKong" Then
Var LangButtonEnable = "Invisible"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Var LangButtonEnable = "Invisible"
EndIf
DEBUGVAR LangButtonEnable

19
xml/page_lid_straw.xml
View file

@ -150,7 +150,16 @@
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf
EndIf
Else
@ -180,7 +189,13 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf
EndIf
EndIf

2
xml/page_payment_cash-AUS.xml
View file

@ -1646,7 +1646,7 @@ EndIf
<Y> 748 </Y>
;inter-image
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-MYR.png" )</Filename>
<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
</Image>

38
xml/page_payment_cash-UAE.xml
View file

@ -1266,11 +1266,11 @@
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
EndIf
;If show_eng = "true" Then
; PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
;Else
; PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
;EndIf
EndIf
@ -1949,22 +1949,22 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage + "/img_popup12.png" )</Filename>
<Filename> Var( DirImage2 + "/img_popup12_uae.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1208 </Y>
<State> alphaState3 </State>
<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
</EventClick>
</Button>
;<Button>
;<X> 327 </X>
;<Y> 1208 </Y>
;<State> alphaState3 </State>
;<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
;<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
; Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
;</EventClick>
;</Button>
<Button>
<X> 327 </X>

6
xml/page_payment_credit3-TopupCash.xml
View file

@ -67,6 +67,12 @@
Var img_popup15 = "/img_popup15-HKG.png"
EndIf
;inter-image
If CountryName = "Australia" Then
Var img_popup11 = "/img_popup11-AUS.png"
Var img_popup15 = "/img_popup15-AUS.png"
EndIf
Var CreditAmount = SumCreditAmount

5
xml/page_payment_credit3.xml
View file

@ -105,6 +105,11 @@
Var img_popup11 = "/img_popup11-HKG.png"
EndIf
;inter-image
If CountryName = "Australia" Then
Var img_popup11 = "/img_popup11-AUS.png"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>

6
xml/page_topup_credit3-TopupCash.xml
View file

@ -69,6 +69,12 @@
Var img_popup15 = "/img_popup15-HKG.png"
EndIf
;inter-image
If CountryName = "Australia" Then
Var img_popup11 = "/img_popup11-AUS.png"
Var img_popup15 = "/img_popup15-AUS.png"
EndIf
Var CreditAmount = 0