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

This commit is contained in:
Pakin 2025-06-05 11:28:29 +07:00
commit ccbd8f8071
237 changed files with 21339 additions and 26530 deletions

View file

@ -193,6 +193,11 @@ EndIf
If BoxID = 201714 Then
Var Catalog20BahtEnable = 1
Var AppleFarmFestivalPro = 1
EndIf
If BoxID = 201729 Then
Var AppleFarmFestivalPro = 1
EndIf
If BoxID = 123456 Then

View file

@ -1754,7 +1754,9 @@
OpenInst 2 PepsiFullScreenPageBoard
EndIf
; tap screen for press popup when app hang
TapScreen 860 1004
Var CountDownFailErrorHappendClear = 8
</EventOpen>
@ -2081,6 +2083,8 @@ PRICE "Reset" "-"
If TaobinOnlineX = "true" Then
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Invisible"
@ -2141,15 +2145,7 @@ PRICE "Reset" "-"
If CountDownPauseVideo = 1 Then
If EnablePepsiFullscreen = 0 Then
If CountryName = "HongKong" Then
If CatalogLayoutV3 = 1 Then
;do-not-thing
Else
TapScreen 860 1004
EndIf
Else
TapScreen 860 1004
EndIf
;TapScreen 860 1004
EndIf
EndIf
@ -2185,7 +2181,6 @@ PRICE "Reset" "-"
Var BaseOnPageBoard = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
Machine DoorClose

View file

@ -98,6 +98,8 @@
Var EMAPopupSuccessState = "Invisible"
Var EMAPopupErrorState = "Invisible"
Var QRErrorText = "Errror scanning\nthe QR code"
Var QRErrorImg = "/QRError.png"
Var QR_POPUP = "/img_popup8-2.png"
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
@ -2102,13 +2104,13 @@ EndIf
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
;inter-image
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
</Image>
;<Image>
;<X> 182 </X>
;<Y> 748 </Y>
;;inter-image
;<State> alphaState2 </State>
;<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
;</Image>
<Image>

View file

@ -16,7 +16,7 @@
;EndIf
Var ErrorCause = ""
Var MAX_EMA_CODE = 6
Var MAX_EMA_CODE = 5
Var PreScaleCanculate = 100
@ -99,6 +99,8 @@
Var EMAPopupSuccessState = "Invisible"
Var EMAPopupErrorState = "Invisible"
Var QRErrorText = "Errror scanning\nthe QR code"
Var QRErrorImg = "/QRError.png"
Var QR_POPUP = "/img_popup8-2.png"
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
@ -174,14 +176,14 @@
Var PayWithCreditCardState = "Disable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Disable"
If RoadShow = "true" Then
Var PayWithCreditCardState = "Invisible"
Var PayWithTaoCreditState = "Invisible"
Var PayWithCouponState = "Invisible"
Var PayWithAUBState = "Invisible"
Var PayWithUKBState = "Invisible"
Var PayWithFatzebraState = "Invisible"
Var showRemaining = "Free"
Else
@ -189,7 +191,7 @@
Var PayWithCreditCardState = "Enable"
Var PayWithTaoCreditState = "Enable"
Var PayWithCouponState = "Enable"
Var PayWithAUBState = "Enable"
Var PayWithUKBState = "Enable"
Var PayWithFatzebraState = "Enable"
If Seeker.IntVendingCredit > 0 Then
@ -197,7 +199,7 @@
Var PayWithCreditCardState = "Enable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Enable"
EndIf
@ -341,7 +343,7 @@
Var PayWithCreditCardState = "Enable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Disable"
Var PayOfflineMode = 1
@ -402,7 +404,7 @@
Var PayWithCreditCardState = "Disable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Disable"
EndIf
@ -442,7 +444,7 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "AUB:2:"
Var ECommerceQR = ECommerceQR + "UKB:2:"
Var ECommerceQR = ECommerceQR + EMAMemberID
Var ECommerceQR = ECommerceQR + "/"
@ -530,7 +532,7 @@
Var Seeker.CampaignPayChanel = "linepay"
EndIf
If ReqPayInfoFlag2 = 6 Then
Var Seeker.CampaignPayChanel = "aubpay"
Var Seeker.CampaignPayChanel = "ukbpay"
EndIf
@ -688,7 +690,7 @@
SPLIT ECommerceQR "/" 6 MemberData
If VendingQRTypeResult = "AUB" Then
If VendingQRTypeResult = "UKB" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var ReqPayInfoFlag = 0
@ -703,7 +705,7 @@
INT _EMAMemberBalance
Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
Var _BalanceFormat = "Remain Balance: $%.2f"
Var _BalanceFormat = "Remain Balance: £%.2f"
Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow)
DEBUGVAR EMAMemberName
@ -920,7 +922,7 @@
If RoadShow = "true" Then
Else
Var PayWithTaoCreditState = "Press"
Var PayWithAUBState = "Press"
Var PayWithUKBState = "Press"
Var PayWithFatzebraState = "Press"
EndIf
@ -1483,7 +1485,7 @@
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "AUB:2:"
Var ECommerceQR = ECommerceQR + "UKB:2:"
Var ECommerceQR = ECommerceQR + EMAMemberID
Var ECommerceQR = ECommerceQR + "/"
@ -1716,7 +1718,8 @@ EndIf
<Button>
<X> 328 </X>
<Y> 1399 </Y>
<State> PayWithFatzebraState </State>
;<State> PayWithFatzebraState </State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_qr_code.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_qr_code.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_qr_code.png" </FilenameDisable>
@ -1806,24 +1809,26 @@ EndIf
</EventClick>
</Button>
;<Button>
;<X> 552 </X>
;<Y> 1399 </Y>
;<State> "Enable" </State>
;<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
;<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
;<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
;</EventClick>
;</Button>
<Button>
<X> 552 </X>
<Y> 1399 </Y>
<State> PayWithAUBState </State>
<State> "Disable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button>
;<X> 552 </X>
;<Y> 1399 </Y>
<X> 328 </X>
<Y> 1399 </Y>
<State> PayWithUKBState </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_ema.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>
@ -2113,13 +2118,13 @@ EndIf
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
;inter-image
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-GBR.png" )</Filename>
</Image>
;<Image>
;<X> 182 </X>
;<Y> 748 </Y>
;;inter-image
;<State> alphaState2 </State>
;<Filename> Var( DirImage2 + "/img_popup11-GBR.png" )</Filename>
;</Image>
<Image>