Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

2025-01-28 15:22:40 +07:00 · 2025-01-28 15:22:40 +07:00 · e80ce060cc
commit e80ce060cc
parent be552d6bbd bc1e9d6419
82 changed files with 728 additions and 1008 deletions
--- a/image/page_drink_disable_n2/IcedCocoax2.png
+++ b/image/page_drink_disable_n2/IcedCocoax2.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_caramel.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel.png
--- a/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_milk.png
+++ b/image/page_drink_disable_n2/bn_iced_milk.png
--- a/image/page_drink_disable_n2/bn_iced_milk_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_ovaltine.png
+++ b/image/page_drink_disable_n2/bn_iced_ovaltine.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_disable_n2/bn_pink_milk.png
+++ b/image/page_drink_disable_n2/bn_pink_milk.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano.png
--- a/image/page_drink_n/IcedCocoax2.png
+++ b/image/page_drink_n/IcedCocoax2.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_n/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_n/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_n/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_n/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_n/bn_iced_caramel.png
+++ b/image/page_drink_n/bn_iced_caramel.png
--- a/image/page_drink_n/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_n/bn_iced_caramel_cocoa.png
--- a/image/page_drink_n/bn_iced_cocoa.png
+++ b/image/page_drink_n/bn_iced_cocoa.png
--- a/image/page_drink_n/bn_iced_milk.png
+++ b/image/page_drink_n/bn_iced_milk.png
--- a/image/page_drink_n/bn_iced_milk_coconut.png
+++ b/image/page_drink_n/bn_iced_milk_coconut.png
--- a/image/page_drink_n/bn_iced_ovaltine.png
+++ b/image/page_drink_n/bn_iced_ovaltine.png
--- a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_n/bn_pink_milk.png
+++ b/image/page_drink_n/bn_pink_milk.png
--- a/image/page_drink_n/bn_smoothie_oreo.png
+++ b/image/page_drink_n/bn_smoothie_oreo.png
--- a/image/page_drink_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_n/bn_super_oreo_volcano.png
--- a/image/page_drink_picture2_n/IcedCocoax2.png
+++ b/image/page_drink_picture2_n/IcedCocoax2.png
--- a/image/page_drink_picture2_n/IcedCocoax3.png
+++ b/image/page_drink_picture2_n/IcedCocoax3.png
--- a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_picture2_n/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_picture2_n/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_picture2_n/bn_iced_caramel.png
+++ b/image/page_drink_picture2_n/bn_iced_caramel.png
--- a/image/page_drink_picture2_n/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_picture2_n/bn_iced_caramel_cocoa.png
--- a/image/page_drink_picture2_n/bn_iced_cocoa.png
+++ b/image/page_drink_picture2_n/bn_iced_cocoa.png
--- a/image/page_drink_picture2_n/bn_iced_milk.png
+++ b/image/page_drink_picture2_n/bn_iced_milk.png
--- a/image/page_drink_picture2_n/bn_iced_milk_coconut.png
+++ b/image/page_drink_picture2_n/bn_iced_milk_coconut.png
--- a/image/page_drink_picture2_n/bn_iced_ovaltine.png
+++ b/image/page_drink_picture2_n/bn_iced_ovaltine.png
--- a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_picture2_n/bn_pink_milk.png
+++ b/image/page_drink_picture2_n/bn_pink_milk.png
--- a/image/page_drink_picture2_n/bn_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano.png
--- a/image/page_drink_press_n/IcedCocoax2.png
+++ b/image/page_drink_press_n/IcedCocoax2.png
--- a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_press_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_press_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_press_n/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_press_n/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_press_n/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_press_n/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_press_n/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_press_n/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_press_n/bn_iced_caramel.png
+++ b/image/page_drink_press_n/bn_iced_caramel.png
--- a/image/page_drink_press_n/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_press_n/bn_iced_caramel_cocoa.png
--- a/image/page_drink_press_n/bn_iced_cocoa.png
+++ b/image/page_drink_press_n/bn_iced_cocoa.png
--- a/image/page_drink_press_n/bn_iced_milk.png
+++ b/image/page_drink_press_n/bn_iced_milk.png
--- a/image/page_drink_press_n/bn_iced_milk_coconut.png
+++ b/image/page_drink_press_n/bn_iced_milk_coconut.png
--- a/image/page_drink_press_n/bn_iced_ovaltine.png
+++ b/image/page_drink_press_n/bn_iced_ovaltine.png
--- a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_press_n/bn_pink_milk.png
+++ b/image/page_drink_press_n/bn_pink_milk.png
--- a/image/page_drink_press_n/bn_smoothie_oreo.png
+++ b/image/page_drink_press_n/bn_smoothie_oreo.png
--- a/image/page_drink_press_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_press_n/bn_super_oreo_volcano.png
--- a/inter/tha/xml/multi/page_catalog.lxml
+++ b/inter/tha/xml/multi/page_catalog.lxml
@ -18,6 +18,20 @@

 	DEBUGVAR ToppingNewShow

+	DEBUGVAR OpenFromPageBoard
+	If OpenFromPageBoard = 1 Then
+		Var OpenFromPageBoard = 0
+		Var langnext1 = "true"
+		Var langnext2 = "true"
+		Var langnext3 = "true"
+		Var langnext4 = "true"
+		Var langnext5 = "true"
+		Var langnext6 = "true"
+		Var langnext7 = "true"
+		Var langnext8 = "true"
+		SAVELOG "======================================= RefreshAll Languages ================================"
+	EndIf
+
 	Var NextPage = "-"

 	Var Seeker.thankLidFlag = 0
@ -561,6 +575,7 @@
 	<EventClick> 

 		If Inst5MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 2 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -631,6 +646,7 @@
 	<EventClick> 

 		If Inst6MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 3 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -664,6 +680,7 @@
 	<EventClick> 

 		If Inst7MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 4 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -697,6 +714,7 @@
 	<EventClick> 

 		If Inst11MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 7
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -730,6 +748,7 @@
 	<EventClick> 

 		If Inst10MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 8
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -766,6 +785,7 @@
 	<EventClick> 

 		If Inst8MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 5 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -798,6 +818,7 @@
 	<Volume> SoundVolume </Volume>
 	<EventClick> 
 		If Inst8MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 5 
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
@ -858,6 +879,7 @@
 	<EventClick> 
 		
 		If Inst9MenuLoaded = "done" Then
+			Var MultiProcess = "Invisible"
 			TabMenuVisibleInst 6
 			
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
--- a/inter/uae_dubai/xml/page_catalog_group_other.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml
--- a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
+++ b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
@ -433,11 +433,6 @@
 	Machine DoorClose


-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf


 	If web_readyOK = "true" Then
--- a/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml
+++ b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml
@ -497,14 +497,6 @@

 	Machine DoorClose

-
-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-
-
 	If web_readyOK = "true" Then

 		Var web_readyOK = "false"
@ -548,6 +540,7 @@
 	EndIf

 	DEBUGVAR DirImage2
+	DEBUGVAR PayState5

 	Var CancelContinue = 0

@ -874,6 +867,11 @@

 <Timeout> 1000 </Timeout>
 <EventTimeout>
+	DEBUGVAR PayState5
+	DEBUGVAR CoinAmount
+	DEBUGVAR SELLONLINE
+
+
 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -913,17 +911,11 @@

 	  If RoadShow = "true" Then
 	  Else
-			Var PayState3 = "Disable"
+	  	If PayState3 = "Enable" Then
 			Var PayState3 = "Disable"
 		EndIf
-		If PayState5 = "Enable" Then
-		Var PayState3 = "Disable"
-		EndIf
 		If PayState5 = "Enable" Then
 		  	Var PayState5 = "Disable"
-		  	Var PayState5 = "Disable"
-	  	EndIf
-	  	Var PayState5 = "Disable"
 	  	EndIf
 	  EndIf

--- a/xml/page_payment_cash-HKG.xml
+++ b/xml/page_payment_cash-HKG.xml
@ -458,12 +458,6 @@
 	Machine DoorClose


-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-

 	If web_readyOK = "true" Then

--- a/xml/page_payment_cash-MYR.xml
+++ b/xml/page_payment_cash-MYR.xml
@ -441,12 +441,6 @@
 	Machine DoorClose


-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-

 	If web_readyOK = "true" Then

--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@ -1121,14 +1121,7 @@
 ;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 ;</Image>

-<Video>
-<X> 0 </X>
-<Y> 0 </Y>
-<Width> 1080</Width>
-<Height> 380 </Height>
-<Loop> "true" </Loop>
-<Filename> video_menu_0 </Filename>
-</Video>
+;include="ROOT/taobin_project/inc/video.inc"