Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasy into Dev

EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs

@@ -1229,6 +1229,14 @@ namespace EasyBL.WEBAPP.ShowEasy
                         if (objBookingOnline.BookingDate!=null) {
                             objBookingOnline.BookingDateFormat = Convert.ToDateTime(objBookingOnline.BookingDate).ToString("yyyy/MM/dd HH:mm");
                         }
+                        if (objBookingOnline.ServiceDateS != null)
+                        {
+                            objBookingOnline.ServiceDateSFormat = Convert.ToDateTime(objBookingOnline.ServiceDateS).ToString("yyyy/MM/dd HH:mm");
+                        }
+                        if (objBookingOnline.ServiceDateE != null)
+                        {
+                            objBookingOnline.ServiceDateEFormat = Convert.ToDateTime(objBookingOnline.ServiceDateE).ToString("yyyy/MM/dd HH:mm");
+                        }
                         var objFiles = db.Queryable<OTB_SYS_Files, SETB_PDT_ONSiteBaseInfo>((t1, t2) =>
                          new object[] {
                                 JoinType.Inner, t1.OrgID == t2.OrgID && t1.ParentID == t2.PreviewFile && t2.ServiceID==objBookingOnline.ServiceID && t2.LangID==objBookingOnline.LangType

EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs

@@ -12,6 +12,8 @@ namespace Entity.ViewModels
         public string ServiceName { get; set; }
         public string ServicePictrue { get; set; }
         public string BookingDateFormat { get; set; }
+        public string ServiceDateSFormat { get; set; }
+        public string ServiceDateEFormat { get; set; }
 
         public View_PDT_ONSiteBaseInfo OnSiteService { get; set; }
         public SETB_SAL_Payment Payment { get; set; }