Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
35769 79 d 4 h amit /trunk/ Lead management fixes: date range filter, schedule timestamp from latest activity, source in edit lead

- Replace single date filter with start/end date range (max 6 months) in getOpenLead and downloadDateWiseLead
- Add new repository methods for date range queries with color/status/authIds filtering
- Fix selectLeadsScheduledBetweenDate SQL to use schedule_timestamp from latest-created activity instead of MAX(schedule_timestamp)
- Add source field to edit lead modal, CreateLeacdActivityRequest model, and EditLead controller
- Bump jsVersion to 318		  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateLeacdActivityRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
35507 126 d 5 h ranu /trunk/ lead repo done  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
35079 222 d 8 h vikas /trunk/ Live Tracking and Shopify Products List Sync  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTrackingPath.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/config
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/config/RestTemplateConfig.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/FofoShopifyController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/ShopifyController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/controllers/ShopifyWebhookController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/models
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/models/ShopifySyncModel.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/repositories
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services/FofoShopifyService.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/shopify/services/ShopifyGraphQLService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.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/model/CreateRefferalRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/affiliate/AffiliateRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/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
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.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/StoreController.java
/trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
34894 259 d 5 h aman /trunk/ Fix:Download lead report by created timestamp  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
34621 342 d 5 h aman.kumar /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ Fixing duplicate input errors in Lead Assign  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
33246 746 d 7 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ added signature also  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
32471 958 d 5 h tejbeer /trunk/  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
31249 1241 d 9 h tejbeer /trunk/ visit changes  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/VisitRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/CommunicationType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/VisitStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UserVisitModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VisitDescriptionModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VisitSummaryModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/VisitRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/VisitRequestRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/visit-request-plan.vm
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeVisit.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadActivity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateLeacdActivityRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateRefferalRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead_activity_modal.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
29435 1665 d 9 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/  
/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/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
29425 1666 d 2 h manish /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ commit  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
29277 1687 d 8 h manish /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ commit  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
29270 1689 d 2 h manish /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ ok  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
27723 1920 d 8 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseLineItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehousePurchaseOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandWiseTertiaryModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OpenPoModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OurPurchaseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SecondaryOrderBillingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory-listing.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseScan.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseScanRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseScanRepositoryImpl.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/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
27642 1937 d 9 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
27615 1941 d 11 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
27610 1944 d 1 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
26298 2287 d 10 h tejbeer /trunk/ chnage  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
/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/cs/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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/ReportsController.java
25988 2338 d 5 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.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/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
25979 2340 d 8 h tejbeer /trunk/ chnage  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadSource.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateRefferalRequest.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead_activity_modal.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRefferalRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
25927 2349 d 2 h amit.gupta /trunk/ Added Reminders for Leads and Notifications  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeVisit.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java

←Prev12Next→

Show All