This commit is contained in:
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user