diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml
index 15a8e7b2..03a1dfe9 100644
--- a/xml/page_payment_cash-AUS.xml
+++ b/xml/page_payment_cash-AUS.xml
@@ -88,6 +88,8 @@
 
 	Var cancelState = "Invisible"
 
+	Var CameraState = "Invisible"
+
 
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
@@ -402,14 +404,6 @@
 
 	Machine DoorClose
 
-
-	If ShoppyPayEnable = "true" Then
-	Else
-		Var PayState5 = "Disable"
-		Var PayState6 = "Disable"
-	EndIf
-
-
 	If web_readyOK = "true" Then
 
 		Var web_readyOK = "false"
@@ -432,7 +426,6 @@
 		Var PayState4 = "Invisible"
 		Var PayState5 = "Invisible"
 		Var PayState6 = "Invisible"
-
 	EndIf
 </EventOpen>
 
@@ -678,6 +671,28 @@
 			EndIf
 		EndIf
 
+		;If ReqPayInfoFlag = 6 Then
+		;    If VendingQRTypeResult = "FZB:2" Then
+		;		Var CashTextWarning = ""
+		;		Var QRErrorState = "Invisible"
+		;		Var QRCODE99Shoppy = SessionID
+		;		Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
+		;		SAVELOG Ext1a
+		;		SAVELOG QRCODE99Shoppy
+		;		Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
+		;		Var ReqPayInfoFlag = 0
+		;		Var ReqPayInfoFlag2 = 5
+		;		SAVELOG QRCODE99Shoppy
+		;		SAVELOG Ext21
+
+		;		Var employeeName = "Jhon"
+		;		Var
+
+		;		;Var QRCODE99 = QRCODE99Shoppy
+		;		Var LOADING_STATE = "Invisible"
+		;	EndIf
+		;EndIf
+
 	Else
 		Var PayInfoCFlag = 1
     EndIf
@@ -718,6 +733,7 @@
 		If ReqPayInfoFlag = 1 Then
 			Var QRErrorFlag = 1
 			If alphaState = "Enable" Then
+			    Var QRErrorImg = "/QRError.png"
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
 			EndIf
@@ -725,6 +741,7 @@
 		If ReqPayInfoFlag = 2 Then
 			Var QRErrorFlag = 1
 			If alphaState = "Enable" Then
+			    Var QRErrorImg = "/QRError.png"
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
 			EndIf
@@ -732,6 +749,7 @@
 		If ReqPayInfoFlag = 3 Then
 			Var QRErrorFlag = 1
 			If alphaState = "Enable" Then
+			    Var QRErrorImg = "/QRError.png"
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
 			EndIf
@@ -739,10 +757,19 @@
 		If ReqPayInfoFlag = 4 Then
 			Var QRErrorFlag = 1
 			If alphaState = "Enable" Then
+			    Var QRErrorImg = "/QRError.png"
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
 			EndIf
 		EndIf
+		If ReqPayInfoFlag = 6 Then
+		    Var QRErrorFlag = 1
+			If alphaState = "Enable" Then
+			    Var QRErrorImg = "/QRError.png"
+			    Var QRErrorState = "Enable"
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
 	Else
 		Var PayInfoCFlag = 1
 	EndIf
@@ -827,11 +854,16 @@
 	If Timeout >= 120 Then
 	  Var alphaState = "Invisible"
 
+	  If CameraState = "Enable" Then
+		Var CameraState = "Invisible"
+	  EndIf
+
 
 	  If RoadShow = "true" Then
 	  Else
 		Var PayState3 = "Disable"
 	  	Var PayState5 = "Disable"
+		Var PayState6 = "Disable"
 	  EndIf
 
         Var LOADING_STATE = "Invisible"
@@ -1351,6 +1383,96 @@
 	EndIf
 </EventVDCancle>
 
+<EventScanQRResult>
+
+    DEBUGVAR scanresult
+    DEBUGVAR scanmsg
+
+    ;If scanresult = "true" Then
+    ;    Var employeeCode = scanmsg
+    ;    Open "ROOT/taobin_project/inter/aus/xml/page_payment_employee_ping
+    ;Else
+
+    ;EndIf
+
+    If scanresult = "true" Then
+        If Timeout < 120 Then
+            If CoinInFlag = 0 Then
+                If CancelFlag = 0 Then
+               	    Var QR_POPUP = "/img_popup_AUS_QR.png"
+    				Var QRCODE99 = ""
+
+    				Var LOADING_STATE = "Enable"
+
+    				VendingQR ON
+
+    				Var SessionID2 = SelectSlot + ":"
+    				Var SessionID2 = SessionID2 + Seeker.ExtendData
+
+    				Var CreditAmount1 = ""
+    				Var ServiceAmountFlow = ""
+    				Var TelephoneNumberQR = "0899999999"
+    				Var ServiceType = "coffee"
+    				Var ECommerceQR = ""
+    				Var ECommerceQR = ECommerceQR + PriceDrink
+    				Var ECommerceQR =	ECommerceQR + "/"
+    				Var ECommerceQR =	ECommerceQR + DiscountDrink
+    				Var ECommerceQR =	ECommerceQR + "/"
+    				Var ECommerceQR =	ECommerceQR + SessionID2
+    				Var ECommerceQR =	ECommerceQR + "/"
+    				Var ECommerceQR =	ECommerceQR + SelectDrink
+    				Var ECommerceQR =	ECommerceQR + "/"
+   					Var ECommerceQR =	ECommerceQR + "FZB:2/"
+
+    				If  Seeker.IntVendingCampaign > 0 Then
+   					Var ECommerceQR =	ECommerceQR + Seeker.VendingCode
+   					Var ECommerceQR =	ECommerceQR + ":"
+   					Var ECommerceQR =	ECommerceQR + Seeker.CodeNumber
+   					Var ECommerceQR =	ECommerceQR + ":"
+   					Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
+    				EndIf
+
+    				If  Seeker.IntVendingCredit > 0 Then
+   					If Seeker.IntVendingCampaign > 0 Then
+  						Var ECommerceQR =	ECommerceQR + "|"
+   					EndIf
+   					Var ECommerceQR =	ECommerceQR + "CRD"
+   					Var ECommerceQR =	ECommerceQR + ":"
+   					Var ECommerceQR =	ECommerceQR + Seeker.TNumberTaobinCredit
+   					Var ECommerceQR =	ECommerceQR + ":"
+   					Var ECommerceQR = 	ECommerceQR + Seeker.IntVendingCredit
+   					Var ECommerceQR =	ECommerceQR + ":"
+   					Var ECommerceQR = 	ECommerceQR + PointCrm
+    				EndIf
+
+
+    				Var ServiceParameter = "max"
+    				Var ServiceCharge = 0
+    				Var AccountType = "new"
+    				Var testservice = "kbank"
+    				Var tc = ""
+    				Var GetScore = ""
+    				Var OperatorName = ""
+    				Var SessionID = ""
+
+    				Var PayDetail2 = Seeker.PayDetail2
+    				GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+    				Var ReqPayInfoFlag = 6
+    				Refresh
+                EndIf
+            EndIf
+        EndIf
+    Else
+        Var scanmsg = "Please try agin"
+    EndIf
+
+    Var CameraState = "Invisible"
+    CLOSESCANQR
+
+    Refresh
+
+</EventScanQRResult>
+
 
 
 ;include="ROOT/taobin_project/inc/video.inc"
@@ -1441,7 +1563,7 @@
 If alphaState = "Invisible" Then
 	If CoinInFlag = 0 Then
 		If CancelFlag = 0 Then
-            Var QR_POPUP = "/img_popup8.png"
+            Var QR_POPUP = "/img_popup8-AUS.png"
             Var alphaState = "Enable"
             Coin CARD
         EndIf
@@ -1604,7 +1726,7 @@ EndIf
 <Button>
 <X> 552 </X>
 <Y> 1499 </Y>
-<State> "Enable" </State>
+<State> "Invisible" </State>
 <Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
 <FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
 <FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
@@ -1618,10 +1740,11 @@ EndIf
 <Button>
 <X> 552 </X>
 <Y> 1499 </Y>
-<State> "Invisible" </State>
-<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_codeOther.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_codeOther.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_codeOther.png" </FilenameDisable>
+<State> PayState6 </State>
+;<State> "Invisible" </State>
+<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1631,68 +1754,18 @@ EndIf
             If CancelFlag = 0 Then
                 If alphaState = "Invisible" Then
 
-               	    Var QR_POPUP = "/img_popup1.png"
+               	    Var QR_POPUP = "/img_popup_ema.png"
     				Var QRCODE99 = ""
 
-    				Var LOADING_STATE = "Enable"
-
     				Var FlagQROpened = 1
     				Var alphaState = "Enable"
 
-    				VendingQR ON
+                    Var scanresult = ""
+                    Var scanmsg = ""
+    				INITSCANQR
 
-    				Var SessionID2 = SelectSlot + ":"
-    				Var SessionID2 = SessionID2 + Seeker.ExtendData
+                    Var CameraState = "Enable"
 
-    				Var CreditAmount1 = ""
-    				Var ServiceAmountFlow = ""
-    				Var TelephoneNumberQR = "0899999999"
-    				Var ServiceType = "coffee"
-    				Var ECommerceQR = ""
-    				Var ECommerceQR = ECommerceQR + PriceDrink
-    				Var ECommerceQR =	ECommerceQR + "/"
-    				Var ECommerceQR =	ECommerceQR + DiscountDrink
-    				Var ECommerceQR =	ECommerceQR + "/"
-    				Var ECommerceQR =	ECommerceQR + SessionID2
-    				Var ECommerceQR =	ECommerceQR + "/"
-    				Var ECommerceQR =	ECommerceQR + SelectDrink
-    				Var ECommerceQR =	ECommerceQR + "/"
-   					Var ECommerceQR =	ECommerceQR + "FZB:2/"
-
-    				If  Seeker.IntVendingCampaign > 0 Then
-    					Var ECommerceQR =	ECommerceQR + Seeker.VendingCode
-    					Var ECommerceQR =	ECommerceQR + ":"
-    					Var ECommerceQR =	ECommerceQR + Seeker.CodeNumber
-    					Var ECommerceQR =	ECommerceQR + ":"
-    					Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
-    				EndIf
-
-    				If  Seeker.IntVendingCredit > 0 Then
-    					If Seeker.IntVendingCampaign > 0 Then
-    						Var ECommerceQR =	ECommerceQR + "|"
-    					EndIf
-    					Var ECommerceQR =	ECommerceQR + "CRD"
-    					Var ECommerceQR =	ECommerceQR + ":"
-    					Var ECommerceQR =	ECommerceQR + Seeker.TNumberTaobinCredit
-    					Var ECommerceQR =	ECommerceQR + ":"
-    					Var ECommerceQR = 	ECommerceQR + Seeker.IntVendingCredit
-    					Var ECommerceQR =	ECommerceQR + ":"
-    					Var ECommerceQR = 	ECommerceQR + PointCrm
-    				EndIf
-
-
-    				Var ServiceParameter = "max"
-    				Var ServiceCharge = 0
-    				Var AccountType = "new"
-    				Var testservice = "kbank"
-    				Var tc = ""
-    				Var GetScore = ""
-    				Var OperatorName = ""
-    				Var SessionID = ""
-
-    				Var PayDetail2 = Seeker.PayDetail2
-    				GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-    				Var ReqPayInfoFlag = 1
     				Refresh
                 EndIf
             EndIf
@@ -1804,8 +1877,14 @@ EndIf
 <Filename> Var( DirImage + "/loadingText.png" )</Filename>
 </Image>
 
-
-
+<CameraX>
+<X> 50 </X>
+<Y> 900 </Y>
+<Name>"usbfront"</Name>
+<Width> 1000 </Width>
+<Height> 1000 </Height>
+<State> CameraState </State>
+</CameraX>
 
 
 <Button>
@@ -1822,6 +1901,7 @@ EndIf
     Var QRErrorState = "Invisible"
     Var CreditCardErrorState = "Invisible"
     Var alphaState = "Invisible"
+    Var CameraState = "Invisible"
     Var QRCODE99 = ""
 
     If CashlessPayFlag = 1 Then
@@ -2138,7 +2218,7 @@ EndIf
 <X> 267 </X>
 <Y> 960 </Y>
 <State>QRErrorState</State>
-<Filename> Var( DirImage + "/QRError.png" ) </Filename>
+<Filename> Var( DirImage + QRErrorImg ) </Filename>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>