THAI: Add Cocoa 7.7 pro

xml/event/ignore_gen_promotion_nam_hom_coconut.xml

@@ -1336,13 +1336,13 @@
 </Block>
 ; menu_new_li;TAGESP
 	; ==================> Len = 12
-	; -  12-05-03-0092 
+	; - - 12-05-03-0092 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( .Button,12-05-03-0092.Button,Disable=Invisible,$Sum1205030092) </State> 
+	<State> Flag( 12-05-03-0092.Button,Disable=Invisible,$Sum1205030092) </State> 
 	<Button>
 	<State> $Sum1205030092 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_coconut.png" </Filename>
@@ -1359,7 +1359,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $.Price
+		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-05-03-0092.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "##-##-##-####"
@@ -1384,7 +1384,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" ""
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -1498,7 +1498,7 @@
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>

xml/event/multi_promotion_config_cocoa77_nam_hom_coconut.json

@@ -0,0 +1,32 @@
+[
+    {
+        "name": "cocoa_77",
+        "template": "/event/promotion_video_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
+            "normal_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
+            "press_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
+            "press_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
+            "disable_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
+            "disable_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
+            "video_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
+        }
+    },
+    {
+        "name": "nam_hom_coconut",
+        "template": "/event/promotion_video_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png",
+            "normal_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png",
+            "press_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png",
+            "disable_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png",
+            "video_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml"
+        }
+    }
+]

xml/event/promotion_template1.inc

@@ -32,7 +32,7 @@
         )
      </FilenameDisable>
 <EventOnClick> 
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa77.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
         
 </EventOnClick>
 

xml/event/script_common_for_open_promotion_xml.ev

@@ -4,15 +4,9 @@ DEBUGVAR PayOfflineMode
 DEBUGVAR CocktailShow
 DEBUGVAR OpenFromPageBoard
 
-DEBUGVAR LipitPro
+
-DEBUGVAR MondayBananaPro
-DEBUGVAR PepsiSecondCup30Enable
-DEBUGVAR FreeEnergyDrink
-DEBUGVAR EnergyDrinkEnable
-DEBUGVAR EnergyDrink1BathPro
-DEBUGVAR CoffeeDrink1BathPro
-DEBUGVAR WednesdayMelonPro
 DEBUGVAR NamHomCoconutPro
+DEBUGVAR Cocoa77Pro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -39,75 +33,27 @@ Else
 	Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
 	; zone promote
 
-	If NamHomCoconutPro = 1 Then
+	If Cocoa77Pro = 1 Then
 		Var PromotionState1 = "Enable"
 		Var CountEnablePromotion = CountEnablePromotion + 1
 
-		If EnergyDrink1BathPro = 1 Then
+		If NamHomCoconutPro = 1 Then
 			Var PromotionState2 = "Enable"
 			Var CountEnablePromotion = CountEnablePromotion + 1
 		EndIf
 
-		If WednesdayMelonPro = 1 Then
-			Var PromotionState3 = "Enable"
-			Var CountEnablePromotion = CountEnablePromotion + 1
-		EndIf
 
 		If CountEnablePromotion > 1 Then
-			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml"
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_cocoa_77_and_nam_hom_coconut.xml"
 		Else
-			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/ignore_gen_promotion_nam_hom_coconut.xml"
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_cocoa77.xml"
 		EndIf
 	Else
-		If EnergyDrink1BathPro = 1 Then
-			Var PromotionState1 = "Enable"
-			Var CountEnablePromotion = CountEnablePromotion + 1
 	
-			If MondayBananaPro = 1 Then
+		If NamHomCoconutPro = 1 Then
-				Var PromotionState2 = "Enable"
+			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/ignore_gen_promotion_nam_hom_coconut.xml"
-				Var CountEnablePromotion = CountEnablePromotion + 1
-			EndIf
-		
-			If WednesdayMelonPro = 1 Then
-				Var PromotionState3 = "Enable"
-				Var CountEnablePromotion = CountEnablePromotion + 1
-			EndIf
-
-			If CountEnablePromotion > 1 Then
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_energy_drink_1_bath_and_monday_banana_and_wednesday_melon.xml"
-			Else
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_energy_drink_1_bath.xml"
-			EndIf
-		Else
-			If CoffeeDrink1BathPro = 1 Then
-				Var PromotionState1 = "Enable"
-				Var CountEnablePromotion = CountEnablePromotion + 1
-
-				If MondayBananaPro = 1 Then
-					Var PromotionState2 = "Enable"
-					Var CountEnablePromotion = CountEnablePromotion + 1
-				EndIf
-
-				If WednesdayMelonPro = 1 Then
-					Var PromotionState3 = "Enable"
-					Var CountEnablePromotion = CountEnablePromotion + 1
-				EndIf
-
-				If CountEnablePromotion > 1 Then
-					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_coffee_drink_1_bath_and_monday_banana_and_wednesday_melon.xml"
-				Else
-					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coffee_drink_1_bath.xml"
-				EndIf
-			Else
-				If MondayBananaPro = 1 Then
-					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_monday_banana.xml"
-				EndIf
-				
-				If WednesdayMelonPro = 1 Then
-					Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_wednesday_melon.xml"
-				EndIf
-			EndIf
 		EndIf
+
 	EndIf
 
 

xml/event/tricker.ev

@@ -226,17 +226,8 @@ EndIf
 
 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
-	Var EnergyDrink1BathPro = 1
-	Var CoffeeDrink1BathPro = 0
 	Var NamHomCoconutPro = 1
-	;Var CheckMemberPageCampaign = 1
+	Var Cocoa77Pro = 1
-EndIf
-
-If BoxID = 200001 Then
-	Var NewFlowPaymentCode = 1
-	Var NamHomCoconutPro = 1
-	Var EnergyDrink1BathPro = 1
-	Var CoffeeDrink1BathPro = 0
 EndIf
 
 
@@ -361,55 +352,10 @@ Else
 	Var WednesdayMelonPro = 0
 EndIf
 
-If BananaSyrupEnable = "true" Then
+If CocoaPowderEnable = "true" Then
 
 Else
-	Var ProBadValentineEnable = 0
+	Var Cocoa77Pro = 0
-	Var MondayBananaPro = 0
-EndIf
-
-
-If PeachSyrupEnable = "true" Then
-
-Else
-	Var ProPeachEnable = 0
-EndIf
-
-If EnergyDrinkEnable = "true" Then
-
-Else
-	Var EnergyDrink1BathPro = 0
-	Var FreeEnergyDrink = 0
-EndIf
-
-If FreeFirePro = 1 Then	
-	Var FreeFireMenuState1 = $12-99-03-0026.Button
-	Var FreeFireMenuState2 = $12-99-03-0067.Button
-	Var FreeFireMenuState3 = $12-99-03-0066.Button
-Else
-	Var FreeFireMenuState1 = "Invisible"
-	Var FreeFireMenuState2 = "Invisible"
-	Var FreeFireMenuState3 = "Invisible"
-EndIf
-
-If LipitPro = 1 Then
-
-	READ_FILE "/mnt/sdcard/lipit_reward_out_of_stock" lipitOutOfStock
-	STRCONTAIN "1" lipitOutOfStock LipitOutOfStockContain
-	If LipitOutOfStockContain = "true" Then
-		Var LipitRewardOutOfStock = 1
-	EndIf
-	
-	Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro1.mp4"
-	Var CountDownShowButton = 0
-	;Var MainPageEventWithTimeout = 25
-	Var ShowButtonClickFull = "Invisible"
-
-	Var img_rest_main_page = "ROOT/taobin_project/image/main_page/bn_main_page_start.png"
-	Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page/bn_main_page_member.png"
-	Var img_reset_topup = "ROOT/taobin_project/image/main_page/bn_main_page_topup.png"
-
-	Var WebAppShow = "Invisible"
 EndIf
 
 

xml/menu_new_layout_gen.py

@@ -236,7 +236,7 @@
     else:
       from_nam_hom_coconut = False
 
-    if current_file_name == "page_catalog_group_pro_cocoa77.skt":
+    if current_file_name == "page_catalog_group_pro_cocoa_77.skt":
       from_cocoa77 = True
       cocoa77_fix_price = True
     else:
@@ -456,6 +456,9 @@
           out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price - 7\r\n')
           out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price - 7\r\n')
           out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price - 7\r\n')
+          out_xml( '\t\tVar OriginalPriceD1 = $' + spl[4] + '.Price\r\n')
+          out_xml( '\t\tVar OriginalPriceD2 = $' + spl[5] + '.Price\r\n')
+          out_xml( '\t\tVar OriginalPriceD3 = $' + spl[6] + '.Price\r\n')
         else:
           out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n')
           out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n')
@@ -707,6 +710,8 @@
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(monday_banana_prices, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               elif wednesday_melon_prices:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(wednesday_melon_prices, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif cocoa77_fix_price:
+                out_xml( '\t<Value> StringFmt(  $' + spl[4] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
@@ -718,6 +723,8 @@
               out_xml( '\t<Value> "฿' + str(GetPrice(monday_banana_prices, spl[4])) + '" </Value>\r\n')
             elif wednesday_melon_prices:
               out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[4])) + '" </Value>\r\n')
+            elif cocoa77_fix_price:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price - 7 ) </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
           out_xml( '\t</Text>\r\n')
@@ -1294,11 +1301,15 @@
             else:
               if wednesday_melon_prices:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(wednesday_melon_prices, spl[8])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif cocoa77_fix_price:
+                out_xml( '\t<Value> StringFmt(  $' +spl[8] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' +spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
             if wednesday_melon_prices:
               out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[8])) + '" </Value>\r\n')
+            elif cocoa77_fix_price:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price - 7 ) </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n')
 
@@ -1347,11 +1358,15 @@
             else:
               if wednesday_melon_prices:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(wednesday_melon_prices, spl[9])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif cocoa77_fix_price:
+                out_xml( '\t<Value> StringFmt(  $' +spl[9] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' +spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
             if wednesday_melon_prices:
               out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[9])) + '" </Value>\r\n')
+            elif cocoa77_fix_price:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price - 7 ) </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n')
           
@@ -1399,11 +1414,15 @@
             else:
               if wednesday_melon_prices:
                 out_xml( '\t<Value> StringFmt(  ' + str(GetPrice(wednesday_melon_prices, spl[10])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+              elif cocoa77_fix_price:
+                out_xml( '\t<Value> StringFmt(  $' +spl[10] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
               else:
                 out_xml( '\t<Value> StringFmt(  $' +spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
           else:
             if wednesday_melon_prices:
               out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[10])) + '" </Value>\r\n')
+            elif cocoa77_fix_price:
+              out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price - 7 ) </Value>\r\n')
             else:
               out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n')
           

xml/page_board.xml

@@ -208,6 +208,7 @@
 	STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable
 	STRCONTAIN "1206" MaterialAvailable EnergyDrinkEnable
 	STRCONTAIN "1216" MaterialAvailable CoconutSyrupEnable
+	STRCONTAIN "1042" MaterialAvailable CocoaPowderEnable
 
 	;Var AppFastEnable = "false"
 	If AppFastEnable = "true" Then
@@ -757,8 +758,8 @@
 
 		Var cups_sold_text = "CUPS SOLD"
 
-		Var MinPhoneNumber = 8
+		Var MinPhoneNumber = 10
-		Var MaxPhoneNumber = 8
+		Var MaxPhoneNumber = 10
 
 	EndIf
 

xml/page_catalog_group_other.lxml

@@ -128,7 +128,7 @@
 
     
     ; soda and other
-    Var Menu6Selected = "PressForever"
+    Var Menu62Selected = "PressForever"
 
     SAVELOG PreviseXMLFileName2
 

xml/page_catalog_group_other.skt

@@ -13,7 +13,7 @@
 	; On open
 	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
     ; soda and other
-    Var Menu6Selected = "PressForever"
+    Var Menu62Selected = "PressForever"
 
     SAVELOG PreviseXMLFileName2
 

xml/page_catalog_group_other.xml

@@ -10,7 +10,7 @@
 	; On open
 	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
     ; soda and other
-    Var Menu6Selected = "PressForever"
+    Var Menu62Selected = "PressForever"
 
     SAVELOG PreviseXMLFileName2
 
@@ -4821,19 +4821,19 @@ Soda & Ice" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	;  12-05-02-0105 12-05-03-0105 
+	; - 12-05-02-0105 12-05-03-0105 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State> 
+	<State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State> 
 	<Button>
 	<State> $Sum12050201051205030105 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
-	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4843,7 +4843,7 @@ Soda & Ice" </Value>
 		Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $.Price
+		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0105.Price
 		Var PriceD3 = $12-05-03-0105.Price
 		Var PD_CODE1 = "##-##-##-####"
@@ -4852,7 +4852,7 @@ Soda & Ice" </Value>
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0105.Button
 		Var PD_STAGE_3 = $12-05-03-0105.Button
-		Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -4872,7 +4872,7 @@ Soda & Ice" </Value>
 			Topping "Load" "12-05-02-0105"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" ""
+			Topping "Load" "-"
 			Else
 			Topping "Load" "12-05-03-0105"
 			EndIf
@@ -4965,7 +4965,7 @@ Soda & Ice" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5574,19 +5574,19 @@ Soda & Ice" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	;  12-05-02-0106 - 
+	; - 12-05-02-0106 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State> 
+	<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State> 
 	<Button>
 	<State> $Sum1205020106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
-	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -5596,7 +5596,7 @@ Soda & Ice" </Value>
 		Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $.Price
+		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0106.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
@@ -5605,7 +5605,7 @@ Soda & Ice" </Value>
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0106.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -5625,7 +5625,7 @@ Soda & Ice" </Value>
 			Topping "Load" "12-05-02-0106"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" ""
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -5718,7 +5718,7 @@ Soda & Ice" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>

xml/page_catalog_group_pepsi_7up.xml

@@ -1796,19 +1796,19 @@
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	;  12-05-02-0105 12-05-03-0105 
+	; - 12-05-02-0105 12-05-03-0105 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State> 
+	<State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State> 
 	<Button>
 	<State> $Sum12050201051205030105 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
-	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -1818,7 +1818,7 @@
 		Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $.Price
+		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0105.Price
 		Var PriceD3 = $12-05-03-0105.Price
 		Var PD_CODE1 = "##-##-##-####"
@@ -1827,7 +1827,7 @@
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0105.Button
 		Var PD_STAGE_3 = $12-05-03-0105.Button
-		Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -1847,7 +1847,7 @@
 			Topping "Load" "12-05-02-0105"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" ""
+			Topping "Load" "-"
 			Else
 			Topping "Load" "12-05-03-0105"
 			EndIf
@@ -1940,7 +1940,7 @@
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2549,19 +2549,19 @@
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	;  12-05-02-0106 - 
+	; - 12-05-02-0106 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State> 
+	<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State> 
 	<Button>
 	<State> $Sum1205020106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
-	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -2571,7 +2571,7 @@
 		Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $.Price
+		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0106.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
@@ -2580,7 +2580,7 @@
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $12-05-02-0106.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -2600,7 +2600,7 @@
 			Topping "Load" "12-05-02-0106"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" ""
+			Topping "Load" "-"
 			Else
 			Topping "Load" "-"
 			EndIf
@@ -2693,7 +2693,7 @@
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>

xml/page_catalog_group_recommend_multi_pro.skt

@@ -10,9 +10,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	<?hurr
+    ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
-        #include=menu_catalog_default_init.xml
-    ?>
     
     Var Menu1Selected = "PressForever"
 
@@ -40,9 +38,7 @@
     
     EndIf
 
-    <?hurr 
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
-        #include=menu_catalog_new_menu.xml
-    ?>
 
 </EventOpen>
 

xml/page_catalog_group_recommend_multi_pro.xml

@@ -8,113 +8,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	    Var NextPage = "-"
+    ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
-
-    DEBUGVAR ICE_PROCESS_STATUS
-    DEBUGVAR ICE_PROCESS_TXT
-
-    
-    If show_eng = "true" Then 
-        Var showthaiText = "Invisible"
-        Var showengText = "Enable"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
-        Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
-        Var ice_tab_text =  "Ice will be ready at "
-        Var text_unavailable = "UNAVAILABLE###size=16"
-
-
-    Else
-        Var showengText = "Invisible"
-        Var showthaiText = "Enable"
-        
-        Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-        Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
-        Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
-        Var text_unavailable = "หมด###size=32"
-    EndIf
-
-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-
-    ; SpiralOnline
-  
-        Var MenuVSelected2 = "Invisible"
-
-        Var Menu1Selected2 = "Invisible"
-        Var Menu2Selected2 = "Invisible"
-        Var Menu3Selected2 = "Invisible"
-        Var Menu4Selected2 = "Invisible"
-        
-        Var Menu6Selected2 = "Invisible"
-        Var Menu7Selected2 = "Invisible"
-        Var MenuVSelected2 = "Invisible"
-        Var Menu11Selected2 = "Invisible"
-
-        Var Menu21Selected2 = "Invisible"
-
-        Var MenuVSelected2 = "Invisible"
-        If SpiralOnline = "true" Then 
-            If Seeker =  "curr" Then
-                Var MenuVSelected2 = "Enable"
-            EndIf
-        EndIf 
-        
-        ; init default
-        Var Menu1Selected = "Enable"
-        Var Menu2Selected = "Enable"
-        Var Menu3Selected = "Enable"
-        Var Menu4Selected = "Enable"
-        ; 5 fruit
-        Var Menu5Selected = "Invisible"
-        Var Menu6Selected = "Enable"
-        Var Menu7Selected = "Enable"
-        ; 8 cocktail
-        Var Menu8Selected = "Invisible"
-
-        If CocktailShow = "true" Then 
-            Var Menu7Selected = "Invisible"
-            Var Menu8Selected = "Enable"
-        EndIf
-
-            
-        If AppFastEnable = "true" Then
-            Var Menu11Selected = "Enable" 
-            Var Menu21Selected = "Invisible" 
-            Var Menu7Selected = "Invisible"
-        Else
-            If MenuKidEnable = "true" Then
-                Var Menu11Selected = "Invisible" 
-                Var Menu21Selected = "Enable"
-                Var Menu7Selected = "Invisible"
-            Else
-                Var Menu11Selected = "Invisible"
-                Var Menu21Selected = "Invisible" 
-                Var Menu7Selected = "Enable"
-            EndIf
-        EndIf
-
-        If CocktailShow = "true" Then
-            Var Menu7Selected = "Invisible"
-        EndIf 
-
-        If RecipeTag1 = "HealthTurnOn" Then
-            Var Menu22Selected = "Enable"
-        Else
-            Var Menu22Selected = "Invisible"
-        EndIf
-        ;
-        
-
-
     
     Var Menu1Selected = "PressForever"
 
@@ -142,406 +36,12 @@
     
     EndIf
 
-    
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
-    If show_eng = "true" Then 
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
-		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
-    Else
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
-    EndIf
 
 </EventOpen>
 
 
-
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
-; notice enable heathy menu
-
-<Image>
-<X> 0 </X>
-<Y> 380 </Y>
-<Width> 1080 </Width>
-<Height> 1540 </Height>
-<Color> "0xeae6e1" </Color>
-</Image>
-
-
-
-<Timeout> 1000 </Timeout>
-<EventTimeout> 
-    ;DEBUGVAR ICE_PROCESS_STATUS
-    
-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-
-    If NextPage = "-" Then
-
-    Else
-            If CupOnArm = "true" Then
-                If Timeout > 9 Then
-                    SAVELOG "COA9"
-                    Open NextPage
-                EndIf
-            Else
-                If Timeout > 30 Then
-                    SAVELOG "COA30"
-                    Open NextPage
-                EndIf
-            EndIf
-    EndIf
-
-    If Timeout > 60 Then
-        SAVELOG "Timeout"
-        If  Seeker = "next" Then 
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-        Else
-            SAVELOG "Back"
-            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-        EndIf
-    EndIf
-
-    If BrewCommand = "RefreshAll" Then
-        Var BrewCommand = "-"
-        Open CurrentXMLFileName2
-    EndIf
-
-    If Seeker = "curr" Then
-        If DoorCupPosition = "bottom" Then
-            ; It normal 
-            Var EmergencyStop = "false"
-        Else
-            Var EmergencyStop = "true"
-            
-            ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" 
-
-        EndIf
-    EndIf
-
-    If IgnoreNetCore = "true" Then
-
-    Else
-        ;stop_now
-        
-    EndIf
-
-
-    ; zone cup on arm
-    If CupOnArm = "true" Then
-
-        If CheckCupStateDoorCupClose = "" Then
-            If buttonRemoveCup =  "Enable" Then
-
-            Else
-                Refresh
-            EndIf
-
-            Var buttonRemoveCup = "Enable"
-
-        EndIf
-
-        If CheckCupStateDoorCupClose = "done" Then
-            If buttonRemoveCup =  "Enable" Then
-
-            Else
-                Refresh
-            EndIf
-            
-            Var buttonRemoveCup = "Enable"
-       
-        EndIf
-    Else
-        If buttonRemoveCup = "Enable" Then
-            Var buttonRemoveCup = "Invisible"
-            Refresh
-        EndIf
-    EndIf
-
-
-    Var Timeout = Timeout + 1
-    TimerReset
-</EventTimeout> 
-
-
-; under line
-<Image>
-<X> 0 </X>
-<Y> 494 </Y>
-<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
-</Image>
-
-
-; under line
-<Image>
-<X> 0 </X>
-<Y> 358 </Y>
-<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
-</Image>
-
-
-; back
-<Button>
-<X> 19 </X>
-<Y> 381 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-    If SpiralOnline = "true" Then
-        If Seeker =  "curr" Then
-            Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
-        Else
-            Open "ROOT/taobin_project/xml/page_catalog.xml" 
-        EndIf 
-    Else
-	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	EndIf
-
-</EventClick>
-</Button>
-
-<Button>
-<X> 1000 </X>
-<Y> 381 </Y>
-<Filename> show_btn </Filename>
-<FilenamePress> show_btp </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-    ; eng
-    If show_eng = "true" Then 
-        Var show_eng = "false"
-        Var text_unavailable = "หมด###size=32"
-    Else
-        Var show_eng = "true"
-        Var text_unavailable = "UNAVAILABLE###size=16"
-    EndIf
-
-
-    Open CurrentXMLFileName2
-</EventClick>
-</Button>
-
-;
-<ListView1>
-    <Width> 1080 </Width>
-    <Height> "auto" </Height>   
-    <X> 0 </X>
-    <Y> 395 </Y>
-    <Row2>
-    <State>"Enable"</State>
-    <Width> 896 </Width>
-    <Height> 102 </Height> 
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu1Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            SAVELOG "Click rec"
-            Var NextPage = "-"
-       
-
-                TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
-        </EventClick>
-        </Button>
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu2Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
-            
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu3Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            If new_layout = "true" Then
-                Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
-            Else
-                Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
-            EndIf
-        </EventClick>
-        </Button>
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            If new_layout = "true" Then
-                Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
-            Else
-                Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
-
-            EndIf
-        </EventClick>
-        </Button>
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu7Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            If new_layout = "true" Then
-                Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
-            Else
-                Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
-            EndIf
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu11Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            If new_layout = "true" Then
-                Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
-            Else
-                Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
-            EndIf
-        </EventClick>
-        </Button>
-
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu21Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
-        </EventClick>
-        </Button>
-
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu22Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu8Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" 
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> Menu6Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            If new_layout = "true" Then
-                Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
-            Else
-                Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
-            EndIf
-        </EventClick>
-        </Button>
-
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> MenuVSelected2 </State>
-        <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick> 
-            Var NextPage = "-"
-            Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
-        </EventClick>
-        </Button>
-</Row2>
-</ListView1>
-
-<EventWebApp>
-
-    DEBUGVAR web_ready
-    If web_ready = "true" Then
-        If web_ref = QRCODE99x Then
-
-            Var web_readyOK = web_ready
-            Var web_telnumOK = web_telnum
-            
-            Var web_app_prepar = "true"
-            
-			; Handle penetrator
-
-			If Only18 = "true" Then
-				
-                Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
-			Else
-				
-                Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-			EndIf
-
-            ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
-        EndIf
-    Else
-    EndIf
- 
-</EventWebApp>
 
 
 

xml/page_payment.xml

@@ -95,9 +95,6 @@
 		Var PriceDrink = OriginalPrice
 	EndIf
 
-	If FromCocoa77Pro = 1 Then
-		Var PriceDrink = OriginalPrice
-	EndIf
 
 
 	DEBUGVAR PriceDrink
@@ -301,8 +298,8 @@
 	DEBUGVAR PriceDrinkTmp
 
 	If FromCocoa77Pro = 1 Then
-		Var PriceDiff = PriceDrink - PromotionPriceDrink
+		Var PriceDiff = OriginalPrice - PromotionPriceDrink
-		Var Seeker.VendingDiscount = PriceDiff
+		Var DiscountDrink = PriceDiff
 		Var Seeker.CampaignPPrice = PromotionPriceDrink
 	EndIf
 

xml/page_payment_cash.xml

@@ -178,6 +178,7 @@
 	SAVELOG QRCODE99
 	DEBUGVAR QRCODE99
 
+	SAVELOG Seeker.VendingDiscount
 	SAVELOG VendingCampaign
 	SAVELOG Seeker.VendingCode
 	SAVELOG Seeker.CodeChannel