some fixes

Author: Dhyan

Bulky.DataAccess/Repository/Repository.cs

@@ -42,10 +42,9 @@ public T Get(Expression<Func<T, bool>> filter, string? includeProperties = null,
             query = query.Where(filter);
             if (!string.IsNullOrEmpty(includeProperties))
             {
-                foreach (var includeProp in includeProperties
-                    .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                 foreach (var includeProperty in includeProperties.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                 {
-                    query = query.Include(includeProp);
+                    query = query.Include(includeProperty.Trim());
                 }
             }
             return query.FirstOrDefault();

BulkyWeb/Areas/Admin/Controllers/UserController.cs

@@ -19,9 +19,9 @@ public class UserController : Controller
 
         private readonly IUnitOfWork _unitOfWork;
         private readonly UserManager<IdentityUser> _userManager;
-        private readonly RoleManager<IdentityUser> _roleManager;
+        private readonly RoleManager<IdentityRole> _roleManager;
 
-        public UserController(IUnitOfWork unitOfWork, UserManager<IdentityUser> userManager, RoleManager<IdentityUser> roleManager)
+        public UserController(IUnitOfWork unitOfWork, UserManager<IdentityUser> userManager, RoleManager<IdentityRole> roleManager)
         {
             _userManager = userManager;
             _unitOfWork = unitOfWork;
@@ -38,9 +38,10 @@ public IActionResult RoleManagement(string userId)
             RoleManagementVM roleManagementVM = new()
             {
                 ApplicationUser = _unitOfWork.ApplicationUserRepository.Get(u => u.Id == userId, includeProperties:"Company"),
-                RoleList = _roleManager.Roles.Select(i => new SelectListItem{
+                RoleList = _roleManager.Roles.Select(i => new SelectListItem
+                {   
                     Text = i.Name,
-                    Value = i.Name.ToString(),
+                    Value = i.Name
                 }),
                 CompanyList  = _unitOfWork.CompanyRepository.GetAll().Select(i => new SelectListItem
                 {
@@ -61,11 +62,11 @@ public IActionResult RoleManagement(RoleManagementVM roleManagementVM)
 
             string oldRole = _userManager.GetRolesAsync(_unitOfWork.ApplicationUserRepository.Get(u => u.Id == roleManagementVM.ApplicationUser.Id)).GetAwaiter().GetResult().FirstOrDefault();
 
-
+            ApplicationUser applicationUser = _unitOfWork.ApplicationUserRepository.Get(u => u.Id == roleManagementVM.ApplicationUser.Id);
             if (roleManagementVM.ApplicationUser.Role != oldRole)
             {
                 //Role is updated
-                ApplicationUser applicationUser = _unitOfWork.ApplicationUserRepository.Get(u => u.Id == roleManagementVM.ApplicationUser.Id);
+               
                 if(roleManagementVM.ApplicationUser.Role == SD.Role_Company)
                 {
                     applicationUser.CompanyId = roleManagementVM.ApplicationUser.CompanyId;
@@ -79,6 +80,14 @@ public IActionResult RoleManagement(RoleManagementVM roleManagementVM)
                 _userManager.RemoveFromRoleAsync(applicationUser, oldRole).GetAwaiter().GetResult();
                 _userManager.AddToRoleAsync(applicationUser, roleManagementVM.ApplicationUser.Role).GetAwaiter().GetResult() ;
             }
+            else
+            {
+                if(oldRole == SD.Role_Company || roleManagementVM.ApplicationUser.CompanyId != applicationUser.CompanyId) {
+                    applicationUser.CompanyId = roleManagementVM.ApplicationUser.CompanyId;
+                    _unitOfWork.ApplicationUserRepository.Update(applicationUser);
+                    _unitOfWork.Save();
+                }
+            }
 
             TempData["Success"] = "Role Updated.";
 
@@ -93,15 +102,11 @@ public IActionResult RoleManagement(RoleManagementVM roleManagementVM)
         [HttpGet]
         public IActionResult GetAll()
         {
-            List<ApplicationUser> userList = _db.ApplicationUsers.Include("Company").ToList();
-
-            var Roles = _db.Roles.ToList();
-            var userRole = _db.UserRoles.ToList();
+            List<ApplicationUser> userList = _unitOfWork.ApplicationUserRepository.GetAll(includeProperties: "Company").ToList();
 
             foreach (var user in userList)
             {
-                var roleId = userRole.FirstOrDefault(u => u.UserId == user.Id).RoleId;
-                user.Role = Roles.FirstOrDefault(u => u.Id == roleId).Name;
+                user.Role = _userManager.GetRolesAsync(user).GetAwaiter().GetResult().FirstOrDefault();
 
                 if(user.Company == null)
                 {
@@ -117,7 +122,7 @@ public IActionResult GetAll()
         [HttpPost]
         public IActionResult LockUnlock([FromBody] string id)
         {
-            var userObj = _db.ApplicationUsers.FirstOrDefault(u=> u.Id == id);
+            var userObj = _unitOfWork.ApplicationUserRepository.Get(u=> u.Id == id);
             if (userObj == null)
             {
                 return Json(new { success = false, message = "Error while locking/unlocking" });
@@ -131,7 +136,8 @@ public IActionResult LockUnlock([FromBody] string id)
                 userObj.LockoutEnd = DateTime.Now.AddYears(1000);
             }
 
-            _db.SaveChanges();
+           _unitOfWork.ApplicationUserRepository.Update(userObj);
+            _unitOfWork.Save();
             return Json(new { success = true, message = "Opration successfully" });
         }
 

BulkyWeb/Areas/Customer/Controllers/CartController.cs

@@ -169,7 +169,7 @@ public IActionResult SummaryPOST()
             {
                 //regulor customer user
                 //add strip logic
-                var domain = Request.Scheme + "//:" + Request.Host.Value + "/";
+                var domain = Request.Scheme + "://" + Request.Host.Value + "/";
                 var options = new SessionCreateOptions
                 { 
 					SuccessUrl = domain + $"customer/cart/OrderConformation?id={shoppingCartVM.OrderHeader.Id}",

BulkyWeb/Areas/Customer/Controllers/HomeController.cs

@@ -30,12 +30,16 @@ public IActionResult Index()
 
         public IActionResult Details(int id)
         {
-            ShoppingCart shoppingCart = new()
+            ShoppingCart shoppingCart = new();
+            if (shoppingCart.Product == null)
             {
-                Product = _unitOfWork.ProductRepository.Get(u => u.Id == id, includeProperties: "Category,ProductImages"),
-                Count = 1,
-                ProductId = id
-            };
+                shoppingCart = new()
+                {
+                    Product = _unitOfWork.ProductRepository.Get(u => u.Id == id, includeProperties: "ProductImages,Category"),
+                    Count = 1,
+                    ProductId = id
+                };
+            }
             return View(shoppingCart);
 
         }

BulkyWeb/wwwroot/js/user.js

@@ -41,7 +41,7 @@ function LoadDataTable() {
                      </div>`
                     }
                 },
-                "width": "25%"
+                "width": "30%"
 
             }
         ]