shoppy webapp

xml/page_board.xml

@@ -13,6 +13,15 @@
 
 	DEBUGVAR SoundVolume
 
+
+	DEBUGVAR web_ref
+	DEBUGVAR web_payment
+	DEBUGVAR web_telnum
+	DEBUGVAR web_code
+	DEBUGVAR web_pin
+
+	Var web_telnumOK = ""
+
 	Var GetFreeFromError = 0
 	Var taobin_version = "1.53"
 	
@@ -124,17 +133,27 @@
 	EndIf
 
 
+	
+
+
 	DEBUGVAR NetworkStatus
 	If NetworkStatus = "ACTIVATE" Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 		Machine NetworkUp
 
+		GenHashWithTimeStamp QRCODE99
+		WEB "ENABLE"
+		
 	Else
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
 		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 		Machine NetworkDown
+		
+
+		Var QRCODE99 = ""
+		WEB "DISABLE"
 	EndIf
 
 
@@ -299,6 +318,8 @@
 	
 	Var showCart = "Invisible"
 
+	
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -477,6 +498,26 @@
 	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
 </EventNetDeactive>
 
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99 Then
+
+			Var web_telnumOK = web_telnum
+			
+
+			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+			TopView "show"
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+		EndIf
+	Else
+	EndIf
+ 
+</EventWebApp>
+
 
 <Video>
 <X> 0 </X>
@@ -611,6 +652,15 @@
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
+<QRCode>
+<X> 895 </X>
+<Y> 1110 </Y>
+<Width> 178 </Width>
+<Height> 178 </Height>
+<State> "Enable" </State>
+<Service> testservice </Service>
+</QRCode>
+
 
 <Button>
 <X> 0 </X>

xml/page_catalog.xml

@@ -8,6 +8,7 @@
 	TopView "show"
 	; On open
 
+	Var web_telnumOK = ""
 
 	
 	If CocktailShow = "true" Then 
@@ -129,6 +130,24 @@
 	;EndIf
 </EventChangeStatus>
 
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99 Then
+
+			Var web_telnumOK = web_telnum
+		
+
+		
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+		EndIf
+		
+	Else
+	EndIf
+ 
+</EventWebApp>
+
 
 <Video>
 <X> 0 </X>
@@ -376,4 +395,6 @@
 </Button>
 
 
+
+
 </Popup>

xml/page_check_member2.xml

@@ -962,7 +962,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-     Open "ROOT/taobin_project/xml/page_member_topup1.xml"
+     Open "ROOT/taobin_project/xml/page_member_topup2.xml"
 
 </EventClick>
 </Button>

xml/page_collect_point_1.xml

@@ -28,11 +28,33 @@
 
 	Var FromConsent = 0
 
+
+	
+
 	If TNumberTaobinCredit = "" Then
 		Var number7 = ""
 		Var number8 = ""
 		Var number9 = ""
 		Var number10 = ""
+
+		If web_telnumOK = "" Then
+		Else
+			Var TelephoneNumber = web_telnumOK
+			Var StepGetPoint = 0
+
+			Var PdpaAsk = 0
+			
+			Var OperatorTemp = ""
+			Var CreditAmount = 0
+			Var OperatorStatus = ""
+			Var AccountType = ""
+
+			SAVELOG "collect_point1-p52."
+
+			GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
+
+		EndIf
 	Else
 
 		Var TelephoneNumber = TNumberTaobinCredit
@@ -46,7 +68,7 @@
 		Var OperatorStatus = ""
 		Var AccountType = ""
 
-		SAVELOG "collect_point1-p49."
+		SAVELOG "collect_point1-p71."
 
 		GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
@@ -80,8 +102,9 @@
 	DEBUGVAR Timeout
 
 	Var Timeout = Timeout + 1
-	If Timeout > 20 Then
+	If Timeout > 30 Then
 
+		SAVELOG "collect_point1-p107."
         Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 	EndIf
 
@@ -563,6 +586,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
+	SAVELOG "collect_point1-p589."
 	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 </EventClick>
 </Button>

xml/page_drinkfail2Multi.xml

@@ -390,13 +390,13 @@
 
 
 <Button>
-<X> 757 </X>
+<X> 160 </X>
-<Y> 424 </Y>
+<Y> 1673 </Y>
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
 <EventClick> 
 	Machine RemoveCup
 	Machine DoorLidOpen

xml/page_drinkok.xml

@@ -50,11 +50,17 @@
 	Var next_pic_bg = ""
 
 
+	Var BlinkImg = 0
+	Var txtDrinkOKState = "Invisible"
+
+
 	If show_eng = "true" Then 
 		If CART_COUNT > 0 Then
 			If 	CART_INDEX < CART_COUNT  Then   
 
 				Var next_pic_bg = DirImage + "/Preparing.png"
+				Var BlinkImg = 1
+				Var txtDrinkOKState = "Enable"
 
 				Var cart_next = CART_INDEX + 1 
 				Var nextCount = "" + cart_next
@@ -83,6 +89,8 @@
 			If 	CART_INDEX < CART_COUNT  Then   
 
 				Var next_pic_bg = DirImage + "/Preparing.png"
+				Var BlinkImg = 1
+				Var txtDrinkOKState = "Enable"
 
 				Var cart_next = CART_INDEX + 1 
 				Var nextCount = "" + cart_next
@@ -141,6 +149,19 @@
 		Var MultiGo = 1 
 	EndIf
 
+	If BlinkImg = 1 Then
+		Var next_pic_bg = DirImage + "/Preparing.png"
+		Var BlinkImg = 2
+	Else
+		If BlinkImg = 2 Then
+			Var next_pic_bg = DirImage + "/Preparing.png"
+			Var BlinkImg = 1
+		EndIf
+
+	EndIf
+
+	
+
 	If MultiGo = 1 Then
 		If 	CART_INDEX = CART_COUNT  Then  
 
@@ -371,15 +392,22 @@
 <Filename> next_pic </Filename>
 </Image>
 
+<Image>
+<X> 77 </X>
+<Y> 1378 </Y>
+<State> txtDrinkOKState </State>
+<Filename> Var( DirImage + "/txtDrinkOK.png" ) </Filename>
+</Image>
+
 
 <Button>
-<X> 757 </X>
+<X> 160 </X>
-<Y> 424 </Y>
+<Y> 1673 </Y>
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
 <EventClick> 
 	Machine RemoveCup
 	Machine DoorLidOpen

xml/page_member_topup3.xml

@@ -128,7 +128,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 638 </Y>
+<Y> 670 </Y>
 <State> PayState1</State>
 <Filename> Var( DirImage + "/bn_cash.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_cash.png") </FilenamePress>
@@ -146,7 +146,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 819 </Y>
+<Y> 800 </Y>
 <State> PayState3</State>
 <Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>

xml/page_payment.xml

@@ -52,6 +52,11 @@
 	Var PayType = ""
 	Var CART_INDEX = 0
 
+	Var QRCODE99KBANK = ""
+	Var QRCODE99Shoppy = ""
+	Var LOADING_STATE = "Invisible"
+	Var QR_POPUP = "/img_popup2.png"
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
@@ -116,37 +121,37 @@
 
 
 
-			Var SessionID2 = SelectSlot + ":"
+			;Var SessionID2 = SelectSlot + ":"
-			Var SessionID2 = SessionID2 + ExtendData
+			;Var SessionID2 = SessionID2 + ExtendData
 
-			Var CreditAmount1 = ""
+			;Var CreditAmount1 = ""
-			Var ServiceAmountFlow = ""
+			;Var ServiceAmountFlow = ""
-			Var TelephoneNumberQR = "0899999999"
+			;Var TelephoneNumberQR = "0899999999"
-			Var ServiceType = "coffee"
+			;Var ServiceType = "coffee"
-			Var ECommerceQR = ""
+			;Var ECommerceQR = ""
-			Var ECommerceQR = ECommerceQR + PriceDrink
+			;Var ECommerceQR = ECommerceQR + PriceDrink
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + DiscountDrink 
+			;Var ECommerceQR =	ECommerceQR + DiscountDrink 
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + SessionID2 
+			;Var ECommerceQR =	ECommerceQR + SessionID2 
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + SelectDrink 
+			;Var ECommerceQR =	ECommerceQR + SelectDrink 
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + "KBA:2"
+			;Var ECommerceQR =	ECommerceQR + "KBA:2"
-			Var ServiceParameter = "max"
+			;Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			;Var ServiceCharge = 0
-			Var AccountType = "new"
+			;Var AccountType = "new"
-			Var testservice = "kbank"
+			;Var testservice = "kbank"
-			Var tc = ""
+			;Var tc = ""
-			Var GetScore = ""
+			;Var GetScore = ""
-			Var OperatorName = ""
+			;Var OperatorName = ""
-			Var SessionID = ""
+			;Var SessionID = ""
 
 
-			GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-			Var Timeout = 0
+			;Var Timeout = 0
-			Var GetPayInfoFlag = 1
+			;Var GetPayInfoFlag = 1
-			Var ReqPayInfoFlag = 1
+			;Var ReqPayInfoFlag = 1
 
 		EndIf
 

xml/page_payment_cash.xml

@@ -6,6 +6,9 @@
 <Volume> SoundVolume </Volume>
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
+
+	DEBUGVAR QRCODETMP 
+
 	DEBUGVAR IsSmoRet
 	Var countClick2 = 0
 	;SAVELOG SelectDrink
@@ -28,8 +31,11 @@
 
 	Var PayAmount = PriceDrink
 	
+	Var LOADING_STATE = "Invisible"
 	; Below original 
 	; On open
+
+	
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
 	Var alphaState3 = "Invisible"
@@ -40,7 +46,7 @@
 	Var CancelFlag = 0
 	Var CancelCounter = 0
 	Var CoinInCounter = 0
-	Var CancelNumber = 2
+	Var CancelNumber = 3
 	
 	Var PayAmount = PriceDrink
 	Var RemainAmount = PayAmount - IntVendingCampaign 
@@ -66,19 +72,21 @@
 	Var ServiceCharge = 0
 	Var	Donate = "" 
 	Var SuggestID  = ""
-	Var CancleState = "Invisible"
+	Var CancleState = "Enable"
 
 	Var VendingDiscount = DiscountDrink
 	
 
 	Var CashTextWarning = "" 
 	Var QRErrorState = "Invisible"
+	Var QRErrorFlag = 0
 
 
 	SAVELOG SelectDrink
 
 	SAVELOG QRChannel
 	SAVELOG QRCODE99
+	DEBUGVAR QRCODE99
 
 	SAVELOG VendingCampaign
 	SAVELOG VendingCode
@@ -89,49 +97,14 @@
 		Var CodeChannel = 0
 	EndIf
 	
-
+	DEBUGVAR QRCODE99KBANK
-	If RoadShow = "false" Then 
-		If QRChannel = 0 Then
-			;Var VendingQRCode = "ERROR"
-			VendingQR ON
-			If CoinVendingOnFlag = 0 Then
-				;CoinVending ON
-				Var CoinVendingOnFlag = 1
-			Else
-
-			
-
-			EndIf
-			;Var QRCODE99 = ""
-			
-
-		Else
-			;Var VendingQRCode = "OK"
-			VendingQR ON
-			CoinVending OFF
-			Var QRCODE99 = QRCODETMP
-			Var RemainAmountStr = ""
-			Var CashTextWarning = ""
-
-
-			If QRCODE99 = "" Then
-				Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้"
-				Var QRErrorState = "Enable"
-			Else
-				Var QRErrorState = "Invisible"
-			EndIf
-
-			
-
-	EndIf
-	EndIf
-
 
 	If RoadShow = "true" Then
 		Var PayState1 = "Enable"
 		Var PayState2 = "Invisible"
 		Var PayState3 = "Invisible"
 		Var PayState4 = "Invisible"
+		Var PayState5 = "Invisible"
 		Var showRemaining = "Free"
 	
 	Else
@@ -139,23 +112,28 @@
 		If IntVendingCampaign = 0 Then
 			Var PayState2 = "Enable"
 			Var PayState4 = "Enable"
+			Var PayState5 = "Enable"
 		Else 
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 		EndIf
 		Var PayState3 = "Enable"
 		
 		
+
 		If CoinAmount > 0 Then
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 			Var CoinInFlag = 1
 		EndIf
 
 		If IntVendingCredit > 0 Then
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 		EndIf
 
 
@@ -267,6 +245,7 @@
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 
 			Var PayOfflineMode = 1
 	Else
@@ -290,13 +269,13 @@
 	If DisableUsingCode = "true" Then
 		SAVELOG "Diable code because using topping."
 		Var PayState2 = "Disable"
-		Var pay_with_code_image = DirImage + "/bp_pay_with_code_error.png"
+		Var pay_with_code_image = DirImage + "/bn_pay_with_codeSmall_error.png"
 	Else
 
 		If IntVendingCredit > 0 Then
 
-			Var pay_with_code_image = DirImage + "/bp_pay_with_code_error2.png"
+			Var pay_with_code_image = DirImage + "/bp_pay_with_code.png"
-			Var pay_with_credit_image = DirImage + "/bp_pay_with_credit_error2.png"
+			Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
 
 			Var pay_with_chanel_text = DirImage + "/text_2.png"
 
@@ -312,6 +291,12 @@
 
 <EventActionOk>
 
+	Var VendingQRTypeResult = ""
+	
+	DEBUGVAR ECommerceQR
+	SPLIT  ECommerceQR "/"  5  VendingQRTypeResult
+	
+
 	If ActionOKCase = 0 Then 
 		If VendingREFID = "" Then
 			SAVELOG "menu_page4-QR.xml > ActOK_REFID"
@@ -338,24 +323,73 @@
 		EndIf
 
 		If ReqPayInfoFlag = 1 Then	
-			Var CashTextWarning = ""
+			If VendingQRTypeResult = "KBA:2" Then
-			Var QRErrorState = "Invisible"
+				Var CashTextWarning = ""
-			Var QRCODE99 = SessionID
+				Var QRErrorState = "Invisible"
-			Var QRCODE99 = QRCODE99 + Ext1a
+				Var QRCODE99KBANK = SessionID
-			SAVELOG Ext1a
+				Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
-			SAVELOG QRCODE99
+				SAVELOG Ext1a
-			Var QRCODE99 = QRCODE99 + Ext21
+				SAVELOG QRCODE99KBANK
-			Var QRCODETMP = QRCODE99
+				Var QRCODE99KBANK = QRCODE99KBANK + Ext21
-			Var ReqPayInfoFlag = 0
+				Var QRCODETMP = QRCODE99KBANK
-			SAVELOG QRCODE99
+				Var ReqPayInfoFlag = 0
-			SAVELOG Ext21
+				SAVELOG QRCODE99KBANK
+				SAVELOG Ext21
+
+				Var QRCODE99 = QRCODE99KBANK
+				Var LOADING_STATE = "Invisible"
+			EndIf
+			
+			
 		EndIf
+
+		If ReqPayInfoFlag = 2 Then	
+			If VendingQRTypeResult = "AIR: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
+				SAVELOG QRCODE99Shoppy
+				SAVELOG Ext21
+
+				Var QRCODE99 = QRCODE99Shoppy
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
+
 	Else
 		Var PayInfoCFlag = 1
     EndIf
 
 </EventActionOk>
 
+<EventActionError>
+
+	If ActionOKCase = 0 Then 
+		If ReqPayInfoFlag = 1 Then	
+			Var QRErrorFlag = 1
+			If alphaState = "Enable" Then
+				Var QRErrorState = "Enable"
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
+		If ReqPayInfoFlag = 2 Then	
+			Var QRErrorFlag = 1
+			If alphaState = "Enable" Then
+				Var QRErrorState = "Enable"
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
+	EndIf
+
+	Refresh
+
+</EventActionError>
+
 
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -373,6 +407,11 @@
 	If Timeout >= 120 Then
 	  Var alphaState = "Invisible"
 	  Var PayState3 = "Disable"
+	  Var PayState5 = "Disable"
+
+	  Var LOADING_STATE = "Invisible"
+	  Var QRErrorState = "Invisible"
+
 	EndIf
 
 
@@ -664,6 +703,7 @@
 		If CoinInOK = 0 Then
 			If CancelFlag = 0 Then
 				SAVELOG "VDCancle  > Cancle Order."
+				Machine CancelWepApp
 				CoinVending OFF
 				Var CancelFlag = 1
 				Var CancelCounter = 0
@@ -714,10 +754,10 @@
 
 ; back
 <Button>
-<X> 19 </X>
+<X> 18 </X>
-<Y> 420 </Y>
+<Y> 422 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<Filename> Var( DirImage + "/bn_back_arrow2.png")  </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<FilenamePress> Var( DirImage + "/bn_back_arrow2.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -725,6 +765,7 @@
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleMain  > Cancle Order."
+			Machine CancelWepApp
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
@@ -766,7 +807,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1254 </Y>
+<Y> 1261 </Y>
 <State> PayState1</State>
 <Filename>  FilenameShowbuttonCashBN </Filename>
 <FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
@@ -802,7 +843,7 @@
 
 <Button>
 <X> 287 </X>
-<Y>  1696</Y>
+<Y>  1677</Y>
 <State> PayState2</State>
 <Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@@ -827,7 +868,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1401 </Y>
+<Y> 1365 </Y>
 <State> PayState3</State>
 <Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
@@ -841,27 +882,78 @@
 
 		If CoinInFlag = 0 Then
 			If CancelFlag = 0 Then
+				If alphaState = "Invisible" Then
+
+				Var QR_POPUP = "/img_popup1.png"
+				Var LOADING_STATE = "Enable"
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
-				If QRCODE99 = "" Then
+
-					Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้"
+			
-					Var QRErrorState = "Enable"
+				Var SessionID2 = SelectSlot + ":"
-				Else
+				Var SessionID2 = SessionID2 + ExtendData
-					Var CashTextWarning = ""
+
-					Var QRErrorState = "Invisible"
+				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 + "KBA:2/"
+
+
+
+				If  IntVendingCampaign > 0 Then
+					Var ECommerceQR =	ECommerceQR + VendingCode
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR =	ECommerceQR + CodeNumber
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR = ECommerceQR + VendingCampaignRI3
 				EndIf
+
+				If  IntVendingCredit > 0 Then
+					Var ECommerceQR =	ECommerceQR + "CRD"
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR =	ECommerceQR + TNumberTaobinCredit
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR = 	ECommerceQR + IntVendingCredit
+				EndIf
+
+
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+				Var ReqPayInfoFlag = 1
 				Refresh
 
-				If CoinAmount > 0 Then
-					Change CoinAmount
-					Var ChangeOK = 0
-					Var CancelFlag = 1
-					Var CancelCounter = 0
-					Var NoGotoMenupage = "true"
 				
+				
+
+				;If CoinAmount > 0 Then
+				;	Change CoinAmount
+				;	Var ChangeOK = 0
+				;	Var CancelFlag = 1
+				;	Var CancelCounter = 0
+				;	Var NoGotoMenupage = "true"
+				;			
+				;EndIf
 				EndIf
 			EndIf
 		EndIf
@@ -880,7 +972,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1548 </Y>
+<Y> 1573 </Y>
 <State> PayState4</State>
 <Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
@@ -907,12 +999,91 @@
 </Button>
 
 <Button>
-<X> 438 </X>
+<X> 287 </X>
-<Y> 1786 </Y>
+<Y> 1469 </Y>
+<State> PayState5</State>
+<Filename> Var( DirImage + "/bn_pay_with_shoppy.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+
+	If Timeout < 120 Then
+
+		If CoinInFlag = 0 Then
+			If CancelFlag = 0 Then
+				If alphaState = "Invisible" Then
+
+					Var QR_POPUP = "/img_popup2.png"
+					Var LOADING_STATE = "Enable"
+					
+					Var QRCODE99 = ""
+
+					Var FlagQROpened = 1
+					Var alphaState = "Enable"
+					;CoinVending OFF
+					VendingQR ON
+					
+					
+					Var SessionID2 = SelectSlot + ":"
+					Var SessionID2 = SessionID2 + 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 + "AIR:2/"
+
+					;If  IntVendingCampaign > 0 Then
+					;	Var ECommerceQR =	ECommerceQR + VendingCode
+					;	Var ECommerceQR =	ECommerceQR + ":"
+					;	Var ECommerceQR =	ECommerceQR + CodeNumber
+					;	Var ECommerceQR =	ECommerceQR + ":"
+					;	Var ECommerceQR = ECommerceQR + VendingCampaignRI3
+					;EndIf
+					
+					Var ServiceParameter = "max"
+					Var ServiceCharge = 0
+					Var AccountType = "new"
+					Var testservice = "kbank"
+					Var tc = ""
+					Var GetScore = ""
+					Var OperatorName = ""
+					Var SessionID = ""
+
+					GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+					Var ReqPayInfoFlag = 2
+					Refresh
+				
+				EndIf
+			
+			EndIf
+		EndIf
+	EndIf
+	
+
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 287 </X>
+<Y> 1781 </Y>
 <State>CancleState</State>
-<Filename> Var( DirImage + "/bn_cancel.png"  )</Filename>
+<Filename> Var( DirImage + "/bn_cancel_all.png"  )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel.png"  ) </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_cancel_all.png"  ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bp_cancel.png" ) </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -924,6 +1095,10 @@
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleMain  > Cancle Order."
+			Machine CancelWepApp
+			If ViewBill > 0 Then
+					CoinVending BILLREJECT
+			EndIf
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
@@ -1000,9 +1175,27 @@
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
+<Filename> Var( DirImage + QR_POPUP )</Filename>
 </Image>
 
+<GIF>
+<X> 493 </X>
+<Y> 968 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> LOADING_STATE </State>
+<Filename> Var( DirImage + "/loading.gif" )</Filename>
+</GIF>
+
+<Image>
+<X> 267 </X>
+<Y> 1065 </Y>
+<State> LOADING_STATE </State>
+<Filename> Var( DirImage + "/loadingText.png" )</Filename>
+</Image>
+
+
+		
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
@@ -1012,8 +1205,11 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+
+	  Var LOADING_STATE = "Invisible"
 	  Var QRErrorState = "Invisible"
 	  Var alphaState = "Invisible"
+	  Var QRCODE99 = ""
 	  ;CoinVending ON
 	  ;VendingQR OFF
 	  Refresh
@@ -1052,6 +1248,10 @@
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
+			Machine CancelWepApp
+			If ViewBill > 0 Then
+				CoinVending BILLREJECT
+			EndIf
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
@@ -1156,7 +1356,7 @@
 
 <QRCode>
 <X> 399 </X>
-<Y> 912 </Y>
+<Y> 905 </Y>
 <Width> WQR </Width>
 <Height> HQR </Height>
 <State> alphaState </State>
@@ -1164,10 +1364,10 @@
 </QRCode>
 
 <Button>
-<X> 490 </X>
+<X> 267 </X>
-<Y> 1050 </Y>
+<Y> 960 </Y>
 <State>QRErrorState</State>
-<Filename> "ROOT/taobin_project/image/page_payment/QRError.png" </Filename>
+<Filename> Var( DirImage + "/QRError.png" ) </Filename>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1265,4 +1465,7 @@
 </Button>
 
 
+
+
+
 </Popup>

xml/page_payment_cashMore.xml

@@ -26,6 +26,8 @@
 
 	Var PayAmount = PriceDrink
 
+	Var LOADING_STATE = "Invisible"
+	
 	; Below original 
 	; On open
 	Var alphaState = "Invisible"
@@ -38,7 +40,7 @@
 	Var CancelFlag = 0
 	Var CancelCounter = 0
 	Var CoinInCounter = 0
-	Var CancelNumber = 2
+	Var CancelNumber = 3
 	
 	Var PayAmount = PriceDrink
 	Var RemainAmount = PayAmount - IntVendingCampaign 
@@ -66,13 +68,14 @@
 	Var ServiceCharge = 0
 	Var	Donate = "" 
 	Var SuggestID  = ""
-	Var CancleState = "Invisible"
+	Var CancleState = "Enable"
 
 	Var VendingDiscount = DiscountDrink
 	
 
 	Var CashTextWarning = "" 
 	Var QRErrorState = "Invisible"
+	Var QRErrorFlag = 0
 
 
 	SAVELOG SelectDrink
@@ -132,6 +135,7 @@
 		Var PayState2 = "Invisible"
 		Var PayState3 = "Invisible"
 		Var PayState4 = "Invisible"
+		Var PayState5 = "Invisible"
 		Var showRemaining = "Free"
 	
 	Else
@@ -139,23 +143,28 @@
 		If IntVendingCampaign = 0 Then
 			Var PayState2 = "Enable"
 			Var PayState4 = "Enable"
+			Var PayState5 = "Enable"
 		Else 
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 		EndIf
 		Var PayState3 = "Enable"
 		
 		
+
 		If CoinAmount > 0 Then
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 			Var CoinInFlag = 1
 		EndIf
 
 		If IntVendingCredit > 0 Then
 			Var PayState2 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 		EndIf
 
 
@@ -175,11 +184,11 @@
 	Var PayWithQR = 0
 	Var NoGotoMenupage = "false"
 		If show_eng = "true" Then 
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cashSmall.png"
+			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cashSmall.png"
+			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
 		Else
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cashSmall.png"
+			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cashSmall.png"
+			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
 		
 		EndIf
 
@@ -267,6 +276,7 @@
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
+			Var PayState5 = "Disable"
 
 			Var PayOfflineMode = 1
 	Else
@@ -308,11 +318,11 @@
 
 
 	If CART_COUNT = 1 Then
-		Var pay_with_code_imagebn =  "/bn_pay_with_codeSmall.png"
+		Var pay_with_code_imagebn =  "/bn_pay_with_code.png"
-		Var pay_with_code_imagebp =  "/bp_pay_with_codeSmall.png"
+		Var pay_with_code_imagebp =  "/bp_pay_with_code.png"
 	Else
 		Var pay_with_code_imagebn =  "/bn_pay_with_codeSmall_error.png"
-		Var pay_with_code_imagebp =  "/bp_pay_with_codeSmall_error.png"
+		Var pay_with_code_imagebp =  "/bn_pay_with_codeSmall_error.png"
 		Var PayState2 = "Disable"
 	EndIf
 
@@ -335,6 +345,11 @@
 
 <EventActionOk>
 
+	Var VendingQRTypeResult = ""
+	
+	DEBUGVAR ECommerceQR
+	SPLIT  ECommerceQR "/"  5  VendingQRTypeResult
+
 	If ActionOKCase = 0 Then 
 		If VendingREFID = "" Then
 			SAVELOG "menu_page4-QR.xml > ActOK_REFID"
@@ -362,24 +377,72 @@
 		EndIf
 
 		If ReqPayInfoFlag = 1 Then	
-			Var CashTextWarning = ""
+			If VendingQRTypeResult = "KBA:2" Then
-			Var QRErrorState = "Invisible"
+				Var CashTextWarning = ""
-			Var QRCODE99 = SessionID
+				Var QRErrorState = "Invisible"
-			Var QRCODE99 = QRCODE99 + Ext1a
+				Var QRCODE99KBANK = SessionID
-			SAVELOG Ext1a
+				Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
-			SAVELOG QRCODE99
+				SAVELOG Ext1a
-			Var QRCODE99 = QRCODE99 + Ext21
+				SAVELOG QRCODE99KBANK
-			Var QRCODETMP = QRCODE99
+				Var QRCODE99KBANK = QRCODE99KBANK + Ext21
-			Var ReqPayInfoFlag = 0
+				Var QRCODETMP = QRCODE99KBANK
-			SAVELOG QRCODE99
+				Var ReqPayInfoFlag = 0
-			SAVELOG Ext21
+				SAVELOG QRCODE99KBANK
+				SAVELOG Ext21
+
+				Var QRCODE99 = QRCODE99KBANK
+				Var LOADING_STATE = "Invisible"
+			EndIf
+			
+			
 		EndIf
+
+		If ReqPayInfoFlag = 2 Then	
+			If VendingQRTypeResult = "AIR: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
+				SAVELOG QRCODE99Shoppy
+				SAVELOG Ext21
+
+				Var QRCODE99 = QRCODE99Shoppy
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
+
 	Else
 		Var PayInfoCFlag = 1
     EndIf
 
 </EventActionOk>
 
+<EventActionError>
+
+	If ActionOKCase = 0 Then 
+		If ReqPayInfoFlag = 1 Then	
+			Var QRErrorFlag = 1
+			If alphaState = "Enable" Then
+				Var QRErrorState = "Enable"
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
+		If ReqPayInfoFlag = 2 Then	
+			Var QRErrorFlag = 1
+			If alphaState = "Enable" Then
+				Var QRErrorState = "Enable"
+				Var LOADING_STATE = "Invisible"
+			EndIf
+		EndIf
+	EndIf
+
+	Refresh
+
+</EventActionError>
 
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -397,6 +460,10 @@
 	If Timeout >= 120 Then
 	  Var alphaState = "Invisible"
 	  Var PayState3 = "Disable"
+	  Var PayState5 = "Disable"
+
+	  Var LOADING_STATE = "Invisible"
+	  Var QRErrorState = "Invisible"
 	EndIf
 
 
@@ -854,12 +921,12 @@
 			Var SessionID = ""
 
 
-			GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			Var Timeout = 0
 
 			Var QRCODE99 = ""
 			Var QRCODETMP = ""
-			Var ReqPayInfoFlag = 1
+			;Var ReqPayInfoFlag = 1
 
 			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"  
 
@@ -942,6 +1009,7 @@
 <EventClick> 
 	
 	If CoinInFlag = 0 Then
+		VendingQR OFF
 		Open "ROOT/taobin_project/xml/page_catalog.xml" 
 	EndIf
 	
@@ -951,7 +1019,7 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1240 </Y>
+<Y> 1261 </Y>
 <State> PayState1</State>
 <Filename>  FilenameShowbuttonCashBN </Filename>
 <FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
@@ -990,7 +1058,7 @@
 
 <Button>
 <X> 287 </X>
-<Y>  1612</Y>
+<Y>  1677</Y>
 <State> PayState2</State>
 <Filename> Var( DirImage + pay_with_code_imagebn) </Filename>
 <FilenamePress> Var( DirImage + pay_with_code_imagebp") </FilenamePress>
@@ -1015,11 +1083,11 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1364 </Y>
+<Y> 1365 </Y>
 <State> PayState3</State>
-<Filename> Var( DirImage + "/bn_prompt_paySmall.png") </Filename>
+<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_prompt_paySmall.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bp_prompt_paySmall.png") </FilenameDisable> 
+<FilenameDisable> Var( DirImage + "/bp_prompt_pay.png") </FilenameDisable> 
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1030,27 +1098,62 @@
 		If CoinInFlag = 0 Then
 			If CancelFlag = 0 Then
 
+				Var QR_POPUP = "/img_popup1.png"
+				Var LOADING_STATE = "Enable"
+
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
-				If QRCODE99 = "" Then
+
-					Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้"
+				Var SessionID2 = SelectSlot + ":"
-					Var QRErrorState = "Enable"
+				Var SessionID2 = SessionID2 + "00000"
-				Else
+				Var CreditAmount1 = ""
-					Var CashTextWarning = ""
+				Var ServiceAmountFlow = ""
-					Var QRErrorState = "Invisible"
+				Var TelephoneNumberQR = "0899999999"
+				Var ServiceType = "coffee-multi"
+				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 + "KBA:2/"
+
+				If  IntVendingCredit > 0 Then
+					Var ECommerceQR =	ECommerceQR + "CRD"
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR =	ECommerceQR + TNumberTaobinCredit
+					Var ECommerceQR =	ECommerceQR + ":"
+					Var ECommerceQR = 	ECommerceQR + IntVendingCredit
 				EndIf
+
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+
+				GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+
+				Var ReqPayInfoFlag = 1
 				Refresh
 
-				If CoinAmount > 0 Then
+				;If CoinAmount > 0 Then
-					Change CoinAmount
+				;	Change CoinAmount
-					Var ChangeOK = 0
+				;	Var ChangeOK = 0
-					Var CancelFlag = 1
+				;	Var CancelFlag = 1
-					Var CancelCounter = 0
+				;	Var CancelCounter = 0
-					Var NoGotoMenupage = "true"
+				;	Var NoGotoMenupage = "true"
-							
+				;			
-				EndIf
+				;EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -1068,11 +1171,11 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1488 </Y>
+<Y> 1573 </Y>
 <State> PayState4</State>
-<Filename> Var( DirImage + "/bn_pay_with_creditSmall.png") </Filename>
+<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_pay_with_creditSmall.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bp_pay_with_creditSmall.png")  </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bp_pay_with_credit.png")  </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1097,11 +1200,79 @@
 
 <Button>
 <X> 287 </X>
-<Y> 1736 </Y>
+<Y> 1469 </Y>
 <State> PayState5</State>
+<Filename> Var( DirImage + "/bn_pay_with_shoppy.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+
+	
+
+		If CoinInFlag = 0 Then
+			If CancelFlag = 0 Then
+
+				Var QR_POPUP = "/img_popup2.png"
+				Var LOADING_STATE = "Enable"
+				
+				Var QRCODE99 = ""
+
+				Var FlagQROpened = 1
+				Var alphaState = "Enable"
+				;CoinVending OFF
+				VendingQR ON
+				
+				
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumberQR = "0899999999"
+				Var ServiceType = "coffee-multi"
+				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 + "AIR:2/"
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+				Var ReqPayInfoFlag = 2
+				Refresh
+
+			
+			EndIf
+		EndIf
+	
+
+
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 287 </X>
+<Y> 1781 </Y>
+<State> CancleState</State>
 <Filename> Var( DirImage + "/bn_cancel_all.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel_all.png") </FilenamePress>
-<FilenameDisable> pay_with_credit_image </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bp_cancel_all.png")  </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1126,52 +1297,7 @@
 </EventClick>
 </Button>
 
-<Button>
-<X> 438 </X>
-<Y> 1786 </Y>
-<State>CancleState</State>
-<Filename> Var( DirImage + "/bn_cancel.png"  )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel.png"  ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bp_cancel.png" ) </FilenameDisable>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
 
-	;VendingQR OFF
-	
-	
-
-	If CoinInOK = 0 Then
-        If CancelFlag = 0 Then
-			SAVELOG "ButtonCancleMain  > Cancle Order."
-            CoinVending OFF
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-
-			If FlagQROpened = 1 Then 
-				Var CancelNumber = 12
-			EndIf
-			
-        EndIf
-	EndIf
-
-	  
-	;If CoinAmount > 0 Then
-	;	Change CoinAmount
-	;	Var ChangeOK = 0
-	;	Var CancelFlag = 1
-	;	Var CancelCounter = 0
-	;			
-	;Else
-	;	;Var ChangeOK = 1
-	;EndIf
-
-	;Open "ROOT/taobin_project/xml/page_catalog.xml"  
-
-	Refresh
-	 
-</EventClick>
-</Button>
 
 <Image>
 <X> 60 </X>
@@ -1324,7 +1450,23 @@
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
+<Filename> Var( DirImage + QR_POPUP )</Filename>
+</Image>
+
+<GIF>
+<X> 493 </X>
+<Y> 968 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> LOADING_STATE </State>
+<Filename> Var( DirImage + "/loading.gif" )</Filename>
+</GIF>
+
+<Image>
+<X> 267 </X>
+<Y> 1065 </Y>
+<State> LOADING_STATE </State>
+<Filename> Var( DirImage + "/loadingText.png" )</Filename>
 </Image>
 		
 <Button>
@@ -1336,8 +1478,11 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+
+	  Var LOADING_STATE = "Invisible"
 	  Var QRErrorState = "Invisible"
 	  Var alphaState = "Invisible"
+	  Var QRCODE99 = ""
 	  ;CoinVending ON
 	  ;VendingQR OFF
 	  Refresh
@@ -1480,7 +1625,7 @@
 
 <QRCode>
 <X> 399 </X>
-<Y> 912 </Y>
+<Y> 905 </Y>
 <Width> WQR </Width>
 <Height> HQR </Height>
 <State> alphaState </State>
@@ -1488,10 +1633,10 @@
 </QRCode>
 
 <Button>
-<X> 490 </X>
+<X> 267 </X>
-<Y> 1050 </Y>
+<Y> 960 </Y>
 <State>QRErrorState</State>
-<Filename> "ROOT/taobin_project/image/page_payment/QRError.png" </Filename>
+<Filename> Var( DirImage + "/QRError.png" ) </Filename>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 

xml/page_payment_code.xml

@@ -109,6 +109,10 @@
 			Var VendingCode = "C00" 
 		EndIf
 
+		If VendingCode = "AIR" Then
+			Var VendingCode = "C00" 
+		EndIf
+
 		SAVELOG VendingCode
 		SAVELOG VendingCampaignRI3
 
@@ -150,147 +154,78 @@
 				
 				
 
-				Var SessionID2 = SelectSlot + ":"
+				;Var SessionID2 = SelectSlot + ":"
-				Var SessionID2 = SessionID2 + ExtendData
+				;Var SessionID2 = SessionID2 + ExtendData
 
-				Var CreditAmount1 = ""
+				;Var CreditAmount1 = ""
-				Var ServiceAmountFlow = ""
+				;Var ServiceAmountFlow = ""
-				Var TelephoneNumber2 = "0899999999"
+				;Var TelephoneNumber2 = "0899999999"
-				Var ServiceType = "coffee"
+				;Var ServiceType = "coffee"
-				Var ECommerce = ""
+				;Var ECommerce = ""
-				Var ECommerce = ECommerce + PriceDrink
+				;Var ECommerce = ECommerce + PriceDrink
-				Var ECommerce =	ECommerce + "/"
+				;Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + DiscountDrink 
+				;Var ECommerce =	ECommerce + DiscountDrink 
-				Var ECommerce =	ECommerce + "/"
+				;Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + SessionID2 
+				;Var ECommerce =	ECommerce + SessionID2 
-				Var ECommerce =	ECommerce + "/"
+				;Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + SelectDrink 
+				;Var ECommerce =	ECommerce + SelectDrink 
-				Var ECommerce =	ECommerce + "/"
+				;Var ECommerce =	ECommerce + "/"
-				Var ECommerce =	ECommerce + "KBA:2/"
+				;Var ECommerce =	ECommerce + "KBA:2/"
-				Var ECommerce =	ECommerce + VendingCode
+				;Var ECommerce =	ECommerce + VendingCode
-				Var ECommerce =	ECommerce + ":"
+				;Var ECommerce =	ECommerce + ":"
-				Var ECommerce =	ECommerce + CodeNumber
+				;Var ECommerce =	ECommerce + CodeNumber
-				Var ECommerce =	ECommerce + ":"
+				;Var ECommerce =	ECommerce + ":"
-				Var ECommerce = ECommerce + VendingCampaignRI3
+				;Var ECommerce = ECommerce + VendingCampaignRI3
-				Var ServiceParameter = "max"
+				;Var ServiceParameter = "max"
-				Var ServiceCharge = 0
+				;Var ServiceCharge = 0
-				Var AccountType = "new"
+				;Var AccountType = "new"
-				Var testservice = "kbank"
+				;Var testservice = "kbank"
-				Var tc = ""
+				;Var tc = ""
-				Var GetScore = ""
+				;Var GetScore = ""
-				Var OperatorName = ""
+				;Var OperatorName = ""
-				Var SessionID = ""
+				;Var SessionID = ""
+
+
+				;GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+				;Var Timeout = 0
+				;Var CodeChannel = 2
+
+				Var CodeChannel = 1
+		
+				If CART_COUNT >= 1 Then 
+					Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+				Else
+					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+				EndIf
 
 
-				GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-				Var Timeout = 0
-				Var CodeChannel = 2
 
 			Else
 
-				Var FreeVendingCampaign = 1
-				
-
-				
-
-				If VendingCode = "C24" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C25" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C30" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C32" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C33" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C34" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C36" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C38" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-				If VendingCode = "C41" Then
-					Var VendingCampaign = PayAmount
-					CoinVending OFF
-					;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
-					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-				EndIf
-
-
 				Var ShowErrorText = "Enable"
 				Var text_show_error = DirImage + "/text_show_error.png"
 				Var GetPayInfoFlag = 0
 				Var CodeChannel = 0
 
 			EndIf
-
 		EndIf
 
 	Else 
 
-		SAVELOG "CodeChannel 2 > ActOK."
+		;SAVELOG "CodeChannel 2 > ActOK."
-	
+		;
-		Var CreditAmount = 0
+		;Var CreditAmount = 0
-		Var QRCODE99 = SessionID
+		;Var QRCODE99 = SessionID
-		Var QRCODE99 = QRCODE99 + Ext1a
+		;Var QRCODE99 = QRCODE99 + Ext1a
-		Var QRCODE99 = QRCODE99 + Ext21
+		;Var QRCODE99 = QRCODE99 + Ext21
-		Var QRCODETMP = QRCODE99
+		;Var QRCODETMP = QRCODE99
-		Var CodeChannel = 1
+		;Var CodeChannel = 1
-		
+		;
-		If CART_COUNT >= 1 Then 
+		;If CART_COUNT >= 1 Then 
-			Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
+		;	Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" 
-		Else
+		;Else
-			Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+		;	Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
-		EndIf
+		;EndIf
 		
 
 	EndIf

xml/page_payment_credit3.xml

@@ -181,47 +181,45 @@
 		Var CoffeePinNumber = PinNumber
 
 		Var IntVendingCredit = SumCreditAmount
-		;Var PriceDrinkWithCredit = PriceDrink - SumCreditAmount
 		
-
+		;Var SessionID2 = SelectSlot + ":"
-		Var SessionID2 = SelectSlot + ":"
+		;Var SessionID2 = SessionID2 + ExtendData
-		Var SessionID2 = SessionID2 + ExtendData
+		;Var CreditAmount1 = ""
-		Var CreditAmount1 = ""
+		;Var ServiceAmountFlow = ""
-		Var ServiceAmountFlow = ""
+		;Var TelephoneNumberQR = "0899999999"
-		Var TelephoneNumberQR = "0899999999"
+		;If CART_COUNT >= 1 Then 
-		If CART_COUNT >= 1 Then 
+		;	Var ServiceType = "coffee-multi"
-			Var ServiceType = "coffee-multi"
+		;Else
-		Else
+		;	Var ServiceType = "coffee"
-			Var ServiceType = "coffee"
+		;EndIf
-		EndIf
+		;Var ECommerceQR = ""
-		Var ECommerceQR = ""
+		;Var ECommerceQR = ECommerceQR + PriceDrink
-		Var ECommerceQR = ECommerceQR + PriceDrink
+		;Var ECommerceQR =	ECommerceQR + "/"
-		Var ECommerceQR =	ECommerceQR + "/"
+		;Var ECommerceQR =	ECommerceQR + DiscountDrink 
-		Var ECommerceQR =	ECommerceQR + DiscountDrink 
+		;Var ECommerceQR =	ECommerceQR + "/"
-		Var ECommerceQR =	ECommerceQR + "/"
+		;Var ECommerceQR =	ECommerceQR + SessionID2 
-		Var ECommerceQR =	ECommerceQR + SessionID2 
+		;Var ECommerceQR =	ECommerceQR + "/"
-		Var ECommerceQR =	ECommerceQR + "/"
+		;Var ECommerceQR =	ECommerceQR + SelectDrink 
-		Var ECommerceQR =	ECommerceQR + SelectDrink 
+		;Var ECommerceQR =	ECommerceQR + "/"
-		Var ECommerceQR =	ECommerceQR + "/"
+		;Var ECommerceQR =	ECommerceQR + "KBA:2/"
-		Var ECommerceQR =	ECommerceQR + "KBA:2/"
+		;Var ECommerceQR =	ECommerceQR + "CRD"
-		Var ECommerceQR =	ECommerceQR + "CRD"
+		;Var ECommerceQR =	ECommerceQR + ":"
-		Var ECommerceQR =	ECommerceQR + ":"
+		;Var ECommerceQR =	ECommerceQR + TNumberTaobinCredit
-		Var ECommerceQR =	ECommerceQR + TNumberTaobinCredit
+		;Var ECommerceQR =	ECommerceQR + ":"
-		Var ECommerceQR =	ECommerceQR + ":"
+		;Var ECommerceQR = 	ECommerceQR + SumCreditAmount
-		Var ECommerceQR = 	ECommerceQR + SumCreditAmount
+		;Var ServiceParameter = "max"
-		Var ServiceParameter = "max"
+		;Var ServiceCharge = 0
-		Var ServiceCharge = 0
+		;Var AccountType = "new"
-		Var AccountType = "new"
+		;Var testservice = "kbank"
-		Var testservice = "kbank"
+		;Var tc = ""
-		Var tc = ""
+		;Var GetScore = ""
-		Var GetScore = ""
+		;Var OperatorName = ""
-		Var OperatorName = ""
+		;Var SessionID = ""
-		Var SessionID = ""
+		;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-		GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+		;Var QRCODE99 = ""
-		Var QRCODE99 = ""
+		;Var QRCODETMP = ""
-		Var QRCODETMP = ""
+		;
-
+		;Var ReqPayInfoFlag = 1
-		Var ReqPayInfoFlag = 1
 
 
 

xml/page_payment_multi.xml

@@ -167,6 +167,11 @@
 	Var AddPointFlag = 0
 	Var PayType = ""
 
+	Var QRCODE99KBANK = ""
+	Var QRCODE99Shoppy = ""
+	Var LOADING_STATE = "Invisible"
+	Var QR_POPUP = "/img_popup2.png"
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
@@ -240,37 +245,37 @@
 
 
 
-			Var SessionID2 = SelectSlot + ":"
+			;Var SessionID2 = SelectSlot + ":"
-			Var SessionID2 = SessionID2 + "00000"
+			;Var SessionID2 = SessionID2 + "00000"
 
-			Var CreditAmount1 = ""
+			;Var CreditAmount1 = ""
-			Var ServiceAmountFlow = ""
+			;Var ServiceAmountFlow = ""
-			Var TelephoneNumberQR = "0899999999"
+			;Var TelephoneNumberQR = "0899999999"
-			Var ServiceType = "coffee-multi"
+			;Var ServiceType = "coffee-multi"
-			Var ECommerceQR = ""
+			;Var ECommerceQR = ""
-			Var ECommerceQR = ECommerceQR + PriceDrink
+			;Var ECommerceQR = ECommerceQR + PriceDrink
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + DiscountDrink 
+			;Var ECommerceQR =	ECommerceQR + DiscountDrink 
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + SessionID2 
+			;Var ECommerceQR =	ECommerceQR + SessionID2 
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + SelectDrink 
+			;Var ECommerceQR =	ECommerceQR + SelectDrink 
-			Var ECommerceQR =	ECommerceQR + "/"
+			;Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + "KBA:2"
+			;Var ECommerceQR =	ECommerceQR + "KBA:2"
-			Var ServiceParameter = "max"
+			;Var ServiceParameter = "max"
-			Var ServiceCharge = 0
+			;Var ServiceCharge = 0
-			Var AccountType = "new"
+			;Var AccountType = "new"
-			Var testservice = "kbank"
+			;Var testservice = "kbank"
-			Var tc = ""
+			;Var tc = ""
-			Var GetScore = ""
+			;Var GetScore = ""
-			Var OperatorName = ""
+			;Var OperatorName = ""
-			Var SessionID = ""
+			;Var SessionID = ""
 
 
-			GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-			Var Timeout = 0
+			;Var Timeout = 0
-			Var GetPayInfoFlag = 1
+			;Var GetPayInfoFlag = 1
-			Var ReqPayInfoFlag = 1
+			;Var ReqPayInfoFlag = 1
 
 		EndIf
 

xml/page_show_consent.xml

@@ -80,6 +80,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     SAVELOG "Press Accept"
+	SAVELOG "show_consent-p83."
 	
 	If UnitTestType = "1" Then
 		Var CoffeePoint = 10
@@ -106,6 +107,7 @@
 <EventClick> 
     ; goto lid straw
     SAVELOG "Press Decline"
+	SAVELOG "show_consent-p110."
 	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 </EventClick>
 </Button>