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

Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Ittipat Lusuk 2025-06-20 18:47:54 +07:00
commit 1b63c31e7a
31 changed files with 3560 additions and 2834 deletions
Download patch file Download diff file Expand all files Collapse all files

35
xml/page_drinkok.xml
View file

@ -11,6 +11,8 @@
DEBUGVAR Seeker.PictureDrink
DEBUGVAR Seeker.showname
Var PureName = ""
; Block Have
Var DrinkOKStringVersion = "DKT3"
@ -297,6 +299,25 @@
; helper show in page_board
Var FromDrinkOk = 1
; pro-mystery-cup
If ProMysteryCup = 1 Then
If Seeker.FromProMysteryCup = "true" Then
Var ShowNameMystery = "Enable"
Else
Var ShowNameMystery = "Invisible"
EndIf
Else
Var ShowNameMystery = "Invisible"
EndIf
STRCONTAIN "size" Seeker.shownameMystery SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.shownameMystery "###" 1 PureName
Var ShowNameMysteryName = PureName
Else
Var ShowNameMysteryName = Seeker.shownameMystery
EndIf
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>
@ -308,6 +329,8 @@
DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT
DEBUGVAR VendingTSID
DEBUGVAR Seeker.VendingTSID
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
@ -619,6 +642,18 @@
</Value>
</Text>
<Text>
<X> 300 </X>
<Y> 1750 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Font> KanitLightTTF </Font>
<Size> 48 </Size>
<Color> HeadlineColor </Color>
<State> ShowNameMystery </State>
<Value> ShowNameMysteryName </Value>
</Text>
<Image>
<X> 0 </X>

4
xml/page_payment_cash-MYR.xml
View file

@ -138,6 +138,7 @@
Var ServiceAmount2 = PayAmount
Var Seeker.ServiceAmount2 = PayAmount
Var ServiceCharge = 0
Var Seeker.ServiceCharge = 0
Var Donate = ""
Var SuggestID = ""
Var CancleState = "Enable"
@ -1025,6 +1026,9 @@
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Var ServiceCharge = 0
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1

81
xml/page_thankyou.xml
View file

@ -106,6 +106,8 @@
DEBUGVAR TelephoneNumber
DEBUGVAR Seeker.StoreCreditFlag
Var Seeker.e_receipt = "false"
If Seeker = "next" Then
Var NextOrder = "true"
EndIf
@ -152,7 +154,7 @@
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
Else
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
TRY script_thankyou
@ -300,6 +302,16 @@
If CountDownThankyou = 0 Then
If IgnoreNetCore = "true" Then
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -323,9 +335,27 @@
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
@ -337,6 +367,15 @@
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
@ -502,6 +541,15 @@
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
@ -510,6 +558,17 @@
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
@ -564,6 +623,17 @@
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
@ -572,6 +642,15 @@
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf

2169
xml/vending_info2.xml
View file

File diff suppressed because it is too large Load diff

4
xml/vending_tasks_pre_main.xml
View file

@ -37,7 +37,7 @@
Var Timeout = Timeout + 1
If Timeout > 60 Then
If Timeout > 900 Then
StatusLog "exit"
__CMD "cancel-pw-newui" "-" "-" "-"
@ -50,7 +50,7 @@
Var Text1_9 = Text1_9 + " "
Var Text1_9 = Text1_9 + SystemDate
Var BackToMainTime = 60 - Timeout
Var BackToMainTime = 900 - Timeout
DEBUGVAR tmpPassPhrase