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

Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
Wanlop Rungsiyangkul 2023-09-25 10:15:10 +07:00
commit 03f21f1a8f
8 changed files with 209 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

0
inter/mys/image/collectiing/QR_MALAYSIA_UI 1.png → inter/mys/image/collectiing/QR_contract.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

BIN
inter/mys/image/collectiing/bn_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
inter/mys/image/collectiing/bp_close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
inter/mys/image/collectiing/text11.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 74 KiB

BIN
inter/mys/image/collectiing/text_11.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 77 KiB

6
xml/page_brewing3.xml
View file

@ -2047,6 +2047,10 @@
</Language>
</Button>
<EventUnitTest4>
; test drinkfail with phone number
Var TelephoneNumberProblem = "1234567890"
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest4>
</Popup>

34
xml/page_drinkfail2.xml
View file

@ -19,7 +19,6 @@
If TelephoneNumberProblem = "" Then
Else
@ -64,11 +63,18 @@
EndIf
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
Else
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
EndIf
EndIf
@ -588,15 +594,19 @@
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf

182
xml/page_drinkfail5.xml Normal file
View file

@ -0,0 +1,182 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
Var DirImage = CountryRootPath + "/image/collectiing/"
Var Timeout = 0
StopLongPlay
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
DEBUGVAR TelephoneNumberProblem
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 30 Then
DEBUGVAR TelephoneNumberProblem
StrLen TelephoneNumberProblem TelNumLen
If TelNumLen >= 10 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
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
TimerReset
</EventTimeout>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 43 </X>
<Y> 428 </Y>
<Filename> Var( DirImage + "/text11.png" ) </Filename>
</Image>
<Image>
<X> 429 </X>
<Y> 1301 </Y>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>
<Image>
<X> 190 </X>
<Y> 1548 </Y>
<Filename> Var( DirImage + "/text13.png" ) </Filename>
</Image>
<Button>
<X> 392 </X>
<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 TelNumLen >= 10 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
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
</EventClick>
</Button>
<Text>
<X> 5 </X>
<Y> 1868 </Y>
<Size> 24 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
<Font> RobotoRegular </Font>
<Color> 0xDE794E </Color>
<Value> MachineErrorDetailAll </Value>
</Text>
</Popup>