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

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

Browse source
This commit is contained in:
wanlop run 2024-05-21 14:16:24 +07:00
commit 60aa6d19b1
4 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

0
inter/aus/image/close_en/img_error_aus.png → inter/aus/image/vending_error_en/img_error_aus.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 371 KiB

After

Width:  |  Height:  |  Size: 371 KiB

Before After
Before After

40
inter/aus/xml/page_show_error.lxml
View file

@ -372,30 +372,36 @@
<State> show_error_normal </State>
<X> 69 </X>
<Y> 642 </Y>
<Filename> Var(DirImage + "/img_error_aus.png") </Filename>
</Image>
<Image>
<State> show_error_sp1 </State>
<X> 0 </X>
<Y> 897 </Y>
<Filename> Var(DirImage + "/img1.png") </Filename>
</Image>
<Image>
<State> show_error_sp1 </State>
<X> 0 </X>
<Y> 694 </Y>
<Filename> Var(DirImage + "/text1.png") </Filename>
<X> 69 </X>
<Y> 642 </Y>
<Filename> Var(DirImage + "/img_error_aus.png") </Filename>
</Image>
<Image>
<State> show_error_sp1 </State>
<X> 127 </X>
<Y> 1685 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>
;<Image>
;<State> show_error_sp1 </State>
;<X> 0 </X>
;<Y> 897 </Y>
;<Filename> Var(DirImage + "/img1.png") </Filename>
;</Image>
;
;<Image>
;<State> show_error_sp1 </State>
;<X> 0 </X>
;<Y> 694 </Y>
;<Filename> Var(DirImage + "/text1.png") </Filename>
;</Image>
;
;<Image>
;<State> show_error_sp1 </State>
;<X> 127 </X>
;<Y> 1685 </Y>
;<Filename> Var(DirImage + "/text2.png") </Filename>
;</Image>
<Button>
<X> 0 </X>

2
xml/page_board.xml
View file

@ -698,6 +698,8 @@
;inter-page-board
If CountryName = "Australia" Then
Var SettingVideoBrewingUseCommon = 1
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"

3
xml/page_payment_cash.xml
View file

@ -2547,6 +2547,9 @@
EndIf
If Seeker.IntVendingCredit > 0 Then
If Seeker.IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + ":"
EndIf
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit