Subversion Repositories SmartDukaan

Rev

Rev 23107 | Rev 23136 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 23107 Rev 23131
Line 258... Line 258...
258 
				this.updateAddress(address, customShop.getAddress());
 258 
				this.updateAddress(address, customShop.getAddress());
259 
			}
 259 
			}
260 
			shop.setAddressId(address.getId());
 260 
			shop.setAddressId(address.getId());
261 
			shop.setAddress(address);
 261 
			shop.setAddress(address);
262 
			shopRepository.persist(shop);
 262 
			shopRepository.persist(shop);
- 
 
 263 
			ShopAddress shopAddress = null;
- 
 
 264 
			try{
- 
 
 265 
				shopAddress = shopAddressRepository.selectByShopId(shop.getId());
- 
 
 266 
				shopAddress.setAddressId(address.getId());
- 
 
 267 
			}catch(ProfitMandiBusinessException profitMandiBusinessException){
263 
			ShopAddress shopAddress = new ShopAddress();
 268 
				shopAddress = new ShopAddress();
264 
			shopAddress.setAddressId(address.getId());
 269 
				shopAddress.setAddressId(address.getId());
265 
			shopAddress.setShopId(shop.getId());
 270 
				shopAddress.setShopId(shop.getId());
- 
 
 271 
			}
266 
			shopAddressRepository.persist(shopAddress);
 272 
			shopAddressRepository.persist(shopAddress);
267 
		}else{
 273 
		}else{
268 
			Address address = addressRepository.selectById(shop.getAddressId());
 274 
			Address address = addressRepository.selectById(shop.getAddressId());
269 
			CustomAddress customAddress = customShop.getAddress();
 275 
			CustomAddress customAddress = customShop.getAddress();
270 
			if(address.getName().equals(customAddress.getName()) &&
 276 
			if(address.getName().equals(customAddress.getName()) &&