diff --git a/Back/Services/servUser.cs b/Back/Services/servUser.cs index 3c32e3a..1e2e102 100644 --- a/Back/Services/servUser.cs +++ b/Back/Services/servUser.cs @@ -206,7 +206,7 @@ namespace Back.Services DashBoardDTO request = new DashBoardDTO(); var period = await _RepoPermissionPeriod .Get(w => w.CompanyID == user.RolUsers.First().CompanyID && (!w.IsLocked.HasValue || !w.IsLocked.Value)) - .Include(inc=>inc.CalculationType) + .Include(inc => inc.CalculationType) .Include(inc => inc.Permission) .ToListAsync(); foreach (var item in period) @@ -255,17 +255,17 @@ namespace Back.Services #region LastActivitySevice //invoice var lastinv = await _RepoInvoice.Get(w => w.CompanyID == user.RolUsers.First().CompanyID && !w.IsDeleted) - .Include(inc=>inc.Customer) - .Select(s=>new LastActivitySevice + .Include(inc => inc.Customer) + .Select(s => new LastActivitySevice { ID = s.ID, - Date=s.InvoiceDate.ShamciToFormatShamci(), - Name=s.Customer.FullName, - PermissionID=3, - TypeTitle=s.invoiceType.GetEnumDisplayName() + Date = s.InvoiceDate.ShamciToFormatShamci(), + Name = s.Customer.FullName, + PermissionID = 3, + TypeTitle = s.invoiceType.GetEnumDisplayName() }) .OrderByDescending(o => o.ID).FirstOrDefaultAsync(); - if (lastinv!=null) + if (lastinv != null) request.lastActivitiesSevices.Add(lastinv); //cod var lastcod = await _RepoCODItem.Get(w => w.CompanyID == user.RolUsers.First().CompanyID && !w.IsDeleted) @@ -295,17 +295,29 @@ namespace Back.Services request.lastActivitiesSevices.Add(lastcus); #endregion - request.MostInvoicedProduct = await _invoiceitemRepo.Get(w => w.invoice.CompanyID == user.RolUsers.First().CompanyID - && (w.invoice.invoiceType==InvoiceType.Sale || w.invoice.invoiceType == InvoiceType.BackFrmSale - || w.invoice.invoiceType == InvoiceType.Repair) && !w.invoice.BillReference.HasValue) - .Include(inc=>inc.cODItem) - .GroupBy(g => g.CODID) - .Select(s => new IdNameByCount{ - ID= s.Key, - Title=s.Select(s=>s.sstt).First(), - count =Convert.ToInt32(s.Sum(s => s.am)) - }).OrderByDescending(o => o.count) + + try + { + var MostInvoicedProduct = await _invoiceitemRepo.Get(w => w.invoice.CompanyID == user.RolUsers.First().CompanyID + && (w.invoice.invoiceType == InvoiceType.Sale || w.invoice.invoiceType == InvoiceType.BackFrmSale + || w.invoice.invoiceType == InvoiceType.Repair) && !w.invoice.BillReference.HasValue + ) + //.Include(inc => inc.cODItem) + // .GroupBy(g => g.CODID) + // .Select(s => new IdNameByCount + // { + // ID = s.Key, + // Title = s.Select(s => s.sstt).First(), + // count = Convert.ToInt32(s.Sum(s => s.am)) + // }).OrderByDescending(o => o.count) .ToListAsync(); + } + catch (Exception ex) + { + + throw; + } + return request; } @@ -337,10 +349,10 @@ namespace Back.Services return false; - + if (user != null) { - using var transaction =await _RepoCompany._dbContext.Database.BeginTransactionAsync(); + using var transaction = await _RepoCompany._dbContext.Database.BeginTransactionAsync(); var company = user.RolUsers.First().Company; company.Mobile = newUserName; if (await _RepoCompany.UpdateAsync(company)) @@ -352,12 +364,12 @@ namespace Back.Services await transaction.CommitAsync(); return true; } - else + else { await transaction.RollbackAsync(); return false; } - + } // return Ok(await _servCompany.AddORUpdateCompanyBoolResult(company)); }