Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece

2025-05-15 15:55:06 +07:00 · 2025-05-15 15:55:06 +07:00 · ce02726c99
commit ce02726c99
parent c8b3cd5e61 823cca0f73
13 changed files with 76 additions and 43 deletions
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@ -1282,7 +1282,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
@ -1301,7 +1301,7 @@
 1300035		Recipes	สูตรอาหาร
 1300036		Save editing	บันทึกการแก้ไข
 1300037		Cancel edting	ยกเลิกการแก้ไข
-1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
+1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดบดที่เลือกและสูตรการชงอีกครั้ง
 1300039		Insert cup manually	ใส่ถ้วยด้วยตนเอง
 1300040		2. Select arm	2. เลือกแขน
 1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยลงในแขนที่เลือก
--- a/inter/tha/xml/multi/control_and_lang_swith.ev
+++ b/inter/tha/xml/multi/control_and_lang_swith.ev
@ -27,6 +27,7 @@ Var InstanceTabOpenFile4 = InstanceTabOpenFile4 + "/page_catalog_group_milk.lxml

 DEBUGVAR BoostEnergyPro

+OpenRedirect "/taobin_project//xml/page_catalog_group_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 OpenRedirect "/taobin_project//xml/page_catalog_group_other_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
--- a/inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json
+++ b/inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json
@ -5,5 +5,5 @@
  "type": "IMAGE",
  "media_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
  "media_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
-  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
-}
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
+}
--- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
@ -118,7 +118,8 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
+				TabMenuVisibleInst 99
+OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
 			</EventOnClick>
 		</Banner>
 		<Banner>
--- a/ui/lang.tsv
+++ b/ui/lang.tsv
@ -1282,7 +1282,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
@ -1301,7 +1301,7 @@
 1300035		Recipes	สูตรอาหาร
 1300036		Save editing	บันทึกการแก้ไข
 1300037		Cancel edting	ยกเลิกการแก้ไข
-1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
+1300038		1. Recheck selected grind sizes and brew recipes	1. ตรวจสอบขนาดบดที่เลือกและสูตรการชงอีกครั้ง
 1300039		Insert cup manually	ใส่ถ้วยด้วยตนเอง
 1300040		2. Select arm	2. เลือกแขน
 1300041		3. Please insert cup into selected arm	3. กรุณาใส่ถ้วยลงในแขนที่เลือก
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -290,7 +290,7 @@


 	If ConnectWithPOSMachine = 1 Then
-	    If POS_SELL_STATUS = "NORMAL" Then
+	    If POS_SELL_MODE = "NORMAL" Then

 		Else
            Var SelectMenuBetweenBrewEnable1 = "Invisible"
@ -1422,7 +1422,7 @@

 	If SelectMenuBetweenBrewEnable1 = "Enable" Then
        If ConnectWithPOSMachine = 1 Then
-            If POS_SELL_STATUS = "NORMAL" Then
+            If POS_SELL_MODE = "NORMAL" Then
            Else
                Var SelectMenuBetweenBrewEnable1 = "Invisible"
            EndIf
--- a/xml/page_NewBrewing3Conti.xml
+++ b/xml/page_NewBrewing3Conti.xml
@ -56,7 +56,7 @@
 	EndIf

 	If ConnectWithPOSMachine = 1 Then
-   	    If POS_SELL_STATUS = "NORMAL" Then
+   	    If POS_SELL_MODE = "NORMAL" Then

  		Else
            Var EnableSelectMenuBetweenBrew = "Invisible"
@ -594,7 +594,7 @@

 	If EnableSelectMenuBetweenBrew = "Enable" Then
    	If ConnectWithPOSMachine = 1 Then
-       	    If POS_SELL_STATUS = "NORMAL" Then
+       	    If POS_SELL_MODE = "NORMAL" Then

      		Else
                Var EnableSelectMenuBetweenBrew = "Invisible"
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -2133,14 +2133,7 @@ PRICE "Reset" "-"

 				Var OpenFromPageBoard = 1

-				If DoorCupPosition = "bottom" Then
-					If CupOnArm = "true" Then
-
-					Else
-						__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
-					EndIf
-				EndIf
-
+				


 				DEBUGVAR InternationalEnable
@ -2149,6 +2142,17 @@ PRICE "Reset" "-"
 				If CurrHelpCenter = 1 Then
 					OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
 				Else
+
+
+					If DoorCupPosition = "bottom" Then
+						If CupOnArm = "true" Then
+
+						Else
+							__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
+						EndIf
+					EndIf
+
+
 					Var BaseOnPageBoard = 0
 					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"

--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -247,8 +247,14 @@
 		Var ReadyForBrew = "false"
 	EndIf

+	READ_FILE "/mnt/sdcard/coffeevending/app_manager/app_list/king_power_service/enable" POSMachineFlag
+	DEBUGVAR POSMachineFlag
+	If POSMachineFlag = 1 Then
+		Var ConnectWithPOSMachine = 1
+	EndIf
+
 	If ConnectWithPOSMachine = 1 Then
-	    If POS_SELL_STATUS = "NORMAL" Then
+	    If POS_SELL_MODE = "NORMAL" Then

 		Else
 		    If Seeker = "next" Then
@ -409,6 +415,7 @@
 			Var param2 = PureName
 		EndIf

+		DEBUGVAR ConnectWithPOSMachine
 		If ConnectWithPOSMachine = 1 Then
    		Var WaitPOSStatus = 1
    		Var TimeWaitPOSStatus = 0
@ -514,6 +521,8 @@

 	If WaitPOSStatus = 1 Then

+	    DEBUGVAR TimeWaitPOSStatus
+		DEBUGVAR POS_SELL_STATUS
        If TimeWaitPOSStatus < 10 Then
            Var TimeWaitPOSStatus = TimeWaitPOSStatus + 1

--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -60,14 +60,12 @@

 		Var BottomText = PicturePath + "text_bottom_eng.png"

-		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
 	EndIf

 	If LanguageShow = "MSC" Then

 		Var BottomText = PicturePath + "text_bottom_eng.png"

-		Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc"
 	EndIf

 	;DEBUGVAR StarwState
@ -117,24 +115,42 @@
 	DEBUGVAR MachineStage
 	DEBUGVAR NextOrderStatus

+	; Default dir image
 	Var DirImage = "ROOT/taobin_project/image/complete/"
+	Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
+
+	If InternationalEnable = 1 Then
+
+		If LanguageShow = "THAI" Then
+			Var DirImage2 = "ROOT/taobin_project/image/complete/"
+		EndIf
+
+		If LanguageShow = "ENG" Then
+			Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
+		EndIf
+
+		;inter-image
+		If LanguageShow = "MYANMAR" Then
+			Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
+		EndIf
+
+		If LanguageShow = "MSC" Then
+			Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
+		EndIf
+
+		If LanguageShow = "MTC" Then
+			Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
+		EndIf
+	Else
+		If show_eng = "true" Then
+
+		Else
+			Var DirImage2 = "ROOT/taobin_project/image/complete/"
+		EndIf

-	If LanguageShow = "ENG" Then
-	    Var DirImage = "ROOT/taobin_project/image/complete_en/"
 	EndIf

-	;inter-image
-	If LanguageShow = "MYANMAR" Then
-		Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
-	EndIf

-	If LanguageShow = "MSC" Then
-		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
-	EndIf
-
-	If LanguageShow = "MTC" Then
-		Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
-	EndIf

 	Var txtDrinkOKState = "Invisible"
 	Var buttonRemoveCup = "Invisible"
@ -151,8 +167,10 @@

 	Var buttonRemoveCup = "Invisible"

-	SAVELOG "Thank you conti version TCV9"
+	Var thankyouContiVersion = "TCV9 "
+	SAVELOG "Thank you conti version " + thankyouContiVersion
 	SAVELOG "Support NextSmoothie and fix bug next"
+	SAVELOG "DirImage detele. use DirImage2"

    DEBUGVAR NextSmoothie
    DEBUGVAR Seeker.SmoothieToPayment
@ -559,7 +577,7 @@
 <Width> 1080 </Width>
 <Align> end </Align>
 <Color> 0xFF0000 </Color>
-<Value> "TCT6 "</Value>
+<Value> thankyouContiVersion </Value>
 </Text>


--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@ -853,8 +853,8 @@

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

-	DEBUGVAR $12-02-03-0043.Name
-	DEBUGVAR $12-02-03-0043.NameE
+	DEBUGVAR SpeicalButtonPositionX
+	DEBUGVAR TextShowSpecialButton
 	
 	If show_eng = "true" Then
 		Var showname = NameDrink
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "9.90"
-	Var XMLPageVersionInt = 990
+	Var XMLPageVersion = "9.91"
+	Var XMLPageVersionInt = 991
 	
 	Var CurrentMainVideo = 2
 </EventOpen>
--- a/xml_main/startup_dev.xml
+++ b/xml_main/startup_dev.xml
@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "10.90"
-	Var XMLPageVersionInt = 1090
+	Var XMLPageVersion = "10.91"
+	Var XMLPageVersionInt = 1091
 ;Oreo
 Var OreoGuarantee = 0