Merge branch 'masterpiece' into feat/sgp-new-payment
This commit is contained in:
Pakin
commit
2c769214c9
3027 changed files with 513353 additions and 237055 deletions
|
|
@ -179,7 +179,8 @@
|
|||
EndIf
|
||||
|
||||
If BoxID = 105005 Then
|
||||
Var XMLProfile = "DiscountFromBO-MachineShedule"
|
||||
Var XMLProfile = "Plus5AndInclude20Percent-taobin_notopup-taobin_nopro-taobin_notopping"
|
||||
Var XMLProfile = "DiscountFromBO-MachineShedule"
|
||||
EndIf
|
||||
DEBUGVAR XMLProfile
|
||||
|
||||
|
|
@ -473,6 +474,41 @@
|
|||
|
||||
; zone init lang
|
||||
; CountryName
|
||||
If CountryName = "" Then
|
||||
READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
|
||||
DEBUGVAR StrCountryShort
|
||||
If StrCountryShort = "MYS" Then
|
||||
Var CountryName = "Malaysia"
|
||||
EndIf
|
||||
If StrCountryShort = "MYR" Then
|
||||
Var CountryName = "Malaysia"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "AUS" Then
|
||||
Var CountryName = "Australia"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "SGP" Then
|
||||
Var CountryName = "Singapore"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "HKG" Then
|
||||
Var CountryName = "HongKong"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "UAE_DUBAI" Then
|
||||
Var CountryName = "UnitedArabEmirates Dubai"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "GBR" Then
|
||||
Var CountryName = "United Kingdom"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "" Then
|
||||
Var CountryName = "Thailand"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var show_eng_button_stage = "Enable"
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/TermTempage2/bp_main_page_member.png"
|
||||
|
|
@ -560,8 +596,10 @@
|
|||
|
||||
DEBUGVAR ButtontoTopupMenu
|
||||
STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
|
||||
STRCONTAIN "taobin_notopping" XMLProfile taobin_notopping
|
||||
|
||||
DEBUGVAR taobin_notopup
|
||||
DEBUGVAR taobin_notopping
|
||||
If taobin_notopup = "true" Then
|
||||
Var ButtontoTopupMenu = "Disable"
|
||||
Else
|
||||
|
|
@ -572,6 +610,11 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
STRCONTAIN "default_english" XMLProfile default_english
|
||||
|
||||
If default_english = "true" Then
|
||||
Var show_eng = "true"
|
||||
EndIf
|
||||
|
||||
Var InternationalEnable = 0
|
||||
Var InternationalEnableStr = "false"
|
||||
|
|
@ -579,42 +622,6 @@
|
|||
Var XButtonMember = 212
|
||||
Var YButtonMember = 1695
|
||||
|
||||
; CountryName
|
||||
If CountryName = "" Then
|
||||
READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
|
||||
DEBUGVAR StrCountryShort
|
||||
If StrCountryShort = "MYS" Then
|
||||
Var CountryName = "Malaysia"
|
||||
EndIf
|
||||
If StrCountryShort = "MYR" Then
|
||||
Var CountryName = "Malaysia"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "AUS" Then
|
||||
Var CountryName = "Australia"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "SGP" Then
|
||||
Var CountryName = "Singapore"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "HKG" Then
|
||||
Var CountryName = "HongKong"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "UAE_DUBAI" Then
|
||||
Var CountryName = "UnitedArabEmirates Dubai"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "" Then
|
||||
Var CountryName = "Thailand"
|
||||
EndIf
|
||||
|
||||
;
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
; Zone set video main page.
|
||||
|
||||
; ignore collection point
|
||||
|
|
@ -654,6 +661,11 @@
|
|||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
|
||||
EndIf
|
||||
|
||||
;inter-xml-open
|
||||
If CountryName = "United Kingdom" Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/gbr/video/script_video.ev"
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR CountDownShowButton
|
||||
DEBUGVAR EventTurnOn
|
||||
|
|
@ -1093,6 +1105,7 @@
|
|||
EndIf
|
||||
|
||||
If CountryName = "HongKong" Then
|
||||
Var EnableMultiInstance = "true"
|
||||
If EnableMultiInstance = "true" Then
|
||||
|
||||
; Change lang icon for hkg
|
||||
|
|
@ -1235,27 +1248,96 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
;inter-page-board
|
||||
If CountryName = "United Kingdom" Then
|
||||
|
||||
Var SettingVideoBrewingUseCommon = 1
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/gbr/video/script_video.ev"
|
||||
|
||||
EnableLanguage "ENG"
|
||||
SetLanguage "ENG"
|
||||
LanguageControl "UpdateList" "-"
|
||||
|
||||
Var InternationalEnable = 1
|
||||
Var show_eng = "true"
|
||||
;Var VideoMainPage = "ROOT/taobin_project/inter/gbr/video/video_main.mp4"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
||||
|
||||
Var ShowNetworkProblemText = "Network error. Payment credit card only."
|
||||
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/gbr/"
|
||||
Var CountryShortName = "gbr"
|
||||
|
||||
Var TextPriceMenuSize = 12
|
||||
Var TextPriceMenuY = 264
|
||||
Var TextPriceMenuBlendX = 180
|
||||
Var TextPriceMenuHotX = 48
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
|
||||
Var PriceUnitText = ""
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
Var CountDownShowButton = 35
|
||||
|
||||
Var XButtonMember = 384
|
||||
Var YButtonMember = 1695
|
||||
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/gbr/menu/lang.tsv"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR MaterialAvailable
|
||||
STRCONTAIN "551215" MaterialAvailable SugarZeroCalEnable
|
||||
|
||||
Var cups_sold_text = "Cups Sold Worldwide"
|
||||
|
||||
Var MinPhoneNumber = 11
|
||||
Var MaxPhoneNumber = 11
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
; New mode
|
||||
; Inter + Multi-Instance available ./inter/tha/multi
|
||||
|
||||
|
||||
If EnableMultiInstance = "true" Then
|
||||
If BoxID = 173149 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
If BoxID = 173249 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
If BoxID = 173319 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
If BoxID = 200435 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
If BoxID = 123456 Then
|
||||
Var EnableMultiInstanceFromBoxID = 1
|
||||
EndIf
|
||||
|
||||
If EnableMultiInstanceFromBoxID = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
|
||||
Var EnableMultiInstance = "true"
|
||||
Var MyanmarLangEnable = "true"
|
||||
Var InternationalShow = 0
|
||||
|
||||
Var CatalogLayoutV3 = 0
|
||||
|
||||
Var CatalogLayoutV3 = 1
|
||||
|
||||
Var SpiralModeFrozenFruit = 0
|
||||
If BoxID = 123456 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
Var SpiralOnline = "true"
|
||||
Var SpiralModeFrozenFruit = 1
|
||||
Var InternationalShow = 0
|
||||
EndIf
|
||||
If BoxID = 173149 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
If BoxID = 105005 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
|
||||
|
||||
; test payment
|
||||
Var New_Payment = 1
|
||||
|
||||
|
|
@ -1269,9 +1351,6 @@
|
|||
;specified to unittest4
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/tha/"
|
||||
Var CountryShortName = "tha"
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
|
||||
DEBUGVAR OpenFileXML
|
||||
TRY OpenFileXML
|
||||
|
||||
Var WebAppShow = "Invisible"
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
|
|
@ -1279,10 +1358,12 @@
|
|||
Var LanguageShow = "THAI"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
|
||||
|
||||
Var RedirectToNormalVersion = 1
|
||||
;EnableLanguage "MYANMAR"
|
||||
;EnableLanguage "MSC"
|
||||
If InternationalShow = 1 Then
|
||||
EnableLanguage "MYANMAR"
|
||||
EnableLanguage "MSC"
|
||||
EndIf
|
||||
|
||||
SetLanguage "THAI"
|
||||
LanguageControl "UpdateList" "-"
|
||||
|
|
@ -1594,11 +1675,11 @@
|
|||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
||||
|
||||
</EventActionOk>
|
||||
|
||||
<EventActionError>
|
||||
|
||||
|
||||
</EventActionError>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
|
@ -1993,7 +2074,7 @@ PRICE "Reset" "-"
|
|||
If InternationalEnable = 1 Then
|
||||
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"
|
||||
|
|
@ -2146,7 +2227,7 @@ PRICE "Reset" "-"
|
|||
Var refresh_str = "-RefreshProf"
|
||||
STRCONTAIN refresh_str XMLProfile HasRefreshProf
|
||||
If HasRefreshProf = "true" Then
|
||||
RebootWithCause "RefreshProf_ProMelon"
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -2192,6 +2273,13 @@ PRICE "Reset" "-"
|
|||
Var CountDownPauseVideo = 1
|
||||
EndIf
|
||||
|
||||
If CountryName = "United Kingdom" Then
|
||||
If EventAO = 1 Then
|
||||
Var CountDownShowButton = 0
|
||||
Var CountDownPauseVideo = 35
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
|
||||
</EventEnd>
|
||||
|
|
@ -2317,11 +2405,11 @@ PRICE "Reset" "-"
|
|||
<FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_topup.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventOnClick>
|
||||
Var PayDetail=""
|
||||
Var NextPage = "-"
|
||||
Open "ROOT/xml/service_menu.xml"
|
||||
</EventClick>
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue