Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36400 1 d 1 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.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/SupportController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.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/OrderController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoHdfcPaymentController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoLoiFormController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPartnerOnBoardingPanelController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoRefferalController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWalletController.java
36336 6 d 5 h ranu /trunk/ sales dispostion updated  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RbmRating.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SalesRating.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SalesRatingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SalesRatingRepositoryImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
36286 11 d 21 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ sales dispostion updated  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
36267 14 d 1 h ranu /trunk/ sales dispostion updated  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth/CollectionRemark.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.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/TicketChatActivityController.java
36211 20 d 22 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ rbm l1,l2,l3 layer introduce  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
36114 28 d 0 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ rating system updated ..weekly rating  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35968 51 d 15 h ranu /trunk/ bm asm filter added in sales escalation  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35920 57 d 1 h ranu /trunk/ now inactive partners also showing on target page  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35853 61 d 21 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ no ans will come after 4 hrs  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35835 63 d 5 h ranu /trunk/ new remark has been updated (schedule time and date for call)  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerCollectionRemark.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth/CollectionRemark.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCollectionPlanModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCollectionRemarkModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerCollectionServiceImpl.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/TicketChatActivityController.java
35781 69 d 20 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Remove unused AuthUserPartnerMappingRepository injection from controllers  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
35725 77 d 1 h ranu /trunk/ now recording also fetching  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.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/TicketChatActivityController.java
35708 77 d 22 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ now recording also fetching  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
35650 84 d 2 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ call target related changes  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35649 84 d 4 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ call target related changes  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35632 87 d 3 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ call target related changes  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
35630 87 d 21 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Fix:Error handling  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
35469 127 d 20 h vikas /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Leads Follow ups  
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35467 127 d 21 h amit /trunk/ Optimize /lead-description endpoint

- Add null check for authUser to prevent NPE
- Move visitRequests query inside followUp block
- Move Comparator outside loop
- Rewrite selectLeadsScheduledBetweenDate using Criteria API with Predicates
- Single query joins Lead + LeadActivity with filters in DB
- Remove in-memory filtering of assignTo		  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35458 128 d 20 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

←Prev12Next→

Show All