Merge branch 'master' of kong:/1TBHDD/ikong/taobin_project

xml/event/pepween/page_pepween_random.xml

@@ -168,6 +168,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30 Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -189,6 +214,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30 Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -210,6 +260,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30 Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -231,6 +306,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30 Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -252,6 +352,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30 Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>

xml/event/pepween/page_pepween_result.xml

@@ -29,35 +29,16 @@
     <EventTimeout>
         DEBUGVAR Timeout
 
-        If PayOfflineMode = 1 Then
-            Var ServerRespond = 0
-            Var CouponResponeFailed = 1
-        EndIf
 
-        If Timeout > 60 Then
+
+        If Timeout > 5 Then
             ; Check and return Error
-            Var CouponResponeFailed = 1
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
         EndIf
 
         Var Timeout = Timeout + 1
         TimerReset
     </EventTimeout>
-    
-    <EventActionOk>
-        If CouponResponeFailed = 0 Then
-            ; TODO:
-            ;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
-        EndIf
-
-    </EventActionOk>
-
-    <EventActionError>
-        ; TODO: open coupon send error page
-        If CouponResponeFailed = 1 Then
-            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
-        EndIf
-    </EventActionError>
 
     <Video>
         <X> 0 </X>