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

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

Browse source
This commit is contained in:
nattapon tachawong 2025-06-05 16:06:25 +07:00
commit c0682cc648
206 changed files with 20058 additions and 30945 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xml/page_board.xml
View file

@ -1754,6 +1754,7 @@
OpenInst 2 PepsiFullScreenPageBoard
EndIf
; tap screen for press popup when app hang
TapScreen 860 1004
Var CountDownFailErrorHappendClear = 8

24
xml/page_payment_cash-GBR.xml
View file

@ -176,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
@ -191,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
@ -199,7 +199,7 @@
Var PayWithCreditCardState = "Enable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Enable"
EndIf
@ -343,7 +343,7 @@
Var PayWithCreditCardState = "Enable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Disable"
Var PayOfflineMode = 1
@ -404,7 +404,7 @@
Var PayWithCreditCardState = "Disable"
Var PayWithTaoCreditState = "Disable"
Var PayWithCouponState = "Disable"
Var PayWithAUBState = "Disable"
Var PayWithUKBState = "Disable"
Var PayWithFatzebraState = "Disable"
EndIf
@ -444,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 + "/"
@ -532,7 +532,7 @@
Var Seeker.CampaignPayChanel = "linepay"
EndIf
If ReqPayInfoFlag2 = 6 Then
Var Seeker.CampaignPayChanel = "aubpay"
Var Seeker.CampaignPayChanel = "ukbpay"
EndIf
@ -690,7 +690,7 @@
SPLIT ECommerceQR "/" 6 MemberData
If VendingQRTypeResult = "AUB" Then
If VendingQRTypeResult = "UKB" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var ReqPayInfoFlag = 0
@ -922,7 +922,7 @@
If RoadShow = "true" Then
Else
Var PayWithTaoCreditState = "Press"
Var PayWithAUBState = "Press"
Var PayWithUKBState = "Press"
Var PayWithFatzebraState = "Press"
EndIf
@ -1485,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 + "/"
@ -1828,7 +1828,7 @@ EndIf
;<Y> 1399 </Y>
<X> 328 </X>
<Y> 1399 </Y>
<State> PayWithAUBState </State>
<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>

1813
xml/page_test_color.xml
View file

File diff suppressed because it is too large Load diff

17
xml/vending_tasks_pre_main.xml
View file

@ -21,6 +21,13 @@
Var EnableTestCoinBank = "Invisible"
EndIf
If CatalogLayoutV3 = 1 Then
If CountryName = "Thailand" Then
Var EnableCheckin = "Enable"
Var EnableTestCoinBank = "Enable"
EndIf
EndIf
SAVELOG "VendingPreMain"
</EventOpen>
@ -48,7 +55,7 @@
DEBUGVAR tmpPassPhrase
__CMD "still-stay-on-pre-main" "-" "-" "-"
Refresh
TimerReset
@ -128,7 +135,7 @@
<MarginTop> 22 </MarginTop>
<Width> 560 </Width>
<Height> 80 </Height>
<State> EnableTestSystem </State>
<State> EnableTestSystem </State>
<Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/test_sys_only.png" </Filename>
@ -144,7 +151,7 @@
<MarginTop> 22 </MarginTop>
<Width> 560 </Width>
<Height> 142 </Height>
<State> EnableServiceOp </State>
<State> EnableServiceOp </State>
<Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/service_ops.png" </Filename>
@ -160,7 +167,7 @@
<MarginTop> 22 </MarginTop>
<Width> 560 </Width>
<Height> 142 </Height>
<State> EnableMaintenance </State>
<State> EnableMaintenance </State>
<Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/maintenance_repair.png" </Filename>
@ -176,7 +183,7 @@
<MarginTop> 22 </MarginTop>
<Width> 560 </Width>
<Height> 142 </Height>
<State> EnableConfigureMachine </State>
<State> EnableConfigureMachine </State>
<Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/configure_machine.png" </Filename>