Merge remote-tracking branch 'origin/masterpiece' into th_inter

This commit is contained in:
Ittipat Lusuk 2025-03-27 10:12:18 +07:00
commit 7c084cd7c6
92 changed files with 70785 additions and 21165 deletions

View file

@ -4,9 +4,7 @@
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
@ -18,8 +16,8 @@
Var Timeout = 0
Var TimeoutSMS = 0
Var StateBGetSMS = "Enable"
Var ShowSentSmsText = "Invisible"
Var ShowTextNumber1 = "Invisible"
@ -27,6 +25,9 @@
Var ShowTextNumber3 = "Invisible"
Var ShowTextNumber4 = "Invisible"
Var LoadingState = "Invisible"
Var ShowLoadingIn = 3
Var ShowErrorText = "Invisible"
Var Tel_Confirm_State = "Invisible"
@ -37,8 +38,8 @@
Var Xtext = 246
Var Ytext_16 = 699
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
Else
Var DirImage = "ROOT/taobin_project/image/collectiing"
@ -59,7 +60,7 @@
Var ReqAdddata22 = 0
Var timeout_Adddata22 = 0
GenHashWithTimeStamp PointCrm
If AcceptAuto = "true" Then
Var AcceptAuto = "false"
@ -70,7 +71,7 @@
Var ShowTextNumber2= "Enable"
Var ShowTextNumber3= "Enable"
Var ShowTextNumber4= "Enable"
Var PinNumber = web_pin
Var TelephoneNumber = web_telnum
@ -78,9 +79,9 @@
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
If ReqAdddata22 = 0 Then
Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
@ -88,9 +89,9 @@
Var ReqAdddata22 = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else
@ -106,7 +107,7 @@
Else
If show_eng = "true" Then
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_4_digits_pin.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_4_digits_pin.mp3"
@ -114,12 +115,12 @@
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
;Open "ROOT/xml/page_board.xml"
<EventTimeout>
;Open "ROOT/xml/page_board.xml"
Var Timeout = Timeout + 1
If Timeout > 30 Then
@ -127,10 +128,19 @@
Var PayState2 = "Enable"
Var QRChannel = 0
;Var Seeker.CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
EndIf
If ReqAdddata22 = 1 Then
If ShowLoadingIn <= 0 Then
Var LoadingState = "Enable"
Refresh
Else
Var ShowLoadingIn = ShowLoadingIn - 1
EndIf
EndIf
@ -149,10 +159,10 @@
EndIf
TimerReset
</EventTimeout>
</EventTimeout>
<EventIDCard>
@ -168,11 +178,11 @@
<EventActionOk>
If ReqFlag = 0 Then
If ReqAdddata22 = 1 Then
If ReqFlag = 0 Then
If ReqAdddata22 = 1 Then
Var Seeker.CreditReferenceTmp = "" + useCreditAmount
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
@ -189,25 +199,25 @@
Var VendingCreditRemain = "" + SumCreditAmount
Var LoadingState = "Invisible"
If useCreditTemp > 0 Then
If useCreditTemp > 0 Then
Var Seeker.CurrCreditUse = useCreditTemp
EndIf
If CART_COUNT >= 1 Then
If CART_COUNT >= 1 Then
Cart "PreparID" 1
Var CART_INDEX = 1
Var PayReference = ""
GenHashWithTimeStamp PayReference
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Else
Var CART_INDEX = 0
If Seeker = "curr" Then
If New_Payment = 1 Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
@ -222,21 +232,21 @@
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
Var ReqAdddata22 = 0
EndIf
;If Ext1a = "ok" Then
; If Ext1c = "" Then
;
; Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
;
; Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
; Else
; EndIf
@ -257,15 +267,12 @@
<EventActionError>
Var ShowErrorText = "Enable"
Refresh
If ReqAdddata22 = 1 Then
If ReqAdddata22 = 1 Then
Var LoadingState = "Invisible"
Var ReqAdddata22 = 0
EndIf
Refresh
</EventActionError>
@ -291,14 +298,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "1"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -336,14 +343,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "2"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -380,14 +387,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "3"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -424,14 +431,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "4"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -468,14 +475,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "5"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -512,14 +519,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "6"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -556,14 +563,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "7"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -600,14 +607,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "8"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -644,14 +651,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "9"
Var ShowTextNumber = "Invisible"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
@ -691,14 +698,14 @@
<FilenamePress> Var( DirImage + "/bp_getPin.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
;Open "ROOT/taobin_project/xml/page_catalog.xml"
;Open "ROOT/taobin_project/xml/page_catalog.xml"
Var ShowSentSmsText = "Enable"
Var StateBGetSMS = "Disable"
Var BmiYear = ""
Var PointCrm1 = ""
@ -713,10 +720,10 @@
Var PinNumber = ""
Var ShowErrorText = "Invisible"
Var ReqFlag = 1
TimerReset
Refresh
</EventClick>
@ -729,18 +736,18 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Var PinNumber = PinNumber + "0"
Trim PinNumber 4
StrLen PinNumber TelNumLen
If TelNumLen >= 4 Then
If TelNumLen >= 4 Then
;Var Tel_Confirm_State = "Enable"
Function 2
EndIf
Var ShowTextNumber = "Invisible"
Var ShowErrorText = "Invisible"
If TelNumLen > 0 Then
@ -775,14 +782,14 @@
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var Timeout = 0
Trim PinNumber -1
;Var Tel_Confirm_State = "Invisible"
StrLen PinNumber TelNumLen
If TelNumLen = 0 Then
If TelNumLen = 0 Then
Var ShowTextNumber = "Enable"
EndIf
@ -812,7 +819,7 @@
TimerReset
Refresh
</EventClick>
</Button>
@ -824,15 +831,15 @@
<FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
DEBUGVAR "USER BN_BACK"
If ReqAdddata22 = 1 Then
If ReqAdddata22 = 1 Then
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
</EventClick>
</Button>
@ -847,7 +854,7 @@
<FilenameDisable> Var( DirImage + "/bn_confirm.png" )</FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
</EventClick>
</Button>
@ -895,7 +902,7 @@
<Image>
<X> 188 </X>
@ -919,13 +926,29 @@
<Filename> Var( DirImage + "/text_show_sentSMS.png") </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 601 </Y>
<State> LoadingState </State>
<Filename> "ROOT/taobin_project/image/collectiing/alpha_loading.png" </Filename>
</Image>
<GIF>
<X> 494 </X>
<Y> 1078 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> LoadingState </State>
<Filename> "ROOT/taobin_project/image/page_payment/loading.gif" </Filename>
</GIF>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
@ -937,25 +960,27 @@
If PinNumberUser = PinNumber Then
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If SumCreditAmount >= PayAmountSubDiscount Then
If SumCreditAmount >= 100 Then
If ReqAdddata22 = 0 Then
Var useCreditAmount = PayAmountSubDiscount
Var BmiYear = useCreditAmount
Var GetScore = "useCredit"
AddData 22 TelephoneNumber BmiYear PointCrm GetScore
Var ShowLoadingIn = 3
Var ReqAdddata22 = 1
Refresh
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"
Else
Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml"
EndIf
Else
Var ShowNotEnoughText = "Enable"
Var Seeker.TNumberTaobinCredit = TelephoneNumber
Var Seeker.CoffeePinNumber = PinNumber
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
Open "ROOT/taobin_project/xml/page_payment_credit3-1.xml"
EndIf
Else
@ -980,9 +1005,9 @@
Var SumCreditAmount = CoffeeCredit
If SumCreditAmount >= PayAmountSubDiscount Then
If SumCreditAmount >= PayAmountSubDiscount Then
If ReqAdddata22 = 0 Then
If ReqAdddata22 = 0 Then
;If Seeker = "next" Then
; Var Curr = "curr"
@ -998,9 +1023,9 @@
Var ReqAdddata22 = 1
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
Open "ROOT/taobin_project/xml/page_payment_credit3.xml"
EndIf
Else