diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs index f20dcda..b2f3597 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs @@ -1199,27 +1199,13 @@ namespace EasyBL.WEBAPP.ShowEasy .Select((t1) => new View_SAL_BookingOnline { BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID), - //ServiceID = t1.ServiceID, - //ServiceNo = t1.ServiceNo, - //ServiceName = t1.ServiceName, - //ConfirmDays = t2.ArgumentValue, - //ExhibitionID = t1.ExhibitionID, - //CancelPolicy = t1.CancelPolicy, - //Features = t1.Features, - //Details = t1.Details, - //MinPrice = t1.MinPrice, - //CurrencyID = t1.CurrencyID, - //ExpenseDescription = "" }).Single(); - - if (objBookingOnline != null) { - - - //ServicePictrue - - var objFiles = db.Queryable((t1, t2) => + if (objBookingOnline.BookingDate!=null) { + objBookingOnline.BookingDateFormat = Convert.ToDateTime(objBookingOnline.BookingDate).ToString("yyyy/MM/dd HH:mm"); + } + var objFiles = db.Queryable((t1, t2) => new object[] { JoinType.Inner, t1.OrgID == t2.OrgID && t1.ParentID == t2.PreviewFile && t2.ServiceID==objBookingOnline.ServiceID && t2.LangID==objBookingOnline.LangType diff --git a/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs b/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs index fc14f6e..dd3802c 100644 --- a/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs +++ b/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs @@ -11,6 +11,10 @@ namespace Entity.ViewModels public string SupplierName { get; set; } public string ServiceName { get; set; } public string ServicePictrue { get; set; } + public string BookingDateFormat { get; set; } + + + //public string MemberName { get; set; } //public string MemberName { get; set; } }