This commit is contained in:
2022-03-08 15:11:47 +00:00
parent a96a005977
commit 5e38d5bd0f

View File

@@ -193,8 +193,9 @@ namespace AyaNova.Biz
} }
var CustomerName = await ct.Customer.AsNoTracking().Where(x => x.Id == csr.CustomerId).Select(x => x.Name).FirstOrDefaultAsync(); var CustomerName = await ct.Customer.AsNoTracking().Where(x => x.Id == csr.CustomerId).Select(x => x.Name).FirstOrDefaultAsync();
Subject = SetCSRTokens(Subject, csr, CustomerName); var UserName = await ct.User.AsNoTracking().Where(x => x.Id == csr.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync();
Body = SetCSRTokens(Body, csr, CustomerName); Subject = SetCSRTokens(Subject, csr, CustomerName, UserName);
Body = SetCSRTokens(Body, csr, CustomerName, UserName);
} }
break; break;
} }
@@ -360,7 +361,7 @@ namespace AyaNova.Biz
} }
private static string SetCSRTokens(string TheField, CustomerServiceRequest csr, string CustomerName) private static string SetCSRTokens(string TheField, CustomerServiceRequest csr, string CustomerName, string requestedBy)
{ {
MatchCollection matches = Regex.Matches(TheField, @"\{{(.|\n)*?\}}", RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); MatchCollection matches = Regex.Matches(TheField, @"\{{(.|\n)*?\}}", RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
//{{.*?}} //{{.*?}}
@@ -371,22 +372,15 @@ namespace AyaNova.Biz
case "{{Customer}}": case "{{Customer}}":
TheField = TheField.Replace(KeyMatch.Value, CustomerName); TheField = TheField.Replace(KeyMatch.Value, CustomerName);
break; break;
case "{{QuoteIntroduction}}": case "{{CustomerServiceRequestRequestedBy}}":
TheField = TheField.Replace(KeyMatch.Value, csr.Introduction); TheField = TheField.Replace(KeyMatch.Value, requestedBy);
break; break;
case "{{WorkOrderCustomerContactName}}": case "{{CustomerServiceRequestCustomerReferenceNumber}}":
TheField = TheField.Replace(KeyMatch.Value, csr.CustomerContactName);
break;
case "{{WorkOrderCustomerReferenceNumber}}":
TheField = TheField.Replace(KeyMatch.Value, csr.CustomerReferenceNumber); TheField = TheField.Replace(KeyMatch.Value, csr.CustomerReferenceNumber);
break; break;
case "{{WorkOrderSummary}}": case "{{CustomerServiceRequestTitle}}":
TheField = TheField.Replace(KeyMatch.Value, csr.Notes); TheField = TheField.Replace(KeyMatch.Value, csr.Name);
break; break;
case "{{QuoteSerialNumber}}":
TheField = TheField.Replace(KeyMatch.Value, csr.Serial.ToString());
break;
} }
} }