Subversion Repositories SmartDukaan

Rev

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

Rev 22493 Rev 22497
Line 188... Line 188...
188 
					Address address = addressRepository.selectById(saholicUser.getAddressId());
 188 
					Address address = addressRepository.selectById(saholicUser.getAddressId());
189 
					responseMap.put(ProfitMandiConstants.ADDRESS, address);
 189 
					responseMap.put(ProfitMandiConstants.ADDRESS, address);
190 
				}
 190 
				}
191 
				// if retailer is activated 1 then verified retailer
 191 
				// if retailer is activated 1 then verified retailer
192 
				// else if migrated is 1 then old retailer
 192 
				// else if migrated is 1 then old retailer
- 
 
 193 
				// also lets incoporte old process i.e is user is activated then also retailer is verified retailer
193 
				// else retailer is not verifed
 194 
				// else retailer is not verifed
194 
				if (retailer.isActive()) {
 195 
				if (retailer.isActive() || user.isActivated()) {
195 
					if (retailer.isFofo()) {
 196 
					if (retailer.isFofo()) {
196 
						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
 197 
						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
197 
					} else {
 198 
					} else {
198 
						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
 199 
						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
199 
					}
 200 
					}