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

inc/video.inc

@@ -7,8 +7,8 @@
 <EventOpen>
 
     If showMultiAds = "true" Then
- 
+
-        
+
         If PreviousFileName = "" Then
             Var PreviousFileName = PreviseXMLFileName2
         EndIf
@@ -39,7 +39,7 @@
         DEBUGVAR CountDownPauseVideo2
         If CountryName = "Singapore" Then
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
-                 
+
                  If CountDownPauseVideo2 < 2 Then
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
@@ -60,7 +60,7 @@
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 EndIf
             EndIf
-           
+
         Else
                 Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
@@ -83,7 +83,7 @@
             EndIf
         EndIf
 
-        
+
     Else
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then
@@ -123,7 +123,7 @@
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
         EndIf
     EndIf
-    
+
 
     If CountryName = "Malaysia" Then
 
@@ -153,13 +153,13 @@
 <EventVideoEnd>
     DEBUGVAR CurrentXMLFileName2
     Var video_end = "Video end"
-    DEBUGVAR video_end 
+    DEBUGVAR video_end
     If CountDownPauseVideo2 = -1 Then
         Var CountDownPauseVideo2 = 0
     EndIf
     If showMultiAds = "true" Then
 
-        
+
 
 
         Var ads_idx = ads_idx + 1
@@ -196,7 +196,7 @@
             EndIf
         Else
             Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
-            Var DisplayAds = AdvTaobinMenu + ".mp4"   
+            Var DisplayAds = AdvTaobinMenu + ".mp4"
         EndIf
 
         If CountryName = "Malaysia" Then
@@ -216,7 +216,7 @@
             EndIf
         EndIf
 
-        
+
     Else
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then

inter/sgp/xml/page_brewing3.lxml

@@ -476,7 +476,6 @@
 		Var XPercent = 0
 	EndIf
 
-	CashlessReq SUCCESS
 
 </EventOpen>
 <EventLanguageOnChange>

xml/page_payment_cash-SGP.xml

@@ -736,6 +736,8 @@
 		Var Seeker.CreditCard = 1
 		Var Seeker.CreditCardRef = CreditCardRef
 
+		CashlessReq SUCCESS
+
 		DEBUGVAR UserChoosePayment
 		Var UserChoosePayment = ""
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"

xml/page_payment_cash-UAE.xml

@@ -741,6 +741,8 @@
 		Var Seeker.CreditCard = 1
 		Var Seeker.CreditCardRef = CreditCardRef
 
+		CashlessReq SUCCESS
+
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 	EndIf
@@ -784,13 +786,17 @@
 
 
 	If VendingCashless = "ERROR" Then
-		Var Timeout = 0
+    	If CoinInOK = 1 Then
 
-		;Var QRErrorFlag = 1
+    	Else
-		If alphaState = "Enable" Then
+    		Var Timeout = 0
-			Var QRErrorState = "Enable"
+    	EndIf
-			Var LOADING_STATE = "Invisible"
+
-		EndIf
+    	;Var QRErrorFlag = 1
+    	If alphaState = "Enable" Then
+    		Var QRErrorState = "Enable"
+    		Var LOADING_STATE = "Invisible"
+    	EndIf
 
 	EndIf
 
@@ -801,10 +807,7 @@
 </EventActionError>
 
 <EventCashlessCard>
-
-
 	Refresh
-
 </EventCashlessCard>
 
 
@@ -1486,40 +1489,44 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-If alphaState = "Invisible" Then
+    If alphaState = "Invisible" Then
-	If CoinInFlag = 0 Then
+    	If CoinInFlag = 0 Then
-		If CancelFlag = 0 Then
+    		If CancelFlag = 0 Then
-            Var QR_POPUP = "/img_popup8.png"
+                Var QR_POPUP = "/img_popup8.png"
-            Var alphaState = "Enable"
+                Var alphaState = "Enable"
-            Coin CARD
+                ;Coin CARD
+                Var ReqPayInfoFromCashOther = 2
+                Var CreditCardRef = ""
 
-            Var ReqPayInfoFromCashOther = 2
+               	GenHashWithTimeStamp CreditCardRef
+               	DEBUGVAR VendingCashless
 
+               	Var QRCODE99 = ""
+               	Var Timeout = 0
+               	Var QRErrorState = "Invisible"
 
-			Var CreditCardRef = ""
+               	;add-pd-to-ref
-			GenHashWithTimeStamp CreditCardRef
+               	Var CreditCardRef = CreditCardRef + "/"
-			DEBUGVAR VendingCashless
+               	Var CreditCardRef = CreditCardRef + SelectDrink
+               	DEBUGVAR CreditCardRef
 
-			Var QRCODE99 = ""
+          		If CoinInOK = 1 Then
-			Var Timeout = 0
-			Var QRErrorState = "Invisible"
 
-			;add-pd-to-ref
+          		Else
-			Var CreditCardRef = CreditCardRef + "/"
+         			Var Timeout = 0
-			Var CreditCardRef = CreditCardRef + SelectDrink
+          		EndIf
-			DEBUGVAR CreditCardRef
 
-			;Var QR_POPUP = "/img_popup8-2.png"
+          		Var QRErrorState = "Invisible"
-			Var VendingCashless = "-"
+          		Var VendingCashless = "-"
-			;Var LOADING_STATE = "Enable"
+          		Var LOADING_STATE = "Enable"
-			;Var alphaState = "Enable"
+          		Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-			Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+          		CashlessPay RemainAmountX CreditCardRef
-			CashlessPay RemainAmountX CreditCardRef
+          		Var CashlessPayFlag = 1
-			Var CashlessPayFlag = 1
+            EndIf
-        EndIf
+    	EndIf
-	EndIf
+    EndIf
 
-EndIf
+    Refresh
 
 </EventClick>
 </Button>