diff --git a/inter/aus/image/collect_point/redeem/close_btn.png b/inter/aus/image/collect_point/redeem/close_btn.png new file mode 100644 index 00000000..a8ba998c Binary files /dev/null and b/inter/aus/image/collect_point/redeem/close_btn.png differ diff --git a/inter/aus/image/collect_point/redeem/close_btn_pressed.png b/inter/aus/image/collect_point/redeem/close_btn_pressed.png new file mode 100644 index 00000000..bc9591e5 Binary files /dev/null and b/inter/aus/image/collect_point/redeem/close_btn_pressed.png differ diff --git a/inter/aus/image/collect_point/redeem/fail_header_bg.png b/inter/aus/image/collect_point/redeem/fail_header_bg.png new file mode 100644 index 00000000..b70f3522 Binary files /dev/null and b/inter/aus/image/collect_point/redeem/fail_header_bg.png differ diff --git a/inter/aus/image/collect_point/redeem/header_bg.png b/inter/aus/image/collect_point/redeem/header_bg.png new file mode 100644 index 00000000..80ee4400 Binary files /dev/null and b/inter/aus/image/collect_point/redeem/header_bg.png differ diff --git a/inter/aus/image/collect_point/redeem/redeem_get_free_content.png b/inter/aus/image/collect_point/redeem/redeem_get_free_content.png index 9ff49f7b..81386175 100644 Binary files a/inter/aus/image/collect_point/redeem/redeem_get_free_content.png and b/inter/aus/image/collect_point/redeem/redeem_get_free_content.png differ diff --git a/inter/aus/image/collect_point/redeem/redemption_bg.png b/inter/aus/image/collect_point/redeem/redemption_bg.png new file mode 100644 index 00000000..78029f45 Binary files /dev/null and b/inter/aus/image/collect_point/redeem/redemption_bg.png differ diff --git a/inter/aus/image/collect_point/show_point/member-profile-bg.png b/inter/aus/image/collect_point/show_point/member-profile-bg.png index 68d5a117..4dedbf3b 100644 Binary files a/inter/aus/image/collect_point/show_point/member-profile-bg.png and b/inter/aus/image/collect_point/show_point/member-profile-bg.png differ diff --git a/inter/aus/image/collect_point/show_point/shell_discount_1dollar_active_new.png b/inter/aus/image/collect_point/show_point/shell_discount_1dollar_active_new.png new file mode 100644 index 00000000..c46b0181 Binary files /dev/null and b/inter/aus/image/collect_point/show_point/shell_discount_1dollar_active_new.png differ diff --git a/inter/aus/image/collect_point/show_point/shell_discount_2dollar_active_new.png b/inter/aus/image/collect_point/show_point/shell_discount_2dollar_active_new.png new file mode 100644 index 00000000..9970131d Binary files /dev/null and b/inter/aus/image/collect_point/show_point/shell_discount_2dollar_active_new.png differ diff --git a/inter/aus/image/collect_point/show_point/shell_new.png b/inter/aus/image/collect_point/show_point/shell_new.png new file mode 100644 index 00000000..27d58c7e Binary files /dev/null and b/inter/aus/image/collect_point/show_point/shell_new.png differ diff --git a/inter/aus/image/collect_point/show_point/taoLevel1.png b/inter/aus/image/collect_point/show_point/taoLevel1.png new file mode 100644 index 00000000..7af8efac Binary files /dev/null and b/inter/aus/image/collect_point/show_point/taoLevel1.png differ diff --git a/inter/aus/image/collect_point/show_point/taoLevel2.png b/inter/aus/image/collect_point/show_point/taoLevel2.png new file mode 100644 index 00000000..798da06a Binary files /dev/null and b/inter/aus/image/collect_point/show_point/taoLevel2.png differ diff --git a/inter/aus/image/collect_point/show_point/taoLevel3.png b/inter/aus/image/collect_point/show_point/taoLevel3.png new file mode 100644 index 00000000..9fe73578 Binary files /dev/null and b/inter/aus/image/collect_point/show_point/taoLevel3.png differ diff --git a/inter/aus/image/collect_point/show_point/taoLevel4.png b/inter/aus/image/collect_point/show_point/taoLevel4.png new file mode 100644 index 00000000..60c2f867 Binary files /dev/null and b/inter/aus/image/collect_point/show_point/taoLevel4.png differ diff --git a/inter/aus/xml/event/tricker.ev b/inter/aus/xml/event/tricker.ev index a75d3318..9d13c958 100644 --- a/inter/aus/xml/event/tricker.ev +++ b/inter/aus/xml/event/tricker.ev @@ -6,6 +6,8 @@ ; Reset flag away. +Var NewCollectPointFlag = 0 + Var WinterWarmersCatalogFlag = 1 diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index 9c8e9aeb..54c0c665 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -1110,7 +1110,25 @@ If AddData = 1 Then - Var Cid = 26 + Var Cid = 26 + + If NewCollectPointFlag = 1 Then + Var redeemSeeker = "curr-redeem" + + If redeemSeeker.redeem2Dollar = 1 Then + ; TODO: Var Cid = + EndIf + + If redeemSeeker.redeem1Dollar = 1 Then + ; TODO: Var Cid = + EndIf + + ; reset + Var redeemSeeker.phoneNumber = "" + Var redeemSeeker.redeem2Dollar = 0 + Var redeemSeeker.redeem1Dollar = 0 + EndIf + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf @@ -1215,6 +1233,22 @@ If AddData = 1 Then Var Cid = 26 + If NewCollectPointFlag = 1 Then + Var redeemSeeker = "curr-redeem" + + If redeemSeeker.redeem2Dollar = 1 Then + ; TODO: Var Cid = + EndIf + + If redeemSeeker.redeem1Dollar = 1 Then + ; TODO: Var Cid = + EndIf + + ; reset + Var redeemSeeker.phoneNumber = "" + Var redeemSeeker.redeem2Dollar = 0 + Var redeemSeeker.redeem1Dollar = 0 + EndIf AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf diff --git a/inter/aus/xml/page_collect_point_3.lxml b/inter/aus/xml/page_collect_point_3.lxml index a73803ab..d6075bd3 100644 --- a/inter/aus/xml/page_collect_point_3.lxml +++ b/inter/aus/xml/page_collect_point_3.lxml @@ -19,55 +19,23 @@ ;AddData 4 TelephoneNumber BmiYear PointCrm GetScore ;Add after pay - Var PointMaskState = "Invisible" - Var CoffeePointStr = CoffeePoint DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumberX + Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/show_point" + If show_eng = "true" 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 IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" - Else - Var DirImage = "ROOT/taobin_project/image/display_point" - Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" - Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf - - Var CoffeePointTmp = CoffeePoint - If CoffeePoint > 29 Then - Var Timeout = 18 - Var CoffeePointTmp = 30 - EndIf - - - - Var pImage = CoffeePointTmp * 20 - Var pImage = pImage / 30 - Var pImageStr = "/taobinPoint.png" - - Var pImageStr = "ROOT/taobin_project/image/display_point" + pImageStr - - Var pointStr = "" - Var pointStr = pointStr + CoffeePointTmp - Var pointStr = pointStr + "/" - Var pointStr = pointStr + "30" - - - ;Var PointDiff = 150 - CoffeePointRank Var PointDiff = 0 - - - - - + Var redeemButtonState = "Disable" + Var RedeemType = "" Var TaobinExpireDay = "" Var TaobinExpireMonth = "" @@ -161,9 +129,13 @@ - Var TaobinLevelDesc3 = "You have coupons " - Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons - Var TaobinLevelDesc3 = TaobinLevelDesc3 + " numbers" + Var shellExpireDescription = "• Shell expire in 3 months." + Var shellExpireDescriptionSub = ": collect before " + ExpireStrTmp + Var shellExpireDescriptionSub = shellExpireDescriptionSub + " for a free drink" + + Var couponDescription = "• " + TaobinCoupons + Var couponDescription = couponDescription + " coupons" + Var couponDescriptionSub = "are available for you, view coupons at Reward point" If TaobinLevel = "1" Then Var TaobinLevelDesc1 = "Shy turtle level" @@ -220,8 +192,7 @@ Var TaobinLeveImg = "/taoLevel4.png" EndIf - - Var CheckCoupons = 0 + Var MakeDrinkState = 0 @@ -234,7 +205,9 @@ Var taobinP7 = "Invisible" Var taobinP8 = "Invisible" Var taobinP9 = "Invisible" - Var taobinP10 = "Invisible" + + Var taobinP10 = "Enable" + Var taobinP11 = "Invisible" Var taobinP12 = "Invisible" Var taobinP13 = "Invisible" @@ -244,7 +217,9 @@ Var taobinP17 = "Invisible" Var taobinP18 = "Invisible" Var taobinP19 = "Invisible" - Var taobinP20 = "Invisible" + + Var taobinP20 = "Enable" + Var taobinP21 = "Invisible" Var taobinP22 = "Invisible" Var taobinP23 = "Invisible" @@ -256,148 +231,247 @@ Var taobinP29 = "Invisible" Var taobinP30 = "Invisible" - Var taobinImgP1 = "/taobinPN.png" - Var taobinImgP2 = "/taobinPN.png" - Var taobinImgP3 = "/taobinPN.png" - Var taobinImgP4 = "/taobinPN.png" - Var taobinImgP5 = "/taobinPN.png" - Var taobinImgP6 = "/taobinPN.png" - Var taobinImgP7 = "/taobinPN.png" - Var taobinImgP8 = "/taobinPN.png" - Var taobinImgP9 = "/taobinPN.png" - Var taobinImgP10 = "/taobinPN.png" - Var taobinImgP11 = "/taobinPN.png" - Var taobinImgP12 = "/taobinPN.png" - Var taobinImgP13 = "/taobinPN.png" - Var taobinImgP14 = "/taobinPN.png" - Var taobinImgP15 = "/taobinPN.png" - Var taobinImgP16 = "/taobinPN.png" - Var taobinImgP17 = "/taobinPN.png" - Var taobinImgP18 = "/taobinPN.png" - Var taobinImgP19 = "/taobinPN.png" - Var taobinImgP20 = "/taobinPN.png" - Var taobinImgP21 = "/taobinPN.png" - Var taobinImgP22 = "/taobinPN.png" - Var taobinImgP23 = "/taobinPN.png" - Var taobinImgP24 = "/taobinPN.png" - Var taobinImgP25 = "/taobinPN.png" - Var taobinImgP26 = "/taobinPN.png" - Var taobinImgP27 = "/taobinPN.png" - Var taobinImgP28 = "/taobinPN.png" - Var taobinImgP29 = "/taobinPN.png" - Var taobinImgP30 = "/taobinPN.png" + Var taobinImgP1 = "/shell_new.png" + Var taobinImgP2 = "/shell_new.png" + Var taobinImgP3 = "/shell_new.png" + Var taobinImgP4 = "/shell_new.png" + Var taobinImgP5 = "/shell_new.png" + Var taobinImgP6 = "/shell_new.png" + Var taobinImgP7 = "/shell_new.png" + Var taobinImgP8 = "/shell_new.png" + Var taobinImgP9 = "/shell_new.png" + Var taobinImgP10 = "/shell_discount_1dollar_inactive.png" + Var taobinImgP11 = "/shell_new.png" + Var taobinImgP12 = "/shell_new.png" + Var taobinImgP13 = "/shell_new.png" + Var taobinImgP14 = "/shell_new.png" + Var taobinImgP15 = "/shell_new.png" + Var taobinImgP16 = "/shell_new.png" + Var taobinImgP17 = "/shell_new.png" + Var taobinImgP18 = "/shell_new.png" + Var taobinImgP19 = "/shell_new.png" + Var taobinImgP20 = "/shell_discount_2dollar_inactive.png" + Var taobinImgP21 = "/shell_new.png" + Var taobinImgP22 = "/shell_new.png" + Var taobinImgP23 = "/shell_new.png" + Var taobinImgP24 = "/shell_new.png" + Var taobinImgP25 = "/shell_new.png" + Var taobinImgP26 = "/shell_new.png" + Var taobinImgP27 = "/shell_new.png" + Var taobinImgP28 = "/shell_new.png" + Var taobinImgP29 = "/shell_new.png" If CoffeePointOld >= 1 Then - Var taobinImgP1 = "/taobinPO.png" + Var taobinImgP1 = "/shell.png" EndIf If CoffeePointOld >= 2 Then - Var taobinImgP2 = "/taobinPO.png" + Var taobinImgP2 = "/shell.png" EndIf If CoffeePointOld >= 3 Then - Var taobinImgP3 = "/taobinPO.png" + Var taobinImgP3 = "/shell.png" EndIf If CoffeePointOld >= 4 Then - Var taobinImgP4 = "/taobinPO.png" + Var taobinImgP4 = "/shell.png" EndIf If CoffeePointOld >= 5 Then - Var taobinImgP5 = "/taobinPO.png" + Var taobinImgP5 = "/shell.png" EndIf If CoffeePointOld >= 6 Then - Var taobinImgP6 = "/taobinPO.png" + Var taobinImgP6 = "/shell.png" EndIf If CoffeePointOld >= 7 Then - Var taobinImgP7 = "/taobinPO.png" + Var taobinImgP7 = "/shell.png" EndIf If CoffeePointOld >= 8 Then - Var taobinImgP8 = "/taobinPO.png" + Var taobinImgP8 = "/shell.png" EndIf If CoffeePointOld >= 9 Then - Var taobinImgP9 = "/taobinPO.png" - EndIf - If CoffeePointOld >= 10 Then - Var taobinImgP10 = "/taobinPO.png" + Var taobinImgP9 = "/shell.png" EndIf + If CoffeePointOld >= 11 Then - Var taobinImgP11 = "/taobinPO.png" + Var taobinImgP11 = "/shell.png" EndIf If CoffeePointOld >= 12 Then - Var taobinImgP12 = "/taobinPO.png" + Var taobinImgP12 = "/shell.png" EndIf If CoffeePointOld >= 13 Then - Var taobinImgP13 = "/taobinPO.png" + Var taobinImgP13 = "/shell.png" EndIf If CoffeePointOld >= 14 Then - Var taobinImgP14 = "/taobinPO.png" + Var taobinImgP14 = "/shell.png" EndIf If CoffeePointOld >= 15 Then - Var taobinImgP15 = "/taobinPO.png" + Var taobinImgP15 = "/shell.png" EndIf If CoffeePointOld >= 16 Then - Var taobinImgP16 = "/taobinPO.png" + Var taobinImgP16 = "/shell.png" EndIf If CoffeePointOld >= 17 Then - Var taobinImgP17 = "/taobinPO.png" + Var taobinImgP17 = "/shell.png" EndIf If CoffeePointOld >= 18 Then - Var taobinImgP18 = "/taobinPO.png" + Var taobinImgP18 = "/shell.png" EndIf If CoffeePointOld >= 19 Then - Var taobinImgP19 = "/taobinPO.png" - EndIf - If CoffeePointOld >= 20 Then - Var taobinImgP20 = "/taobinPO.png" + Var taobinImgP19 = "/shell.png" EndIf + If CoffeePointOld >= 21 Then - Var taobinImgP21 = "/taobinPO.png" + Var taobinImgP21 = "/shell.png" EndIf If CoffeePointOld >= 22 Then - Var taobinImgP22 = "/taobinPO.png" + Var taobinImgP22 = "/shell.png" EndIf If CoffeePointOld >= 23 Then - Var taobinImgP23 = "/taobinPO.png" + Var taobinImgP23 = "/shell.png" EndIf If CoffeePointOld >= 24 Then - Var taobinImgP24 = "/taobinPO.png" + Var taobinImgP24 = "/shell.png" EndIf If CoffeePointOld >= 25 Then - Var taobinImgP25 = "/taobinPO.png" + Var taobinImgP25 = "/shell.png" EndIf If CoffeePointOld >= 26 Then - Var taobinImgP26 = "/taobinPO.png" + Var taobinImgP26 = "/shell.png" EndIf If CoffeePointOld >= 27 Then - Var taobinImgP27 = "/taobinPO.png" + Var taobinImgP27 = "/shell.png" EndIf If CoffeePointOld >= 28 Then - Var taobinImgP28 = "/taobinPO.png" + Var taobinImgP28 = "/shell.png" EndIf If CoffeePointOld >= 29 Then - Var taobinImgP29 = "/taobinPO.png" - EndIf - If CoffeePointOld >= 30 Then - Var taobinImgP30 = "/taobinPO.png" + Var taobinImgP29 = "/shell.png" EndIf - If Seeker = "curr" Then - Var CheckCouponState = "Enable" - Else - Var CheckCouponState = "Disable" + + If CoffeePoint >= 1 Then + Var taobinP1 = "Enable" EndIf - - - Var PointEndDate = "" - GetDateEndOfMonth PointEndDate - DEBUGVAR PointEndDate - Var xPointEndDate = 570 - - If show_eng = "true" Then - Var xPointEndDate = 618 + If CoffeePoint >= 2 Then + Var taobinP2 = "Enable" + EndIf + If CoffeePoint >= 3 Then + Var taobinP3 = "Enable" + EndIf + If CoffeePoint >= 4 Then + Var taobinP4 = "Enable" + EndIf + If CoffeePoint >= 5 Then + Var taobinP5 = "Enable" + EndIf + If CoffeePoint >= 6 Then + Var taobinP6 = "Enable" + EndIf + If CoffeePoint >= 7 Then + Var taobinP7 = "Enable" + EndIf + If CoffeePoint >= 8 Then + Var taobinP8 = "Enable" + EndIf + If CoffeePoint >= 9 Then + Var taobinP9 = "Enable" + EndIf + If CoffeePoint >= 10 Then + Var taobinP10 = "Enable" + Var redeemButtonState = "Enable" + If CoffeePoint > 19 Then + Var taobinImgP10 = "/shell.png" + Else + If CoffeePointOld >= 10 Then + Var taobinImgP10 = "/shell_discount_1dollar_active.png" + Else + Var taobinImgP10 = "/shell_discount_1dollar_active_new.png" + EndIf + EndIf + EndIf + If CoffeePoint >= 11 Then + Var taobinP11 = "Enable" + EndIf + If CoffeePoint >= 12 Then + Var taobinP12 = "Enable" + EndIf + If CoffeePoint >= 13 Then + Var taobinP13 = "Enable" + EndIf + If CoffeePoint >= 14 Then + Var taobinP14 = "Enable" + EndIf + If CoffeePoint >= 15 Then + Var taobinP15 = "Enable" + EndIf + If CoffeePoint >= 16 Then + Var taobinP16 = "Enable" + EndIf + If CoffeePoint >= 17 Then + Var taobinP17 = "Enable" + EndIf + If CoffeePoint >= 18 Then + Var taobinP18 = "Enable" + EndIf + If CoffeePoint >= 19 Then + Var taobinP19 = "Enable" + EndIf + If CoffeePoint >= 20 Then + Var taobinP20 = "Enable" + If CoffeePoint > 29 Then + Var taobinImgP20 = "/shell.png" + Else + If CoffeePointOld >= 20 Then + Var taobinImgP20 = "/shell_discount_2dollar_active.png" + Else + Var taobinImgP20 = "/shell_discount_2dollar_active_new.png" + EndIf + EndIf + EndIf + If CoffeePoint >= 21 Then + Var taobinP21 = "Enable" + EndIf + If CoffeePoint >= 22 Then + Var taobinP22 = "Enable" + EndIf + If CoffeePoint >= 23 Then + Var taobinP23 = "Enable" + EndIf + If CoffeePoint >= 24 Then + Var taobinP24 = "Enable" + EndIf + If CoffeePoint >= 25 Then + Var taobinP25 = "Enable" + EndIf + If CoffeePoint >= 26 Then + Var taobinP26 = "Enable" + EndIf + If CoffeePoint >= 27 Then + Var taobinP27 = "Enable" + EndIf + If CoffeePoint >= 28 Then + Var taobinP28 = "Enable" + EndIf + If CoffeePoint >= 29 Then + Var taobinP29 = "Enable" + EndIf + If CoffeePoint >= 30 Then + Var taobinP30 = "Enable" + Var taobinImgP30 = "/shell_get_free_active.png" EndIf ;inter-from-consent Var Seeker.FromConsent = 0 + + Var redeemSeeker = "curr-redeem" + If redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember Then + If redeemSeeker.redeem1Dollar = 1 Then + Var redeemButtonState = "Disable" + Else + If redeemSeeker.redeem2Dollar = 1 Then + Var redeemButtonState = "Disable" + EndIf + EndIf + EndIf 1000 @@ -410,18 +484,13 @@ Var Timeout = Timeout + 1 If Timeout > 5 Then - ; goto lid straw - If CoffeePoint > 29 Then - Open "ROOT/taobin_project/xml/page_display_get_free.xml" - Else - If Seeker.FromConsent = 1 Then - Open "ROOT/taobin_project/xml/page_display_get_free.xml" - Else - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf - + If CoffeePoint >= 30 Then + Var RedeemType = "get_free" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf EndIf @@ -439,55 +508,6 @@ Open "/media/bt/xml/security_alarm.xml" - - If CheckCoupons = 1 Then - Var MakeDrinkState = 1 - Var CouponPage = 1 - Var CouponInfo1 = Ext1a - Var CouponInfo2 = Ext1b - Var CouponInfo3 = Ext1c - Var CouponInfo4 = Ext1d - Var CouponInfo5 = Ext1e - Var CouponInfo6 = Ext1f - Var CouponInfo7 = Ext1g - Var CouponInfo8 = Ext1h - Var CouponInfo9 = Ext1i - Var CouponInfo10 = Ext1j - - Var TelephoneNumber = TelephoneNumberX - GETACCEXT TelephoneNumber 13 - Var CheckCoupons = 2 - - Else - - If CheckCoupons = 2 Then - - Var TaobinCredit = Ext1b - - If InternationalEnable = 1 Then - Var ChackMemberPage = CountryRootPath + "xml/page_check_member2.lxml" - - If CountryName = "Malaysia" Then - Open ChackMemberPage - EndIf - - If CountryName = "UnitedArabEmirates Dubai" Then - Open ChackMemberPage - EndIf - - - Else - Open "ROOT/taobin_project/xml/page_check_member2.xml" - EndIf - - - EndIf - - EndIf - - - - If MachineStage = "drink-success" Then @@ -505,72 +525,412 @@ - - - - - - 0 - 380 - "ROOT/taobin_project/image/display_point/alpha.png" - - - -; - - - - - 158 - 665 - Var( DirImage + "/img_popup1.png" ) - - - - 158 - 665 - Var( DirImage + "/img_popup3.png" ) + 118 + 642 + Var( DirImage + "/member-profile-bg.png" ) - 243 - 722 - Var( DirImage + "/text7.png" ) - - - - - 243 - 860 - Var( DirImage + "/text4.png" ) - - - - - - - 625 - 734 + 702 + 682 Var( DirImage + TaobinLeveImg ) -; + + + 158 + 682 + 500 + KanitRegularTTF + 0x3F2C20 + 25 + "Membership status" + + + + 158 + 715 + 500 + KanitSemiBoldTTF + 0x4C4542 + 39 + TaobinName + + + + 158 + 766 + 500 + KanitRegularTTF + 0x3F2C20 + 20 + TNumberTaobinMemberXXX + Telnum-mask-1 + + + + + 158 + 823 + 500 + KanitSemiBoldTTF + 0x58514D + 25 + "Total Shell balance" + + + + 158 + 856 + 500 + KanitSemiBoldTTF + 0x82401E + 39 + CoffeePointRank + + + + 158 + 907 + 500 + KanitSemiBoldTTF + 0x82401E + 20 + TaobinLevelDesc1 + + + + 158 + 934 + 500 + KanitRegularTTF + 0x58514D + 20 + TaobinLevelDesc2 + + + + + - 240 - 1161 - pImageStr + 118 + 999 + Var( DirImage + "/points-redemption-bg.png" ) + + 260 + 1023 + Var( DirImage + "/default_points.png" ) + + + + + 740 + 1111 + Var( DirImage + shellDiscount1DollarImage ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 212 + 1583 + Var( DirImage + "/points-alert-container.png" ) + + + + 228 + 1587 + 90 + KanitRegularTTF + 0x4A4644 + 25 + "You got" + + + + 322 + 1587 + 50 + KanitSemiBoldTTF + 0x4A4644 + 25 + Var( CoffeePoint - CoffeePointOld ) + center-vertical-horizontal + + + + 378 + 1587 + 90 + KanitRegularTTF + 0x4A4644 + 25 + "shells" + + + + + 228 + 1638 + 20 + 240 + KanitRegularTTF + 0x3F2C20 + shellExpireDescription + + + + 470 + 1638 + 20 + 400 + KanitSemiBoldTTF + 0xA61100 + shellExpireDescriptionSub + + + + 228 + 1671 + 20 + 120 + KanitSemiBoldTTF + 0x3F2C20 + couponDescription + + + + 352 + 1671 + 20 + 500 + KanitRegularTTF + 0x3F2C20 + couponDescriptionSub + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 250 - 745 - 35 - 1000 - KanitRegularTTF - 0x513C2F - TaobinName - - - - 250 - 790 - 20 - 1000 - KanitRegularTTF - 0x746253 - TNumberTaobinMemberXXX - Telnum-mask-1 - - - - 250 - 890 - 50 - 120 - KanitRegularTTF - 0xDE794E - CoffeePointRank - - - - - - 250 - 990 - 25 - 1000 - KanitRegularTTF - 0xDE794E - TaobinLevelDesc1 - - - - 250 - 1020 - 20 - 1000 - KanitRegularTTF - 0x746253 - TaobinLevelDesc2 - - - - 172 - 1570 - Var( DirImage + "/text8.png" ) - - - - xPointEndDate - 1576 - 25 - 500 - KanitRegularTTF - 0xDE794E - PointEndDate - - - - 310 - 1621 - 25 - 1000 - KanitRegularTTF - 0x746253 - TaobinLevelDesc3 - - ; @@ -880,7 +1007,17 @@ - + + Var TaobinName = "Kenta420" + Var TaobinCoupons = "10" + Var TaobinExpire = "10/05/2025" + Var TaobinLevel = "3" + Var TNumberTaobinMemberXXX = "0809120280" + Var CoffeePointRank = 106 + Var CoffeePointOld = 18 + Var CoffeePoint = 20 + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml" + \ No newline at end of file diff --git a/inter/aus/xml/page_collect_point_redeem.lxml b/inter/aus/xml/page_collect_point_redeem.lxml new file mode 100644 index 00000000..59cf61e1 --- /dev/null +++ b/inter/aus/xml/page_collect_point_redeem.lxml @@ -0,0 +1,290 @@ + + "Enable" + 1080 + 1920 + "0x303030" + SoundVolume + + + + Var Timeout = 0 + Var TargetTimeout = 10 + + If show_eng = "true" Then + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + Else + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/redeem" + + Var congratsState = "Enable" + Var sendCodeState = "Invisible" + + Var footerButtonSectionState = "Enable" + + Var headerBackground = "/header_bg.png" + + Var content_X = 178 + Var content_Y = 899 + + If RedeemType = "1_dollar" Then + Var headerImage = DirImage + "/redeem_1dollar_header.png" + Var contentImage = DirImage + "/redeem_1dollar_content.png" + EndIf + + If RedeemType = "2_dollar" Then + Var headerImage = DirImage + "/redeem_2dollar_header.png" + Var contentImage = DirImage + "/redeem_2dollar_content.png" + EndIf + + If RedeemType = "get_free" Then + Var headerImage = DirImage + "/redeem_get_free_header.png" + Var contentImage = DirImage + "/redeem_get_free_content.png" + Var footerButtonSectionState = "Invisible" + Var content_Y = 984 + Var TargetTimeout = 5 + EndIf + + Var SELLONLINE = 0 + If SELLSTATUS = "SELLONLINE" Then + Var SELLONLINE = 1 + EndIf + If SELLSTATUS = "SELLNOCASH" Then + Var SELLONLINE = 1 + EndIf + + + + + 1000 + + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + ;Var Timeout = Timeout + 1 + + If Timeout > TargetTimeout Then + If sendCodeState = "Enable" Then + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Else + If RedeemType = "get_free" Then + Var congratsState = "Invisible" + Var sendCodeState = "Enable" + + Var Timeout = 0 + Var TargetTimeout = 5 + + If SELLONLINE = 1 Then + Var headerBackground = "/success_header_bg.png" + Var headerImage = "/redeem_success_header.png" + Var contentImage = "/redeem_success_content.png" + Var content_X = 308 + Var content_Y = 1065 + Else + Var headerBackground = "/fail_header_bg.png" + Var headerImage = "/redeem_fail_header.png" + Var contentImage = "/redeem_fail_content.png" + Var content_X = 243 + Var content_Y = 1118 + EndIf + + Refresh + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + EndIf + EndIf + + + TimerReset + Refresh + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + ;include="ROOT/taobin_project/inc/video.inc" + + + + + + + 118 + 642 + Var( DirImage + headerBackground) + + + + 118 + 859 + Var( DirImage + "/redemption_bg.png") + + + + + 158 + 682 + Var( DirImage + headerImage ) + + + + content_X + content_Y + Var( DirImage + contentImage ) + + + + + + + + + + + + + ; + + 751 + 413 + IMG_CNT + + ; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + Var RedeemType = "1_dollar" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" + + + + Var RedeemType = "2_dollar" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" + + + + Var RedeemType = "get_free" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" + + \ No newline at end of file diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index 2178bc69..033712ac 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -130,6 +130,11 @@ INT CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank + If CheckMemberPageCampaign = 1 Then + Var luckeyDrawTicket = Ext1h + INT luckeyDrawTicket + EndIf + GETACCEXT TelephoneNumber 15 diff --git a/xml/page_check_member1.xml b/xml/page_check_member1.xml index 5fc0694d..333a0346 100644 --- a/xml/page_check_member1.xml +++ b/xml/page_check_member1.xml @@ -84,13 +84,18 @@ Var TNumberTaobinMemberXXX = TelephoneNumber - - Var CoffeePointRank = Ext1b INT CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank + + If CheckMemberPageCampaign = 1 Then + Var luckeyDrawTicket = Ext1h + INT luckeyDrawTicket + EndIf + + Var Ext1a = "" Var Ext1b = "" Var Ext1c = "" diff --git a/xml/page_check_member2_campaign.xml b/xml/page_check_member2_campaign.xml index 56389551..eda4c386 100644 --- a/xml/page_check_member2_campaign.xml +++ b/xml/page_check_member2_campaign.xml @@ -689,8 +689,7 @@ INT TaobinCredit Var TaobinCreditStr !assigned StringFmt( TaobinCredit, DisplayFormat, PreScaleConvertShow ) - Var LuckeyDrawTicketFormat = "%03.0f" - Var luckyDrawTicket = 16 + Var LuckyDrawTicketFormat = "%03.0f" If SystemDateMonthInt = 6 Then If SystemDateDayInt >= 17 Then @@ -1052,7 +1051,7 @@ 64 0x3F2C20 center-vertical-horizontal - StringFmt( luckyDrawTicket , LuckeyDrawTicketFormat, PreScaleConvertShow) + StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 163dc647..62a6eada 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -192,10 +192,14 @@ ;inter-xml-open If CountryName = "Australia" Then - ;Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml" - ;Open pageCollectPoint + + If NewCollectPointFlag = 1 Then + Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml" + Open pageCollectPoint + Else + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + EndIf - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" EndIf ;inter-xml-open diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 3febc77e..f638e759 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -270,7 +270,9 @@ If CountDownThankyou = 0 Then If IgnoreNetCore = "true" Then - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + ;Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Var testPageCollectPointAUS = CountryRootPath + "/xml/page_collect_point_3.lxml" + Open testPageCollectPointAUS EndIf If TestLoopMakeDrink = 1 Then