#4456 Fixed Country and State drop down value disappearing when editi…

…ng affiliate
nopSolutions · Apr 5, 2020 · 00e0756 · 00e0756
1 parent b55bfd2
commit 00e0756
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Factories/AffiliateModelFactory.cs b/src/Presentation/Nop.Web/Areas/Admin/Factories/AffiliateModelFactory.cs
@@ -235,18 +235,17 @@ public virtual AffiliateModel PrepareAffiliateModel(AffiliateModel model, Affili
                 PrepareAffiliatedOrderSearchModel(model.AffiliatedOrderSearchModel, affiliate);
                 PrepareAffiliatedCustomerSearchModel(model.AffiliatedCustomerSearchModel, affiliate);
 
+                //prepare address model
                 var address = _addressService.GetAddressById(affiliate.AddressId);
+                model.Address = address.ToModel(model.Address);
+                PrepareAddressModel(model.Address, address);
 
                 //whether to fill in some of properties
                 if (!excludeProperties)
                 {
                     model.AdminComment = affiliate.AdminComment;
                     model.FriendlyUrlName = affiliate.FriendlyUrlName;
                     model.Active = affiliate.Active;
-                    model.Address = address.ToModel(model.Address);
-
-                    //prepare address model
-                    PrepareAddressModel(model.Address, address);
                 }
             }
             else