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

Merge branch 'masterpiece' into sgp_blue

Browse source
This commit is contained in:
Pakin 2024-09-16 17:19:08 +07:00
commit 84445e1be4
78 changed files with 15546 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/event/tricker.ev
View file

@ -374,6 +374,11 @@ If BoxID = 173149 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 172053 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 200001 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
@ -394,7 +399,7 @@ EndIf
;
If BoxID > 200000 Then
If BoxID < 200015 Then
If BoxID < 200120 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf

4
xml/page_NewBrewing3.xml
View file

@ -15,9 +15,11 @@
Var CountUpWhenBREW_CNT = 0
DEBUGVAR TxRef1
SAVELOG "page_brewing3.xml"
SAVELOG "page_Newbrewing3.xml"
DEBUGVAR MachineStage
Machine NewPaymentOpenBrewingXML
Var PictureFileTextDesctionState = "Enable"

33
xml/page_before_check_member.xml
View file

@ -9,6 +9,7 @@
Var OpenTopupCredit = 0
Var OpenCheckCoupon = 0
Var ChangeMemberPassword = 0
; Default language (Thai).
@ -95,12 +96,14 @@
<Button>
<X> 286 </X>
<Y> 824 </Y>
<Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_topup_credit" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenameDisable>
<Filename> Var( "ROOT/taobin_project/image/before_member/bn_topup_credit" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenameDisable>
<EventClick>
Var OpenTopupCredit = 1
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต"
Var CheckMemberTitleEN = "Please enter your mobile number\nto topup Tao bin credit."
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
@ -109,12 +112,30 @@
<Button>
<X> 286 </X>
<Y> 976 </Y>
<Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_check_coupon" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenameDisable>
<Filename> Var( "ROOT/taobin_project/image/before_member/bn_check_coupon" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenameDisable>
<EventClick>
Var OpenCheckCoupon = 1
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ"
Var CheckMemberTitleEN = "Please enter your mobile number\nto check reward point."
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
</Button>
<Button>
<X> 286 </X>
<Y> 1128 </Y>
<Filename> Var( "ROOT/taobin_project/image/before_member/bn_change_pass" + Extension ) </Filename>
<FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenamePress>
<FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenameDisable>
<EventClick>
Var ChangeMemberPassword = 1
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน"
Var CheckMemberTitleEN = "Please enter your mobile number\nto change password."
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>

6
xml/page_board.xml
View file

@ -704,6 +704,10 @@
If BoxID = 200002 Then
Var UseSlideShowVideo = 1
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/event_profile.ev"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
EndIf
@ -1266,7 +1270,7 @@
DEBUGVAR CountDownPauseVideo2
Var TimeProfilePrice = 0
;Machine NewPaymentOpenBrewingXMLEnable
</EventOpen>
<EventActionOk>

1
xml/page_catalog.lxml
View file

@ -18,6 +18,7 @@
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
Var FromProYuzu250 = 0
EndIf
If UsePepsiTheme = 1 Then

50
xml/page_check_member.xml
View file

@ -24,21 +24,25 @@
If show_eng = "true" Then
Var CheckMemberTitle = CheckMemberTitleEN
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
Var Xtext19 = 154
Else
Var DirImage = "ROOT/taobin_project/image/collectiing"
EndIf
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"
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
Else
Var CheckMemberTitle = CheckMemberTitleTH
Var DirImage = "ROOT/taobin_project/image/collectiing"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
EndIf
@ -50,12 +54,6 @@
Var TaobinCredit = 0
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
EndIf
Var show_eng_button_stage = "Enable"
;inter-max-number
@ -191,6 +189,11 @@
;Open "ROOT/taobin_project/xml/page_check_member1.xml"
If Ext1a = "ok" Then
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_payment_changePin1.xml"
EndIf
Open "ROOT/taobin_project/xml/page_check_member1.xml"
Else
If Ext1a = "new customer" Then
@ -632,11 +635,22 @@
<Image>
<X> Xtext19 </X>
<Y> 521 </Y>
<Filename> Var( DirImage + "/text_19.png" )</Filename>
</Image>
;<Image>
;<X> Xtext19 </X>
;<Y> 521 </Y>
;<Filename> Var( DirImage + "/text_19.png" )</Filename>
;</Image>
<Text>
<X> 0 </X>
<Y> 521 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Font> KanitRegularTTF </Font>
<Color> 0x513C2F </Color>
<Size> 51 </Size>
<Value> CheckMemberTitle </Value>
</Text>
<Image>
<X> 430 </X>

5
xml/page_get_yourchange.xml
View file

@ -78,6 +78,11 @@
Var imgGetChange = "/imgGetChange-HKG.png"
EndIf
;inter-image
If CountryName = "UnitedArabEmirates Dubai" Then
Var imgGetChange = "/imgGetChange-UAE_DUBAI.png"
EndIf
;INT StoreCreditAmount
Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )

4
xml/page_payment_cash-UAE.xml
View file

@ -384,6 +384,10 @@
Var SELLONLINE = 1
EndIf
If IgnoreNetCore = "true" Then
Var SELLONLINE = 1
EndIf
If SELLONLINE = 0 Then
SAVELOG "Cash only NetworkStatus down"

6
xml/page_payment_changePin1.xml
View file

@ -738,7 +738,11 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePin2.xml
View file

@ -52,7 +52,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
If ReqFlag = 0 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_payment_changePinFailed.xml"
EndIf
@ -750,7 +754,11 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePinFailed.xml
View file

@ -29,7 +29,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
TimerReset
@ -103,7 +107,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePinSMS.xml
View file

@ -40,7 +40,11 @@
If PinSMSFlag = 1 Then
Open "ROOT/taobin_project/xml/page_check_member1.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
EndIf
@ -105,7 +109,11 @@
If PinSMSFlag = 1 Then
Open "ROOT/taobin_project/xml/page_check_member1.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
</EventClick>
</Button>

12
xml/page_payment_changePinSuccess.xml
View file

@ -29,7 +29,11 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
TimerReset
@ -101,7 +105,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If ChangeMemberPassword = 1 Then
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
</EventClick>
</Button>

7
xml/page_payment_credit.xml
View file

@ -633,7 +633,12 @@
Var Tel2DFlag = 0
TRY "ROOT/taobin_project/xml/verify_number.ev"
If InternationalEnable = 1 Then
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
Else
TRY "ROOT/taobin_project/xml/verify_number.ev"
EndIf
If Tel2DFlag = 1 Then

12
xml/page_show_error.lxml
View file

@ -213,6 +213,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If NeedUpgrade = "true" Then
@ -231,6 +234,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
DEBUGVAR MachineStage
@ -253,6 +259,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
@ -272,6 +281,9 @@
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/close_en"
EndIf
EndIf
EndIf

10
xml/vending_tasks_pre_main.xml
View file

@ -31,6 +31,9 @@
If Timeout > 60 Then
StatusLog "exit"
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
@ -42,6 +45,8 @@
Var BackToMainTime = 60 - Timeout
DEBUGVAR tmpPassPhrase
__CMD "still-stay-on-pre-main" "-" "-" "-"
Refresh
@ -70,6 +75,8 @@
<Volume> SoundVolume </Volume>
<EventClick>
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/vending_info2.xml"
</EventClick>
@ -218,6 +225,9 @@
<Volume> SoundVolume </Volume>
<EventClick>
StatusLog "exit"
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>