Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
845c5f1637
382 changed files with 85242 additions and 516190 deletions
|
|
@ -178,6 +178,10 @@
|
|||
CacheVarStr "put" XMLProfile
|
||||
EndIf
|
||||
|
||||
If BoxID = 105005 Then
|
||||
Var XMLProfile = "DiscountFromBO-MachineShedule"
|
||||
EndIf
|
||||
DEBUGVAR XMLProfile
|
||||
|
||||
Var TermTemOnline = "false"
|
||||
Var TaobinOnline = "false"
|
||||
|
|
@ -1089,7 +1093,11 @@
|
|||
If CountryName = "HongKong" Then
|
||||
If EnableMultiInstance = "true" Then
|
||||
|
||||
; Change lang icon for hkg
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
Var LanguageButtonEnable = "Invisible"
|
||||
Var BtnLangToggleIndex = "Enable"
|
||||
|
||||
Var InternationalEnable = 1
|
||||
Var CurrentPageShowError = 0
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
|
||||
|
|
@ -1104,7 +1112,7 @@
|
|||
Var show_eng = "true"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
||||
Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
Var ShowNetworkProblemText = "Network error."
|
||||
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/hkg/"
|
||||
Var CountryShortName = "hkg"
|
||||
|
|
@ -1117,11 +1125,10 @@
|
|||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
|
||||
Var PriceUnitText = "HKG$"
|
||||
Var PriceUnitText = "HK$"
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
|
||||
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
Var CountDownShowButton = 35
|
||||
|
||||
|
|
@ -1234,13 +1241,19 @@
|
|||
If CountryName = "Thailand" Then
|
||||
|
||||
Var MyanmarLangEnable = "true"
|
||||
|
||||
Var CatalogLayoutV3 = 0
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
Else
|
||||
Var CatalogLayoutV3 = 0
|
||||
EndIf
|
||||
|
||||
If BoxID = 173149 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
If BoxID = 105005 Then
|
||||
Var CatalogLayoutV3 = 1
|
||||
EndIf
|
||||
|
||||
; test payment
|
||||
Var New_Payment = 1
|
||||
|
||||
|
|
@ -1261,11 +1274,13 @@
|
|||
Var WebAppShow = "Invisible"
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
|
||||
Var LanguageShow = "THAI"
|
||||
Var LanguageShow = "THAI"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
EnableLanguage "MYANMAR"
|
||||
EnableLanguage "MSC"
|
||||
|
||||
Var RedirectToNormalVersion = 1
|
||||
;EnableLanguage "MYANMAR"
|
||||
;EnableLanguage "MSC"
|
||||
|
||||
SetLanguage "THAI"
|
||||
LanguageControl "UpdateList" "-"
|
||||
|
|
@ -1497,7 +1512,6 @@
|
|||
; Below. Pendding from XMLProfile
|
||||
DEBUGVAR EnableMultiInstance
|
||||
|
||||
Var RedirectToNormalVersion = 0
|
||||
|
||||
If UsePepsiTheme = 1 Then
|
||||
If InternationalEnable = 1 Then
|
||||
|
|
@ -1578,66 +1592,11 @@
|
|||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
If GetNamHomCoconutRemainReward = 1 Then
|
||||
If Ext1a = "" Then
|
||||
SAVELOG "Get Nam hom coconut remain reward error Ext1a is empty."
|
||||
Else
|
||||
DEBUGVAR Ext1a
|
||||
|
||||
SPLIT2 Ext1a "/" RemainRewardSpl
|
||||
|
||||
Var SuperSetRemain = RemainRewardSpl[0]
|
||||
Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
|
||||
Var CleansingGalRemain = RemainRewardSpl[2]
|
||||
Var TumbleBottleRemain = RemainRewardSpl[3]
|
||||
Var ClearGelRemain = RemainRewardSpl[4]
|
||||
Var E_GiftCard100BathRemain = RemainRewardSpl[5]
|
||||
Var ClearGel4mlRemain = RemainRewardSpl[6]
|
||||
|
||||
INT SuperSetRemain
|
||||
INT BalanceEssenceTonerRemain
|
||||
INT CleansingGalRemain
|
||||
INT TumbleBottleRemain
|
||||
INT ClearGelRemain
|
||||
INT E_GiftCard100BathRemain
|
||||
INT ClearGel4mlRemain
|
||||
|
||||
Var SumNamHomCoconutRemainReward = SuperSetRemain
|
||||
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
|
||||
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
|
||||
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
|
||||
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGelRemain
|
||||
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + E_GiftCard100BathRemain
|
||||
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGel4mlRemain
|
||||
|
||||
If ShouldShowNamHomCoconutRemainReward = 1 Then
|
||||
Var ShowNamHomCoconutRemainReward = "Enable"
|
||||
EndIf
|
||||
|
||||
;DEBUG
|
||||
;Var SumNamHomCoconutRemainReward = 200
|
||||
|
||||
If SumNamHomCoconutRemainReward > 500 Then
|
||||
Var ShowNamHomCoconutRemainReward = "Invisible"
|
||||
Else
|
||||
If SumNamHomCoconutRemainReward = 0 Then
|
||||
SAVELOG "NamHomCoconutPro: All reward out of stock"
|
||||
|
||||
WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var NamHomCoconutRemainReward = SumNamHomCoconutRemainReward
|
||||
DEBUGVAR NamHomCoconutRemainReward
|
||||
Var GetNamHomCoconutRemainRewardLastTime = SystemTimeMinuteInt
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
</EventActionOk>
|
||||
|
||||
<EventActionError>
|
||||
If GetNamHomCoconutRemainReward = 1 Then
|
||||
SAVELOG "Get Nam hom coconut remain reward requet error."
|
||||
EndIf
|
||||
|
||||
</EventActionError>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
|
@ -1685,6 +1644,9 @@ PRICE "Reset" "-"
|
|||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
DEBUGVAR ProfileIndex[11]
|
||||
DEBUGVAR ProfileIndex[12]
|
||||
DEBUGVAR ProfileIndex[13]
|
||||
|
||||
PRICE "Reload" "-"
|
||||
</EventUnitTest3>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue