Subversion Repositories SmartDukaan

Rev

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

Rev 25295 Rev 25297
Line 283... Line 283...
283
		userRoles = this.addRole(userRoles, user.getId(), roleRetailer.getId());
283
		userRoles = this.addRole(userRoles, user.getId(), roleRetailer.getId());
284
 
284
 
285
		Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
285
		Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
286
 
286
 
287
		if (updateRetailerRequest.isFofo()) {
287
		if (updateRetailerRequest.isFofo()) {
288
 
-
 
289
			userRoles = this.addRole(userRoles, user.getId(), roleFofo.getId());
288
			userRoles = this.addRole(userRoles, user.getId(), roleFofo.getId());
290
		} else {
289
		} else {
291
			userRoles = this.removeRole(userRoles, user.getId(), roleFofo.getId());
290
			userRoles = this.removeRole(userRoles, user.getId(), roleFofo.getId());
292
		}
291
		}
293
		map.put("fofoRole", this.containsRoleType(userRoles, roleFofo.getId()));
292
		map.put("fofoRole", this.containsRoleType(userRoles, roleFofo.getId()));
Line 306... Line 305...
306
 
305
 
307
		if (updateRetailerRequest.isFofo()) {
306
		if (updateRetailerRequest.isFofo()) {
308
			FofoStore fofoStore = this.createFofoStoreCodeByRetailerId(retailer.getId(),
307
			FofoStore fofoStore = this.createFofoStoreCodeByRetailerId(retailer.getId(),
309
					updateRetailerRequest.getDistrictName(), retailerAddress.getState(), updateRetailerRequest);
308
					updateRetailerRequest.getDistrictName(), retailerAddress.getState(), updateRetailerRequest);
310
			map.put("fofoStore", fofoStore);
309
			map.put("fofoStore", fofoStore);
-
 
310
			fofoStore.setActive(updateRetailerRequest.isActive());
311
		}
311
		}
312
 
312
 
313
		this.createPrivateDealUser(user, updateRetailerRequest.isFofo(), updateRetailerRequest.getGstNumber(), retailer,
313
		this.createPrivateDealUser(user, updateRetailerRequest.isFofo(), updateRetailerRequest.getGstNumber(), retailer,
314
				retailerAddress.getId());
314
				retailerAddress.getId());
315
		map.put("gstNumber", updateRetailerRequest.getGstNumber());
315
		map.put("gstNumber", updateRetailerRequest.getGstNumber());