From b733836224e5efbe8efc22001b9f31a728dcd66f Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Thu, 20 Jun 2024 19:10:38 +0330 Subject: [PATCH] ... --- Back/Services/servUser.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Back/Services/servUser.cs b/Back/Services/servUser.cs index fd4661a..ad7c9d4 100644 --- a/Back/Services/servUser.cs +++ b/Back/Services/servUser.cs @@ -299,10 +299,10 @@ namespace Back.Services for (int i = -7; i < 1; i++) dt.Add(DateTime.Now.AddDays(i).ConvertMiladiToShamsi()); - request.MostInvoicedProduct = await _invoiceitemRepo.Get(w => w.invoice.CompanyID == user.RolUsers.First().CompanyID + request.MostInvoicedProduct = await _invoiceitemRepo.Get(w => w.invoice.CompanyID == user.RolUsers.First().CompanyID && !w.invoice.IsDeleted && (w.invoice.invoiceType == InvoiceType.Sale || w.invoice.invoiceType == InvoiceType.BackFrmSale || w.invoice.invoiceType == InvoiceType.Repair) && !w.invoice.BillReference.HasValue - && (dt.Contains(w.invoice.Cdate))) + && (dt.Contains(w.invoice.InvoiceDate))) .Include(inc => inc.cODItem) .GroupBy(g => g.CODID) .Select(s => new IdNameByCount @@ -313,10 +313,10 @@ namespace Back.Services }).OrderByDescending(o => o.count) .ToListAsync(); - request.MostInvoicedCustomer =await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID + request.MostInvoicedCustomer =await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID && !w.IsDeleted && (w.invoiceType == InvoiceType.Sale || w.invoiceType == InvoiceType.BackFrmSale || w.invoiceType == InvoiceType.Repair) && !w.BillReference.HasValue - && (dt.Contains(w.Cdate))) + && (dt.Contains(w.InvoiceDate))) .Include(inc => inc.Customer) .GroupBy(g => g.CustomerID) .Select(s => new IdNameByCount @@ -330,9 +330,9 @@ namespace Back.Services var cdate = DateTime.Now.ConvertMiladiToShamsiAndGetYearMonth(); - var sale = await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID + var sale = await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID && !w.IsDeleted && (w.invoiceType == InvoiceType.Sale || w.invoiceType == InvoiceType.BackFrmSale - || w.invoiceType == InvoiceType.Repair) && !w.BillReference.HasValue && w.Cdate.StartsWith(cdate)) + || w.invoiceType == InvoiceType.Repair) && !w.BillReference.HasValue && w.InvoiceDate.StartsWith(cdate)) .Include(inc => inc.invoiceDetails) .ThenInclude(inc => inc.cODItem) .ThenInclude(inc => inc.CODUnit) @@ -343,9 +343,9 @@ namespace Back.Services cdate = DateTime.Now.AddMonths(-1).ConvertMiladiToShamsiAndGetYearMonth(); - var lastonthsale = await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID + var lastonthsale = await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID && !w.IsDeleted && (w.invoiceType == InvoiceType.Sale || w.invoiceType == InvoiceType.BackFrmSale - || w.invoiceType == InvoiceType.Repair) && !w.BillReference.HasValue && w.Cdate.StartsWith(cdate)) + || w.invoiceType == InvoiceType.Repair) && !w.BillReference.HasValue && w.InvoiceDate.StartsWith(cdate)) .Include(inc => inc.invoiceDetails) .ThenInclude(inc => inc.cODItem) .ThenInclude(inc => inc.CODUnit)