Merge

xml/page_brewing3.xml

@@ -534,7 +534,7 @@
 			Var PayDetail = PayDetail + NOBONUS
 
 			
- 			Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+ 			;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
 
 			If GetFreeFromError = 1 Then
 				Var CodeChannel = 1 

xml/page_catalog.xml

@@ -13,6 +13,7 @@
 	Var web_readyOK = "false"
 	Var web_telnumOK = ""
 
+	Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
 	
 	If CocktailShow = "true" Then 
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	

xml/page_payment_cash.xml

@@ -530,7 +530,11 @@
 			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			;Var Timeout = 0
 		EndIf
+<<<<<<< HEAD
 		If Seeker = "curr" Then
+=======
+		If PauseOrder = "false" Then
+>>>>>>> 0479282586527f47f0f2821824b32af59e613c53
 			Open "ROOT/taobin_project/xml/page_catalog.xml"  
 		Else
 			Open "ROOT/taobin_project/xml/page_brewing3.xml"  
@@ -582,6 +586,16 @@
 				Var CancelFlag = 1
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
+
+				If IntVendingCredit > 0 Then
+					Var BmiYear = IntVendingCredit
+					Var GetScore = "useCredit"
+					AddData 24 TNumberTaobinCredit  BmiYear PointCrm GetScore
+					Var IntVendingCredit = 0
+				EndIf
+
+
+
 					If IntVendingCampaign = 0 Then
 						VendingQR OFF
 						If Seeker = "curr" Then

xml/page_payment_cashMore.xml

@@ -568,6 +568,13 @@
 				Var CancelFlag = 1
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
+					If IntVendingCredit > 0 Then
+							Var BmiYear = IntVendingCredit
+							Var GetScore = "useCredit"
+							AddData 24 TNumberTaobinCredit  BmiYear PointCrm GetScore
+							Var IntVendingCredit = 0
+					EndIf
+
 					If IntVendingCampaign = 0 Then
 						VendingQR OFF
 						
@@ -1037,6 +1044,12 @@
 	
 	If CoinInFlag = 0 Then
 		VendingQR OFF
+		If IntVendingCredit > 0 Then
+			Var BmiYear = IntVendingCredit
+			Var GetScore = "useCredit"
+			AddData 24 TNumberTaobinCredit  BmiYear PointCrm GetScore
+			Var IntVendingCredit = 0
+		EndIf
 		Open "ROOT/taobin_project/xml/page_catalog.xml" 
 	EndIf
 	
@@ -1360,6 +1373,12 @@
 <State> cart1_en </State>
 <Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
 <EventClick> 
+	If IntVendingCredit > 0 Then
+		Var BmiYear = IntVendingCredit
+		Var GetScore = "useCredit"
+		AddData 24 TNumberTaobinCredit  BmiYear PointCrm GetScore
+		Var IntVendingCredit = 0
+	EndIf
 	Cart "DeleteMenuID" 1
 
 </EventClick> 
@@ -1399,6 +1418,12 @@
 <State> cart2_en </State>
 <Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
 <EventClick> 
+	If IntVendingCredit > 0 Then
+		Var BmiYear = IntVendingCredit
+		Var GetScore = "useCredit"
+		AddData 24 TNumberTaobinCredit  BmiYear PointCrm GetScore
+		Var IntVendingCredit = 0
+	EndIf
 	Cart "DeleteMenuID" 2
 </EventClick> 
 </Button>
@@ -1438,6 +1463,12 @@
 <State> cart3_en </State>
 <Filename> "ROOT/taobin_project/image/page_payment/iconX.png"  </Filename>
 <EventClick> 
+	If IntVendingCredit > 0 Then
+		Var BmiYear = IntVendingCredit
+		Var GetScore = "useCredit"
+		AddData 24 TNumberTaobinCredit  BmiYear PointCrm GetScore
+		Var IntVendingCredit = 0
+	EndIf
 	Cart "DeleteMenuID" 3
 	
 </EventClick> 

xml/page_thankyou.xml

@@ -35,14 +35,17 @@
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 
+		Var BottomText = PicturePath + "text_bottom_eng.png"
 	Else
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" 
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var BottomText = PicturePath + "text_bottom_thai2.png"
 	EndIf
 
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
+	DEBUGVAR BottomText
 
 	If StarwState = "Press" Then
 		Machine StrawWithDelay
@@ -60,7 +63,6 @@
 
 	
 
-
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml/page_thankyouMore.xml

@@ -30,15 +30,19 @@
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var BottomText = PicturePath + "text_bottom_eng.png"
 	
 	Else
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" 
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var BottomText = PicturePath + "text_bottom_thai2.png"
 	EndIf
 
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
+	DEBUGVAR BottomText
+
 	
 	If StarwState = "Press" Then
 		Machine StrawWithDelay

xml_main/startup.xml

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.83"
+	Var XMLPageVersion = "5.84"
-	Var XMLPageVersionInt = 583
+	Var XMLPageVersionInt = 584
 </EventOpen>
 
 <Text>