THAI: Added Clean Feedback

inter/whatthecup/sgp/xml/page_payment_code-SGP_blue.xml

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

inter/whatthecup/uae_dubai/xml/page_payment_code-UAE_blue.xml

@@ -239,7 +239,7 @@
 					If ShouldCollectPoint = 1 Then
 						Var Seeker.CollectPointMain = 1
 
-						If PayMentCodeShouldCollectPromotionPoint = 1 Then
+						If PaymentCodeShouldCollectPromotionPoint = 1 Then
 							Var Seeker.CollectPointPromotion = 1
 						EndIf
 					EndIf
@@ -285,7 +285,7 @@
 						Var Seeker.CollectPointMain = 1
 					EndIf
 
-					If PayMentCodeShouldCollectPromotionPoint = 1 Then
+					If PaymentCodeShouldCollectPromotionPoint = 1 Then
 						Var Seeker.CollectPointPromotion = 1
 					EndIf
 				EndIf

xml/event/tricker.ev

@@ -176,8 +176,9 @@ Var StrawberrySeriesPro = 0
 Var StrawberrySeriesMenu = 0
 
 Var NewCollectPoint = 1
-Var PayMentCodeShouldCollectPromotionPoint = 0
+Var PaymentCodeShouldCollectPromotionPoint = 0
-Var NotCollectPointPromotion = 0
+
+Var CleanFeedbackFlag = 0
 
 Var NewFlowPaymentCode = 0
 Var New_Payment = 0
@@ -199,138 +200,8 @@ If SystemDateMonthInt = 1 Then
 	EndIf
 EndIf
 
-
+If SystemDateMonthInt >= 2 Then
-If SystemDateMonthInt = 7 Then
+    Var CleanFeedbackFlag = 1
-	If SystemDateDayInt <= 10 Then
-		Var NamHomCoconutPro = 1
-	EndIf
-
-	If SystemDateDayInt >= 7 Then
-		If SystemDateDayInt <= 9 Then
-			Var Cocoa77Pro = 1
-		EndIf
-	EndIf
-
-	If SystemDateDayInt >= 15 Then
-		If SystemDateDayInt <= 17 Then
-			Var PassionMintPro = 1
-		EndIf
-	EndIf
-
-	If SystemDateDayInt >= 22 Then
-		Var 7UpLuckyDrawX2Pro = 1
-	EndIf
-
-EndIf
-
-If SystemDateMonthInt >= 7 Then
-	Var LuckyDrawCampaign = 1
-EndIf
-
-
-If SystemDateMonthInt = 8 Then
-	If SystemDateDayInt <= 9 Then
-		Var 7UpLuckyDrawX2Pro = 1
-	EndIf
-
-	If SystemDateDayInt >= 10 Then
-		Var MomCocoaPro = 1
-
-		If SystemDateDayInt >= 12 Then
-			Var MomCocoaProDiscountEnable = 1
-		EndIf
-	EndIf
-EndIf
-
-
-If SystemDateMonthInt = 9 Then
-
-	If SystemDateDayInt <= 6 Then
-		Var MomCocoaPro = 1
-	EndIf
-
-	If SystemDateDayInt >= 9 Then
-		Var RobinsonBeautyPro = 1
-	EndIf
-EndIf
-
-If SystemDateMonthInt = 10 Then
-	If SystemDateDayInt <= 25 Then
-		Var JemilaPro = 1
-	EndIf
-
-	If SystemDateDayInt >= 21 Then
-	   Var HalloweenPro = 1
-	EndIf
-EndIf
-
-If SystemDateMonthInt = 11 Then
-    If SystemDateDayInt <= 3 Then
-	   Var HalloweenPro = 1
-	EndIf
-
-    If SystemDateDayInt >= 4 Then
-        If SystemDateDayInt <= 8 Then
-            Var WeekdayDiscountPro = 1
-        EndIf
-    EndIf
-
-    If SystemDateDayInt >= 11 Then
-        If SystemDateDayInt <= 15 Then
-            Var WeekdayDiscountPro = 1
-        EndIf
-    EndIf
-
-    If SystemDateDayInt >= 18 Then
-        If SystemDateDayInt <= 22 Then
-            Var WeekdayDiscountPro = 1
-        EndIf
-    EndIf
-
-    If SystemDateDayInt >= 25 Then
-        If SystemDateDayInt <= 29 Then
-            Var WeekdayDiscountPro = 1
-        EndIf
-    EndIf
-
-    If SystemDateDayInt >= 20 Then
-        Var JemilaToppingFlag = 1
-        Var SugarZeroCalFreeFlag = 1
-
-        If SystemDateDayOfWeek = "Wednesday" Then
-            Var JemilaToppingFreeFlag = 1
-        EndIf
-
-    EndIf
-
-    If SystemDateDayInt >= 21 Then
-        Var HappyTriosPro = 1
-    EndIf
-
-
-    If WeekdayDiscountPro = 1 Then
-        If SystemTimeHourInt >= 16 Then
-            If SystemTimeHourInt < 22 Then
-                Var WeekdayDiscountProEventOn = 1
-            EndIf
-        EndIf
-    EndIf
-
-    If SystemDateDayInt >= 11 Then
-        Var OreoDiscount11Pro = 1
-    EndIf
-EndIf
-
-
-If SystemDateMonthInt = 12 Then
-
-    Var WinterWonderPro = 1
-    Var ThickTeaByBrewerPro = 1
-
-    If SystemDateDayInt >= 16 Then
-        Var ThickTeaByBrewerBanner = 1
-    EndIf
-
 EndIf
 
 
@@ -343,6 +214,7 @@ EndIf
 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
 	Var New_Payment = 1
+	Var CleanFeedbackFlag = 1
 	Var 12Day12MenuPro = 0
 	;Var WinterWonderPro = 0
 	;Var ThickTeaByBrewerBanner = 0

xml/page_clean_feedback.xml

@@ -0,0 +1,181 @@
+<Popup>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Volume> SoundVolume </Volume>
+    <Background> "0xffffff" </Background>
+    <EventOpen>
+        Var Timeout = 0
+        Var TimeoutTarget = 10
+
+        Var DirImage = "ROOT/taobin_project/image/clean_feedback/"
+
+
+        Var PopupTitle = "คะแนนความสะอาดของตู้"
+        Var Description = "ช่วยน้องเต่าประเมินด้วยน๊า.. เพราะเราอยากพัฒนาขึ้นในทุก ๆ วัน"
+
+        Var TitleSize = 65
+
+        Var FeedbackLevel[0] = DirImage + "bn_feedback_level_1.png"
+        Var FeedbackLevel[0].Pressed = DirImage + "bp_feedback_level_1.png"
+        Var FeedbackLevel[1] = DirImage + "bn_feedback_level_2.png"
+        Var FeedbackLevel[1].Pressed = DirImage + "bp_feedback_level_2.png"
+        Var FeedbackLevel[2] = DirImage + "bn_feedback_level_3.png"
+        Var FeedbackLevel[2].Pressed = DirImage + "bp_feedback_level_3.png"
+        Var FeedbackLevel[3] = DirImage + "bn_feedback_level_4.png"
+        Var FeedbackLevel[3].Pressed = DirImage + "bp_feedback_level_4.png"
+        Var FeedbackLevel[4] = DirImage + "bn_feedback_level_5.png"
+        Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5.png"
+
+        If show_eng = "true" Then
+            Var PopupTitle = "Cleanliness Score of the Machine"
+            Var Description = "Please help us evaluate! We want to improve every single day."
+
+            Var TitleSize = 55
+
+            Var FeedbackLevel[0] = DirImage + "bn_feedback_level_1_en.png"
+            Var FeedbackLevel[0].Pressed = DirImage + "bp_feedback_level_1_en.png"
+            Var FeedbackLevel[1] = DirImage + "bn_feedback_level_2_en.png"
+            Var FeedbackLevel[1].Pressed = DirImage + "bp_feedback_level_2_en.png"
+            Var FeedbackLevel[2] = DirImage + "bn_feedback_level_3_en.png"
+            Var FeedbackLevel[2].Pressed = DirImage + "bp_feedback_level_3_en.png"
+            Var FeedbackLevel[3] = DirImage + "bn_feedback_level_4_en.png"
+            Var FeedbackLevel[3].Pressed = DirImage + "bp_feedback_level_4_en.png"
+            Var FeedbackLevel[4] = DirImage + "bn_feedback_level_5_en.png"
+            Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_en.png"
+        EndIf
+
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var Timeout = Timeout + 1
+
+        If Timeout > TimeoutTarget Then
+            Function 2
+        EndIf
+
+        TimerReset
+    </EventTimeout>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    ; Background
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> "ROOT/taobin_project/image/display_point/alpha.png" </Filename>
+    </Image>
+
+
+    <Image>
+        <X> 45 </X>
+        <Y> 669 </Y>
+        <Filename> Var( DirImage + "/popup_bg.png" ) </Filename>
+    </Image>
+
+    <Button>
+        <X> 965 </X>
+        <Y> 698 </Y>
+        <Filename> Var( DirImage + "/exit_icon.png" ) </Filename>
+        <EventClick>
+        Function 2
+        </EventClick>
+    </Button>
+
+    <Text>
+        <X> 45 </X>
+        <Y> 745 </Y>
+        <Width> 987 </Width>
+        <Align> center-vertical-horizontal </Align>
+        <Font> KanitRegularTTF </Font>
+        <Size> TitleSize </Size>
+        <Color> 0x513C2F </Color>
+        <Value> PopupTitle </Value>
+    </Text>
+
+    <Text>
+        <X> 45 </X>
+        <Y> 823 </Y>
+        <Width> 987 </Width>
+        <Align> center-vertical-horizontal </Align>
+        <Font> KanitSemiBoldTTF </Font>
+        <Size> 31 </Size>
+        <Color> 0xDE794E </Color>
+        <Value> Description </Value>
+    </Text>
+
+    <Button>
+        <X> 103 </X>
+        <Y> 925 </Y>
+        <Filename> FeedbackLevel[0] </FileName>
+        <FilenamePress> FeedbackLevel[0].Pressed </FilenamePress>
+        <EventClick>
+            __CMD "machine-cleanliness-score" 1 "-" "-"
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 279 </X>
+        <Y> 925 </Y>
+        <Filename> FeedbackLevel[1] </FileName>
+        <FilenamePress> FeedbackLevel[1].Pressed </FilenamePress>
+        <EventClick>
+            __CMD "machine-cleanliness-score" 2 "-" "-"
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 455 </X>
+        <Y> 925 </Y>
+        <Filename> FeedbackLevel[2] </FileName>
+        <FilenamePress> FeedbackLevel[2].Pressed </FilenamePress>
+        <EventClick>
+            __CMD "machine-cleanliness-score" 3 "-" "-"
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 632 </X>
+        <Y> 925 </Y>
+        <Filename> FeedbackLevel[3] </FileName>
+        <FilenamePress> FeedbackLevel[3].Pressed </FilenamePress>
+        <EventClick>
+            __CMD "machine-cleanliness-score" 4 "-" "-"
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 809 </X>
+        <Y> 925 </Y>
+        <Filename> FeedbackLevel[4] </FileName>
+        <FilenamePress> FeedbackLevel[4].Pressed </FilenamePress>
+        <EventClick>
+            __CMD "machine-cleanliness-score" 5 "-" "-"
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Function2>
+        If CleanFeedBackToCollectPoint = 1 Then
+            If NewCollectPoint = 1 Then
+                If LuckyDrawCampaign = 1 Then
+                    If luckyDrawAlredyGotReward = 1 Then
+                        Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+                    Else
+                        Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
+                    EndIf
+                Else
+                    Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
+                EndIf
+            Else
+                Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+            EndIf
+        Else
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
+    </Function2>
+</Popup>

xml/page_collect_point_1.xml

@@ -25,13 +25,23 @@
 	If Seeker.CodeChannel = 1 Then
 		If Seeker.CollectPointMain = 0 Then
 			SAVELOG "Seeker.CollectPointMain = 0 Jump!!!"
+            If CleanFeedbackFlag = 1 Then
+                Var CleanFeedBackToCollectPoint = 0
+                Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+            Else
                 Open "ROOT/taobin_project/xml/page_lid_straw.xml"
             EndIf
 		EndIf
+	EndIf
 
 	If SettingIgnoreCollectPoint = 1 Then
+    	If CleanFeedbackFlag = 1 Then
+            Var CleanFeedBackToCollectPoint = 0
+    	    Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+    	Else
             Open "ROOT/taobin_project/xml/page_lid_straw.xml"
     	EndIf
+	EndIf
 
 	Var ShowErrorText = "Invisible"
 
@@ -137,8 +147,6 @@
 		EndIf
 	EndIf
 
-	DEBUGVAR NotCollectPointPromotion
-
 	DEBUGVAR RobinsonBeautyPro
 	DEBUGVAR FromRobinsonBeautyPro
 	DEBUGVAR JemilaPro
@@ -173,54 +181,10 @@
 			Var TelephoneNumberX = TelephoneNumber
 			DEBUGVAR TelephoneNumber
 
-			If FromTeaTimePro = 1 Then
-				Var TelPhoneNum = TelephoneNumber
-				Var drink_price = PriceFromCatalog
-				Var param2 = ""
-				Var param3 = ""
-				AddData 45 TelPhoneNum drink_price param2 param3
-			EndIf
-
-
-
 			;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP
 
-			If NotCollectPointPromotion = 0 Then
-				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
-
-				If JemilaPro = 1 Then
-					If FromJemilaPro = 1 Then
-					    If JemilaRewardOutOfStock = 1 Then
-                            SAVELOG "Jemila prize out of stock skip collect promotion point."
-						Else
-    						If Seeker.CodeChannel = 1 Then
-    							If Seeker.CollectPointPromotion = 1 Then
-    								GETACCEXT TelephoneNumber 40
-    								Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
-    							EndIf
-    						Else
-    							GETACCEXT TelephoneNumber 40
-    							Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
-    						EndIf
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-
 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
 
@@ -229,14 +193,6 @@
 
 		Var TelephoneNumber = Seeker.TNumberTaobinCredit
 
-		If FromTeaTimePro = 1 Then
-			Var TelPhoneNum = TelephoneNumber
-			Var drink_price = PriceFromCatalog
-			Var param2 = ""
-			Var param3 = ""
-			AddData 45 TelPhoneNum drink_price param2 param3
-		EndIf
-
 		Var StepGetPoint = 1
 
 		Var PdpaAsk = 0
@@ -256,40 +212,6 @@
 		Var Param1 = TelephoneNumber + "/"
 		Var Param1 = Param1 + ParamCP
 
-		If NotCollectPointPromotion = 0 Then
-			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
-
-			If JemilaPro = 1 Then
-				If FromJemilaPro = 1 Then
-				    If JemilaRewardOutOfStock = 1 Then
-                        SAVELOG "Jemila prize out of stock skip collect promotion point."
-                    Else
-                        If Seeker.CodeChannel = 1 Then
-                            If Seeker.CollectPointPromotion = 0 Then
-                                GETACCEXT TelephoneNumber 40
-                                Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
-                            EndIf
-                        Else
-                            GETACCEXT TelephoneNumber 40
-                            Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
-                        EndIf
-                    EndIf
-				EndIf
-			EndIf
-		EndIf
-
 
 		GETACCEXT Param1 23
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@@ -339,9 +261,13 @@
 		SAVELOG "collect_point1-p107."
 		;Open "ROOT/taobin_project/xml/page_catalog.xml"
 
-
+		If CleanFeedbackFlag = 1 Then
+            Var CleanFeedBackToCollectPoint = 0
+            Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+		Else
             Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
+	EndIf
 
 	If Timeout = 18 Then
 		Var date_time_str = ""
@@ -686,11 +612,17 @@
 	;Open "ROOT/taobin_project/xml/page_catalog.xml"
 	SAVELOG "collect_point1-p589."
 
+	If CleanFeedbackFlag = 1 Then
+        Var CleanFeedBackToCollectPoint = 0
+        Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+	Else
     	If LuckyDrawCampaign = 1 Then
     		Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
     	Else
     		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
     	EndIf
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -732,88 +664,15 @@
 			;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 			DEBUGVAR TelephoneNumber
 
-			If FromTeaTimePro = 1 Then
-				Var TelPhoneNum = TelephoneNumber
-				Var drink_price = PriceFromCatalog
-				Var param2 = ""
-				Var param3 = ""
-				AddData 45 TelPhoneNum drink_price param2 param3
-			EndIf
-
-
-
 			If ChildrenFree = 1 Then
 				Var Seeker.TNumberTaobinMember = TelephoneNumber
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
 
-
-
-
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP
 
-			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 NotCollectPointPromotion = 0 Then
-				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
-
-				If JemilaPro = 1 Then
-					If FromJemilaPro = 1 Then
-					    If JemilaRewardOutOfStock = 1 Then
-                            SAVELOG "Jemila prize out of stock skip collect promotion point."
-                        Else
-                            If Seeker.CodeChannel = 1 Then
-                                If Seeker.CollectPointPromotion = 0 Then
-                                    GETACCEXT TelephoneNumber 40
-                                    Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
-                                EndIf
-                            Else
-                                GETACCEXT TelephoneNumber 40
-                                Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
-                            EndIf
-                        EndIf
-					EndIf
-				EndIf
-			EndIf
-
 			GETACCEXT Param1 23
-			;Open "ROOT/taobin_project/xml/page_catalog.xml"
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
 
 		Else

xml/page_collect_point_2.xml

@@ -139,6 +139,10 @@
 					INT luckyDrawTicket
 					Var luckyDrawAlredyGotReward = Ext1i
 
+					If CleanFeedbackFlag = 1 Then
+                        Var CleanFeedBackToCollectPoint = 1
+                        Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+					Else
                         If FromHalloweenPro = 1 Then
                             Open "ROOT/taobin_project/xml/event/halloween/check_quota.xml"
                         Else
@@ -146,6 +150,7 @@
                                 Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
                             Else
                                 Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
+                            EndIf
                         EndIf
 					EndIf
 
@@ -284,11 +289,21 @@
 						If LuckyDrawCampaign = 1 Then
 							Var GetLuckyDraw = 1
 							GETACCEXT TelephoneNumber 14
+						Else
+						    If CleanFeedbackFlag = 1 Then
+                                Var CleanFeedBackToCollectPoint = 1
+                                Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
 							Else
 							    Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
 							EndIf
+						EndIf
+					Else
+                        If CleanFeedbackFlag = 1 Then
+                            Var CleanFeedBackToCollectPoint = 1
+                            Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
                         Else
                             Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+                        EndIf
 					EndIf
 
 

xml/page_collect_point_error.xml

@@ -43,9 +43,13 @@
         ; goto lid straw
 
 
-
+        If CleanFeedbackFlag = 1 Then
+            Var CleanFeedBackToCollectPoint = 0
+            Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+        Else
             Open "ROOT/taobin_project/xml/page_lid_straw.xml"
         EndIf
+	EndIf
 
 	TimerReset
 	Refresh
@@ -92,7 +96,12 @@
 	; goto lid straw
 
 
+	If CleanFeedbackFlag = 1 Then
+        Var CleanFeedBackToCollectPoint = 0
+        Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+    Else
         Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    EndIf
 
 </EventClick>
 </Button>

xml/page_payment_code.xml

@@ -289,7 +289,7 @@
 					If ShouldCollectPoint = 1 Then
 						Var Seeker.CollectPointMain = 1
 
-						If PayMentCodeShouldCollectPromotionPoint = 1 Then
+						If PaymentCodeShouldCollectPromotionPoint = 1 Then
 							Var Seeker.CollectPointPromotion = 1
 						EndIf
 					EndIf
@@ -335,7 +335,7 @@
 						Var Seeker.CollectPointMain = 1
 					EndIf
 
-					If PayMentCodeShouldCollectPromotionPoint = 1 Then
+					If PaymentCodeShouldCollectPromotionPoint = 1 Then
 						Var Seeker.CollectPointPromotion = 1
 					EndIf
 				EndIf

xml/page_show_consent.xml

@@ -62,6 +62,10 @@
 		Var StepGetPoint = 1
 		;GETACCEXT TelephoneNumber 14
 		; goto lid straw
+		If CleanFeedbackFlag = 1 Then
+            Var CleanFeedBackToCollectPoint = 1
+		    Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+		Else
     		If NewCollectPoint = 1 Then
     			If LuckyDrawCampaign = 1 Then
     				Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
@@ -71,6 +75,7 @@
     		Else
     			Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
     		EndIf
+		EndIf
 
 	EndIf
 
@@ -137,6 +142,10 @@
 
 	If UnitTestType = "1" Then
 		Var CoffeePoint = 10
+		If CleanFeedbackFlag = 1 Then
+		    Var CleanFeedBackToCollectPoint = 1
+		    Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+		Else
     		If NewCollectPoint = 1 Then
     			If LuckyDrawCampaign = 1 Then
     				Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
@@ -147,12 +156,17 @@
     			Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
     		EndIf
 		EndIf
+	EndIf
 
 	Var Seeker.FromConsent = 1
 
     Var StepGetPoint = 1
     ;GETACCEXT TelephoneNumber 14
 	; goto lid straw
+	If CleanFeedbackFlag = 1 Then
+        Var CleanFeedBackToCollectPoint = 1
+	    Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+	Else
   		If NewCollectPoint = 1 Then
  			If LuckyDrawCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
@@ -162,6 +176,7 @@
   		Else
  			Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
   		EndIf
+	EndIf
 
 </EventClick>
 </Button>

xml/page_thankyou.xml

@@ -318,16 +318,8 @@
 	If CountDownThankyou = 0 Then
 
 		If IgnoreNetCore = "true" Then
-			If Seeker.IsLineMember = 0 Then
-				If LuckyDrawCampaign = 1 Then
-					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-				Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
-			Else
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-		EndIf
 
 		If TestLoopMakeDrink = 1 Then
 			Open "ROOT/taobin_project/xml/page_brewing_test_loop.xml"
@@ -340,6 +332,11 @@
 
 
 		If RoadShow = "true" Then
+
+            If CleanFeedbackFlag = 1 Then
+                Var CleanFeedBackToCollectPoint = 0
+                Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+            Else
                 If Seeker.IsLineMember = 0 Then
                     If LuckyDrawCampaign = 1 Then
                         Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
@@ -349,11 +346,18 @@
                 Else
                     Open "ROOT/taobin_project/xml/page_lid_straw.xml"
                 EndIf
+            EndIf
+
 		Else
 
 			If EnablePayLaterMode = 1 Then
+			    If CleanFeedbackFlag = 1 Then
+                    Var CleanFeedBackToCollectPoint = 0
+                    Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+                Else
                     Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 				EndIf
+			EndIf
 
 
 			Var Seeker.OrderChanel = Seeker.OrderChanel + ":"
@@ -428,16 +432,8 @@
 				EndIf
 
 				If 	CART_INDEX >= 2  Then
-					If Seeker.IsLineMember = 0 Then
-						If LuckyDrawCampaign = 1 Then
-							Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-						Else
 					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 				EndIf
-					Else
-						Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-					EndIf
-				EndIf
 
 				DEBUGVAR ChangeFlag2
 
@@ -523,16 +519,8 @@
 						EndIf
 					Else
 						If 	CART_INDEX >= 2  Then
-							If Seeker.IsLineMember = 0 Then
-								If LuckyDrawCampaign = 1 Then
-									Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-								Else
 							Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 						EndIf
-							Else
-								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-							EndIf
-						EndIf
 
 						TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 					EndIf
@@ -583,16 +571,8 @@
 							EndIf
 						Else
 							If 	CART_INDEX >= 2  Then
-								If Seeker.IsLineMember = 0 Then
-									If LuckyDrawCampaign = 1 Then
-										Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
-									Else
 								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 							EndIf
-								Else
-									Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-								EndIf
-							EndIf
 							TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 						EndIf
 					EndIf