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

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

Browse source
This commit is contained in:
wanlop run 2024-07-19 21:34:01 +07:00
commit 6f6ef3628b
32 changed files with 1876 additions and 1627 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_board.xml
View file

@ -857,7 +857,10 @@
;Var SettingDisableTaobinCode = "false"
; Singapore disable point
;Var SettingIgnoreCollectPoint = 1
Var SettingIgnoreCollectPoint = 1
If BoxID = 210604 Then
Var SettingIgnoreCollectPoint = 0
EndIf
Var SettingVideoBrewingUseCommon = 1

62
xml/page_get_yourchange.xml
View file

@ -9,13 +9,26 @@
; On open
Var Timeout = 0
Var LangButtonEnable = "Enable"
If CountryName = "Singapore" Then
Var LangButtonEnable = "Invisible"
EndIf
DEBUGVAR LangButtonEnable
If show_eng = "true" Then
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
If CountryName = "Singapore" Then
Var show_btp = ""
Var show_btn = ""
EndIf
Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
@ -23,6 +36,12 @@
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
If CountryName = "Singapore" Then
Var show_btp = ""
Var show_btn = ""
EndIf
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
@ -83,16 +102,42 @@
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
EndIf
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
If Seeker = "next" Then
If Seeker = "next" Then
;CoinBack
Open Brew3ConInter
Else
Open Brew3Inter
EndIf
Else
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If Seeker = "next" Then
;CoinBack
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
;If New_Payment = 1 Then
; TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
;EndIf
;If Seeker = "next" Then
;CoinBack
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
; Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
;Else
; Open "ROOT/taobin_project/xml/page_brewing3.xml"
;EndIf
EndIf
@ -118,6 +163,7 @@
<Button>
<X> 990 </X>
<Y> 416 </Y>
<State> LangButtonEnable </State>
<Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

2
xml/page_lid_straw.xml
View file

@ -144,7 +144,7 @@
DEBUGVAR ChangeFlag2
If ChangeFlag2 = 0 Then
If Seeker.PayWithQR = 0 Then

8
xml/page_payment_cash-SGP.xml
View file

@ -964,6 +964,7 @@
EndIf
If Seeker = "curr" Then
DEBUGVAR UserChoosePayment
DEBUGVAR CancelContinue
Var UserChoosePayment = ""
If CancelContinue = 2 Then
@ -1112,16 +1113,23 @@
EndIf
Var CancelCounter = CancelCounter + 1
DEBUGVAR CancelCounter
DEBUGVAR Seeker.StoreCreditFlag
DEBUGVAR CancelNumber
If CancelCounter = CancelNumber Then
;Change CoinAmount
DEBUGVAR CoinAmount
If CoinAmount > 0 Then
DEBUGVAR Seeker.StoreCreditFlag
If Seeker.StoreCreditFlag = 1 Then
Var ChangeOK = 1
Else
DEBUGVAR CoinAmount
Change CoinAmount
EndIf
Else
DEBUGVAR CancelContinue
If ActionOKCase = 0 Then
Var ActionOKCase = 1
Var PayInfoCFlag = 1

65
xml/page_thankyou.xml
View file

@ -386,10 +386,16 @@
EndIf
EndIf
DEBUGVAR ChangeFlag2
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
Else
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
@ -441,7 +447,12 @@
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else
@ -449,7 +460,11 @@
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
@ -478,14 +493,36 @@
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
Else
If GotoStoreCredit0 = 1 Then
Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml"
If CountryName = "Singapore" Then
; force-change-cash
Change StoreCreditAmount
Var ChangeFlag2 = 1
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
Else
Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml"
EndIf
Else
If Seeker.FreeVendingCampaign = 1 Then
@ -497,7 +534,11 @@
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else
@ -505,7 +546,11 @@
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
@ -535,7 +580,11 @@
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
Open MemberPrompt
If SettingIgnoreCollectPoint = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
Else
Open MemberPrompt
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf

100
xml/sometime/page_campaign_ads_lucky_draw.xml
View file

@ -1,15 +1,18 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xffffff" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var TimeoutTarget = 10
Var ImgDir = "ROOT/taobin_project/image/event/lucky_draw_ads/"
Var Extension = ".png"
Var Show_QR_Popup_State = "Invisible"
Var Text_X = 207
Var Text_Y = 1470
@ -27,7 +30,7 @@
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 10 Then
If Timeout > TimeoutTarget Then
; Go back to lid straw page
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -65,16 +68,101 @@
</Image>
<Button>
<X> 397 </X>
<X> 222 </X>
<Y> 1699 </Y>
<Filename> Var(ImgDir + "bn_next.png") </Filename>
<FilenamePress> Var(ImgDir + "bp_next.png") </FilenamePress>
<FilenameDisable> Var(ImgDir + "bp_next.png") </FilenameDisable>
<Filename>
eval(
Var return = ImgDir + "bn_skip"
Var return = return + Extension
)
</Filename>
<FilenamePress>
eval(
Var return = ImgDir + "bp_skip"
Var return = return + Extension
)
</FilenamePress>
<FilenameDisable>
eval(
Var return = ImgDir + "bp_skip"
Var return = return + Extension
)
</FilenameDisable>
<EventClick>
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
<Button>
<X> 579 </X>
<Y> 1699 </Y>
<Filename>
eval(
Var return = ImgDir + "bn_interested"
Var return = return + Extension
)
</Filename>
<FilenamePress>
eval(
Var return = ImgDir + "bp_interested"
Var return = return + Extension
)
</FilenamePress>
<FilenameDisable>
eval(
Var return = ImgDir + "bp_interested"
Var return = return + Extension
)
</FilenameDisable>
<EventClick>
Var Show_QR_Popup_State = "Enable"
Var Timeout = 0
Var TimeoutTarget = 30
Refresh
</EventClick>
</Button>
; Background QR Popup
<Image>
<X> 0 </X>
<Y> 380 </Y>
<State> Show_QR_Popup_State </State>
<Filename> "ROOT/taobin_project/image/display_point/alpha.png" </Filename>
</Image>
<Image>
<X> 300 </X>
<Y> 816 </Y>
<State> Show_QR_Popup_State </State>
<Filename> Var( ImgDir + "qr_popup.png" ) </Filename>
</Image>
<Button>
<X> 393 </X>
<Y> 1114 </Y>
<State> Show_QR_Popup_State </State>
<Filename>
eval(
Var return = ImgDir + "bn_close"
Var return = return + Extension
)
</Filename>
<FilenamePress>
eval(
Var return = ImgDir + "bp_close"
Var return = return + Extension
)
</FilenamePress>
<FilenameDisable>
eval(
Var return = ImgDir + "bp_close"
Var return = return + Extension
)
</FilenameDisable>
<EventClick>
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
<EventUnitTest4>
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"