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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-03-01 10:50:42 +07:00
commit ab1e788060
11 changed files with 283 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment_cash_extend/img_popup12_offline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
image/page_payment_cash_extend_en/img_popup12_offline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB

8
xml/page_collect_point_3_28.xml
View file

@ -693,6 +693,8 @@
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -710,6 +712,8 @@
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -871,6 +875,8 @@
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -888,6 +894,8 @@
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"

2
xml/page_display_get_15_discount.xml
View file

@ -47,6 +47,8 @@
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"

2
xml/page_display_get_drink_5_baht.xml
View file

@ -66,6 +66,8 @@
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf

41
xml/page_payment_cash-AUS.xml
View file

@ -92,6 +92,7 @@
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaState3_offline = "Invisible"
Var CoinInFlag = 0
@ -1197,7 +1198,8 @@
If ViewBill > 0 Then
If PayOfflineMode = 1 Then
CoinVending BILLREJECT
;CoinVending BILLREJECT
Var alphaState3_offline = "Enable"
Else
If Seeker.StoreCreditFlag = 1 Then
@ -1227,8 +1229,11 @@
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
@ -1867,6 +1872,36 @@ EndIf
</EventClick>
</Button>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> alphaState3_offline </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Refresh
</EventClick>
</Button>
;<Text>
;<X> 0 </X>
;<Y> 1041 </Y>

47
xml/page_payment_cash-IDR.xml
View file

@ -93,6 +93,7 @@
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaState3_offline = "Invisible"
Var CoinInFlag = 0
@ -1135,7 +1136,8 @@
If ViewBill > 0 Then
If PayOfflineMode = 1 Then
CoinVending BILLREJECT
;CoinVending BILLREJECT
Var alphaState3_offline = "Enable"
Else
If Seeker.StoreCreditFlag = 1 Then
@ -1166,8 +1168,11 @@
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
@ -1385,7 +1390,11 @@
EndIf
Else
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
Refresh
EndIf
@ -1967,6 +1976,36 @@
</EventClick>
</Button>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> alphaState3_offline </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Refresh
</EventClick>
</Button>
;<Text>
;<X> 0 </X>
;<Y> 1041 </Y>

76
xml/page_payment_cash-MYR.xml
View file

@ -96,6 +96,9 @@
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Var alphaState3_offline = "Invisible"
Var CoinInFlag = 0
@ -568,10 +571,12 @@
Var QRCODE99 = QRCODE99KBANK
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3"
If alphaStateQR = "Enable" Then
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3"
EndIf
EndIf
EndIf
@ -595,10 +600,12 @@
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
If alphaStateQR = "Enable" Then
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
@ -715,6 +722,12 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
; group debug check alpha
;DEBUGVAR alphaState
;DEBUGVAR alphaState2
;DEBUGVAR alphaState3
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -750,6 +763,10 @@
If Timeout >= 120 Then
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
If RoadShow = "true" Then
@ -1130,7 +1147,8 @@
If ViewBill > 0 Then
If PayOfflineMode = 1 Then
CoinVending BILLREJECT
;CoinVending BILLREJECT
Var alphaState3_offline = "Enable"
Else
If Seeker.StoreCreditFlag = 1 Then
@ -1364,6 +1382,8 @@
<Volume> SoundVolume </Volume>
<EventClick>
DEBUGVAR PayState1
If alphaState = "Invisible" Then
If EnoughChange = "yes" Then
@ -1443,6 +1463,8 @@
Var FlagQROpened = 1
Var alphaState = "Enable"
Var alphaStateQR = "Enable"
Var alphaStateLOGO = "Enable"
;CoinVending OFF
VendingQR ON
@ -1557,6 +1579,8 @@
Var FlagQROpened = 1
Var alphaState = "Enable"
Var alphaStateLOGO = "Enable"
Var alphaStateQR = "Enable"
;CoinVending OFF
VendingQR ON
@ -1816,7 +1840,7 @@ EndIf
<Image>
<X> 267 </X>
<Y> 1065 </Y>
<Y> 1165 </Y>
<State> LOADING_STATE </State>
<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Image>
@ -1840,11 +1864,12 @@ EndIf
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF
CashlessReq OFF
Coin CARDOFF
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
@ -2024,6 +2049,8 @@ EndIf
EndIf
Var alphaState2 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Refresh
@ -2086,6 +2113,8 @@ EndIf
CoinVending BILLREJECT
Var alphaState3 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Refresh
</EventClick>
</Button>
@ -2118,26 +2147,26 @@ EndIf
<Image>
<X> 483 </X>
<Y> 791 </Y>
<State> alphaState </State>
<Y> 891 </Y>
<State> alphaStateLOGO </State>
<Filename> LOGO_CH </Filename>
</Image>
<QRCode>
<X> 445 </X>
<Y> 958 </Y>
<X> 455 </X>
<Y> 1058 </Y>
<Width> 170 </Width>
<Height> 170 </Height>
<Color> "0xFFFFFF" </Color>
;<QRColor> "0xE61A5F" </QRColor>
<State> alphaState </State>
<State> alphaStateQR </State>
<Service> testservice </Service>
</QRCode>
<Button>
<X> 267 </X>
<Y> 960 </Y>
<Y> 1060 </Y>
<State>QRErrorState</State>
<Filename> Var( DirImage + "/QRError.png" ) </Filename>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -2174,7 +2203,7 @@ EndIf
<GIF>
<X> 493 </X>
<Y> 968 </Y>
<Y> 1068 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> LOADING_STATE </State>
@ -2251,7 +2280,16 @@ EndIf
Open CurrentXMLFileName2
</EventUnitTest1>
<EventUnitTest3>
Var EnableCash = "true"
Var PayState2 = "Enable"
Var PayState3 = "Enable"
Var PayState4 = "Enable"
Var PayState5 = "Enable"
Var QR_POPUP = "/img_popup8.png"
</EventUnitTest3>
</Popup>

47
xml/page_payment_cash-SGP.xml
View file

@ -90,6 +90,7 @@
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaState3_offline = "Invisible"
Var CoinInFlag = 0
@ -1195,7 +1196,8 @@
If ViewBill > 0 Then
If PayOfflineMode = 1 Then
CoinVending BILLREJECT
;CoinVending BILLREJECT
Var alphaState3_offline = "Enable"
Else
If Seeker.StoreCreditFlag = 1 Then
@ -1225,8 +1227,11 @@
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
@ -1532,7 +1537,11 @@ EndIf
EndIf
Else
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
Refresh
EndIf
@ -1909,6 +1918,36 @@ EndIf
</EventClick>
</Button>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> alphaState3_offline </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Refresh
</EventClick>
</Button>
;<Text>
;<X> 0 </X>
;<Y> 1041 </Y>

47
xml/page_payment_cash-UAE.xml
View file

@ -90,6 +90,7 @@
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaState3_offline = "Invisible"
Var CoinInFlag = 0
@ -1179,7 +1180,8 @@
If ViewBill > 0 Then
If PayOfflineMode = 1 Then
CoinVending BILLREJECT
;CoinVending BILLREJECT
Var alphaState3_offline = "Enable"
Else
If Seeker.StoreCreditFlag = 1 Then
@ -1209,8 +1211,11 @@
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
@ -1527,7 +1532,11 @@ EndIf
EndIf
Else
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
Refresh
EndIf
@ -1904,6 +1913,36 @@ EndIf
</EventClick>
</Button>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> alphaState3_offline </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Refresh
</EventClick>
</Button>
;<Text>
;<X> 0 </X>
;<Y> 1041 </Y>

51
xml/page_payment_cash.xml
View file

@ -121,6 +121,7 @@
Var FlagalphaState2 = 0
Var alphaState2t = alphaState2
Var alphaState3 = "Invisible"
Var alphaState3_offline = "Invisible"
Var CoinInFlag = 0
@ -2147,7 +2148,8 @@
If ViewBill > 0 Then
If PayOfflineMode = 1 Then
CoinVending BILLREJECT
Var alphaState3_offline = "Enable"
;CoinVending BILLREJECT
Else
If Seeker.StoreCreditFlag = 1 Then
@ -2174,8 +2176,12 @@
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
@ -2413,7 +2419,11 @@
EndIf
Else
Var alphaState3 = "Enable"
If SELLONLINE = 1 Then
Var alphaState3 = "Enable"
Else
Var alphaState3_offline = "Enable"
EndIf
Refresh
EndIf
@ -3045,6 +3055,39 @@
</EventClick>
</Button>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> alphaState3_offline </State>
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
</Image>
<Button>
<X> 327 </X>
<Y> 1335 </Y>
<State> alphaState3_offline </State>
<Filename> Var( DirImage2 + "/bn_cancel2.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_cancel2.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Refresh
</EventClick>
</Button>
;<Text>
;<X> 0 </X>
;<Y> 1041 </Y>