|
@@ -859,17 +859,18 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
return _result;
|
|
|
}
|
|
|
|
|
|
- string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CardPriceCurrency,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,hr.DetermineNo,
|
|
|
- hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,hr.CheckType,
|
|
|
- hr.RoomExplanation,hr.Remark As HotelRemark,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
|
|
|
- hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,hr.CardPrice,
|
|
|
- hr.Isoppay,hr.BreakfastPrice,hr.BreakfastCurrency,hr.GovernmentRent,hr.GovernmentRentCurrency,hr.CityTax,
|
|
|
- hr.CityTaxCurrency,ccp.PayDId,ccp.ConsumptionPatterns,ccp.ConsumptionDate,ccp.PayMoney,ccp.PaymentCurrency,
|
|
|
- ccp.OtherBankName,ccp.OtherSideNo,ccp.OtherSideName,ccp.Payee,ccp.OrbitalPrivateTransfer,ccp.Remark As CcpRemark
|
|
|
- From Grp_HotelReservations hr
|
|
|
- Inner Join Grp_CreditCardPayment ccp On hr.DiId = ccp.DIId And hr.Id = ccp.CId
|
|
|
- And ccp.CTable = 76
|
|
|
- Where hr.IsDel = 0 And ccp.IsDel = 0 And hr.Id = {0}", id);
|
|
|
+ string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CardPriceCurrency,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,
|
|
|
+ hr.DetermineNo,hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,
|
|
|
+ hr.CheckType,hr.RoomExplanation,hr.Remark As HotelRemark,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
|
|
|
+ hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,hr.CardPrice,
|
|
|
+ hr.Isoppay,hr.BreakfastPrice,hr.BreakfastCurrency,hr.GovernmentRent,hr.GovernmentRentCurrency,hr.CityTax,
|
|
|
+ hr.CityTaxCurrency,ccp.PayDId,ccp.ConsumptionPatterns,ccp.ConsumptionDate,ccp.PayMoney,ccp.PaymentCurrency,
|
|
|
+ ccp.BankNo,ccp.CardholderName,ccp.OtherBankName,ccp.OtherSideNo,ccp.OtherSideName,ccp.Payee,
|
|
|
+ ccp.OrbitalPrivateTransfer,ccp.Remark As CcpRemark
|
|
|
+ From Grp_HotelReservations hr
|
|
|
+ Inner Join Grp_CreditCardPayment ccp On hr.DiId = ccp.DIId And hr.Id = ccp.CId
|
|
|
+ And ccp.CTable = 76
|
|
|
+ Where hr.IsDel = 0 And ccp.IsDel = 0 And hr.Id = {0}", id);
|
|
|
|
|
|
if (portType == 1 || portType == 2 || portType == 3)
|
|
|
{
|