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

xml/page_brewing3.xml

@@ -166,6 +166,19 @@
 
 	Var next_pic_bg = DirImage + "/bn_add_order.png"
 	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+	
+	Var bg_strawlid_ST = "Enable"
+
+	Var Seeker.strawAction = 0
+	Var Seeker.lidAction = 0
+
+	If Seeker.thankLidFlag = 1 Then
+		Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+		Var LidStateX = "Invisible"
+		Var Seeker.lidAction = 2
+	EndIf
+
+	
 
 
 	If LastMakeDrinkResult = "success" Then
@@ -1068,100 +1081,115 @@
 </EventClick> 
 </Button>
 
-;<Button>
+<Button>
-;<X> 10 </X>
+<X> 10 </X>
-;<Y> 500 </Y>
+<Y> 500 </Y>
-;<State>"Enable"</State>
+<State>bg_strawlid_ST</State>
-;<Filename> bg_strawlid </Filename>
+<Filename> bg_strawlid </Filename>
-;<EventClick> 
+<EventClick> 
-;
+
-;</EventClick> 
+</EventClick> 
-;</Button>
+</Button>
-;
+
-;
+; straw left
-;; straw left
+<Button>
-;<Button>
+<X> 50 </X>
-;<X> 50 </X>
+<Y> 572 </Y>
-;<Y> 572 </Y>
+<State> StrawStateX </State>
-;<State> StrawStateX </State>
+<Mode> "No" </Mode>
-;<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
-;<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
-;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
-;<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
+<EventClick> 
-;<EventClick> 
+	SAVELOG "Click straw cb"
-;	SAVELOG "Click straw cb"
+	If StrawStateX = "Press" Then
-;	If StrawStateX = "Press" Then
+		;Var StrawStateX = "Enable"	
-;		;Var StrawStateX = "Enable"	
+	Else
-;	Else
+		Var StrawStateX = "Press"
-;		Var StrawStateX = "Press"
+		Var Seeker.strawAction = 1
-;	EndIf
+		
-;	Refresh
+	EndIf
-;</EventClick>
+	Refresh
-;</Button>
+</EventClick>
-;
+</Button>
-;<Button>
+
-;<X> 377 </X>
+<Button>
-;<Y> 579 </Y>
+<X> 377 </X>
-;<State> StrawStateX </State>
+<Y> 579 </Y>
-;<Mode> "No" </Mode>
+<State> StrawStateX </State>
-;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+<Mode> "No" </Mode>
-;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
-;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
-;<EventClick> 
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
-;	SAVELOG "Click straw cb"
+<EventClick> 
-;	If StrawStateX = "Press" Then
+	SAVELOG "Click straw cb"
-;		;Var StrawStateX = "Enable"	
+	If StrawStateX = "Press" Then
-;	Else
+		;Var StrawStateX = "Enable"	
-;		Var StrawStateX = "Press"
+	Else
-;	EndIf
+		Var StrawStateX = "Press"
-;	Refresh
+		Var Seeker.strawAction = 1
-;</EventClick>
+	EndIf
-;</Button>
+	Refresh
-;
+</EventClick>
-;
+</Button>
-;
+
-;; LID left
+
-;<Button>
+
-;<X> 50 </X>
+; LID left
-;<Y> 648 </Y>
+<Button>
-;<State> LidStateX </State>
+<X> 50 </X>
-;<Mode> "No" </Mode>
+<Y> 648 </Y>
-;<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
+<State> LidStateX </State>
-;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
+<Mode> "No" </Mode>
-;<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
+<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
-;<EventClick> 
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
-;	SAVELOG "Click LID pic"
+<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
-;	If LidStateX = "Press" Then
+<EventClick> 
-;		;Var LidStateX = "Enable"	
+
-;	Else
+	If Seeker.thankLidFlag = 0 Then
-;		Var LidStateX = "Press"
+		
-;	EndIf
+		SAVELOG "Click LID pic"
-;	
+		If LidStateX = "Press" Then
-;
+			;Var LidStateX = "Enable"	
-;	DEBUGVAR SugarState1
+		Else
-;	Refresh
+			Var LidStateX = "Press"
-;
+			Var Seeker.lidAction = 1
-;</EventClick>
+		EndIf
-;</Button>
+		
-;
+
-;<Button>
+		DEBUGVAR SugarState1
-;<X> 377 </X>
+		Refresh
-;<Y> 655 </Y>
+
-;<State> LidStateX </State>
+	EndIf
-;<Mode> "No" </Mode>
+
-;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+</EventClick>
-;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+</Button>
-;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+
-;<EventClick> 
+<Button>
-;	SAVELOG "Click LID cb"
+<X> 377 </X>
-;	If LidStateX = "Press" Then
+<Y> 655 </Y>
-;		;Var LidStateX = "Enable"	
+<State> LidStateX </State>
-;	Else
+<Mode> "No" </Mode>
-;		Var LidStateX = "Press"
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
-;	EndIf
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
-;	Refresh
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
-;</EventClick>
+<EventClick> 
-;</Button>
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID cb"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		Refresh
+	
+	EndIf
+
+</EventClick>
+</Button>
 
 
 </Popup>

xml/page_brewing3Conti.xml

@@ -13,8 +13,17 @@
 		CoinBack
 	EndIf
 
+	If show_eng = "true" Then 
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+	Else
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+	EndIf
 
-	
+	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+	If Seeker.thankLidFlag = 1 Then
+		Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+		Var LidStateX = "Invisible"
+	EndIf
 
 	Var TimeoutWaitPay = 10 
 	
@@ -844,4 +853,114 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Button>
+<X> 10 </X>
+<Y> 500 </Y>
+<State>bg_strawlid_ST</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"
+		Var Seeker.strawAction = 1
+		
+	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"
+		Var Seeker.strawAction = 1
+	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> 
+
+	If Seeker.thankLidFlag = 0 Then
+		
+		SAVELOG "Click LID pic"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		
+
+		DEBUGVAR SugarState1
+		Refresh
+
+	EndIf
+
+</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> 
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID cb"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		Refresh
+	
+	EndIf
+
+</EventClick>
+</Button>
+
 </Popup>

xml/page_brewing3Multi.xml

@@ -172,6 +172,30 @@
 
 	Var PayType = "multi"
 
+	If show_eng = "true" Then 
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+	Else
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+	EndIf
+
+	Var StrawStateX = "Enable"
+	Var LidStateX = "Enable"
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
+	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+	
+	Var bg_strawlid_ST = "Enable"
+
+	Var Seeker.strawAction = 0
+	Var Seeker.lidAction = 0
+
+	If Seeker.thankLidFlag = 1 Then
+		Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+		Var LidStateX = "Invisible"
+		Var Seeker.lidAction = 2
+	EndIf
+
 
 </EventOpen>
 
@@ -938,4 +962,116 @@
 </EventClick>
 </Button>
 
+
+<Button>
+<X> 10 </X>
+<Y> 500 </Y>
+<State>bg_strawlid_ST</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"
+		Var Seeker.strawAction = 1
+		
+	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"
+		Var Seeker.strawAction = 1
+	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> 
+
+	If Seeker.thankLidFlag = 0 Then
+		
+		SAVELOG "Click LID pic"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		
+
+		DEBUGVAR SugarState1
+		Refresh
+
+	EndIf
+
+</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> 
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID cb"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		Refresh
+	
+	EndIf
+
+</EventClick>
+</Button>
+
+
 </Popup>

xml/page_check_member2.xml

@@ -573,7 +573,7 @@
             If CouponTypeB = "103" Then
                 Var CouponNameB = "/imgCouponC40.png"
             EndIf 
-            If CouponTypeB = "103" Then
+            If CouponTypeB = "105" Then
                 Var CouponNameB = "/imgCouponC38.png"
             EndIf 
             If CouponTypeB = "106" Then

xml/page_check_newmember2.xml

@@ -51,7 +51,7 @@
 	
 
 	Var Timeout = Timeout + 1
-	If Timeout > 30 Then
+	If Timeout > 40 Then
 		Open "ROOT/taobin_project/xml/page_check_member.xml"
 	EndIf
 
@@ -75,14 +75,6 @@
 
 			Var TNumberTaobinMemberXXX = TelephoneNumber
 
-			Trim TNumberTaobinMemberXXX 3
-			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-"
-			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7
-			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8
-			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9
-			Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10
-
-
 			Var CoffeePointRank = Ext1b
 			INT CoffeePointRank
 			Var CoffeePointRankTmp = CoffeePointRank
@@ -118,6 +110,8 @@
                 Var CouponInfo9 =  Ext1i
                 Var CouponInfo10 =  Ext1j
 
+                Var GetAccFlag = 0
+
                 Open "ROOT/taobin_project/xml/page_check_member2.xml" 
             
         EndIf
@@ -126,16 +120,45 @@
    
 
     If  GetAccFlag = 1 Then
-        Var GetAccFlag = 0
+        Var GetAccFlag = 2
 
 		If Ext1a = "ok" Then
 
+            Var TaobinName = ""
+			Var TaobinCoupons = ""
+			Var TaobinExpire = ""
+			Var TaobinLevel = ""
+
+			Var TNumberTaobinMemberXXX = TelephoneNumber
+
+			Var CoffeePointRank = 0
+			INT CoffeePointRank
+			Var CoffeePointRankTmp = CoffeePointRank
+
+            Var PolygonST1 = "Invisible"
+            Var PolygonST2 = "Invisible"
+            Var CouponSTA =  "Invisible"
+            Var CouponSTB =  "Invisible"
+
+            Var CouponPage = 1 
+            Var MakeDrinkState = 0
+            Var CouponInfo1 =  ""
+            Var CouponInfo2 =  ""
+            Var CouponInfo3 =  ""
+            Var CouponInfo4 =  ""
+            Var CouponInfo5 =  ""
+            Var CouponInfo6 =  ""
+            Var CouponInfo7 =  ""
+            Var CouponInfo8 =  ""
+            Var CouponInfo9 =  ""
+            Var CouponInfo10 =  ""
+
             Var TaobinCredit =  0
-            ;GETACCEXT TelephoneNumber 14
+            GETACCEXT TelephoneNumber 14
-            ;Var StepX = 1
+            Var StepX = 1
-            ;Var Ext1a = "ok"
+            Var Ext1a = "ok"
              
-			Open "ROOT/taobin_project/xml/page_check_member2.xml" 
+			;Open "ROOT/taobin_project/xml/page_check_member2.xml" 
 		Else
 			Var ShowErrorText = "Enable"
             Var ShowText = "Invisible"
@@ -154,7 +177,7 @@
 </EventActionOk>
 
 <EventActionError>
-	If  GetAccFlag = 1 Then
+	If  GetAccFlag > 0 Then
    		Var ShowErrorText = "Enable"
         Var ShowText = "Invisible"
         Var GetAccFlag = 0

xml/page_drinkok.xml

@@ -8,8 +8,40 @@
 <EventOpen>
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
-	
 
+
+	If show_eng = "true" Then 
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+	Else
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+	EndIf
+
+	Var bg_strawlid_ST = "Enable"
+	Var bg_strawProblem_ST = "Invisible"
+	Var bg_strawProblem_Y = 1470
+	Var bg_strawProblem = DirImage2 + "/bg_strawProblem.png"
+	Var straw_problem_flag = 0
+
+	If Seeker.strawAction = 1 Then
+		Machine Straw
+		;Var bg_strawlid = DirImage2 + "/bg_strawProblem.png"
+		Var bg_strawProblem_ST = "Enable"
+
+
+		If  Seeker.lidAction = 0 Then 
+		Else
+			Var bg_strawProblem_Y = 1680
+			Var bg_strawlid_ST = "Invisible"
+			Var LidStateX = "Invisible"
+			Var StrawStateX = "Invisible"
+		EndIf
+	EndIf
+
+	If  Seeker.lidAction = 1 Then
+		Machine Lid
+		
+	EndIf
+	
 	;If StarwState = "Press" Then
 	;	Machine Straw
 	;	LED LedDoorLid Blink 255 255 255 255
@@ -454,5 +486,169 @@
 </EventClick>
 </Button>
 
+;500
+;1180
+<Button>
+<X> 10 </X>
+<Y> 1680 </Y>
+<State>bg_strawlid_ST</State>
+<Filename> bg_strawlid </Filename>
+<EventClick> 
+
+ 
+
+</EventClick> 
+</Button>
+
+<Button>
+<X> 10 </X>
+<Y> bg_strawProblem_Y </Y>
+<State>bg_strawProblem_ST</State>
+<Filename> bg_strawProblem </Filename>
+<EventClick> 
+
+	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
+	
+	__CMD "straw-alert" 0 strawStr "-"
+ 	__CMD "send-error-code" 1231 "-" "-"
+	Var bg_strawProblem_ST = "Invisible"
+
+	Refresh
+</EventClick> 
+</Button>
+
+; straw left
+<Button>
+<X> 50 </X>
+<Y> 1752 </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"
+		
+		If Seeker.strawAction = 0 Then
+			Var Seeker.strawAction = 1
+			Machine Straw
+			
+			Var bg_strawProblem_ST = "Enable"
+			;Var bg_strawlid_ST = "Invisible"
+			;Var LidStateX = "Invisible"
+			;Var StrawStateX = "Invisible"
+		EndIf
+		
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 377 </X>
+<Y> 1759 </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"
+
+		If Seeker.strawAction = 0 Then
+			Var Seeker.strawAction = 1
+			Machine Straw
+			
+			Var bg_strawProblem_ST = "Enable"
+			;Var bg_strawlid_ST = "Invisible"
+			;Var LidStateX = "Invisible"
+			;Var StrawStateX = "Invisible"
+
+		EndIf
+	EndIf
+
+	DEBUGVAR "PICHET"
+	
+	Refresh
+</EventClick>
+</Button>
+
+
+
+; LID left
+<Button>
+<X> 50 </X>
+<Y> 1828 </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> 
+
+	If Seeker.thankLidFlag = 0 Then
+		
+		SAVELOG "Click LID pic"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			If Seeker.lidAction = 0 Then
+				Var Seeker.lidAction = 1
+				Machine Lid
+				Var straw_problem_ST = "Enable"
+			EndIf
+		EndIf
+		
+
+		DEBUGVAR SugarState1
+		Refresh
+
+	EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 377 </X>
+<Y> 1835 </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> 
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID cb"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"	
+		Else
+			Var LidStateX = "Press"
+			If Seeker.lidAction = 0 Then
+				Var Seeker.lidAction = 1
+				Machine Lid
+				
+			EndIf
+		EndIf
+		Refresh
+	
+	EndIf
+
+</EventClick>
+</Button>
+
+
 </Popup>
 

xml/page_payment.xml

@@ -172,6 +172,9 @@
 			Var CountStepPackPayment = CountStepPackPayment + 1
 	EndIf
 
+	;Var CountStepPackPayment = 1
+
+	If CountStepPackPayment = 1 Then
 	DEBUGVAR Seeker
 	DEBUGVAR HaveCup
 	DEBUGVAR CupChecking

xml/page_payment_cash.xml

@@ -198,6 +198,7 @@
 		Var RemainAmount = RemainAmount - Seeker.IntVendingCampaign
 		Var RemainAmount = RemainAmount - Seeker.IntVendingCredit
 		Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
+		Var SumCoinAmount = CoinAmount + Seeker.IntVendingCredit
 		If SumCoinAmount >= PayAmount Then 
 
 			SAVELOG "CoinInOk First"

xml/page_payment_cashMore.xml

@@ -1191,6 +1191,14 @@
 				Var ECommerceQR =	ECommerceQR + "/"
 				Var ECommerceQR =	ECommerceQR + "KBA: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
 					Var ECommerceQR =	ECommerceQR + "CRD"
 					Var ECommerceQR =	ECommerceQR + ":"

xml/page_payment_credit.xml

@@ -156,7 +156,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -197,7 +198,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -238,7 +240,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -279,7 +282,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -320,7 +324,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -361,7 +366,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -402,7 +408,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -443,7 +450,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -484,7 +492,8 @@
 	Refresh
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -522,7 +531,8 @@
 	Trim TelephoneNumber 10
 	StrLen TelephoneNumber TelNumLen
 	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowTextNumber = "Invisible"
 
@@ -577,7 +587,7 @@
 
 
 <Button>
-<X> 218 </X>
+<X> 397 </X>
 <Y> 1607 </Y>
 
 <Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
@@ -693,8 +703,10 @@
 	Open "/media/bt/xml/security_alarm.xml" 
 </EventSecurity>
 
-
+<Function2>
-
+	Var GetAccFlag = 1
+	GETACCEXT TelephoneNumber 19
+</Function2>
 
 
 </Popup>