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

Merge remote-tracking branch 'origin/wso' into wso

Browse source
This commit is contained in:
Ittipat Lusuk 2024-12-02 14:49:51 +07:00
commit a82a22c724
9 changed files with 251 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

38
inter/tha/menu/lang.tsv
View file

@ -221,15 +221,19 @@
Page_before_check_member
Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center,LineHeight=86
002001 Please enter your mobile number\nto topup Tao bin credit. กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต Tao bin ခရက်ဒစ်ငွေဖြည့်ရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်သွင်းပါ။
002002 Please enter your mobile number\nto check reward point. กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ ဆုလာဘ်အမှတ်ကို စစ်ဆေးရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်သွင်းပါ။
002003 Please enter your mobile number\nto change password. กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน စကားဝှက်ပြောင်းရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်ပါ။
Topup
Font=Montserrat,Type=Light,Size=26,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Light,Size=26,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Light,Size=26,Color=0x513C2F,Align=Center,LineHeight=86
002004 Top up phone เติมเงินมือถือ ဖုန်းငွေဖြည့်ပါ။
002005 Reward Points / Top up credit เติมเงินเข้าเครดิต / เช็คคูปองสะสม ဆုအမှတ်များ / ငွေဖြည့်ခရက်ဒစ်
@ -1318,14 +1322,14 @@
2100045 Coffee module Coffee module
2100046 Cofee module type Cofee module type
2100047 Coffee module serial number Coffee module serial number
2100048 Lid sensor will be inactive when machine operating Lid sensor will be inactive 
when machine operating
2100049 Lid sensor will be active when machine operating Lid sensor will be active 
when machine operating
2100050 Request straw button will appear on machine's sale screen Request straw button will appear 
on machine's sale screen
2100051 Request straw button will disappear on machine's sale screen Request straw button will disappear 
on machine's sale screen
2100052 Pulse compressor will be active when machine operating. Pulse compressor will be active 
when machine operating.
2100053 Pulse compressor will be inactive when machine operating. Pulse compressor will be inactive 
when machine operating.
2100054 Sleep mode will be turn on
when machine operating. Sleep mode will be turn on
when machine operating.
2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating.
2100048 Lid sensor will be inactive when machine operating Lid sensor will be inactive when machine operating
2100049 Lid sensor will be active when machine operating Lid sensor will be active when machine operating
2100050 Request straw button will appear on machine's sale screen Request straw button will appear on machine's sale screen
2100051 Request straw button will disappear on machine's sale screen Request straw button will disappear on machine's sale screen
2100052 Pulse compressor will be active when machine operating. Pulse compressor will be active when machine operating.
2100053 Pulse compressor will be inactive when machine operating. Pulse compressor will be inactive when machine operating.
2100054 Sleep mode will be turn onwhen machine operating. Sleep mode will be turn onwhen machine operating.
2100055 Sleep mode will be turn offwhen machine operating. Sleep mode will be turn offwhen machine operating.
2100056 Please check before confirming Please check before confirming
2100057 Fan module Fan module

Can't render this file because it contains an unexpected character in line 183 and column 14.

2
inter/tha/xml/multi/page_catalog_group_recommend.lxml
View file

@ -39,9 +39,7 @@
EndIf
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 13 "show"
RootLayoutVisible 3 "show"
SetInstanceIgnoreTouch

2
inter/tha/xml/multi/page_catalog_group_recommend.skt
View file

@ -28,7 +28,7 @@
SAVELOG PreviseXMLFileName2
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
Var Timeout = 0

2
inter/tha/xml/multi/page_catalog_group_whey.lxml
View file

@ -29,7 +29,7 @@
RootLayoutVisible 12 "show"
Var Timeout = 0
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch

2
inter/tha/xml/multi/page_catalog_group_whey.skt
View file

@ -32,7 +32,7 @@
RootLayoutVisible 12 "show"
Var Timeout = 0
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch

1
inter/tha/xml/page_topping_select6.lxml
View file

@ -2695,6 +2695,7 @@
<X> 0 </X>
<Y> 752 </Y>
<Width> 1080</Width>
<WidthText> 900 </WidthText>
<Align> Center </Align>
<Size> Auto </Size>
<Font> KanitMediumTTF </Font>

89
xml/page_board.xml
View file

@ -1396,6 +1396,86 @@
Var RoadShow = "false"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
; New mode
; Inter + Multi-Instance available ./inter/tha/multi
; Below. Pendding from XMLProfile
DEBUGVAR MyanmarLangEnable
DEBUGVAR EnableMultiInstance
;Var MyanmarLangEnable = "true"
Var MyanmarLangEnable = "false"
;Var MyanmarLangEnable = ""
If MyanmarLangEnable = "" Then
Else
If EnableMultiInstance = "true" Then
If CountryName = "Thailand" Then
Var InternationalEnable = 1
DEBUGVAR InternationalEnable
;TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/video/script_video.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
;specified to unittest4
Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
DEBUGVAR OpenFileXML
TRY OpenFileXML
Var WebAppShow = "Invisible"
EnableLanguage "ENG"
EnableLanguage "THAI"
;EnableLanguage "MYANMAR"
If MyanmarLangEnable = "true" Then
EnableLanguage "MYANMAR"
EndIf
SetLanguage "THAI"
LanguageControl "UpdateList" "-"
Var show_eng = "false"
;Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var CountryRootPath = "ROOT/taobin_project/inter/tha/"
Var CountryShortName = "tha"
Var TextPriceMenuSize = 12
Var TextPriceMenuY = 266
Var TextPriceMenuBlendX = 180
Var TextPriceMenuHotX = 48
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Enable"
Var PriceUnitText = ""
Var show_eng_button_stage = "Invisible"
Var XButtonMember = 384
Var YButtonMember = 1695
If Not#LanguageLoaded = "" Then
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/tha/menu/lang.tsv"
EndIf
Var cups_sold_text = "Cups Sold Worldwide"
Var MinPhoneNumber = 10
Var MaxPhoneNumber = 10
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
EndIf
EndIf
EndIf
If UsePepsiTheme = 1 Then
If InternationalEnable = 1 Then
; enable-color
@ -1883,11 +1963,7 @@ PRICE "Reset" "-"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
; show language icon
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RootLayoutVisible 3 "show"
Var OpenFileXML = "ROOT/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
TRY OpenFileXML
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
Else
; show language icon
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@ -2348,8 +2424,7 @@ PRICE "Reset" "-"
If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
Else ; show language icon
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RootLayoutVisible 3 "show"

25
xml/page_check_member2.xml
View file

@ -7,7 +7,7 @@
<EventOpen>
; On open
RootLayoutVisible 3 "show"
If LuckyDrawCampaign = 1 Then
;Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
EndIf
@ -227,6 +227,7 @@
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/display_point_en"
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
Var text5Img = "/text5.png"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
If TaobinExpireMonth = "01" Then
@ -462,6 +463,7 @@
Var CouponExireA_M = "December"
EndIf
Var CouponExpireA = ""
Var CouponExpireA = CouponExpireA + CouponExireA_D
Var CouponExpireA = CouponExpireA + " "
Var CouponExpireA = CouponExpireA + CouponExireA_M
@ -469,7 +471,7 @@
Var CouponExpireA = CouponExpireA + CouponExireA_Y
Var CouponExpireA = "Expires " + CouponExpireA
Var CouponExpireAPosittion = 1375
EndIf
@ -584,6 +586,7 @@
Var CouponExireB_M = "December"
EndIf
Var CouponExpireB = CouponExpireB + CouponExireB_D
Var CouponExpireB = CouponExpireB + " "
Var CouponExpireB = CouponExpireB + CouponExireB_M
@ -592,6 +595,7 @@
Var CouponExpireB = "Expires " + CouponExpireB
EndIf
Var CouponText = "Coupons (" + CouponNum
@ -601,6 +605,7 @@
If LanguageShow = "THAI" Then
Var DirImage = "ROOT/taobin_project/image/display_point"
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
Var text5Img = "/text5.png"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
If TaobinExpireMonth = "01" Then
@ -833,6 +838,7 @@
Var CouponExireA_M = "ธันวาคม"
EndIf
Var CouponExpireA = ""
Var CouponExpireA = CouponExpireA + CouponExireA_D
Var CouponExpireA = CouponExpireA + " "
Var CouponExpireA = CouponExpireA + CouponExireA_M
@ -840,7 +846,7 @@
Var CouponExpireA = CouponExpireA + CouponExireA_Y
Var CouponExpireA = "หมดอายุ " + CouponExpireA
Var CouponExpireAPosittion = 1375
EndIf
@ -954,6 +960,7 @@
Var CouponExireB_M = "ธันวาคม"
EndIf
Var CouponExpireB = CouponExpireB + CouponExireB_D
Var CouponExpireB = CouponExpireB + " "
Var CouponExpireB = CouponExpireB + CouponExireB_M
@ -962,6 +969,7 @@
Var CouponExpireB = "หมดอายุ " + CouponExpireB
EndIf
Var CouponText = "คูปองสะสม (" + CouponNum
@ -971,6 +979,7 @@
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/display_point_mmr"
Var text5Img = "/text5-MMR.png"
If TaobinExpireMonth = "01" Then
Var TaobinExpireMonth = "Jan"
Var TaobinExpireMonthX = "ဇန္နဝါရီလ"
@ -1206,6 +1215,7 @@
Var CouponExireA_M = "ဒီဇင္ဘာလ"
EndIf
Var CouponExpireA = ""
Var CouponExpireA = CouponExpireA + CouponExireA_D
Var CouponExpireA = CouponExpireA + " "
Var CouponExpireA = CouponExpireA + CouponExireA_M
@ -1213,7 +1223,7 @@
Var CouponExpireA = CouponExpireA + CouponExireA_Y
Var CouponExpireA = "သက်တမ်းကုန် " + CouponExpireA
Var CouponExpireAPosittion = 1400
EndIf
@ -1327,6 +1337,7 @@
Var CouponExireB_M = "ဒီဇင္ဘာလ"
EndIf
Var CouponExpireB = CouponExpireB + CouponExireB_D
Var CouponExpireB = CouponExpireB + " "
Var CouponExpireB = CouponExpireB + CouponExireB_M
@ -1340,8 +1351,8 @@
Var CouponText = "ကူပွန်စုဆောင်းခြင်း။ (" + CouponNum
Var CouponText = CouponText + ")"
;inter-image
Var text5Img = "/text5-MMR.png"
EndIf
SAVELOG "EventLanguageOnChange menu -list"
@ -1645,7 +1656,7 @@
<Text>
<X> 372 </X>
<Y> 1375 </Y>
<Y> CouponExpireAPosittion </Y>
<Size> 15 </Size>
<Width> 600 </Width>
<Font> KanitRegularTTF </Font>