diff --git a/image/collectiing_mmr/bn_close.png b/image/collectiing_mmr/bn_close.png index 74a26717..b37bd7ca 100644 Binary files a/image/collectiing_mmr/bn_close.png and b/image/collectiing_mmr/bn_close.png differ diff --git a/image/collectiing_mmr/bn_door_open2.png b/image/collectiing_mmr/bn_door_open2.png index 72d35539..c59d1d44 100644 Binary files a/image/collectiing_mmr/bn_door_open2.png and b/image/collectiing_mmr/bn_door_open2.png differ diff --git a/image/collectiing_mmr/bn_recieve_coupon.png b/image/collectiing_mmr/bn_recieve_coupon.png index e61de3a1..4cc1aa36 100644 Binary files a/image/collectiing_mmr/bn_recieve_coupon.png and b/image/collectiing_mmr/bn_recieve_coupon.png differ diff --git a/image/collectiing_mmr/bp_close.png b/image/collectiing_mmr/bp_close.png index 60a3529a..73c8994d 100644 Binary files a/image/collectiing_mmr/bp_close.png and b/image/collectiing_mmr/bp_close.png differ diff --git a/image/collectiing_mmr/bp_recieve_coupon.png b/image/collectiing_mmr/bp_recieve_coupon.png index 6f477a08..98070f3c 100644 Binary files a/image/collectiing_mmr/bp_recieve_coupon.png and b/image/collectiing_mmr/bp_recieve_coupon.png differ diff --git a/image/collectiing_mmr/text23.png b/image/collectiing_mmr/text23.png index 14f6781e..baf2a383 100644 Binary files a/image/collectiing_mmr/text23.png and b/image/collectiing_mmr/text23.png differ diff --git a/image/collectiing_mmr/text_24.png b/image/collectiing_mmr/text_24.png index bc369ca3..7aea9f70 100644 Binary files a/image/collectiing_mmr/text_24.png and b/image/collectiing_mmr/text_24.png differ diff --git a/image/event/lucky_draw_ads/bn_interested_mmr.png b/image/event/lucky_draw_ads/bn_interested_mmr.png new file mode 100644 index 00000000..1de8c25d Binary files /dev/null and b/image/event/lucky_draw_ads/bn_interested_mmr.png differ diff --git a/image/event/lucky_draw_ads/bn_skip_mmr.png b/image/event/lucky_draw_ads/bn_skip_mmr.png new file mode 100644 index 00000000..a53d8b92 Binary files /dev/null and b/image/event/lucky_draw_ads/bn_skip_mmr.png differ diff --git a/image/event/lucky_draw_ads/bp_interested_mmr.png b/image/event/lucky_draw_ads/bp_interested_mmr.png new file mode 100644 index 00000000..076ec31d Binary files /dev/null and b/image/event/lucky_draw_ads/bp_interested_mmr.png differ diff --git a/image/event/lucky_draw_ads/bp_skip_mmr.png b/image/event/lucky_draw_ads/bp_skip_mmr.png new file mode 100644 index 00000000..260ff13a Binary files /dev/null and b/image/event/lucky_draw_ads/bp_skip_mmr.png differ diff --git a/image/event/lucky_draw_ads/text_mmr.png b/image/event/lucky_draw_ads/text_mmr.png new file mode 100644 index 00000000..2b4cbf23 Binary files /dev/null and b/image/event/lucky_draw_ads/text_mmr.png differ diff --git a/image/page_thankyou_mmr/imgGetChange-HKG.png b/image/page_thankyou_mmr/imgGetChange-HKG.png new file mode 100644 index 00000000..38c9c54f Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange-HKG.png differ diff --git a/image/page_thankyou_mmr/imgGetChange-IDR.png b/image/page_thankyou_mmr/imgGetChange-IDR.png new file mode 100644 index 00000000..091afc5d Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange-IDR.png differ diff --git a/image/page_thankyou_mmr/imgGetChange-MYR.png b/image/page_thankyou_mmr/imgGetChange-MYR.png new file mode 100644 index 00000000..95d41603 Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange-MYR.png differ diff --git a/image/page_thankyou_mmr/imgGetChange-SGP.png b/image/page_thankyou_mmr/imgGetChange-SGP.png new file mode 100644 index 00000000..8969cd56 Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange-SGP.png differ diff --git a/image/page_thankyou_mmr/imgGetChange-UAE_DUBAI.png b/image/page_thankyou_mmr/imgGetChange-UAE_DUBAI.png new file mode 100644 index 00000000..4847b475 Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange-UAE_DUBAI.png differ diff --git a/image/page_thankyou_mmr/imgGetChange.png b/image/page_thankyou_mmr/imgGetChange.png new file mode 100644 index 00000000..305b281a Binary files /dev/null and b/image/page_thankyou_mmr/imgGetChange.png differ diff --git a/image/page_thankyou_mmr/remainCredit-AUD.png b/image/page_thankyou_mmr/remainCredit-AUD.png new file mode 100644 index 00000000..be8feee5 Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit-AUD.png differ diff --git a/image/page_thankyou_mmr/remainCredit-HKG.png b/image/page_thankyou_mmr/remainCredit-HKG.png new file mode 100644 index 00000000..9c457c24 Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit-HKG.png differ diff --git a/image/page_thankyou_mmr/remainCredit-IDR.png b/image/page_thankyou_mmr/remainCredit-IDR.png new file mode 100644 index 00000000..bee24114 Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit-IDR.png differ diff --git a/image/page_thankyou_mmr/remainCredit-MYR.png b/image/page_thankyou_mmr/remainCredit-MYR.png new file mode 100644 index 00000000..80bab56a Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit-MYR.png differ diff --git a/image/page_thankyou_mmr/remainCredit-SGP.png b/image/page_thankyou_mmr/remainCredit-SGP.png new file mode 100644 index 00000000..5f98fa33 Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit-SGP.png differ diff --git a/image/page_thankyou_mmr/remainCredit-UAE_DUBAI.png b/image/page_thankyou_mmr/remainCredit-UAE_DUBAI.png new file mode 100644 index 00000000..434c3dcb Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit-UAE_DUBAI.png differ diff --git a/image/page_thankyou_mmr/remainCredit.png b/image/page_thankyou_mmr/remainCredit.png new file mode 100644 index 00000000..1ae3199f Binary files /dev/null and b/image/page_thankyou_mmr/remainCredit.png differ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 19477637..0de278b8 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -387,8 +387,8 @@ If BoxID = 201729 Then Var MomCocoaPro = 0 Var MomCocoaProDiscountEnable = 0 Var RobinsonBeautyPro = 0 - Var JemilaPro = 0 - Var JemilaToppingFlag = 0 + Var JemilaToppingFlag = 1 + Var JemilaToppingFreeFlag = 1 Var 12Day12MenuPro = 0 diff --git a/xml/page_board.xml b/xml/page_board.xml index c87c5ee6..5bdcc77e 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1117,6 +1117,9 @@ If EnableMultiInstance = "true" Then If CountryName = "Thailand" Then + ; test payment + Var New_Payment = 1 + Var InternationalEnable = 1 DEBUGVAR InternationalEnable @@ -1135,7 +1138,7 @@ Var ENABLE_UAE_DUBAI = "Invisible" EnableLanguage "ENG" EnableLanguage "THAI" - EnableLanguage "MYANMAR" + ;EnableLanguage "MYANMAR" If MyanmarLangEnable = "true" Then EnableLanguage "MYANMAR" @@ -1154,6 +1157,7 @@ Var ShowButtonClick2 = "Invisible" Var ButtontoTopupMenu = "Enable" + Var CurrentPageShowError = 0 Var PriceUnitText = "" diff --git a/xml/page_drinkfail2-2.xml b/xml/page_drinkfail2-2.xml index 95dc5b2b..fcb05546 100644 --- a/xml/page_drinkfail2-2.xml +++ b/xml/page_drinkfail2-2.xml @@ -17,6 +17,10 @@ Var DirImage = "ROOT/taobin_project/image/collectiing/" EndIf + If LanguageShow = "MYANMAR" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" + EndIf + Var Timeout = 0 StopLongPlay diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 0ac289b6..1e7e72df 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -8,6 +8,8 @@ ; On open + RootLayoutVisible 3 "hide" + Var Seeker.TNumberTaobinMember = "" diff --git a/xml/page_drinkfail4.xml b/xml/page_drinkfail4.xml index 1db17cf0..92b3e3b6 100644 --- a/xml/page_drinkfail4.xml +++ b/xml/page_drinkfail4.xml @@ -17,6 +17,10 @@ Var DirImage = "ROOT/taobin_project/image/collectiing/" EndIf + If LanguageShow = "MYANMAR" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" + EndIf + Var Timeout = 0 Var GetFreeFlag = 0 diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index 273eff0e..46c210b6 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -803,12 +803,12 @@ ; Member not found If ErrorCause = "failed_fromoper_1001" Then - Var QRErrorText = "Member cannot be found" + Var QRErrorText = "Number not found" EndIf ; Not enough balance If ErrorCause = "failed_fromoper_1002" Then - Var QRErrorText = "Not having enough\nbalance" + Var QRErrorText = "Insufficient Balance" EndIf Var QR_POPUP = "/img_popup8-2.png" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index c5a86cdf..4510c5f7 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1233,10 +1233,11 @@ Var PayState2 = "Disable" EndIf - Var PayState2 = "Enable" - Var PayState3 = "Enable" - Var PayState4 = "Enable" - Var PayState5 = "Enable" + ;for test + ;Var PayState2 = "Enable" + ;Var PayState3 = "Enable" + ;Var PayState4 = "Enable" + ;Var PayState5 = "Enable" diff --git a/xml/page_show_error.lxml b/xml/page_show_error.lxml index de092e6c..2cd1f176 100644 --- a/xml/page_show_error.lxml +++ b/xml/page_show_error.lxml @@ -18,6 +18,11 @@ Var countClick = 0 Var countClick2 = 0 + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + Var CurrentPageShowError = 1 + EndIf + EndIf DEBUGVAR MachineStage DEBUGVAR stop_now @@ -198,7 +203,7 @@ Function 2 - Refresh + RefreshAll diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 8e4c25ce..49f4b12b 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -69,6 +69,13 @@ Var DirImage = "ROOT/taobin_project/image/page_thankyou" EndIf + If LanguageShow = "MYANMAR" Then + + Var BottomText = PicturePath + "text_bottom_eng.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_en" + EndIf + DEBUGVAR StarwState DEBUGVAR LidState DEBUGVAR BottomText diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index feb4d7f7..590d2cfd 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -48,6 +48,13 @@ Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf + If LanguageShow = "MYANMAR" Then + + Var BottomText = PicturePath + "text_bottom_eng.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" + EndIf + ;DEBUGVAR StarwState ;DEBUGVAR LidState DEBUGVAR BottomText @@ -108,6 +115,10 @@ Var DirImage2 = "ROOT/taobin_project/image/complete/" EndIf + If LanguageShow = "MYANMAR" Then + Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/" + EndIf + Var txtDrinkOKState = "Invisible" Var buttonRemoveCup = "Invisible" @@ -282,12 +293,25 @@ Else Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" EndIf +<<<<<<< HEAD Else +======= + If LanguageShow = "MYANMAR" Then + Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" + EndIf + Else +>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717 If CupChecking = "true" Then If show_eng = "true" Then Var MachineErrorDetailAll = " Please take a cup." Else Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" +<<<<<<< HEAD +======= + EndIf + If LanguageShow = "MYANMAR" Then + Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" +>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717 EndIf Else If show_eng = "true" Then @@ -295,6 +319,9 @@ Else Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ" EndIf + If LanguageShow = "MYANMAR" Then + Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" + EndIf EndIf EndIf diff --git a/xml/page_thankyouMore.xml b/xml/page_thankyouMore.xml index ed979da2..82bef9bc 100644 --- a/xml/page_thankyouMore.xml +++ b/xml/page_thankyouMore.xml @@ -39,6 +39,13 @@ Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf + If LanguageShow = "MYANMAR" Then + + Var BottomText = PicturePath + "text_bottom_eng.png" + + Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" + EndIf + DEBUGVAR StarwState DEBUGVAR LidState DEBUGVAR BottomText diff --git a/xml/topview2.xml b/xml/topview2.xml index 54859dc4..bf077006 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -219,17 +219,21 @@ DEBUGVAR BrewCommand Var BrewCommand = "-" If EnableMultiInstance = "true" Then - InstanceOverSetString "RefreshNow" 5 - InstanceOverSetString "RefreshNow" 6 - InstanceOverSetString "RefreshNow" 7 - InstanceOverSetString "RefreshNow" 8 - InstanceOverSetString "RefreshNow" 9 - InstanceOverSetString "RefreshNow" 10 - InstanceOverSetString "RefreshNow" 11 - ; TODO + If CurrentPageShowError = 1 Then + ;do not thing + Else + InstanceOverSetString "RefreshNow" 5 + InstanceOverSetString "RefreshNow" 6 + InstanceOverSetString "RefreshNow" 7 + InstanceOverSetString "RefreshNow" 8 + InstanceOverSetString "RefreshNow" 9 + InstanceOverSetString "RefreshNow" 10 + InstanceOverSetString "RefreshNow" 11 + ; TODO - ; Trick Refresh First - Var SlientRefreshIndex = 2 + ; Trick Refresh First + Var SlientRefreshIndex = 2 + EndIf EndIf If Not#CountDownForMulti = 99 Then