Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java – Rev 23786

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

From rev	To rev	Max revs

Search history for

Show All

Rev	Age	Author	Path	Log message	Diff	Changes
23786	2779 d 4 h	amit.gupta	/trunk/	Major commit. 1. Fixed profitmandi-web refactored as per new role management logic. 2. Added Allocation Mechanism 3. Minor bug fixes.		/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/CounterSize.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BrandPerformance.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java /trunk/profitmandi-fofo/src/main/webapp/resources/js/bootstrap3-typeahead.min.js /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/RoleManagerService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/StockAllocationModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/StockAllocation.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepositoryImp.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java
22011	3109 d 0 h	ashik.ali	/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/			/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java
21734	3143 d 1 h	ashik.ali	/trunk/			/trunk/profitmandi-web /trunk/profitmandi-api
21730	3143 d 3 h	ashik.ali	/trunk/			/trunk/profitmandi-api /trunk/profitmandi-web
21431	3179 d 1 h	ashik.ali	/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/			/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Brand.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Category.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomRole.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/UserInfo.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/LineItem.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Otp.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Permission.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/PostOffice.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerAddress.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerBrand.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RoleApi.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Shop.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/UserRole.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerAddressRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/LineOfBusiness.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/PayuPayResponsePojo.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/RetailerAddBrandRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Shop.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java
21426	3179 d 5 h	ashik.ali	/trunk/profitmandi-web/src/main/			/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomRole.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RoleApi.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/UserRole.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerAddressRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/LineOfBusiness.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/RetailerAddBrandRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Role.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequestModel.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/UserInfo.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Document.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/LineItem.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Permission.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerAddress.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerBrand.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Shop.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Shop.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateUserJsonValidator.java /trunk/profitmandi-web/src/main/resources/response-codes.properties