anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#129 bug fixes

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-06-05 16:47:21 +04:30
parent 1807d1fa4d
commit 76326cb26f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RMuseum/Services/Implementation/DonationService.cs
View File

@ -56,7 +56,7 @@ namespace RMuseum.Services.Implementation
var expenses =
await _context.GanjoorExpenses
.Include(e => e.DonationExpenditures)
.Where(e => e.Unit == d.Unit && (e.Amount - e.DonationExpenditures.DefaultIfEmpty().Sum(x => x.Amount)) > 0)
.Where(e => e.Unit == d.Unit && (e.Amount - e.DonationExpenditures.Sum(x => x.Amount)) > 0)
.OrderBy(e => e.Id)
.ToListAsync();
@ -64,7 +64,7 @@ namespace RMuseum.Services.Implementation
{
if (d.Remaining <= 0)
break;
var remaining = expense.Amount - expense.DonationExpenditures.DefaultIfEmpty().Sum(x => x.Amount);
var remaining = expense.Amount - expense.DonationExpenditures.Sum(x => x.Amount);
if(remaining > d.Remaining)
{
remaining = d.Remaining;
@ -406,7 +406,7 @@ namespace RMuseum.Services.Implementation
var expenses =
await _context.GanjoorExpenses
.Include(e => e.DonationExpenditures)
.Where(e => !string.IsNullOrEmpty(e.Unit) && (e.Amount - e.DonationExpenditures.DefaultIfEmpty().Sum(x => x.Amount)) > 0)
.Where(e => !string.IsNullOrEmpty(e.Unit) && (e.Amount - e.DonationExpenditures.Sum(x => x.Amount)) > 0)
.OrderBy(e => e.Id)
.ToListAsync();
if(expenses.Count > 0)