diff --git a/image/event/jemila/jemila_en.png b/image/event/jemila/jemila_en.png new file mode 100644 index 00000000..0b604797 Binary files /dev/null and b/image/event/jemila/jemila_en.png differ diff --git a/image/event/jemila/jemila_prize_out_of_stock_en.png b/image/event/jemila/jemila_prize_out_of_stock_en.png new file mode 100644 index 00000000..308ee504 Binary files /dev/null and b/image/event/jemila/jemila_prize_out_of_stock_en.png differ diff --git a/image/event/jemila/jemila_prize_out_of_stock_th.png b/image/event/jemila/jemila_prize_out_of_stock_th.png new file mode 100644 index 00000000..48fcb5a8 Binary files /dev/null and b/image/event/jemila/jemila_prize_out_of_stock_th.png differ diff --git a/image/event/jemila/jemila.png b/image/event/jemila/jemila_th.png similarity index 100% rename from image/event/jemila/jemila.png rename to image/event/jemila/jemila_th.png diff --git a/xml/event/promotion_jemila.xml b/xml/event/promotion_jemila.xml index 6b491cf2..cd7af1b0 100644 --- a/xml/event/promotion_jemila.xml +++ b/xml/event/promotion_jemila.xml @@ -12812,43 +12812,61 @@ LIMENADE SODA" BigButtonEnable - eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/jemila/jemila.png" + eval( + If JemilaRewardOutOfStock = 1 Then + Var return = "ROOT/taobin_project/image/event/jemila/jemila_prize_out_of_stock" Else - Var return = "ROOT/taobin_project/image/event/jemila/jemila.png" + Var return = "ROOT/taobin_project/image/event/jemila/jemila" + EndIf + + If show_eng = "true" Then + Var return = return + "_en.png" + Else + Var return = return + "_th.png" EndIf ) - - eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/jemila/jemila.png" + + eval( + If JemilaRewardOutOfStock = 1 Then + Var return = "ROOT/taobin_project/image/event/jemila/jemila_prize_out_of_stock" Else - Var return = "ROOT/taobin_project/image/event/jemila/jemila.png" + Var return = "ROOT/taobin_project/image/event/jemila/jemila" + EndIf + + If show_eng = "true" Then + Var return = return + "_en.png" + Else + Var return = return + "_th.png" EndIf ) - - eval( - If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/jemila/jemila.png" + + eval( + If JemilaRewardOutOfStock = 1 Then + Var return = "ROOT/taobin_project/image/event/jemila/jemila_prize_out_of_stock" Else - Var return = "ROOT/taobin_project/image/event/jemila/jemila.png" + Var return = "ROOT/taobin_project/image/event/jemila/jemila" + EndIf + + If show_eng = "true" Then + Var return = return + "_en.png" + Else + Var return = return + "_th.png" EndIf ) - + Open "ROOT/taobin_project/xml/page_catalog_group_pro_jemila.xml" - + - Var BigButtonEnable = "Enable" + Var BigButtonEnable = "Enable" Refresh diff --git a/xml/event/promotion_template2.inc b/xml/event/promotion_template2.inc index 68db40ca..9e42c025 100644 --- a/xml/event/promotion_template2.inc +++ b/xml/event/promotion_template2.inc @@ -5,42 +5,60 @@ BigButtonEnable - eval( - If show_eng = "true" Then - Var return = ###normal_eng + eval( + If JemilaRewardOutOfStock = 1 Then + Var return = "ROOT/taobin_project/image/event/jemila/jemila_prize_out_of_stock" Else - Var return = ###normal_thai + Var return = "ROOT/taobin_project/image/event/jemila/jemila" + EndIf + + If show_eng = "true" Then + Var return = return + "_en.png" + Else + Var return = return + "_th.png" EndIf ) - - eval( - If show_eng = "true" Then - Var return = ###normal_eng + + eval( + If JemilaRewardOutOfStock = 1 Then + Var return = "ROOT/taobin_project/image/event/jemila/jemila_prize_out_of_stock" Else - Var return = ###normal_thai + Var return = "ROOT/taobin_project/image/event/jemila/jemila" + EndIf + + If show_eng = "true" Then + Var return = return + "_en.png" + Else + Var return = return + "_th.png" EndIf ) - - eval( - If show_eng = "true" Then - Var return = ###normal_eng + + eval( + If JemilaRewardOutOfStock = 1 Then + Var return = "ROOT/taobin_project/image/event/jemila/jemila_prize_out_of_stock" Else - Var return = ###normal_thai + Var return = "ROOT/taobin_project/image/event/jemila/jemila" + EndIf + + If show_eng = "true" Then + Var return = return + "_en.png" + Else + Var return = return + "_th.png" EndIf ) - + ###EventOnClick - + - Var BigButtonEnable = "Enable" + Var BigButtonEnable = "Enable" Refresh diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index f099f888..c0d69f87 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -131,6 +131,8 @@ Var FromRobinsonBeautyPro = 0 ; Enable Jemila promotion, 1 - 18 Oct Var JemilaPro = 0 +Var FromJemilaPro = 0 +Var JemilaRewardOutOfStock = 0 Var NewCollectPoint = 1 Var PayMentCodeShouldCollectPromotionPoint = 0 @@ -377,8 +379,10 @@ EndIf Var CurrentMainVideoTemp = 0 -DEBUGVAR FreePowerup +; Check reward out of stock +READ_FILE "/mnt/sdcard/coffeevending/jemila_reward_out_of_stock" JemilaRewardOutOfStock +DEBUGVAR JemilaRewardOutOfStock ; Control collect promotion point behavior diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 21a2067e..e6caaacf 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -11,8 +11,8 @@ ; jump If IgnoreCollectPointByMe = 1 Then Var IgnoreCollectPointByMe = 0 - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf If Seeker.CodeChannel = 1 Then If Seeker.CollectPointMain = 0 Then @@ -20,10 +20,10 @@ Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf EndIf - + If SettingIgnoreCollectPoint = 1 Then - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf Var ShowErrorText = "Invisible" @@ -35,7 +35,7 @@ Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collect_point1_en" ;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" @@ -74,7 +74,7 @@ Var CampaingRef1 = "" Var CampaingRef2 = "" - + SUBSTRING CampaingRef 0 6 CampaingRef1 SUBSTRING CampaingRef 12 18 CampaingRef2 @@ -124,20 +124,21 @@ Var PepweenCollectPoint = 0 EndIf EndIf - + DEBUGVAR NotCollectPointPromotion DEBUGVAR RobinsonBeautyPro DEBUGVAR FromRobinsonBeautyPro DEBUGVAR JemilaPro DEBUGVAR FromJemilaPro - + DEBUGVAR JemilaRewardOutOfStock + If Seeker.TNumberTaobinCredit = "" Then - + If web_telnumOK = "" Then - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -148,7 +149,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -168,10 +169,10 @@ AddData 45 TelPhoneNum drink_price param2 param3 EndIf - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP If NotCollectPointPromotion = 0 Then @@ -191,21 +192,25 @@ If JemilaPro = 1 Then If FromJemilaPro = 1 Then - If Seeker.CodeChannel = 1 Then - If Seeker.CollectPointPromotion = 1 Then - GETACCEXT TelephoneNumber 40 - Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" - EndIf + If JemilaRewardOutOfStock = 1 Then + SAVELOG "Jemila prize out of stock skip collect promotion point." Else - GETACCEXT TelephoneNumber 40 - Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointPromotion = 1 Then + GETACCEXT TelephoneNumber 40 + Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + EndIf + Else + GETACCEXT TelephoneNumber 40 + Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + EndIf EndIf EndIf EndIf EndIf GETACCEXT Param1 23 - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" EndIf Else @@ -223,7 +228,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -233,10 +238,10 @@ Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber DEBUGVAR PepweenCollectPoint - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP If NotCollectPointPromotion = 0 Then @@ -256,22 +261,26 @@ If JemilaPro = 1 Then If FromJemilaPro = 1 Then - If Seeker.CodeChannel = 1 Then - If Seeker.CollectPointPromotion = 1 Then - GETACCEXT TelephoneNumber 40 - Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" - EndIf - Else - GETACCEXT TelephoneNumber 40 - Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" - EndIf + If JemilaRewardOutOfStock = 1 Then + SAVELOG "Jemila prize out of stock skip collect promotion point." + Else + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointPromotion = 0 Then + GETACCEXT TelephoneNumber 40 + Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + EndIf + Else + GETACCEXT TelephoneNumber 40 + Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml" + EndIf + EndIf EndIf EndIf EndIf GETACCEXT Param1 23 - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" EndIf @@ -279,24 +288,24 @@ 1000 - + Var CountDownBrewing = BREW_CNT - + Var ShowCountDownBrewing = CountDownBrewing - + StrLen TelephoneNumber TelNumLen If TelNumLen > 0 Then Var ShowTextNumber = "Invisible" - + Else ; Add Var TimeOutPlay = TimeOutPlay + 1 If TimeOutPlay > 10 Then Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -305,17 +314,17 @@ ; EndIf - + DEBUGVAR Timeout Var Timeout = Timeout + 1 If Timeout > 30 Then SAVELOG "collect_point1-p107." - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf If Timeout = 18 Then @@ -333,7 +342,7 @@ Refresh TimerReset - + @@ -359,13 +368,13 @@ "ROOT/taobin_project/image/collectiing/bp_1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "1" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -375,9 +384,9 @@ TimerReset Refresh - - + + @@ -389,13 +398,13 @@ "ROOT/taobin_project/image/collectiing/bp_2.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "2" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -414,13 +423,13 @@ "ROOT/taobin_project/image/collectiing/bp_3.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "3" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -439,13 +448,13 @@ "ROOT/taobin_project/image/collectiing/bp_4.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "4" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -464,13 +473,13 @@ "ROOT/taobin_project/image/collectiing/bp_5.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "5" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -489,13 +498,13 @@ "ROOT/taobin_project/image/collectiing/bp_6.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "6" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -514,13 +523,13 @@ "ROOT/taobin_project/image/collectiing/bp_7.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "7" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -539,13 +548,13 @@ "ROOT/taobin_project/image/collectiing/bp_8.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "8" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -564,13 +573,13 @@ "ROOT/taobin_project/image/collectiing/bp_9.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "9" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -579,7 +588,7 @@ TimerReset Refresh - + @@ -590,13 +599,13 @@ "ROOT/taobin_project/image/collectiing/bp_0.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -615,24 +624,24 @@ "ROOT/taobin_project/image/collectiing/bp_back-1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Trim TelephoneNumber -1 StrLen TelephoneNumber TelNumLen - If TelNumLen < 10 Then + If TelNumLen < 10 Then Var Tel_Confirm_State = "Invisible" EndIf - - - If TelNumLen = 0 Then + + + If TelNumLen = 0 Then Var ShowTextNumber = "Enable" EndIf TimerReset Refresh - + @@ -656,11 +665,11 @@ Var( DirImage + "/bp_negative.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + ; goto lid straw - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" SAVELOG "collect_point1-p589." - + If LuckyDrawCampaign = 1 Then Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Else @@ -679,9 +688,9 @@ Var( DirImage + "/bn_positive.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + + - If Tel_Confirm_Flag = 1 Then @@ -696,7 +705,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -715,17 +724,17 @@ AddData 45 TelPhoneNum drink_price param2 param3 EndIf - + If ChildrenFree = 1 Then Var Seeker.TNumberTaobinMember = TelephoneNumber - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf - - Var Param1 = TelephoneNumber + "/" + + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP DEBUGVAR FruityRayaEnable @@ -756,7 +765,7 @@ If MyMintEnable = 1 Then If FromMyMintPro = 1 Then GETACCEXT TelephoneNumber 32 - Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" + Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml" EndIf EndIf @@ -821,12 +830,12 @@ EndIf GETACCEXT Param1 23 - ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" - Else + Else - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/collectiing_en" Else Var DirImage2 = "ROOT/taobin_project/image/collectiing" @@ -839,7 +848,7 @@ Var Tel_Confirm_State = "Invisible" Refresh - + EndIf @@ -930,11 +939,11 @@ ShowErrorText text_show_error - - - - Open "/media/bt/xml/security_alarm.xml" + + + + Open "/media/bt/xml/security_alarm.xml" If MachineStage = "drink-success" Then