shopizer-uncached

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
index e6a6858..444e89f 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
@@ -9,4 +9,7 @@ public interface MerchantRepository extends JpaRepository<MerchantStore, Integer
 
 	@Query("select m from MerchantStore m left join fetch m.country mc left join fetch m.currency mc left join fetch m.zone mz left join fetch m.defaultLanguage md left join fetch m.languages mls where m.code = ?1")
 	MerchantStore findByCode(String code);
+	
+	@Query("select m from MerchantStore m left join fetch m.country mc left join fetch m.currency mc left join fetch m.zone mz left join fetch m.defaultLanguage md left join fetch m.languages mls where m.id = ?1")
+	MerchantStore findById(Integer id);
 }

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
index 07af995..0106a33 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
@@ -78,10 +78,13 @@ public class MerchantStoreServiceImpl extends SalesManagerEntityServiceImpl<Inte
 
 	@Override
 	public MerchantStore getByCode(String code) throws ServiceException {
-		
 		return merchantRepository.findByCode(code);
 	}
-	
+
+	@Override
+	public MerchantStore getById(Integer id) {
+		return merchantRepository.findById(id);
+	}
 /*	@Override
 	public void delete(MerchantStore merchant) throws ServiceException {
 		

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
index c73fac9..c9fe746 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
@@ -178,6 +178,7 @@ public class MerchantStoreController {
 		
 		
 		setMenu(model,request);
+		request.getSession().setAttribute(Constants.ADMIN_STORE, store);
 		Language language = (Language)request.getAttribute("LANGUAGE");
 		List<Language> languages = languageService.getLanguages();
 		List<Currency> currencies = currencyService.list();