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

Mulitple updated MYS: new payment & update lang SGP: update lang &

Browse source 
remove season pass bug UAE_DUBAI: update lang NewUI: move init ipc
service
This commit is contained in:
Pakin 2025-08-04 08:16:10 +07:00
parent 6316d785c6
commit 847a4660fa
22 changed files with 2732 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

22
xml/page_board.xml
View file

@ -67,7 +67,7 @@
DEBUGVAR web_pin
Var web_telnumOK = ""
DEBUGVAR web_readyOK
Var web_readyOK = "false"
@ -191,7 +191,7 @@
STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable
If XMLProfile = "" Then
CacheVarStr "get" XMLProfile
@ -743,7 +743,7 @@
;inter-page-board
If CountryName = "Malaysia" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
@ -1876,7 +1876,12 @@
Else
; tap screen for press popup when app hang
TapScreen 860 1004
If UsePepsiTheme = 1 Then
Else
TapScreen 860 1004
EndIf
EndIf
Var buttonRemoveCupOnArm = "Invisible"
@ -1890,6 +1895,15 @@
TRY "ROOT/taobin_project/xml/process/temp_ledv4_offall_horizontal.ev"
EndIf
; aidl
If EnableBrewIPC = "" Then
Var EnableBrewIPC = "false"
EndIf
If EnableBrewIPC = "true" Then
StartBrewIPCService
EndIf
</EventOpen>
<EventActionOk>

14
xml/page_drinkok.xml
View file

@ -349,6 +349,20 @@
DEBUGVAR VendingTSID
DEBUGVAR Seeker.VendingTSID
If Seeker.VendingTSID = "" Then
If VendingTSID = "" Then
Else
Var Seeker.VendingTSID = VendingTSID
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
EndIf
EndIf
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
DEBUGVAR CupChecking

8
xml/page_get_yourchange.xml
View file

@ -162,6 +162,12 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If New_PaymentInter = 1 Then
Var PaymentEv = CountryRootPath + "/xml/process/payment.ev"
TRY PaymentEv
EndIf
If Seeker = "next" Then
;CoinBack
If New_Payment = 1 Then
@ -175,7 +181,7 @@
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
If Seeker = "next" Then
;CoinBack
Open Brew3ConInter

26
xml/page_lid_straw.xml
View file

@ -226,10 +226,15 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If New_PaymentInter = 1 Then
Var PaymentEV = CountryRootPath + "/xml/process/payment.ev"
TRY PaymentEV
EndIf
If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
@ -273,6 +278,20 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
If New_PaymentInter = 1 Then
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
EndIf
Else
Var PaymentEV = CountryRootPath + "/xml/process/payment.ev"
TRY PaymentEV
EndIf
EndIf
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
EndIf
@ -287,6 +306,11 @@
Else
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
If New_PaymentInter = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/sgp/xml/process/payment.ev"
EndIf
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then

48
xml/page_payment.xml
View file

@ -184,7 +184,6 @@
Var Seeker.IntVendingCredit = 0
Var EMAMemberID = ""
Var UKBMemberID = ""
Var Seeker.StoreCreditFlag = 0
Var Seeker.pageStoreCredit0 = 0
@ -352,6 +351,12 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@ -379,6 +384,12 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@ -408,15 +419,14 @@
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
DEBUGVAR Seeker.NameDrinkPOS
Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkPOS
Var param2 = Seeker.NameDrinkEN
Var param3 = DiscountCampaignCode
STRCONTAIN "size" Seeker.NameDrinkPOS SizeFromSheet
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.NameDrinkPOS "###" 1 PureName
SPLIT Seeker.NameDrinkEN "###" 1 PureName
Var param2 = PureName
EndIf
@ -430,6 +440,32 @@
EndIf
If New_PaymentInter = 1 Then
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkEN
Var param3 = DiscountCampaignCode
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.NameDrinkEN "###" 1 PureName
Var param2 = PureName
EndIf
If ConnectWithPOSMachine = 1 Then
Var WaitPOSStatus = 1
Var TimeWaitPOSStatus = 0
Var POS_SELL_STATUS = "-"
GetPOSStatus param1 param2 param3
EndIf
EndIf
</EventOpen>
<Timeout> 900 </Timeout>
@ -459,7 +495,7 @@
If SELLSTATUS = "SELLNOCASH" Then
Var SELLONLINE = 1
EndIf
If POS_SELL_MODE = "OFFLINE" Then
Var SELLONLINE = 0
EndIf

70
xml/page_payment_cash-MYR.xml
View file

@ -269,20 +269,7 @@
If GetFreeFromError = 1 Then
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@ -530,6 +517,15 @@
EndIf
If RoadShow = "true" Then
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
</EventOpen>
@ -564,18 +560,14 @@
EndIf
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
;Var TxRef1 = ""
;CreateTxRef1 TxRef1
EndIf
Var Seeker.PayWithQR = 1
Var Seeker.VendingTSID = VendingTSID
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var BrewingTextThai = "เตรียมแก้ว"
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
@ -665,13 +657,10 @@
CoinVending OFF
Refresh
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;include="ROOT/taobin_project/xml/sometime/make_drink.xml"
EndIf
@ -747,6 +736,7 @@
Var CreditCardRef = ""
GenHashWithTimeStamp CreditCardRef
DEBUGVAR VendingCashless
DEBUGVAR CashlessAmount
If VendingCashless = "READY" Then
Var QRCODE99 = ""
@ -758,6 +748,18 @@
Var alphaState = "Enable"
DEBUGVAR PayAmount
DEBUGVAR Seeker.IntVendingCampaign
DEBUGVAR CashlessAmount
If PayAmount = CashlessAmount Then
Else
DEBUGVAR "Detect cashless amount not equal, fix now"
Var CashlessAmount = PayAmount
EndIf
DEBUGVAR CashlessAmount
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
@ -778,6 +780,7 @@
DEBUGVAR CashlessPayFlag
DEBUGVAR ReadyForBrew
DEBUGVAR CashlessAmount
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
@ -912,6 +915,13 @@
If Seeker = "curr" Then
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
@ -1720,6 +1730,18 @@ If alphaState = "Invisible" Then
If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable"
DEBUGVAR CashlessAmount
If PayAmount = CashlessAmount Then
Else
DEBUGVAR "Detect cashless amount not equal, fix now"
Var CashlessAmount = PayAmount
EndIf
DEBUGVAR CashlessAmount
Coin CARDON
Var CardOnActed = "true"
DEBUGVAR CardOnActed

3
xml/page_payment_cash.xml
View file

@ -447,6 +447,9 @@
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If Seeker.SmoothieToPayment = 1 Then
; do nothing
Else

26
xml/page_thankyouConti.xml
View file

@ -251,6 +251,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml "
EndIf
@ -275,6 +279,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Var LastMakeDrinkResult = "fail"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
@ -296,6 +304,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
@ -304,6 +316,10 @@
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
EndIf
If New_PaymentInter = 1 Then
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
EndIf
; old condition
If HaveCup = "false" Then
If MachineStage = "show-menu" Then
@ -365,6 +381,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
; smoothie next
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
@ -443,7 +463,7 @@
DEBUGVAR MenuErrorCode
If MenuReadyForCup = "YES" Then
If DoorCupPosition = "bottom" Then
; new payment not enable. use have cup false only.
If New_Payment = 1 Then
@ -501,6 +521,10 @@
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Var LastMakeDrinkResult = "fail"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"

5
xml/sometime/make_drink.xml
View file

@ -5,6 +5,11 @@ If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If New_PaymentInter = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
If Seeker.SmoothieToPayment = 1 Then
; do nothing
Else

10
xml/vending_info2.xml
View file

@ -186,17 +186,13 @@
Var AlphaState = "Invisible"
Var LoginReadyState = "Enable"
Var NewUiBSM = "Offline"
If NewUiBSM = "Online" Then
If EnableBrewIPC = "" Then
Var EnableBrewIPC = "false"
Else
Var NewUiBSM = "Offline"
EndIf
If EnableBrewIPC = "true" Then
StartBrewIPCService
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>