Merge branch 'masterpiece' into feat/sgp-new-payment

xml/page_payment.xml

@@ -10,7 +10,7 @@
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 
-	
+
 	If Seeker = "curr" Then
 		If MachineStage = "remove-cup" Then
 			SAVELOG "MachineStage = remove-cup"
@@ -37,7 +37,7 @@
 
 	EndIf
 
-	
+
 	Var IndoQR = 0
 
 	Var PaymentEnableAll = "true"
@@ -79,7 +79,7 @@
 
 	SAVELOG BoxID
 
-	Var ServiceCharge = 0
+	Var Seeker.ServiceCharge = 0
 
 	Var AdultFlag = 0
 
@@ -247,6 +247,23 @@
 		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_MODE = "NORMAL" Then
+
+		Else
+		    If Seeker = "next" Then
+				Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+			Else
+		        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+			EndIf
+		EndIf
+	EndIf
 
 
 	; Test
@@ -343,7 +360,7 @@
 
 		Var RoadShowMarketCode = ""
 		Var Seeker.VendingCode = RoadShowMarketCode
-		
+
 		DEBUGVAR PriceDrink
 
 		Var Seeker.IntVendingCampaign = PriceDrink
@@ -404,6 +421,7 @@
 			Var param2 = PureName
 		EndIf
 
+		DEBUGVAR ConnectWithPOSMachine
 		If ConnectWithPOSMachine = 1 Then
     		Var WaitPOSStatus = 1
     		Var TimeWaitPOSStatus = 0
@@ -535,6 +553,8 @@
 
 	If WaitPOSStatus = 1 Then
 
+	    DEBUGVAR TimeWaitPOSStatus
+		DEBUGVAR POS_SELL_STATUS
         If TimeWaitPOSStatus < 10 Then
             Var TimeWaitPOSStatus = TimeWaitPOSStatus + 1
 
@@ -662,9 +682,11 @@
 <State> StageShowAlias</State>
 <X> 0 </X>
 <Y> 938 </Y>
-<Width> 1080</Width>
+<Width> 1080 </Width>
 <Align> Center </Align>
-<Size> 66 </Size>
+<MaxSize> 66 </MaxSize>
+<Size> Auto </Size>
+<MaxLine> 1 </MaxLine>
 <Font> KanitMediumTTF </Font>
 <Color> HeadlineColor </Color>
 <Value> showname </Value>