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

Browse Source
This commit is contained in:
John Cardinal
2021-07-07 19:30:07 +00:00
parent 01f2a5bbfc
commit 416f5cd33c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1003,12 +1003,13 @@ namespace AyaNova.Biz
//popup Alert notes //popup Alert notes
//Customer notes first then others below //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)) if (!string.IsNullOrWhiteSpace(custInfo.AlertViz))
{ {
o.AlertViz = $"{await Translate("Customer")}\n{custInfo.AlertViz}\n\n"; o.AlertViz = $"{await Translate("Customer")}\n{custInfo.AlertViz}\n\n";
} }
o.CustomerTechNotesViz = custInfo.TechNotes;
o.CustomerViz = custInfo.CustomerViz; o.CustomerViz = custInfo.CustomerViz;
if (o.ProjectId != null) if (o.ProjectId != null)
@@ -4116,7 +4117,7 @@ namespace AyaNova.Biz
return;//this should never happen but this is insurance in case it does return;//this should never happen but this is insurance in case it does
o.PartViz = part.PartNumber; o.PartViz = part.PartNumber;
o.PartNameViz=part.Name;
o.UpcViz = part.UPC; o.UpcViz = part.UPC;
TaxCode Tax = null; TaxCode Tax = null;

4
server/AyaNova/models/WorkOrder.cs
View File

@@ -32,6 +32,10 @@ namespace AyaNova.Models
public long CustomerId { get; set; } public long CustomerId { get; set; }
[NotMapped] [NotMapped]
public string CustomerViz { get; set; } public string CustomerViz { get; set; }
[NotMapped]
public string CustomerTechNotesViz { get; set; }
public long? ProjectId { get; set; } public long? ProjectId { get; set; }
[NotMapped] [NotMapped]
public string ProjectViz { get; set; } public string ProjectViz { get; set; }

4
server/AyaNova/models/WorkOrderItemPart.cs
View File

@@ -18,6 +18,8 @@ namespace AyaNova.Models
[NotMapped] [NotMapped]
public string PartViz { get; set; } public string PartViz { get; set; }
[NotMapped] [NotMapped]
public string PartNameViz { get; set; }
[NotMapped]
public string UpcViz { get; set; } public string UpcViz { get; set; }
[Required] [Required]
public long PartWarehouseId { get; set; } public long PartWarehouseId { get; set; }
@@ -51,7 +53,7 @@ namespace AyaNova.Models
[NotMapped] [NotMapped]
public decimal LineTotalViz { get; set; }//line total netViz + taxes public decimal LineTotalViz { get; set; }//line total netViz + taxes
//workaround for notification //workaround for notification
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]