THAI: clean promotion flag and added flag not collect promotion point

xml/event/tricker.ev

@@ -133,7 +133,8 @@ Var FromRobinsonBeautyPro = 0
 Var JemilaPro = 0
 
 Var NewCollectPoint = 1
-Var ShouldCollectPromotionPoint = 0
+Var PayMentCodeShouldCollectPromotionPoint = 0
+Var NotCollectPointPromotion = 0
 
 Var NewFlowPaymentCode = 0
 Var New_Payment = 0

xml/page_collect_point_1.xml

@@ -125,17 +125,10 @@
 		EndIf
 	EndIf
 	
-	DEBUGVAR PepweenCollectPoint
+	DEBUGVAR NotCollectPointPromotion
 
-	DEBUGVAR ProBadValentineEnable
+	DEBUGVAR RobinsonBeautyPro
-	DEBUGVAR FromBadValentinePro
+	DEBUGVAR FromRobinsonBeautyPro
-	DEBUGVAR LipitPro
-	DEBUGVAR FromLipitPro
-	DEBUGVAR FruityRayaEnable
-	DEBUGVAR FromFruityRaya
-	DEBUGVAR ProThaiTeaEnable
-	DEBUGVAR FromProThaiTea
-	DEBUGVAR FromProYuzu
 	
 	If Seeker.TNumberTaobinCredit = "" Then
 	
@@ -179,101 +172,18 @@
 			Var Param1 = TelephoneNumber + "/" 
 			Var Param1 = Param1 + ParamCP
 
-			If MyMintEnable = 1 Then
+			If NotCollectPointPromotion = 0 Then
-				If FromMyMintPro = 1 Then
+				If RobinsonBeautyPro = 1 Then
-					GETACCEXT TelephoneNumber 32
+					If FromRobinsonBeautyPro = 1 Then
-					Open "ROOT/taobin_project/xml/event/my_mint_my_moment/page_collect_point_pro_mymint_2.xml"  
+						If Seeker.CodeChannel = 1 Then
-				EndIf
+							If Seeker.CollectPointPromotion = 1 Then
-			EndIf
-
-			DEBUGVAR FruityRayaEnable
-			DEBUGVAR FromFruityRaya
-			If FruityRayaEnable = 1 Then
-				If FromFruityRaya = 1 Then
-					Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml"
-				EndIf
-
-			EndIf
-
-			DEBUGVAR ProThaiTeaEnable
-			DEBUGVAR FromProThaiTea
-			If ProThaiTeaEnable = 1 Then
-				If FromProThaiTea = 1 Then
-					Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
-				EndIf
-			EndIf
-
-			DEBUGVAR ProYuzuEnable
-			DEBUGVAR FromProYuzu
-			If ProYuzuEnable = 1 Then
-				If FromProYuzu = 1 Then
-					Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml"
-				EndIf
-			EndIf
-
-			If PepweenEnable = 1 Then
-				If PepweenCollectPoint = 0 Then
-					GETACCEXT TelephoneNumber 31
-					Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
-				EndIf
-			EndIf
-
-			If ProBadValentineEnable = 1 Then
-				If FromBadValentinePro = 1 Then
-					GETACCEXT TelephoneNumber 32
-					Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml"
-				EndIf
-			EndIf
-
-			If LipitPro = 1 Then
-				If FromLipitPro = 1 Then
-					If Seeker.CodeChannel = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
-							If LipitRewardOutOfStock = 0 Then
 								GETACCEXT TelephoneNumber 32
-								Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
+								Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
 							EndIf
-						EndIf
+						Else
-					Else
-						If LipitRewardOutOfStock = 0 Then
-							GETACCEXT TelephoneNumber 32
-							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-
-			DEBUGVAR NamHomCoconutPro
-			DEBUGVAR FromNamHomCoconutPro
-			DEBUGVAR Seeker.CodeChannel
-			If NamHomCoconutPro = 1 Then
-				If FromNamHomCoconutPro = 1 Then
-					If Seeker.CodeChannel = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
-							If NamHomCoconutRewardOutOfStock = 0 Then
-								GETACCEXT TelephoneNumber 32
-								Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
-							EndIf
-						EndIf
-					Else
-						If NamHomCoconutRewardOutOfStock = 0 Then
-							GETACCEXT TelephoneNumber 32
-							Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-
-			If RobinsonBeautyPro = 1 Then
-				If FromRobinsonBeautyPro = 1 Then
-					If Seeker.CodeChannel = 1 Then
-						If Seeker.CollectPointPromotion = 1 Then
 							GETACCEXT TelephoneNumber 32
 							Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
 						EndIf
-					Else
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
 					EndIf
 				EndIf
 			EndIf
@@ -313,98 +223,18 @@
 		Var Param1 = TelephoneNumber + "/" 
 		Var Param1 = Param1 + ParamCP
 
-		DEBUGVAR MyMintEnable
+		If NotCollectPointPromotion = 0 Then
-		DEBUGVAR FromMyMintPro
+			If RobinsonBeautyPro = 1 Then
-		DEBUGVAR LipitPro
+				If FromRobinsonBeautyPro = 1 Then
-		DEBUGVAR FromLipitPro
+					If Seeker.CodeChannel = 1 Then
-		If MyMintEnable = 1 Then
+						If Seeker.CollectPointPromotion = 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"  
-			EndIf
-		EndIf
-
-		DEBUGVAR FruityRayaEnable
-		DEBUGVAR FromFruityRaya
-		If FruityRayaEnable = 1 Then
-			If FromFruityRaya = 1 Then
-				Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml"
-			EndIf
-
-		EndIf
-
-		DEBUGVAR ProThaiTeaEnable
-			DEBUGVAR FromProThaiTea
-			If ProThaiTeaEnable = 1 Then
-				If FromProThaiTea = 1 Then
-					Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
-				EndIf
-			EndIf
-		
-		DEBUGVAR ProYuzuEnable
-		DEBUGVAR FromProYuzu
-		If ProYuzuEnable = 1 Then
-			If FromProYuzu = 1 Then
-				Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml"
-			EndIf
-		EndIf
-
-		If ProBadValentineEnable = 1 Then
-			If FromBadValentinePro = 1 Then
-				GETACCEXT TelephoneNumber 32
-				Open "ROOT/taobin_project/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml"
-			EndIf
-		EndIf
-
-		If LipitPro = 1 Then
-			If FromLipitPro = 1 Then
-				If Seeker.CodeChannel = 1 Then
-					If Seeker.CollectPointPromotion = 1 Then
-						If LipitRewardOutOfStock = 0 Then
 							GETACCEXT TelephoneNumber 32
-							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
+							Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
 						EndIf
-					EndIf
+					Else
-				Else
-					If LipitRewardOutOfStock = 0 Then
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
-					EndIf
-				EndIf
-			EndIf
-		EndIf
-
-		DEBUGVAR NamHomCoconutPro
-		DEBUGVAR FromNamHomCoconutPro
-		DEBUGVAR Seeker.CodeChannel
-		If NamHomCoconutPro = 1 Then
-			If FromNamHomCoconutPro = 1 Then
-				If Seeker.CodeChannel = 1 Then
-					If Seeker.CollectPointPromotion = 1 Then
-						If NamHomCoconutRewardOutOfStock = 0 Then
-							GETACCEXT TelephoneNumber 32
-							Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
-						EndIf
-					EndIf
-				Else
-					If NamHomCoconutRewardOutOfStock = 0 Then
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml"
-					EndIf
-				EndIf
-			EndIf
-		EndIf
-
-		If RobinsonBeautyPro = 1 Then
-			If FromRobinsonBeautyPro = 1 Then
-				If Seeker.CodeChannel = 1 Then
-					If Seeker.CollectPointPromotion = 1 Then
 						GETACCEXT TelephoneNumber 32
 						Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
 					EndIf
-				Else
-					GETACCEXT TelephoneNumber 32
-					Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
 				EndIf
 			EndIf
 		EndIf

xml/page_payment_code.xml

@@ -232,7 +232,7 @@
 					If ShouldCollectPoint = 1 Then
 						Var Seeker.CollectPointMain = 1
 					
-						If ShouldCollectPromotionPoint = 1 Then
+						If PayMentCodeShouldCollectPromotionPoint = 1 Then
 							Var Seeker.CollectPointPromotion = 1
 						EndIf
 					EndIf
@@ -278,7 +278,7 @@
 						Var Seeker.CollectPointMain = 1
 					EndIf
 
-					If ShouldCollectPromotionPoint = 1 Then
+					If PayMentCodeShouldCollectPromotionPoint = 1 Then
 						Var Seeker.CollectPointPromotion = 1
 					EndIf
 				EndIf