From 045c078e267cb2fa9f741c13d79c61b5f8fb40c2 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 26 May 2021 23:10:00 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 32 ++++++++++++++++-------------- server/AyaNova/models/LoanUnit.cs | 13 ++++++++++++ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 77f77c39..8e351d93 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2539,15 +2539,6 @@ namespace AyaNova.Biz if (Tax != null) o.TaxCodeViz = Tax.Name; - o.PriceViz = 0; - if (loanUnit != null) - { - switch(o.Rate){ - case LoanUnitRateUnit.None: - o.PriceViz=0; - break; - } - } //manual price overrides anything if (o.PriceOverride != null) @@ -2626,7 +2617,7 @@ namespace AyaNova.Biz o.LineTotalViz = o.NetViz + o.TaxAViz + o.TaxBViz; } - //////////////////////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////////////////////// //BIZ ACTIONS // // @@ -2645,7 +2636,7 @@ namespace AyaNova.Biz if (ayaEvent == AyaEvent.Modified) { //If it wasn't a complete part change there is no need to set pricing - if (newObj.LoanUnitId == oldObj.LoanUnitId && newObj.Rate==oldObj.Rate) + if (newObj.LoanUnitId == oldObj.LoanUnitId && newObj.Rate == oldObj.Rate) { SnapshotPricing = false; } @@ -2656,14 +2647,25 @@ namespace AyaNova.Biz if (SnapshotPricing) { //default in case nothing to apply - newObj.Charges = 0; + newObj.Cost = 0; + newObj.ListPrice = 0; LoanUnit loanUnit = await ct.LoanUnit.AsNoTracking().FirstOrDefaultAsync(x => x.Id == newObj.LoanUnitId); if (loanUnit != null) - { - newObj.Charges = s.Cost; - newObj.ListPrice = s.Retail; + { + + switch (newObj.Rate) + { + case LoanUnitRateUnit.None: + break; + case LoanUnitRateUnit.Hours: + newObj.Cost=loanUnit. + break; + + } + + } } } diff --git a/server/AyaNova/models/LoanUnit.cs b/server/AyaNova/models/LoanUnit.cs index 44388ae2..d437b090 100644 --- a/server/AyaNova/models/LoanUnit.cs +++ b/server/AyaNova/models/LoanUnit.cs @@ -44,6 +44,19 @@ namespace AyaNova.Models [Required] public decimal RateYear { get; set; } + [Required] + public decimal RateHourCost { get; set; } + [Required] + public decimal RateHalfDayCost { get; set; } + [Required] + public decimal RateDayCost { get; set; } + [Required] + public decimal RateWeekCost { get; set; } + [Required] + public decimal RateMonthCost { get; set; } + [Required] + public decimal RateYearCost { get; set; } + [Required] public LoanUnitRateUnit DefaultRate { get; set; }