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

inter/hkg/xml/multi/control_and_lang_swith.ev

@@ -35,19 +35,10 @@ Else
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml"
 EndIf
 
-Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml"
+Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
-
-Var InstanceTabOpenFile9 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
-
-Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
-
-Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
-Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
-Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
 
 TabMenuVisibleInst 99
 
-TabMenuLock 13
 
 DEBUGVAR Not#CountDownForMulti
 DEBUGVAR InstanceTabOpenFile2 

inter/hkg/xml/multi/menu_catalog_new.lxml

@@ -162,7 +162,7 @@
     SAVELOG "  Back multi inst"
     TabMenuVisibleInst 99
 
-    RootLayoutVisible 13 "hide"
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
 
     Var OpenFromMulti = 1
     OpenInst 2 "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog.lxml" 

inter/hkg/xml/multi/page_catalog.lxml

@@ -561,7 +561,7 @@
 	Var OpenFromMulti = 1
 	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
 	RootLayoutVisible 3 "hide"
-	RootLayoutVisible 13 "hide"
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
 	
 </EventClick>
 <Language>

inter/hkg/xml/multi/page_catalog_group_recommend.lxml

@@ -39,7 +39,7 @@
     EndIf
 
     ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
-    RootLayoutVisible 13 "show"
+    RootLayoutVisible 15 "show"
     RootLayoutVisible 3 "show"
     
     

inter/hkg/xml/multi/page_catalog_group_recommend.skt

@@ -41,7 +41,7 @@
     EndIf
 
     ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
-    RootLayoutVisible 13 "show"
+    RootLayoutVisible 15 "show"
     RootLayoutVisible 3 "show"
     
     

inter/hkg/xml/multi/page_instance2.xml

@@ -7,7 +7,7 @@
     
 
     RootLayoutVisible 3 "show"
-    RootLayoutVisible 13 "show"
+    RootLayoutVisible 15 "show"
     
     OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 

inter/hkg/xml/multi/start_up_inst_11.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

inter/hkg/xml/multi/start_up_inst_12.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

inter/hkg/xml/multi/start_up_inst_13.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

inter/hkg/xml/multi/start_up_inst_14.xml

@@ -0,0 +1,23 @@
+<Popup>
+<Width> 1080</Width>
+<Height> 1920 </Height>
+
+<EventOpen>
+
+</EventOpen>
+<Timeout> 10000 </Timeout>
+<EventTimeout> 
+
+	If InstanceTabOpenFile14 = "" Then
+		
+	Else
+		Open InstanceTabOpenFile14
+	EndIf
+
+	TimerReset
+
+</EventTimeout>
+
+
+
+</Popup>

inter/hkg/xml/multi/tab_menu.lxml

@@ -82,7 +82,7 @@
 		    ;TRY OpenFileXML
 
             RootLayoutVisible 3 "hide"
-            RootLayoutVisible 13 "hide"
+            RootLayoutVisible 15 "hide"
     
             TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
         </EventClick>
@@ -252,7 +252,7 @@
 
 
             RootLayoutVisible 3 "hide"
-            RootLayoutVisible 13 "hide"
+            RootLayoutVisible 15 "hide"
 
             TabMenuVisibleInst 99
             OpenInst 2 "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"

inter/hkg/xml/multi/tab_menu_hide.lxml

@@ -1 +1 @@
-RootLayoutVisible 13 "hide"
+RootLayoutVisible 15 "hide"

inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml

@@ -1,2 +1,3 @@
 
-    OpenInst 13 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
+    OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
+    RootLayoutVisible 15 "show"

inter/hkg/xml/page_topping_select6.lxml

@@ -7,7 +7,7 @@
 <EventOpen>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
-	RootLayoutVisible 13 "hide"
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
 
 	Var UserSeletedSugar = 0
 

xml/page_NewBrewing3.xml

@@ -288,6 +288,15 @@
 		Var EnableTopupCreditBetweenBrew = "Enable"
 	EndIf
 
+
+	If ConnectWithPOSMachine = 1 Then
+	    If POS_SELL_MODE = "NORMAL" Then
+
+		Else
+            Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		EndIf
+	EndIf
+
 	If GetFreeFromError = 1 Then
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 		Var EnableTopupCreditBetweenBrew = "Invisible"
@@ -670,7 +679,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -723,7 +732,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -885,7 +894,7 @@
 				Var ECommerce =	ECommerce + "C:"
 				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -930,7 +939,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
 
 			Var waitAckPay = 2
@@ -969,7 +978,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
 
 			Var waitAckPay = 2
@@ -1411,6 +1420,14 @@
 	EndIf
 
 
+	If SelectMenuBetweenBrewEnable1 = "Enable" Then
+        If ConnectWithPOSMachine = 1 Then
+            If POS_SELL_MODE = "NORMAL" Then
+            Else
+                Var SelectMenuBetweenBrewEnable1 = "Invisible"
+            EndIf
+        EndIf
+    EndIf
 
 	Refresh
 	TimerReset

xml/page_NewBrewing3Conti.xml

@@ -55,6 +55,14 @@
 		Var EnableSelectMenuBetweenBrew = "Enable"
 	EndIf
 
+	If ConnectWithPOSMachine = 1 Then
+   	    If POS_SELL_MODE = "NORMAL" Then
+
+  		Else
+            Var EnableSelectMenuBetweenBrew = "Invisible"
+  		EndIf
+   	EndIf
+
 	If GetFreeFromError = 1 Then
 		Var EnableSelectMenuBetweenBrew = "Invisible"
 		Var EnableTopupCreditBetweenBrew = "Invisible"
@@ -186,7 +194,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -243,7 +251,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -342,7 +350,7 @@
 				Var ECommerce =	ECommerce + "C:"
 				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -388,7 +396,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
 
 			Var waitAckPay = 2
@@ -427,7 +435,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
 
 			Var waitAckPay = 2
@@ -584,6 +592,16 @@
 		Var EnableTopupCreditBetweenBrew = "Invisible"
 	EndIf
 
+	If EnableSelectMenuBetweenBrew = "Enable" Then
+    	If ConnectWithPOSMachine = 1 Then
+       	    If POS_SELL_MODE = "NORMAL" Then
+
+      		Else
+                Var EnableSelectMenuBetweenBrew = "Invisible"
+      		EndIf
+       	EndIf
+	EndIf
+
 	If EnableSelectMenuBetweenBrew = "Enable" Then
 		If EnableSelectMenuBetweenBrewBlink = "Enable" Then
 			Var EnableSelectMenuBetweenBrewBlink = "Invisible"

xml/page_NewCannotConti.xml

@@ -188,7 +188,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -245,7 +245,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -322,7 +322,7 @@
 				Var ECommerce =	ECommerce + "C:"
 				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -397,7 +397,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
 
 			Var waitAckPay = 2
@@ -438,7 +438,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
 
 			Var waitAckPay = 2

xml/page_board.xml

@@ -599,10 +599,24 @@
 		EndIf
 
 		If ConnectWithPOSMachine = 1 Then
-			OpenInst 0 "ROOT/taobin_project/xml/page_network_down_pos_machine.xml"
+			OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
 		EndIf
 	EndIf
 
+
+	If ConnectWithPOSMachine = 1 Then
+	    DEBUGVAR POS_SELL_MODE
+	    Var POSSellCountdown = 5
+    	If POS_SELL_MODE = "NORMAL" Then
+
+    	Else
+            Var BackgroundColor = "0x2C2F4E"
+            OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+            Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+    	EndIf
+	EndIf
+
+
 	DEBUGVAR ButtontoTopupMenu
 	STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
 	STRCONTAIN "taobin_notopping" XMLProfile taobin_notopping
@@ -1323,7 +1337,7 @@
 
 			; enable helper
 			Var EnableHelperShow = 0
-			Var FromDrinkOk = 1
+			;Var FromDrinkOk = 1
 			If EnableHelperShow = 1 Then
 				; enable btn_change_langs
 				Var EnableBtnLangWithHelper = 1
@@ -2298,6 +2312,22 @@ PRICE "Reset" "-"
 		Open "ROOT/taobin_project/xml/page_sleepmode.xml"
 	EndIf
 
+	If ConnectWithPOSMachine = 1 Then
+	    If POSSellCountdown > 0 Then
+			Var POSSellCountdown = POSSellCountdown - 1
+		Else
+            DEBUGVAR POS_SELL_MODE
+            Var POSSellCountdown = 5
+            If POS_SELL_MODE = "NORMAL" Then
+
+            Else
+                Var BackgroundColor = "0x2C2F4E"
+                OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
+                Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+            EndIf
+		EndIf
+	EndIf
+
 	; for count helper show
 	If EnableHelperShow = 1 Then
 		If FromDrinkOk = 1 Then

xml/page_lid_straw.xml

@@ -209,6 +209,7 @@
 			If Seeker.PayWithQR = 0 Then
 				DEBUGVAR TxRef1
 				Var PayDetail2 = ToppingDetail
+				Var ServiceCharge = Seeker.ServiceCharge
 				DEBUGVAR PayDetail
 				DEBUGVAR PayDetail2
 
@@ -257,6 +258,7 @@
 			If Seeker.PayWithQR = 0 Then
 				DEBUGVAR TxRef1
 				Var PayDetail2 = ToppingDetail
+				Var ServiceCharge = Seeker.ServiceCharge
 				DEBUGVAR PayDetail
 				DEBUGVAR PayDetail2
 

xml/page_payment.xml

@@ -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
@@ -398,6 +415,7 @@
 			Var param2 = PureName
 		EndIf
 
+		DEBUGVAR ConnectWithPOSMachine
 		If ConnectWithPOSMachine = 1 Then
     		Var WaitPOSStatus = 1
     		Var TimeWaitPOSStatus = 0
@@ -503,6 +521,8 @@
 
 	If WaitPOSStatus = 1 Then
 
+	    DEBUGVAR TimeWaitPOSStatus
+		DEBUGVAR POS_SELL_STATUS
         If TimeWaitPOSStatus < 10 Then
             Var TimeWaitPOSStatus = TimeWaitPOSStatus + 1
 

xml/page_payment_cash.xml

@@ -202,7 +202,7 @@
 	Var ServiceCredit = SelectDrink
 	Var ServiceAmount2 = PayAmount
 	Var Seeker.ServiceAmount2 = PayAmount
-	Var ServiceCharge = 0
+	Var Seeker.ServiceCharge = 0
 	Var	Donate = ""
 	Var SuggestID  = ""
 	Var CancleState = "Enable"
@@ -707,7 +707,7 @@
 
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -762,7 +762,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -816,7 +816,7 @@
 
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -869,7 +869,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -922,7 +922,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -975,7 +975,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -1029,7 +1029,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -1083,7 +1083,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -1136,7 +1136,7 @@
 				EndIf
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -1190,7 +1190,7 @@
 
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -1244,7 +1244,7 @@
 
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -1975,7 +1975,7 @@
 						Var LOADING_STATE = "Invisible"
 						Var CreditCardLoading = 0
 
-						Var ServiceCharge = 0
+						Var Seeker.ServiceCharge = 0
 
 						CoinVending XBILL
 					Else
@@ -2017,9 +2017,9 @@
 
 			Var QRErrorState = "Invisible"
 			Var VendingCashless = "-"
-			Var ServiceCharge = 3
+			Var Seeker.ServiceCharge = 3
 			Var RemainAmountX = RemainAmount
-			Var RemainAmountX = RemainAmountX + ServiceCharge
+			Var RemainAmountX = RemainAmountX + Seeker.ServiceCharge
 			CashlessPay RemainAmountX CreditCardRef
 			Var CashlessPayFlag = 1
 		EndIf
@@ -2146,7 +2146,7 @@
 			Var ECommerce =	ECommerce + "C:"
 			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
 			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			Var ServiceCharge = Seeker.ServiceCharge
 			Var AccountType = "new"
 			Var testservice = "kbank"
 			Var tc = ""
@@ -2335,6 +2335,7 @@
 				Var ServiceType = "credit"
 				Var SessionID2 = SelectDrink
 				Var ServiceCredit = "coffee"
+				Var ServiceCharge = Seeker.ServiceCharge
 
 				Var PayDetail2 = Seeker.PayDetail2
 				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
@@ -3051,7 +3052,7 @@
 
 
 				Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				Var ServiceCharge = Seeker.ServiceCharge
 				Var AccountType = "new"
 				Var testservice = "kbank"
 				Var tc = ""
@@ -3364,9 +3365,7 @@ eval(
 
 		If KBankCashlessMachine = "1" Then
 			If ReqPayInfoFromCashOther = 2 Then
-				If ServiceCharge > 0 Then
+			    Var Seeker.ServiceCharge = 0
-					Var ServiceCharge = 0
-				EndIf
 				CoinVending XBILL
 			EndIf
 		EndIf

xml/page_pos_machine_midnight_close.xml

@@ -0,0 +1,80 @@
+<Page>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Volume> SoundVolume </Volume>
+<Cache> "Enable" </Cache>
+<Background> "0x2C2F4E" </Background>
+
+<EventOpen>
+
+    Var Timeout = 0
+
+    Var title_image = "ROOT/taobin_project/image/pos_midnight/pos_close_midnight_th.png"
+    If show_eng = "true" Then
+        Var title_image = "ROOT/taobin_project/image/pos_midnight/pos_close_midnight_en.png"
+    EndIf
+
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    If Timeout > 5 Then
+        DEBUGVAR POS_SELL_MODE
+        If POS_SELL_MODE = "NORMAL" Then
+            RootLayoutVisible 3 "show"
+            Open "ROOT/taobin_project/xml/page_board.xml"
+        EndIf
+
+        Var Timeout = 0
+    Else
+        Var Timeout = Timeout + 1
+    EndIf
+
+    TimerReset
+
+</EventTimeout>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/video/Taobin_Sleep_Screen.mp4" </Filename>
+</Video>
+
+<Button>
+<X> 990 </X>
+<Y> 380 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	; eng
+	If show_eng = "true" Then
+		Var show_eng = "false"
+	Else
+		Var show_eng = "true"
+	EndIf
+
+	If show_eng = "true" Then
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+	Else
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+
+
+	Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
+</EventClick>
+</Button>
+
+<Image>
+<X> 156 </X>
+<Y> 380 </Y>
+<Filename> title_image </Filename>
+</Image>
+
+</Page>

xml/page_pos_machine_network_down.xml

@@ -67,7 +67,7 @@
 	EndIf
 	
 
-	Open "ROOT/taobin_project/xml/page_network_down_pos_machine.xml"
+	Open "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
 </EventClick>
 </Button>
 

xml/page_thankyou.xml

@@ -360,6 +360,9 @@
 				Var VendingDiscount = Seeker.VendingDiscount
 				Var VendingCampaign = Seeker.VendingCampaign
 
+				DEBUGVAR Seeker.ServiceCharge
+				Var ServiceCharge = Seeker.ServiceCharge
+				DEBUGVAR ServiceCharge
 
 				Var PayDetail = "2/F:1311/0//XML|" +  Seeker.OrderChanel
 				Var PayType = ""
@@ -381,6 +384,7 @@
 					Var SessionID2 = SessionID2 + "/"
 
 					Var PayDetail2 = ToppingDetail
+
 					DEBUGVAR PayDetail
 					DEBUGVAR PayDetail2
 

xml/process/payment.ev

@@ -8,6 +8,7 @@ If Seeker.PayWithQR = 1 Then
 		Var VendingCampaign = 0
 		Var SelectDrink = Seeker.selected_a_drink
 		Var SuggestID  = ""
+		Var ServiceCharge = Seeker.ServiceCharge
 
 		If ChangeFlag2 = 1 Then
 			Var TelephoneNumber = "0899999999"
@@ -54,6 +55,8 @@ If Seeker.PayWithQR = 1 Then
     		Var ServiceCredit = SelectDrink
     		Var SuggestID  = ""
 
+            Var ServiceCharge = Seeker.ServiceCharge
+
     		Var PayDetail = "2/S:0/0//XML|" +  Seeker.OrderChanel
 
     		If GetFreeFromError = 1 Then
@@ -90,6 +93,8 @@ If Seeker.PayWithQR = 1 Then
 		Var ServiceCredit = SelectDrink
 		Var SuggestID  = ""
 
+		Var ServiceCharge = Seeker.ServiceCharge
+
 		Var PayDetail = "2/S:0/0//XML|" +  Seeker.OrderChanel
 
 		If GetFreeFromError = 1 Then