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

xml/page_brewing3.xml

@@ -9,6 +9,9 @@
 	
 	DEBUGVAR MachineStage
 
+	Var StrawStateX = "Enable"
+	Var LidStateX = "Enable"
+
 
 	If CART_COUNT >= 1 Then
 		 Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"  
@@ -120,7 +123,7 @@
 			Var PointCrm = "pdpa1"
 		EndIf
 		Var GetScore = VendingTSID
-		If TaobinErrorNetwork = 0 Then
+		If Seeker.TaobinErrorNetwork = 0 Then
 			Var Cid = 11
 			Var AddData = 1
 			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
@@ -1065,5 +1068,100 @@
 </EventClick> 
 </Button>
 
+;<Button>
+;<X> 10 </X>
+;<Y> 500 </Y>
+;<State>"Enable"</State>
+;<Filename> bg_strawlid </Filename>
+;<EventClick> 
+;
+;</EventClick> 
+;</Button>
+;
+;
+;; straw left
+;<Button>
+;<X> 50 </X>
+;<Y> 572 </Y>
+;<State> StrawStateX </State>
+;<Mode> "No" </Mode>
+;<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
+;<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
+;<EventClick> 
+;	SAVELOG "Click straw cb"
+;	If StrawStateX = "Press" Then
+;		;Var StrawStateX = "Enable"	
+;	Else
+;		Var StrawStateX = "Press"
+;	EndIf
+;	Refresh
+;</EventClick>
+;</Button>
+;
+;<Button>
+;<X> 377 </X>
+;<Y> 579 </Y>
+;<State> StrawStateX </State>
+;<Mode> "No" </Mode>
+;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+;<EventClick> 
+;	SAVELOG "Click straw cb"
+;	If StrawStateX = "Press" Then
+;		;Var StrawStateX = "Enable"	
+;	Else
+;		Var StrawStateX = "Press"
+;	EndIf
+;	Refresh
+;</EventClick>
+;</Button>
+;
+;
+;
+;; LID left
+;<Button>
+;<X> 50 </X>
+;<Y> 648 </Y>
+;<State> LidStateX </State>
+;<Mode> "No" </Mode>
+;<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
+;<EventClick> 
+;	SAVELOG "Click LID pic"
+;	If LidStateX = "Press" Then
+;		;Var LidStateX = "Enable"	
+;	Else
+;		Var LidStateX = "Press"
+;	EndIf
+;	
+;
+;	DEBUGVAR SugarState1
+;	Refresh
+;
+;</EventClick>
+;</Button>
+;
+;<Button>
+;<X> 377 </X>
+;<Y> 655 </Y>
+;<State> LidStateX </State>
+;<Mode> "No" </Mode>
+;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+;<EventClick> 
+;	SAVELOG "Click LID cb"
+;	If LidStateX = "Press" Then
+;		;Var LidStateX = "Enable"	
+;	Else
+;		Var LidStateX = "Press"
+;	EndIf
+;	Refresh
+;</EventClick>
+;</Button>
+
 
 </Popup>

xml/page_brewing3Conti.xml

@@ -64,7 +64,7 @@
 			Var PointCrm = "pdpa1"
 		EndIf
 		Var GetScore = VendingTSIDTmp1
-		If TaobinErrorNetwork = 0 Then
+		If Seeker.TaobinErrorNetwork = 0 Then
 			Var Cid = 11
 			Var AddData = 1
 			AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore

xml/page_brewing3Multi.xml

@@ -145,7 +145,7 @@
 
 		If AddPointFlag = 0 Then
 			Var AddPointFlag = 1
-			If TaobinErrorNetwork = 0 Then
+			If Seeker.TaobinErrorNetwork = 0 Then
 				AddData 11 Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
 			Else
 				Var PointCrm = ""

xml/page_collect_point_2.xml

@@ -18,10 +18,10 @@
 
 	Var TaobinLevel = 0
 
-	Var TaobinErrorNetwork = 0
+	Var Seeker.TaobinErrorNetwork = 0
 
 	If PayOfflineMode = 1 Then
-		Var TaobinErrorNetwork = 1
+		Var Seeker.TaobinErrorNetwork = 1
 		Var Seeker.PointTaobinStr = "" + PayAmount
 		Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
 		Var Seeker.TNumberTaobinMember= TelephoneNumber
@@ -46,7 +46,7 @@
 			Var TaobinLevel = 0
 			Var CoffeePoint = 1 
 
-			Var TaobinErrorNetwork = 1
+			Var Seeker.TaobinErrorNetwork = 1
 			Var Seeker.PointTaobinStr = "" + PayAmount
 			Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
 			If TelephoneNumber = "" Then
@@ -89,7 +89,7 @@
 		If Ext1a = "" Then
 			;Var CoffeePoint = 1
 			;Var Seeker.TNumberTaobinMember = TelephoneNumber
-			Var TaobinErrorNetwork = 1
+			Var Seeker.TaobinErrorNetwork = 1
 			Var Seeker.PointTaobinStr = "" + PayAmount
 			Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
 			Var Seeker.TNumberTaobinMember = TelephoneNumber
@@ -129,7 +129,13 @@
 			
 				Var CoffeePoint = PointTaobin + CoffeePoint1
 				Var CoffeePointOld = CoffeePoint1
-				Var CoffeePointRank = CoffeePointRank + PointTaobin
+
+				If TaobinLevel = 1 Then
+					Var CoffeePointRank = CoffeePointRank + 0
+				Else
+					Var CoffeePointRank = CoffeePointRank + PointTaobin
+				EndIf 
+
 				Var CoffeePointRankTmp = CoffeePointRank
 
 				Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
@@ -137,7 +143,7 @@
 			Else
 				;Var CoffeePoint = 1
 				;Var Seeker.TNumberTaobinMember = TelephoneNumber
-				Var TaobinErrorNetwork = 1
+				Var Seeker.TaobinErrorNetwork = 1
 				Var Seeker.PointTaobinStr = "" + PayAmount
 				Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
 				Var Seeker.TNumberTaobinMember = TelephoneNumber
@@ -159,7 +165,7 @@
 		Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 	Else
 		;Var CoffeePoint = 1 
-		Var TaobinErrorNetwork = 1
+		Var Seeker.TaobinErrorNetwork = 1
 		Var Seeker.PointTaobinStr = "" + PayAmount
 		Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
 		Var Seeker.TNumberTaobinMember= TelephoneNumber

xml/page_drinkfail2Multi.xml

@@ -136,6 +136,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = 
 
+			DEBUGVAR CART2_PRICE
+
 			Var ServiceAmount2 = CART2_PRICE
 
 			Var ServiceAmountSum = ServiceAmountSum - ServiceAmount2
@@ -178,6 +180,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = 
 
+			DEBUGVAR CART3_PRICE
+
 			Var ServiceAmount2 = CART3_PRICE
 
 			Var ServiceAmountSum = ServiceAmountSum - ServiceAmount2

xml/page_payment.xml

@@ -33,6 +33,8 @@
    
     Var CountStepPackPayment = 0
 
+	Var Seeker.TaobinErrorNetwork = 0
+
 	Var Seeker.VendingCode = "C00"
 	Var Seeker.VendingCampaignRI3 = 0
 	Var Seeker.IntVendingCampaign = 0

xml/page_payment_credit2.xml

@@ -777,7 +777,7 @@
 
 
 <Button>
-<X> 286 </X>
+<X> 397 </X>
 <Y> 1607 </Y>
 <Filename> Var( DirImage + "/bn_back.png") </Filename>
 <FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>

xml/page_payment_multi.xml

@@ -147,6 +147,8 @@
    
     Var CountStepPackPayment = 0
 
+	Var Seeker.TaobinErrorNetwork = 0
+
 	Var Seeker.VendingCode = "C00"
 	Var Seeker.VendingCampaignRI3 = 0
 	Var Seeker.IntVendingCampaign = 0

xml/page_payment_storeCredit2.xml

@@ -567,7 +567,7 @@
 
 
 <Button>
-<X> 286 </X>
+<X> 397 </X>
 <Y> 1607 </Y>
 <Filename> Var( DirImage + "/bn_back.png") </Filename>
 <FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>