This commit is contained in:
2019-07-05 14:23:20 +00:00
parent b7accbacf1
commit 021199a2f4
3 changed files with 172 additions and 151 deletions

View File

@@ -93,6 +93,8 @@ namespace rockfishCore.Controllers
public IEnumerable<dtoNameIdChildrenItem> GetActiveSubsForSites([FromRoute] long id)
{
long EpochNow = DateUtil.NowAsEpoch();
var res = from c in _context.Site
.Where(c => c.CustomerId.Equals(id)).OrderBy(c => c.Name)
select new dtoNameIdChildrenItem
@@ -108,7 +110,7 @@ namespace rockfishCore.Controllers
{
var subs = from c in _context.Purchase
.Where(c => c.SiteId.Equals(child.id))
.Where(c => c.CancelDate == null)
.Where(c => c.CancelDate == null || c.CancelDate > EpochNow)
.OrderByDescending(c => c.PurchaseDate)
select new dtoNameIdItem
{