fix bug web credit

adv/sync_4.file

@@ -0,0 +1,36 @@
+total 83088
+-rw-rw---- 1 root sdcard_rw    2667 2022-02-03 17:02 sync_0.file
+-rw-rw---- 1 root sdcard_rw       0 2022-02-03 17:03 sync_4.file
+-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_00.mp4
+-rw-rw---- 1 root sdcard_rw 3647528 2021-07-06 15:30 taobin_adv_01.mp4
+-rw-rw---- 1 root sdcard_rw 3184464 2021-06-22 14:08 taobin_adv_02.mp4
+-rw-rw---- 1 root sdcard_rw 4349971 2021-04-21 11:53 taobin_adv_03.mp4
+-rw-rw---- 1 root sdcard_rw 3064661 2021-09-27 13:44 taobin_adv_04.mp4
+-rw-rw---- 1 root sdcard_rw 2211917 2021-09-23 10:57 taobin_adv_05.mp4
+-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_06.mp4
+-rw-rw---- 1 root sdcard_rw 1637056 2021-09-21 09:57 taobin_adv_07.mp4
+-rw-rw---- 1 root sdcard_rw 1962660 2021-09-17 16:42 taobin_adv_08.mp4
+-rw-rw---- 1 root sdcard_rw 1598810 2021-09-23 11:27 taobin_adv_09.mp4
+-rw-rw---- 1 root sdcard_rw 2769257 2022-02-02 17:17 taobin_adv_10.mp4
+-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4
+-rw-rw---- 1 root sdcard_rw 2755962 2021-07-07 15:35 taobin_adv_menu2_01.mp4
+-rw-rw---- 1 root sdcard_rw 2814749 2021-07-07 14:44 taobin_adv_menu2_02.mp4
+-rw-rw---- 1 root sdcard_rw 3111677 2021-04-21 14:21 taobin_adv_menu2_03.mp4
+-rw-rw---- 1 root sdcard_rw 2809964 2021-09-27 13:43 taobin_adv_menu2_04.mp4
+-rw-rw---- 1 root sdcard_rw 1809071 2021-09-23 10:57 taobin_adv_menu2_05.mp4
+-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_06.mp4
+-rw-rw---- 1 root sdcard_rw 1653061 2021-09-21 10:00 taobin_adv_menu2_07.mp4
+-rw-rw---- 1 root sdcard_rw 2098002 2021-09-17 16:42 taobin_adv_menu2_08.mp4
+-rw-rw---- 1 root sdcard_rw 1970490 2021-09-23 11:27 taobin_adv_menu2_09.mp4
+-rw-rw---- 1 root sdcard_rw 2414534 2022-02-02 17:16 taobin_adv_menu2_10.mp4
+-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4
+-rw-rw---- 1 root sdcard_rw 2587515 2021-07-07 15:35 taobin_adv_menu_01.mp4
+-rw-rw---- 1 root sdcard_rw 2645861 2021-07-07 14:44 taobin_adv_menu_02.mp4
+-rw-rw---- 1 root sdcard_rw 3117015 2021-04-21 14:21 taobin_adv_menu_03.mp4
+-rw-rw---- 1 root sdcard_rw 2929148 2021-09-27 13:44 taobin_adv_menu_04.mp4
+-rw-rw---- 1 root sdcard_rw 1885128 2021-09-23 10:57 taobin_adv_menu_05.mp4
+-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_06.mp4
+-rw-rw---- 1 root sdcard_rw 1805549 2021-09-21 10:00 taobin_adv_menu_07.mp4
+-rw-rw---- 1 root sdcard_rw 1873183 2021-09-17 16:42 taobin_adv_menu_08.mp4
+-rw-rw---- 1 root sdcard_rw 1967036 2021-09-23 11:27 taobin_adv_menu_09.mp4
+-rw-rw---- 1 root sdcard_rw 2133414 2022-02-02 17:16 taobin_adv_menu_10.mp4

xml/page_board.xml

@@ -341,39 +341,14 @@
 	EndIf
 
 
-	If CAMPAIGN1 = "true" Then
-		Var video_menu_1 = "ROOT/taobin_project/campaign1/page_catalog_menu.mp4"
-		Var video_menu_0 = "ROOT/taobin_project/campaign1/page_catalog.mp4"
-
-		Var video_main_2 = "/mnt/sdcard/coffeevending/taobin_project/campaign1/page_main.mp4"
-		Var video_main_count = 3
-
-	EndIf
-
 	
 	Var showCart = "Invisible"
 	
-	Var web_app_str = ""
+	Var LedLidBlink = "no"
-	READ_FILE "/mnt/sdcard/web_app_enable" web_app_str
-	STRCONTAIN "1" web_app_str WebAppEnable
 
-	DEBUGVAR WebAppEnable
-	If WebAppEnable = "true" Then
 
 	Var WebAppShow = "Enable"
-	Else
-		Var WebAppShow = "Invisible"
-	EndIf
-
-	Var can_select_menu = ""
-	READ_FILE "/mnt/sdcard/can_select_menu" can_select_menu
-
-	DEBUGVAR can_select_menu
-	If can_select_menu = "1" Then
 	Var EnableSelectMenuBetweenBrew = "Enable"
-	Else
-		Var EnableSelectMenuBetweenBrew = "Invisible"
-	EndIf
 	
 	
 	DEBUGVAR XMLProfile
@@ -399,7 +374,7 @@
 	DEBUGVAR AdvertiseProfile
 
 	If XMLProfile = "taobin_notopup" Then
-		Var ButtontoTopupMenu = "Invisible"
+		Var ButtontoTopupMenu = "Disable"
 	Else
 		Var ButtontoTopupMenu = "Enable"
 	EndIf

xml/page_catalog.xml

@@ -135,6 +135,10 @@
 	EndIf
 
 
+	If XMLProfile = "taobin_notopup" Then
+		Var ButtontoTopupMenu = "Disable"
+	
+	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -356,6 +360,7 @@
 <State> ButtontoTopupMenu </State>
 <Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 

xml/page_catalog_choose_drink6.pml

@@ -49,8 +49,12 @@
 
  product_code.append('12-05-02-0030')
  
+
  product_code.append('12-05-02-0002')
  product_code.append('12-05-02-0003')
+ 
+ product_code.append('12-06-01-0001')
+
  product_code.append('12-05-02-0016')
  product_code.append('12-05-02-0017')
  product_code.append('12-05-02-0018')

xml/page_catalog_choose_drink6.xml

@@ -3896,7 +3896,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=35 12-05-02-0016 
+	; button i=35 12-06-01-0001 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-06-01-0001.Button  </State> 
+	<Button>
+	<State> $12-06-01-0001.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-06-01-0001.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-06-01-0001.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-06-01-0001.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-06-01-0001.Self
+		Var NameDrink = $12-06-01-0001.NameE
+		Var NameDrinkTH = $12-06-01-0001.Name
+		Var DrinkDescriptionTH = $12-06-01-0001.description
+		Var DrinkDescription = $12-06-01-0001.descriptionE
+		Var PriceDrink = $12-06-01-0001.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-06-01-0001.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-06-01-0001.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-06-01-0001.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-06-01-0001.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-06-01-0001.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-06-01-0001.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-06-01-0001.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-06-01-0001.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=36 12-05-02-0016 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4002,7 +4108,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=36 12-05-02-0017 
+	; button i=37 12-05-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4108,7 +4214,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=37 12-05-02-0018 
+	; button i=38 12-05-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4214,7 +4320,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=38 12-05-01-0002 
+	; button i=39 12-05-01-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>

xml/page_thankyou.xml

@@ -93,9 +93,16 @@
 		Var SaveTheWorldCount = SaveTheWorldCount + 1
 	EndIf
 
+	DEBUGVAR LedLidBlink
+	DEBUGVAR SaveTheWorldCount
+
 	If SaveTheWorldCount = 2 Then
+	
+		If LedLidBlink = "no" Then
 			Var SaveTheWorldST = "Enable"
 		EndIf
+	EndIf
+
 	
 
 </EventOpen>

xml/page_topping_select4.xml

@@ -1519,7 +1519,6 @@
 	DEBUGVAR UserSelectProductCode
 	DEBUGVAR HAVE_UV_DOOR_LID
 
-	If HAVE_UV_DOOR_LID = "true" Then
 
 	If StrawState = "Press" Then
 		Machine StrawOrder	
@@ -1535,7 +1534,6 @@
 	Var LidState = "Enable"
 	; 
 		
-	EndIf
 
 	Var SelectDrink = UserSelectProductCode
 	; Set drink 

xml_main/startup.xml

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.00"
+	Var XMLPageVersion = "6.01"
-	Var XMLPageVersionInt = 600
+	Var XMLPageVersionInt = 601
 </EventOpen>
 
 <Text>