Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

inc/button_topping_select_confirm_order.inc

@@ -192,10 +192,10 @@ EndIf
                 Var topping2 = toppingID2index1
             EndIf
             If CustomCoffeeQuantityState[1] = "PressForever" Then
-                Var topping2 = toppingID2index2
+                Var topping2 = toppingID2index3
             EndIf
             If CustomCoffeeQuantityState[2] = "PressForever" Then
-                Var topping2 = toppingID2index3
+                Var topping2 = toppingID2index4
             EndIf
         Else
             If toppingID2index3 = "" Then

xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml

@@ -0,0 +1,182 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xeae6e1" </Background>
+    <Volume> SoundVolume </Volume>
+
+    <EventOpen>
+        ; On open
+
+        Var Timeout = 0
+        SAVELOG UnitTestType
+
+        Var TaobinLevel = 0
+
+        Var Seeker.TaobinErrorNetwork = 0
+
+        If show_eng = "true" Then
+            Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+        Else
+            Var DirImage = "ROOT/taobin_project/image/collectiing"
+
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+        EndIf
+
+        Var CollectPointError = ""
+
+        If PayOfflineMode = 1 Then
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember= TelephoneNumber
+            Var CollectPointError = "collect"
+            Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+        EndIf
+
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+
+        Var ShowCountDownBrewing = CountDownBrewing
+
+
+        Var Timeout = Timeout + 1
+        If Timeout > 30 Then
+
+            Var TaobinLevel = 0
+            Var CoffeePoint = 1
+
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+
+            Var TelephoneNumber = TelephoneNumberX
+
+            Var Seeker.TNumberTaobinMember= TelephoneNumber
+            Var CollectPointError = "collect"
+            Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+
+        EndIf
+
+        TimerReset
+        Refresh
+    </EventTimeout>
+
+
+
+
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventActionOk>
+        If Ext1a = "" Then
+
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember = TelephoneNumber
+            Var CollectPointError = "collect"
+            Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+
+        Else
+            Var TaobinName = Ext1c
+            Var TelephoneNumber = TelephoneNumberX
+            Var TNumberTaobinMemberXXX = TelephoneNumber
+
+            If TaobinName = "" Then
+                Var Seeker.IsLineMember = 0
+            Else
+                If TaobinName = "-" Then
+                    Var Seeker.IsLineMember = 0
+                Else
+                    Var Seeker.IsLineMember = 1
+                EndIf
+            EndIf
+
+            Var Seeker.PointTaobinStr = ParamCP
+            Var Seeker.TNumberTaobinMember = TelephoneNumberX
+
+            DEBUGVAR Ext1b
+            Var PointCount = Ext1b
+            INT PointCount
+
+            If PointCount < 6 Then
+                Var PointCount = PointCount + 1
+            EndIf
+
+            DEBUGVAR PointCount
+
+            DEBUGVAR Seeker.PointTaobinStr
+            DEBUGVAR Seeker.TNumberTaobinMember
+
+            Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml"
+        EndIf
+
+    </EventActionOk>
+
+    <EventActionError>
+        Var Seeker.TaobinErrorNetwork = 1
+        Var Seeker.PointTaobinStr = ParamCP
+        Var TelephoneNumber = TelephoneNumberX
+        Var Seeker.TNumberTaobinMember= TelephoneNumber
+        Var CollectPointError = "collect"
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+    </EventActionError>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+
+
+    <Image>
+        <X> 178 </X>
+        <Y> 680 </Y>
+        <Filename> Var( DirImage + "/text20.png" ) </Filename>
+    </Image>
+
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+
+    <Text>
+        <X> 0 </X>
+        <Y> 873 </Y>
+        <Width> 1080 </Width>
+        <Align> Center </Align>
+        <Size> 62 </Size>
+        <Font> RobotoBlack </Font>
+        <Color> 0x513C2F </Color>
+        <Value> TelephoneNumber </Value>
+        <Format> Telnum-mask-1 </Format>
+    </Text>
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font>
+        <Color> 0x513C2F </Color>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+</Popup>

xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml

@@ -0,0 +1,311 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xeae6e1" </Background>
+    <Volume> SoundVolume </Volume>
+
+    <EventOpen>
+        ; On open
+
+        Var Timeout = 0
+        Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
+        Var PointCrm = "pdpa1"
+        Var GetScore = ""
+        Var TelephoneNumber = TelephoneNumberX
+        Var Seeker.TNumberTaobinMember = TelephoneNumber
+
+        Var CoffeePointStr = CoffeePoint
+
+        DEBUGVAR TelephoneNumber
+        DEBUGVAR TelephoneNumberX
+
+        Var PointRootDir = "ROOT/taobin_project/image/event/7.7_up_to_35/display_point/"
+
+        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 CheckCoupons = 0
+        Var MakeDrinkState = 0
+
+        Var taobinImgPoint[0] = "/point_1_placeholder.png"
+        Var taobinImgPoint[1]= "/point_2_placeholder.png"
+        Var taobinImgPoint[2]= "/point_3_placeholder.png"
+        Var taobinImgPoint[3]= "/point_4_placeholder.png"
+        Var taobinImgPoint[4]= "/point_5_placeholder.png"
+        Var taobinImgPoint[5]= "/point_6_placeholder.png"
+
+        DEBUGVAR PointCount
+
+        If PointCount >= 1 Then
+            Var taobinImgPoint[0] = "/point_1.png"
+        EndIf
+
+        If PointCount >= 2 Then
+            Var taobinImgPoint[1] = "/point_2.png"
+        EndIf
+
+        If PointCount >= 3 Then
+            Var taobinImgPoint[2] = "/point_3.png"
+        EndIf
+
+        If PointCount >= 4 Then
+            Var taobinImgPoint[3] = "/point_4.png"
+        EndIf
+
+        If PointCount >= 5 Then
+            Var taobinImgPoint[4] = "/point_5.png"
+        EndIf
+
+        If PointCount >= 6 Then
+            Var taobinImgPoint[5] = "/point_6.png"
+        EndIf
+
+        If show_eng = "true" Then
+            Var memberText = "MEMBERSHIP STATUS"
+            Var missionText = "7.7 Get up to 35%\ndiscount"
+            Var message1 = "Collect cups daily to get a discount"
+            Var message2 = "Miss a day? Progress resets automatically"
+        Else
+            Var memberText = "สถานะสมาชิก"
+            Var missionText = "7.7 รับส่วนลดสูงสุด 35%"
+            Var message1 = "สะสมแก้วต่อเนื่องทุกวันเพื่อรับส่วนลด"
+            Var message2 = "*หากไม่มีการสะสมต่อเนื่องระบบจะทำการ reset อัตโนมัติ*"
+        EndIf
+
+        Var CurrentPointSlot = PointCount
+
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 8 Then
+            Var val1 = "X"
+            Var val2 = "X"
+            Var val3 = "X"
+            AddData 58 TelephoneNumber val1 val2 val3
+            Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_send_code.xml"
+        EndIf
+
+        TimerReset
+        Refresh
+    </EventTimeout>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+    <X> 0 </X>
+    <Y> 380 </Y>
+        <Filename> "ROOT/taobin_project/image/display_point/alpha.png" </Filename>
+    </Image>
+
+    <Image>
+        <X> 158 </X>
+        <Y> 665 </Y>
+        <Filename> Var( PointRootDir + "/top_bg.png" )</Filename>
+    </Image>
+
+    <Image>
+        <X> 158 </X>
+        <Y> 1085 </Y>
+        <Filename> Var( PointRootDir + "/bottom_bg.png" )</Filename>
+    </Image>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 722 </Y>
+        <Width> 235 </Width>
+        <Height> 36 </Height>
+        <Font> KanitMediaTTF </Font>
+        <Size> 24 </Size>
+        <Color> 0x746253 </Color>
+        <Value> memberText </Value>
+    </Text>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 758 </Y>
+        <Width> 480 </Width>
+        <Height> 42 </Height>
+        <Font> RobotoBold </Font>
+        <Size> 36 </Size>
+        <Color> 0x513C2F </Color>
+        <Value> TaobinName <Value>
+    </Text>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 799 </Y>
+        <Width> 100 </Width>
+        <Height> 16 </Height>
+        <Font> RobotoRegular </Font>
+        <Color> 0x746253 </Color>
+        <Value> TNumberTaobinMemberXXX </Value>
+        <Format> Telnum-mask-1 </Format>
+    </Text>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 820 </Y>
+        <Width> 328 </Width>
+        <Height> 90 </Height>
+        <Font> KanitMediaTTF </Font>
+        <Size> 32 </Size>
+        <Color> 0x746253 </Color>
+        <Value> missionText </Value>
+    </Text>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 907 </Y>
+        <Size> 57 </Size>
+        <Width> 120 </Width>
+        <Font> RobotoBold </Font>
+        <Color> 0xDE794E </Color>
+        <Value> PointCount </Value>
+    </Text>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 981 </Y>
+        <Width> 400 </Width>
+        <Font> KanitMediaTTF </Font>
+        <Size> 25 </Size>
+        <Color> 0xDE794E </Color>
+        <Value> message1 </Value>
+    </Text>
+
+    <Text>
+        <X> 243 </X>
+        <Y> 1017 </Y>
+        <Width> 500 </Width>
+        <Font> KanitMediaTTF </Font>
+        <Size> 20 </Size>
+        <Color> 0x837365 </Color>
+        <Value> message2 </Value>
+    </Text>
+
+
+
+    <Image>
+        <X> 269 </X>
+        <Y> 1147 </Y>
+        <Filename> Var( PointRootDir +  taobinImgPoint[0]) </Filename>
+    </Image>
+
+    <Image>
+        <X> 478 </X>
+        <Y> 1147 </Y>
+        <Filename> Var( PointRootDir +  taobinImgPoint[1]) </Filename>
+    </Image>
+
+    <Image>
+        <X> 687 </X>
+        <Y> 1147 </Y>
+        <Filename> Var( PointRootDir +  taobinImgPoint[2]) </Filename>
+    </Image>
+
+    <Image>
+        <X> 269 </X>
+        <Y> 1404 </Y>
+        <Filename> Var( PointRootDir +  taobinImgPoint[3]) </Filename>
+    </Image>
+
+    <Image>
+        <X> 478 </X>
+        <Y> 1404 </Y>
+        <Filename> Var( PointRootDir +  taobinImgPoint[4]) </Filename>
+    </Image>
+
+
+    <Image>
+        <X> 687 </X>
+        <Y> 1404 </Y>
+        <Filename> Var( PointRootDir +  taobinImgPoint[5]) </Filename>
+    </Image>
+
+
+    <Button>
+        <X> 425 </X>
+        <Y> 1660 </Y>
+        <Filename> Var( PointRootDir + "/bn_close.png" )</Filename>
+        <FilenamePress> Var( PointRootDir + "/bp_close.png" )</FilenamePress>
+        <EventClick>
+            ; goto lid straw
+
+            Var val1 = "X"
+            Var val2 = "X"
+            Var val3 = "X"
+            AddData 58 TelephoneNumber val1 val2 val3
+            Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_send_code.xml"
+        </EventClick>
+    </Button>
+
+
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font
+        <Color> 0x513C2F </Color>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+
+    <EventUnitTest2>
+        Var val2 = "X"
+        Var val3 = "X"
+        AddData 58 TelephoneNumber CurrentPointSlot val2 val3
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_send_code.xml"
+    </EventUnitTest2>
+
+    <EventUnitTest3>
+        Var PointState[0] = 1
+        Var PointState[1] = 1
+        Var PointState[2] = 1
+        Var PointState[3] = 1
+        Var PointState[4] = 1
+        Var PointState[5] = 1
+
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml"
+    </EventUnitTest3>
+
+    <EventUnitTest4>
+        If show_eng = "true" Then
+            Var show_eng = "false"
+        Else
+            Var show_eng = "true"
+        EndIf
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml"
+    </EventUnitTest4>
+</Popup>

xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml

@@ -0,0 +1,170 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xeae6e1" </Background>
+    <Volume> SoundVolume </Volume>
+
+    <EventOpen>
+        ; On open
+
+
+        Var Timeout = 0
+
+        DEBUGVAR show_eng
+        DEBUGVAR CollectPointError
+
+        Var DirImage = "ROOT/taobin_project/image/event/7.7_up_to_35/"
+
+        If show_eng = "true" Then
+            Var confirmButtonIdleImage = "bn_confirm_en.png"
+            Var confirmButtonPressImage = "bp_confirm_en.png"
+        Else
+            Var confirmButtonIdleImage = "bn_confirm.png"
+            Var confirmButtonPressImage = "bp_confirm.png"
+        EndIf
+
+        If CollectPointError = "collect" Then
+            If show_eng = "true" Then
+                Var errorMessage = "Network Disruption!\nRest assured, we'll promptly credit your FABULOUS  points.\nWe apologize for any inconvenience."
+            Else
+                Var errorMessage = "สัญญาณขัดข้อง เราจะทำการบันทึกแต้มให้คุณภายหลัง\nขออภัยในความไม่สะดวก"
+            EndIf
+        EndIf
+
+        If CollectPointError = "send_code" Then
+            If show_eng = "true" Then
+                Var errorMessage = "Network Disruption!\nRest assured, we'll promptly credit your FABULOUS  points.\nWe apologize for any inconvenience."
+            Else
+                Var errorMessage = "สัญญาณขัดข้อง เราจะจัดส่งลิ้งค์ลงทะเบียนให้คุณภายหลัง\nขออภัยในความไม่สะดวก"
+            EndIf
+        EndIf
+
+        Var val1 = "X"
+        Var val2 = "X"
+        Var val3 = "X"
+        AddData 58 TelephoneNumber val1 val2 val3
+
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+
+        Var CountDownBrewing = BREW_CNT
+
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 5 Then
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        EndIf
+
+        TimerReset
+        Refresh
+    </EventTimeout>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> Var( DirImage + "error_bg.png" ) </Filename>
+    </Image>
+
+
+    <Text>
+        <X> 0 </X>
+        <Y> 1500 </Y>
+        <Width> 1080 </Width>
+        <Height> 200 </Height>
+        <Font> KanitRegularTTF </Font>
+        <Size> 40 </Size>
+        <Color> 0x513C2F </Color>
+        <Value> errorMessage </Value>
+        <Align> center-vertical-horizontal </Align>
+    </Text>
+
+
+    <Button>
+    <X> 397 </X>
+    <Y> 1752 </Y>
+    <Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
+    <FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
+    <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+    <Volume> SoundVolume </Volume>
+    <EventClick>
+    ; goto lid straw
+
+
+    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+    </EventClick>
+    </Button>
+
+
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+    <Image>
+    <X> 751 </X>
+    <Y> 413 </Y>
+    <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+    <X> XPosiShowCountDownBrew </X>
+    <Y> 470 </Y>
+    <Align> End </Align>
+    <Width> 153 </Width>
+    <Size> 88 </Size>
+    <Font> RobotoBold </Font>
+    <Color> 0x513C2F </Color>
+    <Value> ShowCountDownBrewing </Value>
+    </Text>
+
+    <EventSecurity>
+    Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventUnitTest1>
+        If show_eng = "true" Then
+            Var show_eng = "false"
+        Else
+            Var show_eng = "true"
+        EndIf
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+    </EventUnitTest1>
+
+    <EventUnitTest4>
+        If CollectPointError = "collect" then
+            Var CollectPointError = "send_code"
+        Else
+            Var CollectPointError = "collect"
+        EndIf
+
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+    </EventUnitTest4>
+
+</Popup>

xml/event/7.7_up_to_35/page_send_code.xml

@@ -0,0 +1,96 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <EventOpen>
+
+        Var Timeout = 0
+
+        Var DirImage = "ROOT/taobin_project/image/event/7.7_up_to_35/send_code/"
+
+        Var rewardNumber = PointCount
+
+        DEBUGVAR rewardNumber
+
+        Var rewardImage = DirImage + "/reward_"
+        Var rewardImage = rewardImage + rewardNumber
+
+        If show_eng = "true" Then
+            Var detailMessageImage = DirImage + "/detail_message_en.png"
+            Var rewardImage = rewardImage + "_en.png"
+        Else
+            Var detailMessageImage = DirImage + "/detail_message.png"
+            Var rewardImage = rewardImage + ".png"
+        EndIf
+
+        DEBUGVAR rewardImage
+
+    </EventOpen>
+
+
+    <EventActionOk>
+
+    </EventActionOk>
+
+    <EventActionError>
+        Var Seeker.TaobinErrorNetwork = 1
+        Var Seeker.PointTaobinStr = ParamCP
+        Var TelephoneNumber = TelephoneNumberX
+        Var Seeker.TNumberTaobinMember= TelephoneNumber
+        Var CollectPointError = "send_code"
+        Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml"
+    </EventActionError>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var Timeout = Timeout + 1
+
+        If Timeout >= 5 Then
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        EndIf
+
+        TimerReset
+    </EventTimeout>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> Var( DirImage + "/send_code_bg.png") </Filename>
+    </Image>
+
+    <Image>
+        <X> 6 </X>
+        <Y> 377 </Y>
+        <Filename> Var( DirImage + "/lid.png") </Filename>
+    </Image>
+
+    <Image>
+        <X> 619 </X>
+        <Y> 635 </Y>
+        <Filename> detailMessageImage </Filename>
+    </Image>
+
+    <Image>
+        <X> 238 </X>
+        <Y> 672 </Y>
+        <Filename> rewardImage </Filename>
+    </Image>
+
+    <Image>
+        <X> 255 </X>
+        <Y> 851 </Y>
+        <Filename> Var( DirImage + "/send_code_decoration.png") </Filename>
+    </Image>
+</Popup>

xml/event/script_common_for_open_promotion_xml.ev

@@ -9,6 +9,7 @@ DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR HappyTriosPro
 DEBUGVAR TaiwaneseTeaPro
 DEBUGVAR AmericanoPro
+DEBUGVAR Discount7_7Pro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"

xml/event/tricker.ev

@@ -98,6 +98,9 @@ Var TaiwaneseTeaPro = 0
 ; Americano, 1 - 31 July
 Var AmericanoPro = 0
 
+;7.7 discount code,  7 - 13 July
+Var Discount7_7Pro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0
 
@@ -181,6 +184,12 @@ If SystemDateMonthInt = 7 Then
     Var AmericanoPro = 1
     Var TaiwaneseTeaPro = 1
 
+    If SystemDateDayInt >= 7 Then
+        If SystemDateDayInt <= 13 Then
+            Var Discount7_7Pro = 1
+        EndIf
+    EndIf
+
 EndIf
 
 

xml/page_collect_point_1.xml

@@ -190,6 +190,14 @@
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP
 
+            If Seeker.CodeChannel = 0 Then
+                If Discount7_7Pro = 1 Then
+                    SAVELOG "7.7 Discount level collect point"
+                    GETACCEXT TelephoneNumber 44
+                    Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
+                EndIf
+            EndIf
+
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
 
@@ -217,6 +225,13 @@
 		Var Param1 = TelephoneNumber + "/"
 		Var Param1 = Param1 + ParamCP
 
+		If Seeker.CodeChannel = 0 Then
+            If Discount7_7Pro = 1 Then
+                SAVELOG "7.7 Discount level collect point"
+                GETACCEXT TelephoneNumber 44
+                Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
+            EndIf
+        EndIf
 
 		GETACCEXT Param1 23
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@@ -677,6 +692,14 @@
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP
 
+            If Seeker.CodeChannel = 0 Then
+                If Discount7_7Pro = 1 Then
+                    SAVELOG "7.7 Discount level collect point"
+                    GETACCEXT TelephoneNumber 44
+                    Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml"
+                EndIf
+            EndIf
+
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"