diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
index 9e80e94..df438f0 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
@@ -236,7 +236,7 @@ namespace EasyBL.WEBAPP.SYS
             //booking status
             sb.Append("<td style=\"padding-top: 25px;\">");
             sb.Append("<h1 style =\"padding-bottom: 12px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #7997ff;margin: 0 0 0 0;\">");
-            sb.Append("訂單完成，已付款");
+            sb.Append("訂單進行中，已付款待確認");
             sb.Append("</h1>");
             //service name
             sb.Append("<h1 style =\"padding-bottom: 8px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #232323;margin: 0 0 0 0;\">");
@@ -379,7 +379,7 @@ namespace EasyBL.WEBAPP.SYS
             //booking status
             sb.Append("<td style=\"padding-top: 25px;\">");
             sb.Append("<h1 style =\"padding-bottom: 12px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #7997ff;margin: 0 0 0 0;\">");
-            sb.Append("訂單已確認,<span style=\"color: #2dc695;\">已付款</span>");
+            sb.Append("訂單已完成,<span style=\"color: #2dc695;\">已付款</span>");
             sb.Append("</h1>");
             //service name
             sb.Append("<h1 style =\"padding-bottom: 8px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #232323;margin: 0 0 0 0;\">");
@@ -818,7 +818,7 @@ namespace EasyBL.WEBAPP.SYS
             //booking status
             sb.Append("<td style=\"padding-top: 25px;\">");
             sb.Append("<h1 style =\"padding-bottom: 12px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #7997ff;margin: 0 0 0 0;\">");
-            sb.Append("訂單處理中,<span style=\"color: #2dc695;\">未付款</span>");
+            sb.Append("訂單進行中,<span style=\"color: #2dc695;\">未付款</span>");
             sb.Append("</h1>");
             //service name
             sb.Append("<h1 style =\"padding-bottom: 8px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #232323;margin: 0 0 0 0;\">");
@@ -1117,7 +1117,7 @@ namespace EasyBL.WEBAPP.SYS
             //booking status
             sb.Append("<td style=\"padding-top: 25px;\">");
             sb.Append("<h1 style =\"font-size: 14px;padding-bottom: 12px;font-family: 'arial','sans-serif';font-weight: 700;line-height: 18px;color: #7997ff;margin: 0 0 0 0;\">");
-            sb.Append("取消訂單, " + PaymentStatus);
+            sb.Append("取消訂單, " + (PaymentStatus == "01" ? "未付款" : "已付款"));
             sb.Append("</h1>");
             //service name
             sb.Append("<h1 style =\"font-size: 14px;padding-bottom: 8px;font-family: 'arial','sans-serif';font-weight: 700;line-height: 18px;color: #232323;margin: 0 0 0 0;\">");
@@ -1796,7 +1796,7 @@ namespace EasyBL.WEBAPP.SYS
             //booking status
             sb.Append("<td style=\"padding-top: 25px;\">");
             sb.Append("<h1 style =\"font-size: 14px;padding-bottom: 12px;font-family: 'arial','sans-serif';font-weight: 700;line-height: 18px;color: #7997ff;margin: 0 0 0 0;\">");
-            sb.Append("取消訂單, " + BookingOnlineModel.PaymentStatus=="01"?"未付款":"已付款");
+            sb.Append("取消訂單, " + (BookingOnlineModel.PaymentStatus=="01"?"未付款":"已付款"));
             sb.Append("</h1>");
             //service name
             sb.Append("<h1 style =\"font-size: 14px;padding-bottom: 8px;font-family: 'arial','sans-serif';font-weight: 700;line-height: 18px;color: #232323;margin: 0 0 0 0;\">");
@@ -1970,7 +1970,7 @@ namespace EasyBL.WEBAPP.SYS
             //booking status
             sb.Append("<td style=\"padding-top: 25px;\">");
             sb.Append("<h1 style =\"padding-bottom: 12px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #7997ff;margin: 0 0 0 0;\">");
-            sb.Append("訂單處理中,<span style=\"color: #2dc695;\">未付款</span>");
+            sb.Append("訂單進行中,<span style=\"color: #2dc695;\">未付款</span>");
             sb.Append("</h1>");
             //service name
             sb.Append("<h1 style =\"padding-bottom: 8px;font-family: 'arial','sans-serif';font-weight: 700;font-size: 14px;line-height: 18px;color: #232323;margin: 0 0 0 0;\">");
diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs
index 3ddef97..7dc8473 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs
@@ -449,13 +449,11 @@ namespace EasyBL.WEBAPP.SYS
 
                     service.PreviewFile = GetPreviewFile(service.PreviewFile);
 
-                    var supplier = db.Queryable<SETB_SCM_Supplier>()   //get Supplier info
-                        .Where(x => x.SupplierID == service.SupplierID && x.LangType == Lang)
-                        .Single();
+                   
 
                     var supplierMail = db.Queryable<SETB_SCM_SupplierContactor>()   //get Supplier Mail
-                        .Where(x => x.SupplierID == service.SupplierID && x.LangType == Lang)
-                        .Single();
+                        .Where(x => service.Undertaker.Contains(x.Guid)  && x.LangType == Lang)
+                        .ToList();
 
                     //var img = db.Queryable<OTB_SYS_Files>()   //get img info
                     //.Where(x => x.ParentID == sAccount && x.ParentID == service.PreviewFile)
@@ -497,15 +495,15 @@ namespace EasyBL.WEBAPP.SYS
                     var toEmail = new List<EmailTo>();   //收件人
                     var oEmailTo = new EmailTo   //收件人資訊
                     {
-                        ToUserID = sUser.MemberID,
-                        ToUserName = sUser.LastName,
-                        ToEmail = sUser.Email,
+                        ToUserID = sSubscriber.MemberID,
+                        ToUserName = sSubscriber.LastName,
+                        ToEmail = sSubscriber.Email,
                         Type = "to"
                     };
                     toEmail.Add(oEmailTo);
                     oEmail.FromUserName = "訂單取消通知";   //取fonfig
                     oEmail.Title = "訂單取消通知";   //取fonfig
-                    oEmail.EmailBody = new BookingMail().CancelledBooking(service.PreviewFile, sUser.LastName, booking.BookingStatus, sPayment, booking.BookingNo, booking.BookingItem, booking.BookingDate, booking.ServiceDateS, booking.CurrencyID, booking.TotalPrice, service.ServiceName);
+                    oEmail.EmailBody = new BookingMail().CancelledBooking(service.PreviewFile, sUser.LastName, booking.BookingStatus, booking.PaymentStatus, booking.BookingNo, booking.BookingItem, booking.BookingDate, booking.ServiceDateS, booking.CurrencyID, booking.TotalPrice, service.ServiceName);
                     oEmail.IsCCSelf = false;
                     oEmail.Attachments = null;
                     oEmail.EmailTo = toEmail;
@@ -514,13 +512,18 @@ namespace EasyBL.WEBAPP.SYS
                     //寄信給Supplier
                     oEmail = new Emails();   //寄件人
                     toEmail = new List<EmailTo>();   //收件人
-                    oEmailTo = new EmailTo   //收件人資訊
+
+                foreach(var supplier in supplierMail)
                     {
-                        ToUserID = sSubscriber.MemberID,
-                        ToUserName = sSubscriber.LastName,
-                        ToEmail = sSubscriber.Email,
-                        Type = "to"
-                    };
+                        oEmailTo = new EmailTo   //收件人資訊
+                        {
+                            ToUserID = "",
+                            ToUserName = supplier.ContacterName,
+                            ToEmail = supplier.Email,
+                            Type = "to"
+                        };
+                    }
+                    
                     toEmail.Add(oEmailTo);
                     oEmail.FromUserName = "訂單取消通知";   //取fonfig
                     oEmail.Title = "訂單取消通知";   //取fonfig
diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs
index 89afad6..d68d581 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs
@@ -1306,6 +1306,7 @@ namespace EasyBL.WEBAPP.ShowEasy
                             var objMember = db.Queryable<SETB_SAL_Subscriber>().Where(x => x.BookingID == objBookingOnline.BookingID).Single();
                             if (objMember != null)
                             {
+                                objBookingOnline.MemberName = objMember.FirstName;
                                 //開始寄送給訂購人
                                 var oEmail = new Emails();   //寄件人
                                 var toEmail = new List<EmailTo>();   //收件人
@@ -1329,7 +1330,17 @@ namespace EasyBL.WEBAPP.ShowEasy
                                     else
                                     {
                                         //匯款
-                                        oEmail.EmailBody = new BookingMail().PayByTransfer(objBookingOnline);
+                                        if (string.IsNullOrEmpty(objBookingOnline.Account))
+                                        {
+                                            //未登錄，沒有上傳匯款單按鈕
+                                            oEmail.EmailBody = new BookingMail().PayByTransfer_NoLogin(objBookingOnline);
+
+                                        }
+                                        else
+                                        {
+                                            oEmail.EmailBody = new BookingMail().PayByTransfer(objBookingOnline);
+                                        }
+
 
                                     }
                                 }
diff --git a/EuroTran/WebApp/Scripts/pages/ShowEasy/BookingMaintain_Upd.js b/EuroTran/WebApp/Scripts/pages/ShowEasy/BookingMaintain_Upd.js
index 366f38b..85df98d 100644
--- a/EuroTran/WebApp/Scripts/pages/ShowEasy/BookingMaintain_Upd.js
+++ b/EuroTran/WebApp/Scripts/pages/ShowEasy/BookingMaintain_Upd.js
@@ -256,7 +256,7 @@ var fnPageInit = function () {
                     //立即回復既是bypass的流程
                     if (pargs.data.ConfirmDays == "01") {
                         //只顯示已完成部分
-                        $("#btnConfirm,#btnReject,#btnProcessing").hide();
+                        $("#btnConfirm,#btnReject").hide();
                        
                     }