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

This commit is contained in:
Ittipat Lusuk 2025-03-10 11:31:16 +07:00
commit f6acf161ba
1197 changed files with 473794 additions and 58452 deletions

View file

@ -25,34 +25,7 @@
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
DEBUGVAR TelephoneNumberProblem
; try-get-user
Var payload = "HKG/" + TelephoneNumberProblem
Var payload = payload + "/-"
Var payload = payload + "/-"
Var payload = payload + "/-"
Var payload = payload + "/-"
DEBUGVAR payload
Var Seeker.IsMember = 0
Var SendProblemOfMember = 0
Var ShowQRByNoMember = "Invisible"
Var TaobinName = ""
If TelephoneNumberProblem = "" Then
Var ShowQRByNoMember = "Enable"
Else
GETACCEXT payload 35
EndIf
Var StepX = 1
Var Ext1a = ""
</EventOpen>
<Timeout> 1000 </Timeout>
@ -64,38 +37,6 @@
If Timeout > 30 Then
If SendProblemOfMember = 1 Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= MinPhoneNumber Then
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems"
If Seeker.PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
If Seeker.CampaignPayChanel = "promptpay" Then
Var ProblemID = 8
Var ChooseProblem = "taobin purchasing problems(Void Failed)"
EndIf
Else
Var VendingTSIDProblem = VendingTSID
EndIf
PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
EndIf
EndIf
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
@ -122,62 +63,6 @@
;include="ROOT/taobin_project/inc/video.inc"
<EventActionOk>
If StepX = 1 Then
If Ext1a = "ok" Then
Var TaobinName = Ext1d
If TaobinName = "" Then
Var Seeker.IsMember = 0
Else
If TaobinName = "-" Then
Var Seeker.IsMember = 0
Else
Var Seeker.IsMember = 1
EndIf
EndIf
DEBUGVAR Seeker.IsMember
If Seeker.IsMember = 1 Then
SAVELOG "Already member, will send problem"
Var SendProblemOfMember = 1
Else
SAVELOG "Not member, show QR"
Var SendProblemOfMember = 0
Var ShowQRByNoMember = "Enable"
EndIf
Else
Var Seeker.IsMember = 0
SAVELOG "StepX.error, show QR"
Var ShowQRByNoMember = "Enable"
EndIf
EndIf
</EventActionOk>
<EventActionError>
If StepX = 1 Then
SAVELOG "ActionError show QR"
Var ShowQRByNoMember = "Enable"
EndIf
</EventActionError>
<Image>
<X> 43 </X>
@ -188,15 +73,14 @@ EndIf
<Image>
<X> 429 </X>
<Y> 1301 </Y>
<State> ShowQRByNoMember </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>
;<Image>
;<X> 190 </X>
;<Y> 1548 </Y>
;<Filename> Var( DirImage + "/text13.png" ) </Filename>
;</Image>
<Image>
<X> 190 </X>
<Y> 1548 </Y>
<Filename> Var( DirImage + "/text13.png" ) </Filename>
</Image>
<Button>
@ -204,42 +88,8 @@ EndIf
<Y> 1720 </Y>
<Filename> Var( DirImage + "/bn_close.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
StrLen TelephoneNumberProblem TelNumLen
If SendProblemOfMember = 1 Then
If TelNumLen >= MinPhoneNumber Then
Var ProblemID = 7
Var ChooseProblem = "taobin purchasing problems"
If Seeker.PayWithQR = 1 Then
Var VendingTSIDProblem = VendingTSIDTmp
If Seeker.CampaignPayChanel = "promptpay" Then
Var ProblemID = 8
Var ChooseProblem = "taobin purchasing problems(Void Failed)"
EndIf
Else
Var VendingTSIDProblem = VendingTSID
EndIf
PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
EndIf
EndIf
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else