adv video update

2024-11-01 10:39:22 +07:00 · 2024-11-01 10:39:22 +07:00 · fa6e718e87
commit fa6e718e87
parent 2fb7b50a63 b1b4233ba7
26 changed files with 706 additions and 382 deletions
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -276,8 +276,11 @@ EndIf
 If BoxID = 105005 Then
 	Var NewFlowPaymentCode = 1
 	Var New_Payment = 1
-	Var JemilaPro = 1
-	Var HalloweenPro = 1
+	Var JemilaPro = 0
+	Var HalloweenPro = 0
+	Var WeekdayDiscountPro = 1
+	Var WeekdayDiscountProEventOn = 1
+	Var OreoDiscount11Pro = 1
 EndIf

 If BoxID = 172331 Then
@ -296,7 +299,7 @@ EndIf

 If BoxID = 172053 Then
 	Var WeekdayDiscountPro = 1
-	Var WeekdayDiscountProEventOn = 0
+	Var WeekdayDiscountProEventOn = 1
 EndIf

 If BoxID = 176121 Then
--- a/xml/menutab/page_catalog_group_pro_weekday_discount.xml
+++ b/xml/menutab/page_catalog_group_pro_weekday_discount.xml
@ -2853,7 +2853,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -2937,7 +2937,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3106,7 +3106,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -3190,7 +3190,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/menutab/page_catalog_group_pro_weekday_discount_event_on.xml
+++ b/xml/menutab/page_catalog_group_pro_weekday_discount_event_on.xml
@ -2854,7 +2854,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -2938,7 +2938,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3107,7 +3107,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -3191,7 +3191,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_weekday_discount.xml
+++ b/xml/page_catalog_group_pro_weekday_discount.xml
@ -2831,7 +2831,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -2913,7 +2913,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3082,7 +3082,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -3164,7 +3164,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_weekday_discount_event_on.xml
+++ b/xml/page_catalog_group_pro_weekday_discount_event_on.xml
@ -2832,7 +2832,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SUPER COCOA X3"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 3"
-		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -2914,7 +2914,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3083,7 +3083,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICE SUPER COCOA X2"
 		Var NameDrinkTH = "ซูเปอร์โกโก้เข้ม คูณ 2"
-		Var DrinkDescriptionTH = "โกโก้ 3x นม และน้ำตาล"
+		Var DrinkDescriptionTH = "โกโก้ 2x นม และน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@ -3165,7 +3165,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "โกโก้ 3x นม และน้ำตาล" </Value>
+	<Value> "โกโก้ 2x นม และน้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@ -11,8 +11,8 @@
 	DEBUGVAR Seeker.PictureDrink
 	DEBUGVAR Seeker.showname

-	; Block HaveCup
-	Var DrinkOKStringVersion = "DKT2" 
+	; Block Have 
+	Var DrinkOKStringVersion = "DKT3" 
 	
 	DEBUGVAR DrinkOKStringVersion

@ -334,16 +334,14 @@
 		Else

 			If DoorCupPosition = "bottom" Then
-				If HaveCup = "false" Then
-					; BEGIN
-					Var NextOrder = "false"
+				; BEGIN
+				Var NextOrder = "false"

-					TransferVar "next" "curr"
-					Var Seeker = "curr"
-					SAVELOG "Make next order by remove to take-cup"
-					Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
-					; END
-				EndIf
+				TransferVar "next" "curr"
+				Var Seeker = "curr"
+				SAVELOG "Make next order by remove to take-cup"
+				Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
+				; END
 			Else
 				Machine DoorClose
 			EndIf
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -121,7 +121,7 @@

 	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc

-	SAVELOG "Thank you conti version 2"
+	SAVELOG "Thank you conti version TCT3"

 	;PendingFlag InternationalEnable
 	;PendingFlag New_Payment
@ -226,24 +226,25 @@
 		Var MachineState_Result = 0
 		
 		If MachineStage = "show-menu" Then
-	
-			Var LastMakeDrinkResult = "-"
-			If New_Payment = 1 Then 
-				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
-			EndIf
-			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
-       	
-
-       		If InternationalEnable = 1 Then
-				Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
-                Open Brew3Inter
-			Else
+			If HaveCup = "false" Then
+				Var LastMakeDrinkResult = "-"
 				If New_Payment = 1 Then 
-					Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
-				Else
-					Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				EndIf
-			EndIf  
+				MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
+			
+
+				If InternationalEnable = 1 Then
+					Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
+					Open Brew3Inter
+				Else
+					If New_Payment = 1 Then 
+						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"  
+					Else
+						Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+					EndIf
+				EndIf  
+			EndIf
     	EndIf
       
 	
@ -372,7 +373,7 @@
 <Width> 1080 </Width>
 <Align> end </Align>
 <Color> 0xFF0000 </Color>
-<Value> "TCT2 "</Value>
+<Value> "TCT3 "</Value>
 </Text>


--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -508,6 +508,17 @@

 	TRY "ROOT/taobin_project/speical/call_from_topping.ev"

+
+	If show_eng = "true" Then
+		Strlen showname show_name_len
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
+	Else
+		Var showname = showname + "###size=68"
+	EndIf
+
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@ -899,7 +910,7 @@

 	CRLFToSpace showname
 	CRLFToSpace showdesc
-
+	

 	If SugarSoundFlag = 1 Then
 		If SelectDrinkType = 1 Then
@ -936,7 +947,7 @@
 	Function 2


-	RefreshAll
+	
 </EventClick>
 </Button>

@ -7750,6 +7761,15 @@
 	DEBUGVAR showname
 	DEBUGVAR showdesc

+	If show_eng = "true" Then
+		Strlen showname show_name_len
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
+	Else
+		Var showname = showname + "###size=68"
+	EndIf
+

 	Var Timeout = 0