Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java – Rev 35517

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
35517	43 d 7 h	aman	/trunk/profitmandi-fofo/src/main/	Fix:Update Brand Market Share and give status wise filter for trial users		/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/all-trial-form.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-modal.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
35499	50 d 7 h	aman	/trunk/	Fix:Trial Activation Mail, All trial user page and gst validation		/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/all-trial-form.vm /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java /trunk/profitmandi-dao/src/main/resources/trial-activation-email.vm /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-verified.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
35458	59 d 5 h	amit	/trunk/	Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level Changes: - profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true) - profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional - profitmandi-dao: Removed @Transactional from services/repositories Exceptions (called from interceptors, need own transaction): - RoleManager: @Transactional(readOnly = true) - called from interceptor for auth - PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional Fixed rollbackOn to rollbackFor for Spring compatibility		/trunk/profitmandi-dao/pinelabs.http /trunk/profitmandi-dao /trunk/profitmandi-dao/build.gradle /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.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/fofo/PartnerTypeChangeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsCustomerRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsPaymentMethodRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsRefundRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SchemeBlockedImeiServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.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/InvoiceController.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/LeadController.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/LogisticsController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MapTrackController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.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/OfferController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.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/PerformanceController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.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/SDCreditController.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/TagListingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/logix/LogixController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property /trunk/profitmandi-fofo/src/main/resources/log4j2.xml /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BannerListingController.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/CustomerController.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/FileUploaderController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.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/LeadController.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/NotificationController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PageController.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/SDCreditController.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/SmartCartController.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/StoreController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrackingController.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/TrialUserController.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/controller/checkout/PayuPayController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java /trunk/profitmandi-web/src/main/resources/META-INF/env.property /trunk/profitmandi-web/src/main/resources/log4j2.xml
35391	64 d 7 h	aman	/trunk/	Fix:Trial Upgrade internal and external mail		/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
35370	69 d 9 h	aman	/trunk/	DEBUG:add debugger for trialform		/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/TrialController.java
35360	70 d 7 h	aman	/trunk/	Feat:Approval page for sales team		/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialBrandPotentialRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TrialBrandPotentialRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.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/TrialController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-verified.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
35340	75 d 13 h	aman	/trunk/profitmandi-fofo/src/main/	Feat:Approval page to trial user		/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-verified.vm /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js
35289	94 d 16 h	amit	/trunk/	Added trial franchisee feature		/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialFormRepositoryImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/trial-form.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/trial-form.js /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/trialUser /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/trialOnboarding/TrialOnboardingRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js