DO

2021-09-25 22:27:55 +07:00 · 2021-09-25 22:27:55 +07:00 · b222fd700f
commit b222fd700f
parent 5fbdc668d5
51 changed files with 34 additions and 16 deletions
--- a/animation01/TaoBin2_draft02_art40.mp4
+++ b/animation01/TaoBin2_draft02_art40.mp4
--- a/animation01/TaoBin2_draft02_art41.mp4
+++ b/animation01/TaoBin2_draft02_art41.mp4
--- a/animation01/TaoBin2_draft02_art42.mp4
+++ b/animation01/TaoBin2_draft02_art42.mp4
--- a/animation01/TaoBin2_draft02_art43.mp4
+++ b/animation01/TaoBin2_draft02_art43.mp4
--- a/campaign2/page_catalog.mp4
+++ b/campaign2/page_catalog.mp4
--- a/campaign2/page_catalog_menu.mp4
+++ b/campaign2/page_catalog_menu.mp4
--- a/campaign2/page_main.mp4
+++ b/campaign2/page_main.mp4
--- a/campaign3/page_catalog.mp4
+++ b/campaign3/page_catalog.mp4
--- a/campaign3/page_catalog_menu.mp4
+++ b/campaign3/page_catalog_menu.mp4
--- a/campaign3/page_main.mp4
+++ b/campaign3/page_main.mp4
--- a/campaign4/page_main.mp4
+++ b/campaign4/page_main.mp4
--- a/image/page_drink/bn_dirty_light.png
+++ b/image/page_drink/bn_dirty_light.png
--- a/image/page_drink/bn_dirty_light_bluedaddy.png
+++ b/image/page_drink/bn_dirty_light_bluedaddy.png
--- a/image/page_drink/bn_dirty_light_mozart.png
+++ b/image/page_drink/bn_dirty_light_mozart.png
--- a/image/page_drink/bn_hot_americano_light.png
+++ b/image/page_drink/bn_hot_americano_light.png
--- a/image/page_drink/bn_hot_americano_light_bluedaddy.png
+++ b/image/page_drink/bn_hot_americano_light_bluedaddy.png
--- a/image/page_drink/bn_hot_americano_light_mozart.png
+++ b/image/page_drink/bn_hot_americano_light_mozart.png
--- a/image/page_drink/bn_hot_espresso_light.png
+++ b/image/page_drink/bn_hot_espresso_light.png
--- a/image/page_drink/bn_hot_espresso_light_bluedaddy.png
+++ b/image/page_drink/bn_hot_espresso_light_bluedaddy.png
--- a/image/page_drink/bn_hot_espresso_light_mozart.png
+++ b/image/page_drink/bn_hot_espresso_light_mozart.png
--- a/image/page_drink/bn_iced_americano_light.png
+++ b/image/page_drink/bn_iced_americano_light.png
--- a/image/page_drink/bn_iced_americano_light_bluedaddy.png
+++ b/image/page_drink/bn_iced_americano_light_bluedaddy.png
--- a/image/page_drink/bn_iced_americano_light_mozart.png
+++ b/image/page_drink/bn_iced_americano_light_mozart.png
--- a/image/page_drink_disable/bn_dirty_light.png
+++ b/image/page_drink_disable/bn_dirty_light.png
--- a/image/page_drink_disable/bn_dirty_light_bluedaddy.png
+++ b/image/page_drink_disable/bn_dirty_light_bluedaddy.png
--- a/image/page_drink_disable/bn_dirty_light_mozart.png
+++ b/image/page_drink_disable/bn_dirty_light_mozart.png
--- a/image/page_drink_disable/bn_hot_americano_light.png
+++ b/image/page_drink_disable/bn_hot_americano_light.png
--- a/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png
+++ b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png
--- a/image/page_drink_disable/bn_hot_americano_light_mozart.png
+++ b/image/page_drink_disable/bn_hot_americano_light_mozart.png
--- a/image/page_drink_disable/bn_hot_espresso_light.png
+++ b/image/page_drink_disable/bn_hot_espresso_light.png
--- a/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png
+++ b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png
--- a/image/page_drink_disable/bn_hot_espresso_light_mozart.png
+++ b/image/page_drink_disable/bn_hot_espresso_light_mozart.png
--- a/image/page_drink_disable/bn_iced_americano_light.png
+++ b/image/page_drink_disable/bn_iced_americano_light.png
--- a/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png
+++ b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png
--- a/image/page_drink_disable/bn_iced_americano_light_mozart.png
+++ b/image/page_drink_disable/bn_iced_americano_light_mozart.png
--- a/image/page_drink_press/bn_dirty_light.png
+++ b/image/page_drink_press/bn_dirty_light.png
--- a/image/page_drink_press/bn_dirty_light_bluedaddy.png
+++ b/image/page_drink_press/bn_dirty_light_bluedaddy.png
--- a/image/page_drink_press/bn_dirty_light_mozart.png
+++ b/image/page_drink_press/bn_dirty_light_mozart.png
--- a/image/page_drink_press/bn_hot_americano_light.png
+++ b/image/page_drink_press/bn_hot_americano_light.png
--- a/image/page_drink_press/bn_hot_americano_light_bluedaddy.png
+++ b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png
--- a/image/page_drink_press/bn_hot_americano_light_mozart.png
+++ b/image/page_drink_press/bn_hot_americano_light_mozart.png
--- a/image/page_drink_press/bn_hot_espresso_light.png
+++ b/image/page_drink_press/bn_hot_espresso_light.png
--- a/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png
+++ b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png
--- a/image/page_drink_press/bn_hot_espresso_light_mozart.png
+++ b/image/page_drink_press/bn_hot_espresso_light_mozart.png
--- a/image/page_drink_press/bn_iced_americano_light.png
+++ b/image/page_drink_press/bn_iced_americano_light.png
--- a/image/page_drink_press/bn_iced_americano_light_bluedaddy.png
+++ b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png
--- a/image/page_drink_press/bn_iced_americano_light_mozart.png
+++ b/image/page_drink_press/bn_iced_americano_light_mozart.png
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -82,7 +82,7 @@

 	STRCONTAIN "whey" SaleProfile WheyShow 
 	STRCONTAIN "cocktail" SaleProfile CocktailShow 
-	STRCONTAIN "roadshow" SaleProfile RoadShow 
+	;STRCONTAIN "roadshow" SaleProfile RoadShow 
 	
 	Var TermTemOnline = "false"
 	Var TaobinOnline = "false"
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@ -7,9 +7,8 @@
 <EventOpen>
 	Var y_topping_bg = 912

-	If ToppingNewEnable = "false" Then
-
-	Else
+	If ConfigNumer > 360 Then
+		SAVELOG "Recipe have smoothies"
 		Open "ROOT/taobin_project/xml/page_topping_select2.xml"
 	EndIf

--- a/xml/page_topping_select2.xml
+++ b/xml/page_topping_select2.xml
@ -121,6 +121,10 @@
 		Var PriceDrinkTmp = "Free"
 	EndIf

+	If ShowPrice = "Invisible" Then
+		Var PriceDrinkTmpShow = "Free"
+	EndIf
+
 	Var StateImgKeto = "Invisible"


@ -677,7 +681,8 @@
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp

 	SAVELOG PriceDrinkTmp
-	Refresh</EventClick>
+	Refresh
+</EventClick>
 </Button>

 <Button>
@ -690,14 +695,30 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+		
+	SAVELOG "Press Smoothies"
+
+	DEBUGVAR PriceDrinkNoTop
+
 	If blendedState = "Press" Then
+		Var PriceDrinkTmp = PriceDrinkTmp - PriceDiff
 		Var blendedState = "Enable"
+		Var UserSelectProductCode = SaveProductCodeSelect
 	Else
 		Var blendedState = "Press"
+		Var PriceDrinkTmp = PriceDrinkTmp + PriceDiff
+		Var UserSelectProductCode = SubMenuProductCode1
 	
 	EndIf

+	DEBUGVAR UserSelectProductCode
+	Var PriceDrinkNoTop = PriceDrinkTmp
+
+	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
+
+	SAVELOG PriceDrinkTmp
 	Refresh
+
 </EventClick>
 </Button>

@ -709,12 +730,10 @@
 <Width> 988 </Width>
 <Height> 156 </Height>
 <MarginTop> 20 </MarginTop>
-<State> "Enable" </State> 
-;<State> BGSugar </State> 
+<State> BGSugar </State> 
 ; sugar layout
 <Image>
-<State> "Enable" </State>
-;<State> BGSugar </State>
+<State> BGSugar </State>
 <Filename> Var( DirImage + "/bg_sugar.png" )</Filename>
 </Image>

@ -984,16 +1003,16 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	SAVELOG "Press add shot 2"
-
+	
 	If showShotEnable = "Press" Then
-		Var showShotEnable = "Enable"	
-		Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2
+		Var showShotEnable = "Enable"
+		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
 		Var topping2 = toppingID2index1
 		Var DisableUsingCode = "false"
 		SAVELOG "Deselect add premium shot"
 	Else
 		Var showShotEnable = "Press"
-		Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
+		Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
 		Var topping2 = toppingID2index2
 		Var DisableUsingCode = "true"
 		SAVELOG "Select add premium shot"
@ -1002,11 +1021,11 @@
 	Var PriceDrinkNoTop = PriceDrinkTmp

 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
-	
-	
+
 	SAVELOG PriceDrinkTmp
 	Refresh

+
 </EventClick>
 </Button>

--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -95,7 +95,7 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "5.60"
+	Var XMLPageVersion = "5.61"

 </EventOpen>