From 48eccab0ab7ca3d565145294565c947f3cddf848 Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 10 Jan 2023 09:22:14 +0700
Subject: [PATCH 1/2] DO

---
 xml/page_board.xml        |  6 +-----
 xml/page_camera.xml       | 28 +++++++++++++++-------------
 xml/page_catalog.lxml     | 37 +++++++------------------------------
 xml/page_payment_cash.xml |  9 +++++++--
 xml_main/startup.xml      |  4 ++--
 5 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/xml/page_board.xml b/xml/page_board.xml
index df8f5b30..d89c2711 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -147,7 +147,7 @@
 		Var RoadShow = "false"
 	EndIf
 
-	
+
 	Var TermTemOnline = "false"
 	Var TaobinOnline = "false"
 	STRCONTAIN "9501" MaterialAvailable TaobinOnline 
@@ -566,10 +566,6 @@
 
 	DEBUGVAR AdvertiseProfile
 
-	If RoadShow = "true" Then
-		;Var new_layout = "false"
-	EndIf
-
 	Var show_lang = "THAI"
 
 
diff --git a/xml/page_camera.xml b/xml/page_camera.xml
index d8efc377..6ecb5f5f 100644
--- a/xml/page_camera.xml
+++ b/xml/page_camera.xml
@@ -43,22 +43,16 @@
 	;EndIf
 </EventChangeStatus>
 
-<CameraX> 
-<X> 753 </X>
-<Y> 1394 </Y>
-<Name>"usbfront"</Name>
-<Width> 326 </Width>
-<Height> 236 </Height>
-</CameraX>
-
 ;<CameraX> 
-;<X> 0 </X>
-;<Y> 381 </Y>
+;<X> 753 </X>
+;<Y> 1394 </Y>
 ;<Name>"usbfront"</Name>
-;<Width> 700 </Width>
-;<Height> 394 </Height>
+;<Width> 326 </Width>
+;<Height> 236 </Height>
 ;</CameraX>
 
+
+
 <EventCamera>
 	DEBUGVAR BugFlag
 	If BugFlag = 0 Then
@@ -72,7 +66,7 @@
 <Width> 1080</Width>
 <Height> 380 </Height>
 <Loop> "true" </Loop>
-<Filename> "ROOT/taobin_project/campaign2/page_catalog_menu.mp4" </Filename>
+<Filename> "ROOT/taobin_project/adv/taobin_adv_menu_07.mp4" </Filename>
 
 </Video>
 
@@ -108,6 +102,14 @@
 </EventClick>
 </Button>
 
+<CameraX> 
+;<State>"Invisible"</State>
+<X> 0 </X>
+<Y> 381 </Y>
+<Name>"usbfront"</Name>
+<Width> 700 </Width>
+<Height> 394 </Height>
+</CameraX>
 
 
 </Popup>
diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml
index 4bb19fbb..53987bdf 100644
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@@ -186,7 +186,7 @@
 	Var menu_desc_thai_blender = ""
 
 
-	
+		
 	
 	If BoxID = 0 Then 
 		RebootWithCause "BoxID was zero"
@@ -499,7 +499,7 @@
 	<X> 28 </X>
 	<Y> 202 </Y>
 	<Width> 241 </Width>
-	<Height> 72 </Height>
+	<Height> 82 </Height>
 </Language>
 </Button>
 
@@ -545,6 +545,11 @@
 <Color> "0xFF0000" </Color>
 <Width> 1080 </Width>
 <Height> 60 </Height>
+<EventClick> 
+	
+	Open "ROOT/taobin_project/xml/page_camera.xml"
+	
+</EventClick>
 </Button>
 
 <Text>
@@ -558,34 +563,6 @@
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
-<Button>
-<X> 0 </X>
-<Y> 1860 </Y>
-<Width> 200 </Width>
-<Height> 50 </Height>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var countClick = countClick + 1
-	If countClick = 3 Then
-
-		;Var TestLoopMakeDrink = 1
-
-	EndIf
-	DEBUGVAR countClick
-
-	If countClick = 5 Then
-		If ToppingNewEnable = "false" Then
-			Var ToppingNewEnable = "true"
-		Else
-			Var ToppingNewEnable = "false"
-		EndIf
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
-	EndIf
-
-	Refresh
-</EventClick>
-</Button>
-
 ; Cart
 <Button>
 <X> 915 </X>
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 49daaa77..bf1af9bf 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -1093,7 +1093,12 @@
 
 	If VendingCashless = "READY" Then
 		Var QRCODE99 = ""
-		Var Timeout = 0
+		If CoinInOK = 1 Then
+
+		Else
+			Var Timeout = 0
+		EndIf
+		
 		Var QRErrorState = "Invisible"
 		Var QR_POPUP = "/img_popup8-2.png"
 		Var VendingCashless = "-"
@@ -1548,7 +1553,7 @@
 
 	Var CoinInFlag = 1
 
-	
+	DEBUGVAR CoinInOK
 
 	If ViewBill > 0 Then
 
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 8e136e30..1a95e8f1 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.88"
-	Var XMLPageVersionInt = 688
+	Var XMLPageVersion = "6.89"
+	Var XMLPageVersionInt = 689
 </EventOpen>
 
 <Text>

From 29f32c0a91d2364e10a6bae34fd47df8adea3bf7 Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 10 Jan 2023 10:35:55 +0700
Subject: [PATCH 2/2] comment show error ; remove 12-05-02-0040

---
 xml/page_catalog_group_other.xml | 34 ++++++++++++++++----------------
 xml/page_show_error.xml          |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index bb0bfc8e..b5821efb 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -7740,15 +7740,15 @@ Water & Ice" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 16
-	; - 12-05-02-0040 12-05-03-0040 
+	; - - 12-05-03-0040 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-05-02-0040.Button,12-05-03-0040.Button,$Sum12050200401205030040) </State> 
+	<State> Flag( 12-05-03-0040.Button,$Sum1205030040) </State> 
 	<Button>
-	<State> $Sum12050200401205030040 </State> 
+	<State> $Sum1205030040 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_strawberry.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_strawberry.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_strawberry.png" </FilenameDisable>
@@ -7762,13 +7762,13 @@ Water & Ice" </Value>
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-05-02-0040.Price
+		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-05-03-0040.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-05-02-0040"
+		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-05-03-0040"
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-05-02-0040.Button
+		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-05-03-0040.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -7785,7 +7785,7 @@ Water & Ice" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-05-02-0040"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -7798,10 +7798,10 @@ Water & Ice" </Value>
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-		Var menu_name_eng_cold = $12-05-02-0040.NameE
-		Var menu_desc_eng_cold = $12-05-02-0040.descriptionE
-		Var menu_name_thai_cold = $12-05-02-0040.Name
-		Var menu_desc_thai_cold = $12-05-02-0040.description
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
 		
 		Var menu_name_eng_blender = $12-05-03-0040.NameE
 		Var menu_desc_eng_blender = $12-05-03-0040.descriptionE
@@ -7889,7 +7889,7 @@ Water, Ice" </Value>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-05-02-0040.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@@ -7899,8 +7899,8 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-05-02-0040.Button </State>
-	<Value> StringFmt( $12-05-02-0040.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -7943,9 +7943,9 @@ Water, Ice" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum12050200401205030040 = "Disable" Then
+			If $Sum1205030040 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-05-02-0040.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-05-03-0040.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -7982,7 +7982,7 @@ Water, Ice" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum12050200401205030040 </State> 
+	<State> $Sum1205030040 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml
index 5f7f345a..339c21e7 100644
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@@ -164,7 +164,7 @@
 		If NETCORE_LOST_CNT > 0 Then
 
 		Else
-
+			
 			DEBUGVAR NCIC07_EVENT_CNT
 			DEBUGVAR NETCORE_EVENT_CNT_TMP