Merge branch 'pos_aot' into masterpiece

This commit is contained in:
Kenta420 2024-10-08 12:53:14 +07:00
commit e6eff07907
11 changed files with 272 additions and 112 deletions

View file

@ -423,6 +423,11 @@ DEBUGVAR JemilaRewardOutOfStock
Var New_Payment = 0
Var NewFlowPaymentCode = 0
If BoxID = 105005 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 173149 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
@ -469,3 +474,10 @@ If BoxID = 176757 Then
Var SaveOrderNameAndPictureEnable = 1
EndIf
; Check POS machine flag
Var ConnectWithPOSMachine = 0
READ_FILE "/mnt/sdcard/coffeevending/POS_MACHINE" POSMachineFlag
If POSMachineFlag = 1 Then
Var ConnectWithPOSMachine = 1
EndIf

View file

@ -8,7 +8,7 @@
;world-class
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml"
@ -33,7 +33,7 @@
Var ServiceCharge = 0
Var AdultFlag = 0
Var AdultFlag = 0
If Only18 = "true" Then
DEBUGVAR AdultState1
@ -68,7 +68,7 @@
DEBUGVAR CustomerFilterType
EndIf
If NightTime = 1 Then
If NightTime = 1 Then
If SelectDrink = "12-99-03-0066" Then
Var PriceDrink = 60
EndIf
@ -110,10 +110,10 @@
Var QRCODE3 = "VDGN"
Var QRCODE4 = BoxID
Var QRCODE5 = SelectSlot
Var QRCODE6 = SelectDrink
Var QRCODE7 = PriceDrink
Var QRCODE6 = SelectDrink
Var QRCODE7 = PriceDrink
Var QRCODE8 = ""
Var CountStepPackPayment = 0
Var CountStepForCupFlagDelay = 0
@ -121,13 +121,13 @@
Var ReqPayInfoFromCashOther = 0
Var Seeker.PromotionIDCurrentOrder = 0
Var Seeker.TxRef1 = ""
Var Seeker.OrderChanel = "Normal"
Var Seeker.CurrCreditAmount = 0
Var Seeker.CurrCreditUse = 0
Var Seeker.CurrCreditTelNum = ""
@ -141,26 +141,26 @@
Var Seeker.IntVendingCampaign = 0
Var Seeker.FreeVendingCampaign = 0
Var Seeker.CodeChannel = 0
Var CoinVendingOnFlag = 0
Var CoinVendingOnFlag = 0
Var Seeker.CreditCard = 0
Var Seeker.CreditCardRef = ""
Var Seeker.UseCreditPayFullDrinkPrice = 0
Var Seeker.IntVendingCredit = 0
Var Seeker.StoreCreditFlag = 0
Var Seeker.pageStoreCredit0 = 0
Var Seeker.TNumberTaobinCredit = ""
Var Seeker.TNumberTaobinMember = ""
Var Seeker.CoffeePinNumber = ""
Var Seeker.VendingDiscount = 0
Var Seeker.VendingCampaign = 0
Var Seeker.VendingTSID = ""
Var Seeker.CreditNotEnoughRefID = ""
Var PayType = ""
Var CART_INDEX = 0
@ -169,7 +169,7 @@
Var LOADING_STATE = "Invisible"
Var QR_POPUP = "/img_popup2.png"
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
Var PlaySoundCodeLang = "ROOT/taobin_project/sound_eng/Code8digit.mp3"
@ -178,24 +178,24 @@
Else
Var DirImage = "ROOT/taobin_project/image/page_payment"
Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3"
If FromJemilaPro = 1 Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/payment.m4a"
EndIf
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "payment.wav"
EndIf
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
EndIf
@ -203,7 +203,7 @@
SAVELOG MachineStage
If AdultFlag = 1 Then
If CameraCount = 1 Then
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
@ -222,7 +222,7 @@
EndIf
; Test
;Var MachineStage = "-"
@ -242,7 +242,7 @@
Var ServiceType = "coffee"
Var VendingCreditRemain = ""
DEBUGVAR Seeker.thankLidFlag
@ -275,7 +275,7 @@
EndIf
;
;
DEBUGVAR PromotionIDCurrentOrder
@ -306,23 +306,45 @@
DEBUGVAR TOPPING_PRICE
TRY "ROOT/taobin_project/xml/process/discount_from_promotion.ev"
DEBUGVAR PromotionIDCurrentOrder
Var CoundDownStillOnPage = 240
__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
Var WaitPOSStatus = 0
;new payment coffee-payment
If New_Payment = 1 Then
If New_Payment = 1 Then
SAVELOG "NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT "
Var Seeker.ORDER_ID = ""
GenHashWithTimeStamp Seeker.ORDER_ID
DEBUGVAR Seeker.NameDrinkTH
DEBUGVAR Seeker.NameDrinkEN
Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkEN
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
EndIf
EndIf
</EventOpen>
<Timeout> 900 </Timeout>
<EventTimeout>
<EventTimeout>
If stop_now = "true" Then
SAVELOG "stop_now is true page_payment"
@ -349,7 +371,7 @@
EndIf
EndIf
If CupChecking = "true" Then
If HaveCup = "true" Then
SAVELOG "Have cup"
@ -369,7 +391,7 @@
EndIf
If ReadyForBrew = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
Var ReadyForBrew = "false"
@ -382,7 +404,7 @@
EndIf
EndIf
;If CupChecking = "false" Then
; Var CountStepPackPayment = CountStepPackPayment + 1
;EndIf
@ -395,96 +417,118 @@
DEBUGVAR ToppingDetailCurr
DEBUGVAR ToppingDetailNext
If CountStepPackPayment = CountStepForCupFlagDelay Then
If Seeker = "curr" Then
Var Seeker.ExtendData = ExtendDataCurr
Var Seeker.PayDetail2 = ToppingDetailCurr
Else
Var Seeker.ExtendData = ExtendDataNext
Var Seeker.PayDetail2 = ToppingDetailNext
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
If GetPayInfoFlag = 0 Then
SaveLog "RoadShow test"
If RoadShow = "false" Then
;CoinVending ON
If AdultFlag = 1 Then
Var CoinAmount = 0
Else
If NOCashFlag = 0 Then
SAVELOG "CoinVending XBILL from page_payment"
CoinVending XBILL
Else
Var CoinAmount = 0
EndIf
EndIf
;Var CoinAmount = 0
Var Delay = 1
Else
Var Delay = 1
EndIf
If WaitPOSStatus = 1 Then
Var RemainAmount = 0
If TimeWaitPOSStatus < 10 Then
Var TimeWaitPOSStatus = TimeWaitPOSStatus + 1
If POS_SELL_STATUS = "READY" Then
Var WaitPOSStatus = 0
EndIf
Else
If POS_SELL_STATUS = "READY" Then
Var WaitPOSStatus = 0
Else
Open "ROOT/taobin_project/xml/pos_fail.xml"
EndIf
EndIf
Else
If CountStepPackPayment = CountStepForCupFlagDelay Then
If Seeker = "curr" Then
Var Seeker.ExtendData = ExtendDataCurr
Var Seeker.PayDetail2 = ToppingDetailCurr
Else
Var Seeker.ExtendData = ExtendDataNext
Var Seeker.PayDetail2 = ToppingDetailNext
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
If GetPayInfoFlag = 0 Then
SaveLog "RoadShow test"
If RoadShow = "false" Then
;CoinVending ON
If AdultFlag = 1 Then
Var CoinAmount = 0
Else
If NOCashFlag = 0 Then
SAVELOG "CoinVending XBILL from page_payment"
CoinVending XBILL
Else
Var CoinAmount = 0
EndIf
EndIf
;Var CoinAmount = 0
Var Delay = 1
Else
Var Delay = 1
EndIf
Var RemainAmount = 0
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
EndIf
EndIf
; Reset
Var MachineState_Result = 0
; Reset
Var MachineState_Result = 0
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData
Var CountStepPackPayment = 1
Var CountStepPackPayment = 1
EndIf
If Delay = 1 Then
Var DelayCount = DelayCount + 1
If DelayCount >= 2 Then
If web_readyOK = "true" Then
Var Seeker.OrderChanel = "WebApp"
Var Seeker.selected_a_drink = SelectDrink
Var Seeker.ServiceAmount2 = PriceDrink
Var PayAmount = PriceDrink
If web_payment = "CODE" Then
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
If web_payment = "CREDIT" Then
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
EndIf
EndIf
If Only18 = "true" Then
Var AdultFlag = 0
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
EndIf
EndIf
If Delay = 1 Then
Var DelayCount = DelayCount + 1
If DelayCount >= 2 Then
If web_readyOK = "true" Then
Var Seeker.OrderChanel = "WebApp"
Var Seeker.selected_a_drink = SelectDrink
Var Seeker.ServiceAmount2 = PriceDrink
Var PayAmount = PriceDrink
If web_payment = "CODE" Then
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
If web_payment = "CREDIT" Then
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
EndIf
EndIf
If Only18 = "true" Then
Var AdultFlag = 0
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
EndIf
TimerReset
Refresh
</EventTimeout>
</EventTimeout>
<Video>
@ -520,7 +564,7 @@
</Text>
<Text>
<State> StageShowAlias</State>
<State> StageShowAlias</State>
<X> 0 </X>
<Y> 1022 </Y>
<Width> 1080</Width>

View file

@ -159,6 +159,9 @@
Var BugFlag = 0
Var Seeker.NameDrinkEN = NameDrink
Var Seeker.NameDrinkTH = NameDrinkTH
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/topping2_en"
@ -167,6 +170,7 @@
Var showname = NameDrink
Var showdesc = DrinkDescription
Var text_show_thai = "Invisible"
Var text_show_eng = "Enable"
@ -205,6 +209,7 @@
Var showname = NameDrinkTH
Var showdesc = DrinkDescriptionTH
Var text_show_thai = "Enable"
Var text_show_eng = "Invisible"

68
xml/pos_fail.xml Normal file
View file

@ -0,0 +1,68 @@
<Popup>
<X> 0 </X>
<Y> 0 </Y>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var DirImage = "ROOT/taobin_project/image/pos/"
If show_eng = "true" Then
Var PosFailImg = DirImage + "pos_fail_en.png"
Var CloseBtnImg = DirImage + "bn_close_en.png"
Var ClosePressedImg = DirImage + "bp_close_en.png"
Else
Var PosFailImg = DirImage + "pos_fail_th.png"
Var CloseBtnImg = DirImage + "bn_close_th.png"
Var ClosePressedImg = DirImage + "bp_close_th.png"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
Var Timeout = Timeout + 1
Refresh
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 0 </X>
<Y> 480 </Y>
<Filename> PosFailImg </Filename>
</Image>
<Button>
<X> 398 </X>
<Y> 1753 </Y>
<Filename> CloseBtnImg </Filename>
<FilenamePress> ClosePressedImg </FilenamePress>
<EventClick>
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
</EventClick>
</Button>
<EventUnitTest1>
Open "ROOT/taobin_project/xml/pos_fail.xml"
</EventUnitTest1>
<EventUnitTest2>
If show_eng = "true" Then
Var show_eng = "false"
Else
Var show_eng = "true"
EndIf
Open "ROOT/taobin_project/xml/pos_fail.xml"
</EventUnitTest2>
</Popup>

View file

@ -1,6 +1,5 @@
DEBUGVAR "MIGGAZE0"
If Seeker.PayWithQR = 1 Then
Var ServiceAmount2 = Seeker.ServiceAmount2
Var CreditReference = ""
@ -19,7 +18,7 @@ If Seeker.PayWithQR = 1 Then
Var PayDetail = ""
Var PayDetail2 = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If Seeker.StoreCreditFlag = 1 Then
@ -31,12 +30,44 @@ If Seeker.PayWithQR = 1 Then
Var PayDetail = ""
Var PayDetail2 = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
If ConnectWithPOSMachine = 1 Then
Var SelectDrink = Seeker.selected_a_drink
Var ExtendData = Seeker.ExtendData
Var ServiceAmount2 = Seeker.ServiceAmount2
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var CreditReference = Seeker.CreditReferenceTmp
Var VendingDiscount = Seeker.VendingDiscount
Var VendingCampaign = Seeker.VendingCampaign
Var TxReference = Seeker.TxRef1
Var VendingOrderID = Seeker.ORDER_ID
Var PayType = "newpay"
Var ServiceType = "coffee-payment"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel
If GetFreeFromError = 1 Then
Var Seeker.CodeChannel = 1
Var Seeker.VendingCode = "FAU"
Var Seeker.CodeNumber = "0000000000"
Var VendingCampaign = ServiceAmount2
EndIf
Var PayDetail2 = Seeker.PayDetail2
POSPay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
Else
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
@ -62,7 +93,7 @@ If Seeker.PayWithQR = 1 Then
Var PayDetail = "2/S:0/0//XML|" + Seeker.OrderChanel
If GetFreeFromError = 1 Then
Var Seeker.CodeChannel = 1
Var Seeker.CodeChannel = 1
Var Seeker.VendingCode = "FAU"
Var Seeker.CodeNumber = "0000000000"
Var VendingCampaign = ServiceAmount2
@ -83,14 +114,14 @@ If Seeker.PayWithQR = 1 Then
Var SessionID2 = SessionID2 + Seeker.CodeNumber
Var SessionID2 = SessionID2 + "/"
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
EndIf