Skip to content

fixed admin area customer-company mapping popup irrelevant users #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Artur984 wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

fixed admin area customer-company mapping popup irrelevant users #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/Presentation/Nop.Web/Areas/Admin/Factories/CompanyModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,20 +218,34 @@ public virtual async Task<AddCustomerToCompanyListModel> PrepareAddCustomerToCom
//get customers
var customers = await _customerService.GetAllCustomersAsync(
email: searchModel.SearchCustomerEmail, customerRoleIds: customerRoleIds,
pageIndex: searchModel.Page - 1, pageSize: searchModel.PageSize);
pageIndex: 0);

IPagedList<Customer> filteredCustomers = new PagedList<Customer>(new List<Customer>(), searchModel.Page - 1, searchModel.PageSize, customers.TotalCount);
var filteredCustomersCount = 0;
IPagedList<Customer> filteredCustomers = new PagedList<Customer>(new List<Customer>(), 0, int.MaxValue, customers.TotalCount);
foreach (var customer in customers)
{
var companyCustomerMapping = await _companyService.GetCompanyCustomersByCustomerIdAsync(customer.Id);
if (companyCustomerMapping.Count == 0)
{
filteredCustomers.Add(customer);
filteredCustomersCount++;
}
}

IPagedList<Customer> filteredFilteredCustomers = new PagedList<Customer>(new List<Customer>(), searchModel.Page - 1, searchModel.PageSize, filteredCustomersCount);
int count = (searchModel.Page - 1) * searchModel.PageSize;
for (var i = count; i < searchModel.Page * searchModel.PageSize; i++)
{
if (i == filteredCustomersCount)
break;

filteredFilteredCustomers.Add(filteredCustomers[i]);
}

//prepare grid model
var model = await new AddCustomerToCompanyListModel().PrepareToGridAsync(searchModel, filteredCustomers, () =>
var model = await new AddCustomerToCompanyListModel().PrepareToGridAsync(searchModel, filteredFilteredCustomers, () =>
{
return filteredCustomers.SelectAwait(async customer =>
return filteredFilteredCustomers.SelectAwait(async customer =>
{
var customerModel = customer.ToModel<CustomerModel>();

Expand Down