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

inc/video.inc

@@ -63,7 +63,7 @@
                 EndIf
             EndIf
            
-         Else
+        Else
                 Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
         EndIf
@@ -130,6 +130,11 @@
         EndIf
     EndIf
 
+    If CountryName = "UnitedArabEmirates Dubai" Then
+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
+    EndIf
+
     DEBUGVAR DisplayAds
 
 </EventOpen>
@@ -255,6 +260,11 @@
         EndIf
     EndIf
 
+    If CountryName = "UnitedArabEmirates Dubai" Then
+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
+    EndIf
+
     Var XMLFileVideo = "false"
     DEBUGVAR XMLFileVideo
     DEBUGVAR DisplayAds

inter/uae_dubai/xml/page_catalog_group_coffee.lxml

@@ -1271,7 +1271,7 @@
 		Var aliasName[5] = "-"
 		Var aliasDesc[5] = "-"
 		Var NameLang[0][0] = "DOUBLE ESPRESSO"
-		Var NameLang[0][1] = "إسبرسو مزدوج"
+		Var NameLang[0][1] = "إسبريسو مزدوج"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
 		Var NameLang[0][4] = ""
@@ -1545,7 +1545,7 @@
 		Var aliasName[5] = "-"
 		Var aliasDesc[5] = "-"
 		Var NameLang[0][0] = "DOUBLE ESPRESSO"
-		Var NameLang[0][1] = "إسبرسو مزدوج"
+		Var NameLang[0][1] = "إسبريسو مزدوج"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
 		Var NameLang[0][4] = ""
@@ -3469,7 +3469,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7023,7 +7023,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7035,7 +7035,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -10311,7 +10311,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -18219,7 +18219,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE"
-		Var NameLang[2][1] = "عصير الشاي التايلاندي والقهوة واللاتيه"
+		Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
@@ -22540,6 +22540,276 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 53-21-02-0071 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 53-21-02-0071.Button,$Sum5321020071) </State> 
+	<Button>
+	<State> $Sum5321020071 </State> 
+	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_almost_dirty_normal_coffee.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_almost_dirty_normal_coffee.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_almost_dirty_normal_coffee.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/uae_dubai/image/page_drink_picture2_n/" + "bn_almost_dirty_normal_coffee.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $53-21-02-0071.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "53-21-02-0071"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "ALMOST DIRTY "
+		Var aliasDesc[0] = "ALMOST DIRTY "
+		Var aliasName[1] = "قذر تقريبًا "
+		Var aliasDesc[1] = "قذر تقريبًا "
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "-"
+		Var aliasDesc[5] = "-"
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "ALMOST DIRTY "
+		Var NameLang[1][1] = "قذر تقريبًا"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "ALMOST DIRTY "
+		Var DescLang[1][1] = "قذر تقريبًا"
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $53-21-02-0071.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "53-21-02-0071"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>ALMOST DIRTY </LanguageSlot1>
+		<LanguageSlot2>قذر تقريبًا </LanguageSlot2>
+		<LanguageSlot3>ALMOST DIRTY </LanguageSlot3>
+		<LanguageSlot4>قذر تقريبًا </LanguageSlot4>
+		<LanguageSlot5>ALMOST DIRTY </LanguageSlot5>
+		<LanguageSlot6>قذر تقريبًا </LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>ALMOST DIRTY </LanguageSlot1>
+		<LanguageSlot2>قذر تقريبًا </LanguageSlot2>
+		<LanguageSlot3>ALMOST DIRTY </LanguageSlot3>
+		<LanguageSlot4>قذر تقريبًا </LanguageSlot4>
+		<LanguageSlot5>ALMOST DIRTY </LanguageSlot5>
+		<LanguageSlot6>قذر تقريبًا </LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $53-21-02-0071.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $53-21-02-0071.Button </State>
+	<Value> StringFmt( $53-21-02-0071.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5321020071 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $53-21-02-0071.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5321020071 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart

inter/uae_dubai/xml/page_catalog_group_health.lxml

@@ -5926,7 +5926,7 @@
 		Var aliasName[5] = "-"
 		Var aliasDesc[5] = "-"
 		Var NameLang[0][0] = "Hot COCOA"
-		Var NameLang[0][1] = "الكاكاو الساخن"
+		Var NameLang[0][1] = "كاكاو ساخن"
 		Var NameLang[0][2] = ""
 		Var NameLang[0][3] = ""
 		Var NameLang[0][4] = ""

inter/uae_dubai/xml/page_catalog_group_recommend.lxml

@@ -6469,7 +6469,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -6481,7 +6481,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""

inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.skt

@@ -0,0 +1,76 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+    ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+    
+    Var Menu1Selected = "PressForever"
+
+    Var OreoBigButtonEnable = "Enable"
+
+    If $12-01-01-0001.Button = "Invisible" Then
+        Var esp102101001Enable = "Invisible"
+        Var esp122101001Enable = "Enable"
+
+    Else
+        Var esp102101001Enable = "Enable"
+        Var esp122101001Enable = "Invisible"
+
+    EndIf
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+    If show_eng = "true" Then 
+    
+        Var text_unavailable = "UNAVAILABLE###size=16"
+    Else
+        Var text_unavailable = "หมด###size=32"
+    
+    EndIf
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+;BigLogoLayout
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
+
+

inter/uae_dubai/xml/page_catalog_group_tea.lxml

@@ -2923,7 +2923,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[0][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[0][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -2935,7 +2935,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[1][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[1][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -2947,7 +2947,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[2][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[2][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""

xml/.page_topping_select_icream.xml

@@ -6504,7 +6504,7 @@
 	SAVELOG PriceDrinkTmp
 
 	If RoadShow = "true" Then
-		Var PriceDrinkTmp = 0
+		
 		Var PriceDrinkTmpShow = "Free"
 
 		DEBUGVAR SelectDrink2

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_board.xml

@@ -962,6 +962,8 @@
 
 		Var PriceUnitText = "Price in DH"
 
+		Var cups_sold_text = "Cups Sold Worldwide"
+
 		Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
 		Var show_eng_button_stage = "Invisible"
 

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

xml/page_topping_select6.lxml

@@ -4000,7 +4000,7 @@
 	SAVELOG PriceDrinkTmp
 
 	If RoadShow = "true" Then
-		Var PriceDrinkTmp = 0
+		
 		Var PriceDrinkTmpShow = "Free"
 
 		DEBUGVAR SelectDrink2

xml/page_topping_select6.xml

@@ -4216,7 +4216,7 @@
 	SAVELOG PriceDrinkTmp
 
 	If RoadShow = "true" Then
-		Var PriceDrinkTmp = 0
+		
 		Var PriceDrinkTmpShow = "Free"
 
 		DEBUGVAR SelectDrink2

xml/page_topping_select7.xml

@@ -7679,7 +7679,7 @@
 	SAVELOG PriceDrinkTmp
 
 	If RoadShow = "true" Then
-		Var PriceDrinkTmp = 0
+		
 		Var PriceDrinkTmpShow = "Free"
 
 		DEBUGVAR SelectDrink2

xml/page_topping_select7_copy.xml

@@ -4750,7 +4750,7 @@
 	SAVELOG PriceDrinkTmp
 
 	If RoadShow = "true" Then
-		Var PriceDrinkTmp = 0
+		
 		Var PriceDrinkTmpShow = "Free"
 
 		DEBUGVAR SelectDrink2

xml/page_topping_select8.xml

@@ -5720,7 +5720,7 @@
 	SAVELOG PriceDrinkTmp
 
 	If RoadShow = "true" Then
-		Var PriceDrinkTmp = 0
+		
 		Var PriceDrinkTmpShow = "Free"
 
 		DEBUGVAR SelectDrink2

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.90"
+	Var XMLPageVersion = "8.91"
-	Var XMLPageVersionInt = 890
+	Var XMLPageVersionInt = 891
 ;Oreo
 Var OreoGuarantee = 0