nelson.kai
/
ShowEasy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

Dev
berlin-tzen 2 years ago
parent
142cd271f4 f465b446f5
commit
d6f59eba2c
2 changed files with 31 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
  2. 42
      EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs

13
EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMail.cs
View File

@ -134,7 +134,7 @@ namespace EasyBL.WEBAPP.SYS
//cost
sb.Append("<h1 style =\"padding-bottom: 25px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
//sb.Append("$3,500 台幣");
sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
sb.Append("</h1>");
//前往付款按鈕 (連結要記得修改!)
//sb.Append("<a class=\"s-btn s-btn__primary\" href=\"https://www.showeasy.com\" target=\"_parent\" style=\"width: 88px;background: #f48800;border: 1px solid #ee9546;font-family: arial, sans-serif;font-size: 14px;line-height: 16px;color: #ffffff;text-align: center;text-decoration: none;padding: 12px 20px;display: block;border-radius: 16px;white-space: nowrap;\">");
@ -281,7 +281,8 @@ namespace EasyBL.WEBAPP.SYS
//cost
sb.Append("<h1 style =\"padding-bottom: 10px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
//sb.Append("$3,500 台幣");
sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
sb.Append("</h1>");
sb.Append("</td>");
sb.Append("</tr>");
@ -422,7 +423,7 @@ namespace EasyBL.WEBAPP.SYS
//cost
sb.Append("<h1 style =\"padding-bottom: 10px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
//sb.Append("$3,500 台幣");
sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
sb.Append("</h1>");
sb.Append("</td>");
sb.Append("</tr>");
@ -581,7 +582,7 @@ namespace EasyBL.WEBAPP.SYS
//cost
sb.Append("<h1 style =\"padding-bottom: 15px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
//sb.Append("$3,500 台幣");
sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###")+ " "+ BookingOnlineModel.CurrencyName);
sb.Append("</h1>");
sb.Append("</td>");
sb.Append("</tr>");
@ -860,7 +861,7 @@ namespace EasyBL.WEBAPP.SYS
//cost
sb.Append("<h1 style =\"padding-bottom: 10px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
//sb.Append("$3,500 台幣");
sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
sb.Append("</h1>");
sb.Append("</td>");
sb.Append("</tr>");
@ -994,7 +995,7 @@ namespace EasyBL.WEBAPP.SYS
//cost
sb.Append("<h1 style =\"padding-bottom: 15px;font-family: 'arial','sans-serif';font-weight: 500;font-size: 14px;line-height: 18px;color: #f48800;margin: 0 0 0 0;\">");
//sb.Append("$3,500 台幣");
sb.Append("$" + BookingOnlineModel.TotalPrice + " 台幣");
sb.Append("$" + int.Parse(BookingOnlineModel.TotalPrice.ToString()).ToString("#,###") + " " + BookingOnlineModel.CurrencyName);
sb.Append("</h1>");
//前往付款按鈕 (連結要記得修改!)
//sb.Append("<a class=\"s-btn s-btn__primary\" href=\"https://www.showeasy.com\" target=\"_parent\" style=\"width: 88px;background: #f48800;border: 1px solid #ee9546;font-family: arial, sans-serif;font-size: 14px;line-height: 16px;color: #ffffff;text-align: center;text-decoration: none;padding: 12px 20px;display: block;border-radius: 16px;white-space: nowrap;\">");

42
EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs
View File

@ -115,20 +115,22 @@ namespace EasyBL.WEBAPP.WSM
if (iRel > 0)
{
//確認 后給會員發信息講已確認
var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member>
((t1, t2, t3) =>
var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
((t1, t2, t3,t4) =>
new object[] {
JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
JoinType.Left, t1.OrgID == t3.OrgID && t1.BookingID == sBookingID && t1.Account == t3.Account
JoinType.Left, t1.OrgID == t3.OrgID && t1.BookingID == sBookingID && t1.Account == t3.Account,
JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency"
}
)
.Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
.Select((t1, t2, t3) => new View_SAL_BookingOnline
.Where((t1, t2, t3, t4) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
.Select((t1, t2, t3, t4) => new View_SAL_BookingOnline
{
BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
ServiceName = t2.ServiceName,
MemberName = t3.LastName+ t3.FirstName,
MemberEmail=t3.Email
MemberEmail=t3.Email,
CurrencyName = t4.ArgumentValue
})
.Single();
@ -299,20 +301,22 @@ namespace EasyBL.WEBAPP.WSM
if (iRel > 0 && (sSupplierStatus=="03" || sSupplierStatus == "04"))
{
//供應商處理中
var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member>
((t1, t2, t3) =>
var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
((t1, t2, t3,t4) =>
new object[] {
JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
JoinType.Left, t1.OrgID == t3.OrgID && t1.BookingID == sBookingID && t1.Account == t3.Account
JoinType.Left, t1.OrgID == t3.OrgID && t1.BookingID == sBookingID && t1.Account == t3.Account,
JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency"
}
)
.Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
.Select((t1, t2, t3) => new View_SAL_BookingOnline
.Where((t1, t2, t3,t4) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
.Select((t1, t2, t3,t4) => new View_SAL_BookingOnline
{
BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
ServiceName = t2.ServiceName,
MemberName = t3.LastName + t3.FirstName,
MemberEmail = t3.Email
MemberEmail = t3.Email,
CurrencyName = t4.ArgumentValue
})
.Single();
@ -472,20 +476,22 @@ namespace EasyBL.WEBAPP.WSM
//訂單狀態進行中 付款狀態已付款時
if (iRel > 0 && (oNewEntity.PaymentStatus == "03" && oNewEntity.BookingStatus=="02")) {
var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member>
((t1, t2, t3) =>
var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
((t1, t2, t3,t4) =>
new object[] {
JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
JoinType.Left, t1.OrgID == t3.OrgID && t1.BookingID == sBookingID && t1.Account == t3.Account
JoinType.Left, t1.OrgID == t3.OrgID && t1.BookingID == sBookingID && t1.Account == t3.Account,
JoinType.Left, t1.OrgID == t4.OrgID && t1.CurrencyID == t4.ArgumentID && t4.ArgumentClassID=="Currency"
}
)
.Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
.Select((t1, t2, t3) => new View_SAL_BookingOnline
.Where((t1, t2, t3, t4) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
.Select((t1, t2, t3, t4) => new View_SAL_BookingOnline
{
BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
ServiceName = t2.ServiceName,
MemberName = t3.LastName + t3.FirstName,
MemberEmail = t3.Email
MemberEmail = t3.Email,
CurrencyName = t4.ArgumentValue
})
.Single();
if (objBookingOnline != null)

Write Preview
Loading…
Cancel
Save