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

xml/page_board.xml

@@ -13,9 +13,16 @@
 
 	DEBUGVAR SoundVolume
 
+	
+	Var NextOrder = "false"
+	
+	Var Seeker = "next"
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
 
 	Var Seeker = "curr"
-	Var NextOrder = "false"
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
 
 	DEBUGVAR web_ref
 	DEBUGVAR web_payment

xml/page_catalog.xml

@@ -8,6 +8,9 @@
 	TopView "show"
 	; On open
 
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
 	WEB "DISABLE"
 
 	Var web_readyOK = "false"

xml/page_check_newmember2.xml

@@ -131,11 +131,11 @@
 		If Ext1a = "ok" Then
 
             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"

xml/page_payment.xml

@@ -106,6 +106,14 @@
 	Var ServiceAmount2 = PriceDrink
 	Var TelephoneNumber = "0899999999"
 	Var ServiceType = "coffee"
+
+	Var VendingCreditRemain = ""
+	
+
+
+	DEBUGVAR Seeker.thankLidFlag
+	DEBUGVAR Seeker.thankStrawFlag
+	
 				
 	
 </EventOpen>

xml/page_payment_cash.xml

@@ -36,6 +36,10 @@
 	; Below original 
 	; On open
 
+
+
+	Var cancelState = "Invisible"
+
 	
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
@@ -573,7 +577,7 @@
 	Var stringLog = stringLog + PayOK
 
 
-	If Timeout > 180 Then
+	If Timeout > 18 Then
 		If PayOK = 1 Then
 			
 			If Seeker = "curr" Then
@@ -592,6 +596,8 @@
 
 				CoinVending OFF
 				Var CancelFlag = 1
+				Var cancelState = "Enable"
+
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
 
@@ -827,6 +833,7 @@
 				Machine CancelWepApp
 				CoinVending OFF
 				Var CancelFlag = 1
+				Var cancelState = "Enable"
 				Var CancelCounter = 0
 				;If CoinAmount = 0 Then
 				;	Open "ROOT/taobin_project/xml/page_catalog.xml"  
@@ -889,6 +896,7 @@
 			Machine CancelWepApp
             CoinVending OFF
 			Var CancelFlag = 1
+			Var cancelState = "Enable"
 			Var CancelCounter = 0
 
 			If FlagQROpened = 1 Then 
@@ -1224,6 +1232,7 @@
 			EndIf
             CoinVending OFF
 			Var CancelFlag = 1
+			Var cancelState = "Enable"
 			Var CancelCounter = 0
 
 			If FlagQROpened = 1 Then 
@@ -1377,6 +1386,7 @@
 			EndIf
             CoinVending OFF
 			Var CancelFlag = 1
+			Var cancelState = "Enable"
 			Var CancelCounter = 0
 			If FlagQROpened = 1 Then 
 				Var CancelNumber = 12
@@ -1498,6 +1508,22 @@
 </EventClick>
 </Button>
 
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> cancelState </State>
+<Filename> Var( DirImage + "/CancelOrder.png" ) </Filename>
+</Image>
+
+<GIF>
+<X> 493 </X>
+<Y> 960 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> cancelState </State>
+<Filename> Var( DirImage + "/loading.gif" )</Filename>
+</GIF>
+
 
 
 <EventSecurity> 

xml/page_payment_cashMore.xml

@@ -28,6 +28,8 @@
 	Var PayAmount = PriceDrink
 
 	Var LOADING_STATE = "Invisible"
+
+	Var cancelState = "Invisible"
 	
 	; Below original 
 	; On open
@@ -571,6 +573,8 @@
 
 				CoinVending OFF
 				Var CancelFlag = 1
+				Var cancelState = "Enable"
+
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
 					If Seeker.IntVendingCredit > 0 Then
@@ -798,6 +802,7 @@
 				SAVELOG "VDCancle  > Cancle Order."
 				CoinVending OFF
 				Var CancelFlag = 1
+				Var cancelState = "Enable"
 				Var CancelCounter = 0
 				
 				;Var showRemaining = "คืนเงิน"
@@ -970,6 +975,7 @@
 				SAVELOG "EventCart  > Cancle All Order."
 				CoinVending OFF
 				Var CancelFlag = 1
+				Var cancelState = "Enable"
 				Var CancelCounter = 0
 
 				If FlagQROpened = 1 Then 
@@ -1336,6 +1342,7 @@
 			SAVELOG "ButtonCancleMain  > Cancle All Order."
             CoinVending OFF
 			Var CancelFlag = 1
+			Var cancelState = "Enable"
 			Var CancelCounter = 0
 
 			If FlagQROpened = 1 Then 
@@ -1601,6 +1608,7 @@ EndIf
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
             CoinVending OFF
 			Var CancelFlag = 1
+			Var cancelState = "Enable"
 			Var CancelCounter = 0
 			If FlagQROpened = 1 Then 
 				Var CancelNumber = 12
@@ -1722,6 +1730,22 @@ EndIf
 </EventClick>
 </Button>
 
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> cancelState </State>
+<Filename> Var( DirImage + "/CancelOrder.png" ) </Filename>
+</Image>
+
+<GIF>
+<X> 493 </X>
+<Y> 960 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> cancelState </State>
+<Filename> Var( DirImage + "/loading.gif" )</Filename>
+</GIF>
+
 
 
 <EventSecurity> 

xml/page_payment_code.xml

@@ -178,6 +178,16 @@
 
 		Else
 
+			Var VendingCreditRemain = ""
+			Var IntVendingCampaign1 = VendingCampaign1
+			INT IntVendingCampaign1
+
+			If IntVendingCampaign1 > 0 Then
+				Var VendingCreditRemain = VendingCampaign1
+			EndIf 
+
+
+
 			Var Seeker.IntVendingCampaign =  Seeker.VendingCampaignRI3
 			INT Seeker.IntVendingCampaign
 		

xml/page_payment_credit.xml

@@ -74,6 +74,13 @@
 	;Open "ROOT/taobin_project/xml/page_payment_credit2.xml" 
 	If  GetAccFlag = 1 Then
 		If Ext1a = "ok" Then
+			Var PinNumberUser = Ext1c
+			Var CoffeeCredit = Ext1b
+			INT CoffeeCredit 
+
+			;Var CoffeeCredit = 5
+			
+
 			Open "ROOT/taobin_project/xml/page_payment_credit2.xml" 
 		Else
 			Var ShowErrorText = "Enable"

xml/page_payment_credit2.xml

@@ -65,6 +65,9 @@
 		GETACCEXT DataTmp 19
 
 	EndIf
+
+	Var ReqAdddata22 = 0
+	Var timeout_Adddata22 = 0
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -121,26 +124,64 @@
 	
 
 	If ReqFlag = 0 Then 
+
+		If ReqAdddata22 = 1 Then 
+			Var Seeker.CreditReferenceTmp = "" + PayAmount
+			Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
+			Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
+
+			CoinVending OFF
+
+
+			Var Seeker.TNumberTaobinCredit = TelephoneNumber
+			Var Seeker.CoffeePinNumber = PinNumber
+
+			Var Seeker.StoreCreditFlag = 1
+
+			Var SumCreditAmount = SumCreditAmount - PayAmount
+
+			Var VendingCreditRemain = "" + SumCreditAmount
+
+			If CART_COUNT >= 1 Then 
+
+				Cart "PreparID" 1
+				Var CART_INDEX = 1
+				Var PayReference = ""
+				GenHashWithTimeStamp PayReference
+				Cart "MakeID" CART_INDEX
+				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			Else
+				Var CART_INDEX = 0
+				
+				If Seeker = "curr" Then
+					MakeDrinkV1  SelectDrink SelectSugarID
+				Else
+					DEBUGVAR Seeker
+				EndIf
+				Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+			EndIf
+
+		EndIf
     
 			
 	
 
-		If Ext1a = "ok" Then
+		;If Ext1a = "ok" Then
 
-			If Ext1c = "" Then
+		;	If Ext1c = "" Then
-			
+		;	
-				Open "ROOT/taobin_project/xml/page_payment_credit3.xml" 
+		;		Open "ROOT/taobin_project/xml/page_payment_credit3.xml" 
-			Else
+		;	Else
 
-			EndIf
+		;	EndIf
-		Else
+		;Else
-			Var ShowErrorText = "Enable"
+		;	Var ShowErrorText = "Enable"
-			Var PinNumber = ""
+		;	Var PinNumber = ""
-			Var ShowTextNumber1 = "Invisible"
+		;	Var ShowTextNumber1 = "Invisible"
-			Var ShowTextNumber2 = "Invisible"
+		;	Var ShowTextNumber2 = "Invisible"
-			Var ShowTextNumber3 = "Invisible"
+		;	Var ShowTextNumber3 = "Invisible"
-			Var ShowTextNumber4 = "Invisible"
+		;	Var ShowTextNumber4 = "Invisible"
-		EndIf
+		;EndIf
 	Else
 
 	EndIf
@@ -720,13 +761,41 @@
 <EventClick> 
 
 		Var ShowSentSmsText = "Invisible"
+		Var Timeout = 0
 
-			Var DataTmp = TelephoneNumber + "/"
+		If PinNumberUser = PinNumber Then
-			Var DataTmp = DataTmp + PinNumber
 
-			GETACCEXT DataTmp 19
+			Var SumCreditAmount = CoffeeCredit
 
-			Var ReqFlag = 0
+			If SumCreditAmount >= PayAmount Then 
+
+				GenHashWithTimeStamp PointCrm
+
+				Var BmiYear = PayAmount
+				Var GetScore = "useCredit"
+				AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+				Var ReqAdddata22 = 1
+
+				
+			Else
+				Open "ROOT/taobin_project/xml/page_payment_credit3.xml" 
+			EndIf
+
+		Else
+
+			Var ShowErrorText = "Enable"
+			Var PinNumber = ""
+			Var ShowTextNumber1 = "Invisible"
+			Var ShowTextNumber2 = "Invisible"
+			Var ShowTextNumber3 = "Invisible"
+			Var ShowTextNumber4 = "Invisible"
+
+		EndIf
+
+		;Var DataTmp = TelephoneNumber + "/"
+		;Var DataTmp = DataTmp + PinNumber
+		;GETACCEXT DataTmp 19
+		Var ReqFlag = 0
 
 		Refresh
     

xml/page_payment_credit3.xml

@@ -15,8 +15,8 @@
 	Var Tel_Confirm_State = "Disable"
 	Var ShowNotEnoughText = "Invisible"
 
-	Var CoffeeCredit = Ext1b
+	;Var CoffeeCredit = Ext1b
-	INT CoffeeCredit 
+	;INT CoffeeCredit 
 
 	Var SumCreditAmount = CoffeeCredit
 	;Var SumCreditAmount = 5

xml/page_payment_multi.xml

@@ -216,6 +216,12 @@
 	Var RemainAmountStr = "" + PayAmount
 	Var showRemaining = charOfBaht + RemainAmountStr
 
+
+	Var VendingCreditRemain = ""
+
+	Var Seeker.thankLidFlag = 1
+	Var Seeker.thankStrawFlag = 1
+
 	
 </EventOpen>
 <Timeout> 500 </Timeout>

xml/page_show_consent.xml

@@ -35,8 +35,20 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 20 Then
         ; goto lid straw
+		;SAVELOG "Timeout"
+		;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		SAVELOG "Timeout"
-		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	
+	
+	
+
+		Var Seeker.FromConsent = 1
+
+		Var StepGetPoint = 1
+		GETACCEXT TelephoneNumber 14
+		; goto lid straw
+		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+
 	EndIf
 
 	TimerReset
@@ -72,7 +84,7 @@
 
 
 <Button>
-<X> 577 </X>
+<X> 397 </X>
 <Y> 1679 </Y>
 <Filename> Var( DirImage + "/bn_accept.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_accept.png" ) </FilenamePress>
@@ -97,20 +109,20 @@
 </EventClick>
 </Button>
 
-<Button>
+;<Button>
-<X> 218 </X>
+;<X> 218 </X>
-<Y> 1679 </Y>
+;<Y> 1679 </Y>
-<Filename> Var( DirImage + "/bn_decline.png" ) </Filename>
+;<Filename> Var( DirImage + "/bn_decline.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_decline.png" ) </FilenamePress>
+;<FilenamePress> Var( DirImage + "/bp_decline.png" ) </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
+;<Volume> SoundVolume </Volume>
-<EventClick> 
+;<EventClick> 
-    ; goto lid straw
+;    ; goto lid straw
-    SAVELOG "Press Decline"
+;    SAVELOG "Press Decline"
-	SAVELOG "show_consent-p110."
+;	SAVELOG "show_consent-p110."
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+;	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-</EventClick>
+;</EventClick>
-</Button>
+;</Button>
 
 
 

xml/page_thankyou.xml

@@ -43,11 +43,15 @@
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 
 		Var BottomText = PicturePath + "text_bottom_eng.png"
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
 	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"
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou"
 	EndIf
 
 	DEBUGVAR StarwState
@@ -72,6 +76,26 @@
 		Var NextOrder = "true"
 	EndIf
 
+	If VendingCreditRemain = "" Then
+		Var RemainCreditST = "Invisible"
+	Else
+		Var RemainCreditST = "Enable"
+	EndIf
+
+	Var SaveTheWorldST = "Invisible"
+	Var SaveTheWorldCount = 0
+
+	If Seeker.thankLidFlag = 0 Then
+		Var SaveTheWorldCount = SaveTheWorldCount + 1
+	EndIf
+
+	If Seeker.thankStrawFlag = 0 Then
+		Var SaveTheWorldCount = SaveTheWorldCount + 1
+	EndIf
+
+	If SaveTheWorldCount = 2 Then
+		Var SaveTheWorldST = "Enable"
+	EndIf
 	
 
 </EventOpen>
@@ -209,6 +233,39 @@
 ;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 ;</Image>
 
+
+
+<Image>
+<X> 89 </X>
+<Y> 700 </Y>
+<Filename> "ROOT/taobin_project/image/page_thankyou/img1.png" </Filename>
+</Image>
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<State>SaveTheWorldST</State>
+<Filename> "ROOT/taobin_project/image/page_thankyou/img3.png" </Filename>
+</Image>
+
+<Image>
+<X> 760 </X>
+<Y> 413 </Y>
+<State>RemainCreditST</State>
+<Filename> Var( DirImage + "/remainCredit.png" ) </Filename>
+</Image>
+
+<Text>
+<X> 760 </X>
+<Y> 480 </Y>
+<Size> 70 </Size>
+<Width> 413</Width>
+<Align> Center </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> VendingCreditRemain </Value>
+</Text>
+
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
@@ -218,12 +275,6 @@
 <Filename> video_menu_0 </Filename>
 </Video>
 
-<Image>
-<X> 89 </X>
-<Y> 700 </Y>
-<Filename> "ROOT/taobin_project/image/page_thankyou/img1.png" </Filename>
-</Image>
-
 
 ;<Image>
 ;<X> 751 </X>

xml/page_topping_select4.xml

@@ -1342,8 +1342,14 @@
 	SAVELOG "Click straw cb"
 	If StrawState = "Press" Then
 		Var StrawState = "Enable"	
+
+		Var Seeker.thankStrawFlag = 0
+
 	Else
 		Var StrawState = "Press"
+
+		Var Seeker.thankStrawFlag = 1
+
 	EndIf
 	Refresh
 </EventClick>
@@ -1361,8 +1367,14 @@
 	SAVELOG "Click straw cb"
 	If StrawState = "Press" Then
 		Var StrawState = "Enable"	
+
+		Var Seeker.thankStrawFlag = 0
+
 	Else
 		Var StrawState = "Press"
+
+		Var Seeker.thankStrawFlag = 1
+
 	EndIf
 	Refresh
 </EventClick>
@@ -1383,8 +1395,14 @@
 	SAVELOG "Click LID pic"
 	If LidState = "Press" Then
 		Var LidState = "Enable"	
+
+		Var Seeker.thankLidFlag = 0
+		
 	Else
 		Var LidState = "Press"
+
+		Var Seeker.thankLidFlag = 1
+		
 	EndIf
 	
 
@@ -1406,8 +1424,14 @@
 	SAVELOG "Click LID cb"
 	If LidState = "Press" Then
 		Var LidState = "Enable"	
+
+		Var Seeker.thankLidFlag = 0
+
 	Else
 		Var LidState = "Press"
+
+		Var Seeker.thankLidFlag = 1
+
 	EndIf
 	Refresh
 </EventClick>