diff --git a/Admin/AdminWindow.xaml b/Admin/AdminWindow.xaml
index 75944f9..edf5f8f 100644
--- a/Admin/AdminWindow.xaml
+++ b/Admin/AdminWindow.xaml
@@ -46,7 +46,7 @@
              Margin="10" 
              Click="DashboardButton_Click"/>
             <Button 
-             Content="Quản lý người dùng" 
+             Content="Quản lý gian hàng" 
              HorizontalAlignment="Stretch" 
              Height="40"
              Margin="10" 
diff --git a/Admin/UserManageUC.xaml b/Admin/UserManageUC.xaml
index 76ee2f6..8c98663 100644
--- a/Admin/UserManageUC.xaml
+++ b/Admin/UserManageUC.xaml
@@ -8,7 +8,8 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <Button Content="Get Users" Width="200" Margin="10" x:Name="btnGetUsers" Click="btnGetUsers_Click"/>
+            <Button Content="TẢI D/S GIAN HÀNG" Width="200" Margin="10" x:Name="btnGetUsers" Click="btnGetUsers_Click"/>
+            <Button Content="ĐỒNG BỘ GIAO DỊCH LÊN SERVER" Width="200" Margin="10" x:Name="btnSyncTransaction" Click="btnSyncTransaction_Click"/>
             <Label x:Name="lblStatus"/>
         </StackPanel>
     </Grid>
diff --git a/Admin/UserManageUC.xaml.cs b/Admin/UserManageUC.xaml.cs
index 4450369..51099ad 100644
--- a/Admin/UserManageUC.xaml.cs
+++ b/Admin/UserManageUC.xaml.cs
@@ -82,6 +82,11 @@ namespace SafeBagDE70.Admin
                 lblStatus.Content= ex.Message;
             }
         }
+
+        private void btnSyncTransaction_Click(object sender, RoutedEventArgs e)
+        {
+            AppData.ResendData();
+        }
     }
    
 }
diff --git a/AppData.cs b/AppData.cs
index 59b31fb..d5326f7 100644
--- a/AppData.cs
+++ b/AppData.cs
@@ -1,4 +1,5 @@
 using DE70_CMDv2;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SafeBagDE70.API;
 using SafeBagDE70.Model;
@@ -37,6 +38,7 @@ namespace SafeBagDE70
         public static string BaseURL = "";
         public static int TenantId = 0;
         public static bool IsInternetOk = false;
+        static Task? resendTask = null;
         public static DeviceStatus? _DeviceStatus = null;
         public static DeviceStatus? DeviceStatus
         {
@@ -259,6 +261,58 @@ namespace SafeBagDE70
             }
             return str.Trim(',');
         }
+        public static void ResendData()
+        {
+            if (!AppData.IsInTransaction && AppData.IsInternetOk)
+            {
+
+                if (resendTask == null || resendTask.IsCompleted)
+                {
+                    resendTask = Task.Run(async () =>
+                    {
+                        try
+                        {
+                            using (var context = new CDMDbContext())
+                            {
+                                var startTime = DateTime.Now.Date.AddDays(-2).Date;
+                                var unsentHist = context.Histories
+                                .Where(x => x.DepositTime >= startTime)
+                                .Where(x => ((x.IsSent == null || x.IsSent == false)))
+                                .ToList();
+                                foreach (var item in unsentHist)
+                                {
+                                    var data2Send = JsonConvert.DeserializeObject<CountingData2Send>(item.Data);
+                                    var bResult = await APIModels.SendCountingData(data2Send);
+                                    if (bResult)
+                                    {
+                                        item.IsSent = true;
+                                        context.Update(item);
+                                        context.SaveChanges();
+                                        Log.Information("Resend: " + item.Data + " successfully");
+                                    }
+                                    else
+                                    {
+                                        Log.Error("Resend: " + item.Data + " failed");
+                                    }
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Log.Fatal(ex, "Resend failed");
+                        }
+                    });
+                }
+                else
+                {
+                    Log.Information("Previous resend are running");
+                }
+            }
+            else
+            {
+                Log.Information($"Resend could not start Is In Transaction: {AppData.IsInTransaction} IsInternetOk: {AppData.IsInTransaction}");
+            }
+        }
 
     }
     public class CustomerAccount
@@ -499,12 +553,11 @@ namespace SafeBagDE70
     public enum SensorStatusCode
     {
         NORMAL = 0,
-        ERROR = 1
+        ERROR = 4
     }
     public enum CDMStatusCode
     {
         NORMAL = 0,
         DISCONNECT_SERIALPORT=1,
-
     }
 }
diff --git a/DepositSMUCv2.xaml.cs b/DepositSMUCv2.xaml.cs
index e1c82e6..fbd02dd 100644
--- a/DepositSMUCv2.xaml.cs
+++ b/DepositSMUCv2.xaml.cs
@@ -145,67 +145,87 @@ namespace SafeBagDE70
         }
 
         private bool InitSerialPorts()
+        {
+            var bInitDE70=InitSerialPortDE70();
+            var bInitSensor = InitSerialPortSensor();
+            if (bInitDE70 && bInitSensor)
+                return true;
+            else
+            {
+                AppData.DeviceStatus.CDMStatus = (int)CDMStatusCode.DISCONNECT_SERIALPORT;
+                APIModels.SendEvent(AppData.DeviceStatus);
+                Log.Fatal("LỖI CỔNG KẾT NỐI");
+                ShowError("LỖI CỔNG KẾT NỐI, VUI LÒNG KIỂM TRA LẠI CỔNG KẾT NỐI");
+                return false;
+            }    
+           
+        }
+
+        private bool InitSerialPortSensor()
         {
             try
             {
-                InitSerialPortDE70();
-                InitSerialPortSensor();
+                if (serialPortSensor.IsOpen) serialPortSensor.Close();
+
+                serialPortSensor.PortName = AppData.SensorPort;
+                serialPortSensor.BaudRate = 9600;
+                serialPortSensor.Parity = Parity.None;
+                serialPortSensor.DataBits = 8;
+                serialPortSensor.StopBits = StopBits.One;
+                serialPortSensor.ReadTimeout = 1000;
+                serialPortSensor.WriteTimeout = 1000;
+
+                if (bOpenPort)
+                {
+                    if (!serialPortSensor.IsOpen)
+                        serialPortSensor.Open();
+                }
+                return true;
+            }catch(Exception ex)
+            {
+                AppData.DeviceStatus.SensorStatus = (int)SensorStatusCode.ERROR;
+                AppData.DeviceStatus.Description = ex.Message;
+               APIModels.SendEvent(AppData.DeviceStatus);
+                Log.Information(ex, "LỖI KẾT NỐI SENSOR");
+            }
+            return false;
+        }
+
+        private bool InitSerialPortDE70()
+        {
+            try
+            {
+                if (serialPortDE70.IsOpen) serialPortDE70.Close();
+
+
+                serialPortDE70.ReadBufferSize = 4096;
+                serialPortDE70.WriteBufferSize = 4096;
+
+
+                serialPortDE70.PortName = AppData.CDMPort;
+                serialPortDE70.BaudRate = 9600;
+                serialPortDE70.Parity = Parity.Even;
+                serialPortDE70.DataBits = 8;
+                serialPortDE70.StopBits = StopBits.One;
+                serialPortDE70.ReadTimeout = 10000;
+                serialPortDE70.WriteTimeout = 10000;
+                if (bOpenPort)
+                {
+                    if (!serialPortDE70.IsOpen)
+                        serialPortDE70.Open();
+                }
                 return true;
             }
             catch(Exception ex)
             {
                 AppData.DeviceStatus.CDMStatus = (int)CDMStatusCode.DISCONNECT_SERIALPORT;
+                AppData.DeviceStatus.Description = ex.Message;
                 APIModels.SendEvent(AppData.DeviceStatus);
-                Log.Fatal(ex, "LỖI CỔNG KẾT NỐI");
-                ShowError("LỖI CỔNG KẾT NỐI, VUI LÒNG KIỂM TRA LẠI CỔNG KẾT NỐI");
+                Log.Information(ex, "LỖI KẾT NỐI CDM");
             }
             return false;
         }
 
-        private void InitSerialPortSensor()
-        {
-            if (serialPortSensor.IsOpen) serialPortSensor.Close();
-
-            serialPortSensor.PortName = AppData.SensorPort;
-            serialPortSensor.BaudRate = 9600;
-            serialPortSensor.Parity = Parity.None;
-            serialPortSensor.DataBits = 8;
-            serialPortSensor.StopBits = StopBits.One;
-            serialPortSensor.ReadTimeout = 1000;
-            serialPortSensor.WriteTimeout = 1000;
-
-            if(bOpenPort)
-            {
-                if (!serialPortSensor.IsOpen)
-                    serialPortSensor.Open();
-            }
-           
-        }
-
-        private void InitSerialPortDE70()
-        {
-            if (serialPortDE70.IsOpen) serialPortDE70.Close();
-
-
-            serialPortDE70.ReadBufferSize = 4096;
-            serialPortDE70.WriteBufferSize = 4096;
-
-
-            serialPortDE70.PortName = AppData.CDMPort;
-            serialPortDE70.BaudRate = 9600;
-            serialPortDE70.Parity = Parity.Even;
-            serialPortDE70.DataBits = 8;
-            serialPortDE70.StopBits = StopBits.One;
-            serialPortDE70.ReadTimeout = 10000;
-            serialPortDE70.WriteTimeout = 10000;
-            if(bOpenPort)
-            {
-                if (!serialPortDE70.IsOpen)
-                    serialPortDE70.Open();
-            }
-          
-        }
-
         private void InitTimers()
         {
             warningTimer = new DispatcherTimer(); // 30 seconds
@@ -262,8 +282,6 @@ namespace SafeBagDE70
                 });
                 Log.Information("7. Timout completed");
             });
-           
-            
         }
 
         private void BackToWelcomeScreen()
@@ -402,7 +420,7 @@ namespace SafeBagDE70
                 }
                 if (countSensorTimer % 300 == 0)
                 {
-                    ResenData();
+                    AppData.ResendData();
                 }
                 countSensorTimer++;
                 sensorTimer.IsEnabled = false;
@@ -415,53 +433,6 @@ namespace SafeBagDE70
             }
             sensorTimer.IsEnabled = true;
         }
-        static Task? resendTask=null;
-        private static void ResenData()
-        {
-            if (!AppData.IsInTransaction && AppData.IsInternetOk)
-            {
-
-                if(resendTask==null || resendTask.IsCompleted)
-                {
-                    resendTask = Task.Run(async () =>
-                    {
-                        try
-                        {
-                            using (var context = new CDMDbContext())
-                            {
-                                var startTime = DateTime.Now.Date.AddDays(-2).Date;
-                                var unsentHist = context.Histories
-                                .Where(x => x.DepositTime >= startTime)
-                                .Where(x => ((x.IsSent == null || x.IsSent == false)))
-                                .ToList();
-                                foreach (var item in unsentHist)
-                                {
-                                    var data2Send = JsonConvert.DeserializeObject<CountingData2Send>(item.Data);
-                                    var bResult = await APIModels.SendCountingData(data2Send);
-                                    if (bResult)
-                                    {
-                                        item.IsSent = true;
-                                        context.Update(item);
-                                        context.SaveChanges();
-                                        Log.Information("Resend: " + item.Data + " successfully");
-                                    }
-                                    else
-                                    {
-                                        Log.Error("Resend: " + item.Data + " failed");
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.Fatal(ex, "Resend failed");
-                        }
-                    });
-                }
-               
-            }
-        }
-
         Stopwatch watch = new Stopwatch();
         private void GetSensorValue()
         {
@@ -512,6 +483,7 @@ namespace SafeBagDE70
                             if (state!=prevSensorStatus)
                             {
                                 AppData.DeviceStatus.Description=strSensorMessage;
+                                AppData.DeviceStatus.SensorStatus= state;
                                 APIModels.SendEvent(AppData.DeviceStatus);  
                                 prevSensorStatus = state;
                             }