diff --git a/image/display_get_free/img_popup4.png b/image/display_get_free/img_popup4.png
new file mode 100644
index 00000000..cc693ba3
Binary files /dev/null and b/image/display_get_free/img_popup4.png differ
diff --git a/image/display_get_free_en/img_popup4.png b/image/display_get_free_en/img_popup4.png
new file mode 100644
index 00000000..a065ffb8
Binary files /dev/null and b/image/display_get_free_en/img_popup4.png differ
diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml
index 88bcc647..6554da57 100644
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@@ -19,6 +19,15 @@
 	Var TaobinLevel = 0
 
 	Var TaobinErrorNetwork = 0
+
+	If PayOfflineMode = 1 Then
+
+		Var PointTaobinStr = "" + PayAmount
+		Var PointTaobinStr = PointTaobinStr + "/1/0"
+		Var TNumberTaobinMember = TelephoneNumber
+		Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
+
+	EndIf
 		
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -41,7 +50,7 @@
 			Var PointTaobinStr = "" + PayAmount
 			Var PointTaobinStr = PointTaobinStr + "/1/0"
 			Var TNumberTaobinMember = TelephoneNumber
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 		EndIf
 		
 	EndIf
@@ -69,10 +78,16 @@
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 		EndIf
 	Else
+
+
 		If Ext1a = "" Then
 			;Var CoffeePoint = 1
 			;Var TNumberTaobinMember = TelephoneNumber
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			Var TaobinErrorNetwork = 1
+			Var PointTaobinStr = "" + PayAmount
+			Var PointTaobinStr = PointTaobinStr + "/1/0"
+			Var TNumberTaobinMember = TelephoneNumber
+			Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 			
 		Else
 
@@ -119,7 +134,11 @@
 			Else
 				;Var CoffeePoint = 1
 				;Var TNumberTaobinMember = TelephoneNumber
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				Var TaobinErrorNetwork = 1
+				Var PointTaobinStr = "" + PayAmount
+				Var PointTaobinStr = PointTaobinStr + "/1/0"
+				Var TNumberTaobinMember = TelephoneNumber
+				Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 			EndIf
 			
 	
@@ -141,7 +160,7 @@
 		Var PointTaobinStr = "" + PayAmount
 		Var PointTaobinStr = PointTaobinStr + "/1/0"
 		Var TNumberTaobinMember = TelephoneNumber
-		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
 	EndIf
 
 </EventActionError> 
diff --git a/xml/page_collect_point_error.xml b/xml/page_collect_point_error.xml
new file mode 100644
index 00000000..2dec8860
--- /dev/null
+++ b/xml/page_collect_point_error.xml
@@ -0,0 +1,107 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	
+
+	Var Timeout = 0
+	SAVELOG show_eng
+	
+    If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_free/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 10 Then
+        ; goto lid straw
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
+</Image>
+
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+</EventClick>
+</Button>
+
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename>
+</Video>
+		
+
+
+			
+
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+</Page>
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 7e86a910..993a7276 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -230,10 +230,17 @@
 	
 	Var EnoughChange = "yes"
 
+	
+
 	If NetworkStatus = "DOWN" Then
+	
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
+
+			Var PayOfflineMode = 1
+	Else
+		Var PayOfflineMode = 0
 	EndIf
 
 </EventOpen>
@@ -501,29 +508,36 @@
 
 	Var CoinInFlag = 1
 
+	
+
 	If ViewBill > 0 Then
 
-
-		Var RemainAmount = PayAmount - CoinAmount
-		Var RemainAmount = RemainAmount - IntVendingCampaign
-
-
-		If ViewBill > RemainAmount Then
-			Var RemainAmountKeep = ViewBill - RemainAmount
+		If PayOfflineMode = 1 Then
+			CoinVending BILLREJECT
 		Else
-			Var RemainAmountKeep = ViewBill
+
+
+			Var RemainAmount = PayAmount - CoinAmount
+			Var RemainAmount = RemainAmount - IntVendingCampaign
+
+
+			If ViewBill > RemainAmount Then
+				Var RemainAmountKeep = ViewBill - RemainAmount
+			Else
+				Var RemainAmountKeep = ViewBill
+			EndIf
+
+			Var Timeout = 0
+
+
+			Var RemainAmountStr = "" + RemainAmount
+			Var showRemaining = charOfBaht + RemainAmountStr
+
+
+			
+			
+			Var alphaState3 = "Enable"
 		EndIf
-
-		Var Timeout = 0
-
-
-		Var RemainAmountStr = "" + RemainAmount
-		Var showRemaining = charOfBaht + RemainAmountStr
-
-
-		
-		 
-		Var alphaState3 = "Enable"
 		
 
 	Else
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 89f75090..826c053a 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -104,15 +104,27 @@
 		If RoadShow = "true" Then
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		Else
-			If StoreCreditFlag = 1 Then
-				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
-			Else
-				If GotoStoreCredit0 = 1 Then
-					Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml" 
-				Else
+			If PayOfflineMode = 1 Then
+
+				If StoreCreditAmount > 0 Then
+
+					Change StoreCreditAmount	
+        			Var ChangeFlag2 = 1
 					Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+
+				EndIf
+
+			Else
+				If StoreCreditFlag = 1 Then
+					Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+				Else
+					If GotoStoreCredit0 = 1 Then
+						Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml" 
+					Else
+						Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+					EndIf
+					
 				EndIf
-				
 			EndIf
 		EndIf