This commit is contained in:
@@ -1003,12 +1003,13 @@ namespace AyaNova.Biz
|
||||
|
||||
//popup 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, CustomerViz = x.Name }).FirstOrDefaultAsync();
|
||||
var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.PopUpNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync();
|
||||
if (!string.IsNullOrWhiteSpace(custInfo.AlertViz))
|
||||
{
|
||||
o.AlertViz = $"{await Translate("Customer")}\n{custInfo.AlertViz}\n\n";
|
||||
}
|
||||
|
||||
|
||||
o.CustomerTechNotesViz = custInfo.TechNotes;
|
||||
o.CustomerViz = custInfo.CustomerViz;
|
||||
|
||||
if (o.ProjectId != null)
|
||||
@@ -4116,7 +4117,7 @@ namespace AyaNova.Biz
|
||||
return;//this should never happen but this is insurance in case it does
|
||||
|
||||
o.PartViz = part.PartNumber;
|
||||
|
||||
o.PartNameViz=part.Name;
|
||||
o.UpcViz = part.UPC;
|
||||
|
||||
TaxCode Tax = null;
|
||||
|
||||
@@ -32,6 +32,10 @@ namespace AyaNova.Models
|
||||
public long CustomerId { get; set; }
|
||||
[NotMapped]
|
||||
public string CustomerViz { get; set; }
|
||||
|
||||
[NotMapped]
|
||||
public string CustomerTechNotesViz { get; set; }
|
||||
|
||||
public long? ProjectId { get; set; }
|
||||
[NotMapped]
|
||||
public string ProjectViz { get; set; }
|
||||
|
||||
@@ -18,6 +18,8 @@ namespace AyaNova.Models
|
||||
[NotMapped]
|
||||
public string PartViz { get; set; }
|
||||
[NotMapped]
|
||||
public string PartNameViz { get; set; }
|
||||
[NotMapped]
|
||||
public string UpcViz { get; set; }
|
||||
[Required]
|
||||
public long PartWarehouseId { get; set; }
|
||||
@@ -51,7 +53,7 @@ namespace AyaNova.Models
|
||||
[NotMapped]
|
||||
public decimal LineTotalViz { get; set; }//line total netViz + taxes
|
||||
|
||||
//workaround for notification
|
||||
//workaround for notification
|
||||
[NotMapped, JsonIgnore]
|
||||
public List<string> Tags { get; set; } = new List<string>();
|
||||
[NotMapped, JsonIgnore]
|
||||
|
||||
Reference in New Issue
Block a user