SmartDukaan – //trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java

Rev 23786 – Major commit. 1. Fixed profitmandi-web refactored as per new role ...

amit.gupta — Thu, 14 Jun 2018 15:38:04 +0530

amit.gupta – 45 file(s) modified
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/CustomRetailer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.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
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.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/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
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.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/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/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/resources/js/bootstrap3-typeahead.min.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /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-web/src/main/java/com/spice/profitmandi/service/RoleManagerService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.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

Rev 23568 – Fixed changes related to logging. Updated to log4j2

govind — Tue, 17 Apr 2018 17:23:28 +0530

govind – 94 file(s) modified
Fixed changes related to logging. Updated to log4j2

~ /trunk/profitmandi-common/build.gradle
~ /trunk/profitmandi-common/pom.xml
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/ResponseCodeHolder.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/SnapdealProductPageParser.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java
x /trunk/profitmandi-common/src/main/resources/log4j.xml
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.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/ItemLedgerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.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/PaymentOptionController.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/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
+ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.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/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CodPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CommonPaymentService.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/controller/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.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/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.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/OTPController.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/RechargeController.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/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.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/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/WalletPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
x /trunk/profitmandi-web/src/main/resources/log4j.xml
+ /trunk/profitmandi-web/src/main/resources/log4j2.xml

Rev 22931 –

ashik.ali — Wed, 15 Nov 2017 12:08:56 +0530

ashik.ali – 31 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.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/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.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/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.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/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.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/OTPController.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/RechargeController.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/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.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/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/JsonProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest

Rev 22473 –

ashik.ali — Wed, 20 Sep 2017 11:28:03 +0530

ashik.ali – 4 file(s) modified

+ /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/req/CreateRetailerRequest.java