admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 3976

Browse Source
This commit is contained in:
John Cardinal
2021-09-24 23:42:59 +00:00
parent 542926b748
commit ed78e94af9
19 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/biz/CustomerBiz.cs
View File

@@ -222,7 +222,7 @@ namespace AyaNova.Biz
.AddText(obj.Wiki)
.AddText(obj.Tags)
.AddText(obj.WebAddress)
.AddText(obj.PopUpNotes)
.AddText(obj.AlertNotes)
.AddText(obj.TechNotes)
.AddText(obj.AccountNumber)
.AddText(obj.Phone1)

4
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -139,7 +139,7 @@ namespace AyaNova.Biz
//l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "CustomerNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "CustomerTechNotes", FieldKey = "TechNotes" });
l.Add(new FormField { TKey = "AlertNotes", FieldKey = "PopUpNotes" });
l.Add(new FormField { TKey = "AlertNotes", FieldKey = "AlertNotes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
@@ -779,7 +779,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "VendorContact", FieldKey = "Contact" });
l.Add(new FormField { TKey = "VendorNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "VendorContactNotes", FieldKey = "ContactNotes" });
l.Add(new FormField { TKey = "AlertNotes", FieldKey = "PopUpNotes" });
l.Add(new FormField { TKey = "AlertNotes", FieldKey = "AlertNotes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });

4
server/AyaNova/biz/PMBiz.cs
View File

@@ -859,9 +859,9 @@ namespace AyaNova.Biz
await ItemPopulateVizFields(v, populateForReporting);
}
//popup Alert notes
//Alert notes
//Customer notes first then others below
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.PopUpNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.AlertNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
if (!string.IsNullOrWhiteSpace(custInfo.AlertViz))
{
o.AlertViz = $"{await Translate("Customer")} - {await Translate("AlertNotes")}\n{custInfo.AlertViz}\n\n";

3
server/AyaNova/biz/PurchaseOrderBiz.cs
View File

@@ -142,6 +142,7 @@ namespace AyaNova.Biz
var vnd = await ct.Vendor.AsNoTracking().Where(x => x.Id == po.VendorId).FirstOrDefaultAsync();
po.VendorViz = vnd.Name;
po.VendorAlertNotesViz = vnd.AlertNotes;
if (forReporting)
{
po.VendorAddressViz = vnd.Address;
@@ -164,7 +165,7 @@ namespace AyaNova.Biz
po.VendorContactViz = vnd.Contact;
po.VendorContactNotesViz = vnd.ContactNotes;
po.VendorPopUpNotesViz = vnd.PopUpNotes;
po.VendorAccountNumberViz = vnd.AccountNumber;
}

4
server/AyaNova/biz/QuoteBiz.cs
View File

@@ -838,9 +838,9 @@ namespace AyaNova.Biz
await ItemPopulateVizFields(v, populateForReporting);
}
//popup Alert notes
//Alert notes
//Customer notes first then others below
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.PopUpNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.AlertNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
if (!string.IsNullOrWhiteSpace(custInfo.AlertViz))
{
o.AlertViz = $"{await Translate("Customer")} - {await Translate("AlertNotes")}\n{custInfo.AlertViz}\n\n";

2
server/AyaNova/biz/VendorBiz.cs
View File

@@ -206,7 +206,7 @@ namespace AyaNova.Biz
.AddText(obj.WebAddress)
.AddText(obj.Contact)
.AddText(obj.ContactNotes)
.AddText(obj.PopUpNotes)
.AddText(obj.AlertNotes)
.AddText(obj.AccountNumber)
.AddText(obj.Phone1)
.AddText(obj.Phone2)

4
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -953,9 +953,9 @@ namespace AyaNova.Biz
await ItemPopulateVizFields(v, populateForReporting);
}
//popup Alert notes
//Alert notes
//Customer notes first then others below
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.PopUpNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.AlertNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
if (!string.IsNullOrWhiteSpace(custInfo.AlertViz))
{
o.AlertViz = $"{await Translate("Customer")} - {await Translate("AlertNotes")}\n{custInfo.AlertViz}\n\n";