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-04-09 16:00:50 +07:00
commit cbba25c311
32 changed files with 1396 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_collect_point_1.xml
View file

@ -36,6 +36,12 @@
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
If InternationalEnable = 1 Then
If LanguageShow = "UAE_DUBAI" Then
Var IMG_CNT = CountryRootPath + "/image/page_doing/img2.png"
EndIf
EndIf
SAVELOG "collect_point1"
SAVELOG Seeker.TNumberTaobinCredit
SAVELOG TelephoneNumber

18
xml/page_collect_point_3.xml
View file

@ -739,7 +739,23 @@
If CheckCoupons = 2 Then
Var TaobinCredit = Ext1b
Open "ROOT/taobin_project/xml/page_check_member2.xml"
If InternationalEnable = 1 Then
Var ChackMemberPage = CountryRootPath + "xml/page_check_member2.lxml"
If CountryName = "Malaysia" Then
Open ChackMemberPage
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Open ChackMemberPage
EndIf
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf

13
xml/page_drinkok.xml
View file

@ -62,6 +62,17 @@
Var DirImage = "ROOT/taobin_project/image/complete/"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png"
Else
Var text_bottom = DirImage + "text_bottom.png"
EndIf
DEBUGVAR text_bottom
Var VideoPlayFile = VideoPath
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + "24"
@ -612,7 +623,7 @@
<X> 0 </X>
<Y> 1418 </Y>
<State> TextBottomShow </State>
<Filename> Var( DirImage + "text_bottom.png") </Filename>
<Filename> text_bottom </Filename>
</Image>

17
xml/page_lid_straw.xml
View file

@ -75,6 +75,14 @@
Var PictureBegin = "txt_"
Var PictureEnd = "_en.png"
;inter-has-alter-anim
If CountryName = "UnitedArabEmirates Dubai" Then
;check LanguageShow
If LanguageShow = "ENG" Then
Var PicturePath = "ROOT/taobin_project/image/page_doing/"
EndIf
EndIf
Else
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
@ -132,7 +140,14 @@
UpdateTxRef2 TxRef1 ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
If CountryName = "UnitedArabEmirates Dubai" Then
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
Open brewing3ContiInter
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf

17
xml/page_payment_cash-SGP.xml
View file

@ -452,6 +452,15 @@
Var PayState6 = "Invisible"
EndIf
;Disable taobin credit
Var TopRowY = 1276
Var BotRowY = 1499
If DisableTaobinCredit = "true" Then
Var PayState4 = "Invisible"
EndIf
</EventOpen>
<EventActionOk>
@ -1504,7 +1513,13 @@ EndIf
; cash Singapore
<Button>
<X> 439 </X>
<Y> 1499 </Y>
<Y> eval(
If DisableTaobinCredit = "true" Then
Var return = TopRowY
Else
Var return = BotRowY
EndIf
) </Y>
<State> PayState1</State>
<Filename> FilenameShowbuttonCashBN </Filename>
<FilenamePress> FilenameShowbuttonCashBP </FilenamePress>

50
xml/page_payment_cash-UAE.xml
View file

@ -233,8 +233,8 @@
Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_cash/bn_cash.png"
Var FilenameShowbuttonCashBP = CountryRootPath + "/image/page_payment_cash/bp_cash.png"
Else
Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_en/page_payment_cash/bn_cash.png"
Var FilenameShowbuttonCashBP = CountryRootPath + "/image/page_payment_en/page_payment_cash/bp_cash.png"
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
EndIf
Else
Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_cash/bn_cash.png"
@ -352,6 +352,9 @@
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "/image/page_payment_cash/"
EndIf
Var EnoughChange = "yes"
@ -401,7 +404,11 @@
Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
Var pay_with_chanel_text = CountryRootPath + "image/page_payment_cash/text_1.png"
If LanguageShow = "UAE_DUBAI" Then
Var pay_with_chanel_text = CountryRootPath + "image/page_payment_cash/text_1.png"
Else
Var pay_with_chanel_text = DirImage + "/text_1.png"
EndIf
;If DisableUsingCode = "true" Then
@ -874,7 +881,9 @@
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
DEBUGVAR brewing3ContiInter
Open brewing3ContiInter
EndIf
EndIf
@ -957,8 +966,9 @@
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
Open brewing3ContiInter
EndIf
EndIf
EndIf
@ -1029,8 +1039,9 @@
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
Open brewing3ContiInter
EndIf
EndIf
Else
@ -1419,9 +1430,9 @@
<Y> 1276</Y>
<State> PayState2</State>
;inter-image
<Filename> Var( CountryRootPath + "image/page_payment_cash/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( CountryRootPath + "image/page_payment_cash/bp_pay_with_code.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "image/page_payment_cash/bd_pay_with_code.png") </FilenameDisable>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_pay_with_code.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1445,9 +1456,9 @@
<Y> 1276 </Y>
<State> PayState5 </State>
;inter-image
<Filename> Var( CountryRootPath + "image/page_payment_cash/bn_credit_card_and_qr.png") </Filename>
<FilenamePress> Var( CountryRootPath + "image/page_payment_cash/bp_credit_card_and_qr.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "image/page_payment_cash/bd_credit_card_and_qr.png") </FilenameDisable>
<Filename> Var( DirImage + "/bn_credit_card_and_qr.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_credit_card_and_qr.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_credit_card_and_qr.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -1513,7 +1524,7 @@ EndIf
</EventClick>
</Button>
; cash Singapore
; cash Dubai
<Button>
<X> 439 </X>
<Y> eval(
@ -1707,7 +1718,14 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-UAE_DUBAI.png" )</Filename>
;inter-image
<Filename> eval(
If LanguageShow = "UAE_DUBAI" Then
Var return = CountryRootPath + "/image/page_payment_cash/img_popup11-UAE_DUBAI.png"
Else
Var return = CountryRootPath + "/image/page_payment_cash/img_popup11-UAE_DUBAI_en.png"
EndIf
) </Filename>
</Image>