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

Rev 35769 – Lead management fixes: date range filter, schedule timestamp from latest ...

amit — Mon, 16 Feb 2026 16:41:53 +0530

amit – 7 file(s) modified
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/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 35765 – rbm called detail now coming from call log not by ...

ranu — Fri, 13 Feb 2026 19:29:25 +0530

ranu – 4 file(s) modified
rbm called detail now coming from call log not by remark

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm

Rev 35754 – Fixed selectById issue

amit — Thu, 12 Feb 2026 18:07:07 +0530

amit – 1 file(s) modified
Fixed selectById issue

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java

Rev 35750 – Fixed SchemeService

amit — Thu, 12 Feb 2026 12:17:18 +0530

amit – 1 file(s) modified
Fixed SchemeService

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PinelabsWebhookController.java

Rev 35746 – Fix: Handle empty item list in searchOrderDetails endpoint Added ...

amit — Wed, 11 Feb 2026 18:54:01 +0530

amit – 1 file(s) modified
Fix: Handle empty item list in searchOrderDetails endpoint

Added empty check before calling itemRepository.selectByIds() to prevent
invalid SQL IN clause exception when invoice has no items.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 35737 – OrderController: fix N+1 queries, replace e.printStackTrace with LOGGER, fix string ...

amit — Wed, 11 Feb 2026 16:10:14 +0530

amit – 1 file(s) modified
OrderController: fix N+1 queries, replace e.printStackTrace with LOGGER, fix string concat in logging, make accessoriesDeals static final

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 35730 – rbm calls date wise filter given

ranu — Wed, 11 Feb 2026 13:35:27 +0530

ranu – 4 file(s) modified
rbm calls date wise filter given

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.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/rbm_call_target.vm

Rev 35726 – Pinelabs offer discovery on billing and stock page

vikas — Tue, 10 Feb 2026 20:15:33 +0530

vikas – 13 file(s) modified
Pinelabs offer discovery on billing and stock page

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOfferCacheService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.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/OfferController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/resources/messages_en.properties
~ /trunk/profitmandi-fofo/src/main/resources/message_en.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm

Rev 35717 – Fix performance issues in PurchaseOrderController - Replace supplierRepository.selectAll() with ...

amit — Mon, 09 Feb 2026 23:59:47 +0530

amit – 3 file(s) modified
Fix performance issues in PurchaseOrderController

- Replace supplierRepository.selectAll() with targeted selectBySupplierIds() in 2 endpoints
- Replace sellerRepository.selectAll() with new selectByIds() in 2 endpoints
- Add SellerRepository.selectByIds(List<Integer>) batch method
- Remove dead code: unused totalUnitPrice and totalPriceOfLineItem computations

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 35716 – Refactor GrnController and PurchaseOrderController: extract business logic into focused services ...

amit — Mon, 09 Feb 2026 23:56:47 +0530

amit – 10 file(s) modified
Refactor GrnController and PurchaseOrderController: extract business logic into focused services and fix N+1 query performance issues

- Create InvoiceService: invoice item CRUD, validation, vendor price matching
- Create GrnRequestService: GRN request lifecycle, mismatch resolution state machine
- Create DebitNoteService: debit note generation, PDF model building
- Move PO amendment logic from PurchaseOrderController to PurchaseOrderService
- Delegate generateDebitNote from PurchaseOrderServiceImpl to DebitNoteService
- Thin GrnController from ~1215 to ~717 lines, remove 15 unused autowired dependencies
- Thin PurchaseOrderController editPurchaseOrder from 40+ lines to 3 lines

Performance fixes:
- InvoiceServiceImpl.validateInvoiceDetail: batch item/vendor pricing/GST loading (4N+3 queries -> ~5)
- DebitNoteServiceImpl: batch item loading in buildDebitNotePdfModel and generateDebitNote
- GrnController.generateDebitNote: eliminate 2 redundant DB fetches
- Replace 3x supplierRepository.selectAll() with targeted selectBySupplierIds()

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/DebitNoteService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/DebitNoteServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/GrnRequestService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/GrnRequestServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InvoiceService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InvoiceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 35679 – calling webhook updated

ranu — Sat, 07 Feb 2026 17:49:29 +0530

ranu – 8 file(s) modified
calling webhook updated

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/AgentCallLog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/SipRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/SipRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentCallLogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentCallLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/model/PushCallLogModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 35674 – Add multi-month duration option for manual partner category upgrade (up ...

amit — Sat, 07 Feb 2026 00:29:38 +0530

amit – 3 file(s) modified
Add multi-month duration option for manual partner category upgrade (up to 3 months)

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-category.vm

Rev 35672 – code commit for calling target / retailer contact

ranu — Fri, 06 Feb 2026 20:03:33 +0530

ranu – 3 file(s) modified
code commit for calling target / retailer contact

Rev 35670 – code commit for calling target / retailer contact

ranu — Fri, 06 Feb 2026 19:21:35 +0530

ranu – 5 file(s) modified
code commit for calling target / retailer contact

Rev 35669 – code commit for calling target / retailer contact

ranu — Fri, 06 Feb 2026 18:19:31 +0530

ranu – 4 file(s) modified
code commit for calling target / retailer contact

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmWeeklyBillingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.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/rbm-today-arr.vm

Rev 35660 – code commit for calling target / retailer contact

ranu — Wed, 04 Feb 2026 18:39:18 +0530

ranu – 1 file(s) modified
code commit for calling target / retailer contact

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 35654 – code commit for calling target / retailer contact

ranu — Wed, 04 Feb 2026 12:02:17 +0530

ranu – 5 file(s) modified
code commit for calling target / retailer contact

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/RbmCallSequenceLogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/RbmCallSequenceLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35648 – code commit for calling target / retailer contact

ranu — Tue, 03 Feb 2026 11:49:16 +0530

ranu – 5 file(s) modified
code commit for calling target / retailer contact

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RetailerContact.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/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-contact-list.vm

Rev 35646 – Fix:Dsm Code update null check

aman — Mon, 02 Feb 2026 17:54:32 +0530

aman – 1 file(s) modified
Fix:Dsm Code update null check

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java

Rev 35645 – code commit for calling target

ranu — Mon, 02 Feb 2026 15:46:55 +0530

ranu – 4 file(s) modified
code commit for calling target

Rev 35640 – Skip escalations in ticket overview Message column, compact escalation styling ...

amit — Sat, 31 Jan 2026 16:42:42 +0530

amit – 5 file(s) modified
Skip escalations in ticket overview Message column, compact escalation styling in detail dialog

- Pass lastMessageMap to ticket overview templates for all three views
(myTicket, managerTicket, myPartnerTicket)
- Template Message column prefers lastMessageMap over activityMap
- Escalation activities in detail dialog render as compact centered
system messages with pill styling instead of chat bubbles
- Add .system-activity CSS for compact centered gray pill style

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activity-modal-styles.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets-content.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-content.vm

Rev 35631 – code commit for calling target

ranu — Sat, 31 Jan 2026 12:53:34 +0530

ranu – 30 file(s) modified
code commit for calling target

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerCollectionRemark.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/RbmCallSequenceLog.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/enumuration/auth/CollectionRemark.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.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/dao/model/RbmCallTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/RbmCallSequenceLogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/RbmCallSequenceLogRepositoryImpl.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/TicketRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.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
~ /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/service/PartnerCollectionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerCollectionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.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/rbm-today-arr.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po_rbm.vm

Rev 35628 – Commented dashobard

amit — Fri, 30 Jan 2026 17:49:59 +0530

amit – 1 file(s) modified
Commented dashobard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 35626 – Ticket system: add unread tracking, pagination, search, and partner notifications

amit — Fri, 30 Jan 2026 17:38:35 +0530

amit – 25 file(s) modified
Ticket system: add unread tracking, pagination, search, and partner notifications

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketReadStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TicketViewModel.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/cs/TicketReadStatusRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketReadStatusRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/partner-ticket-update.vm
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/ticket-manager.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/ticket-renderer.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-content.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets-content.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-content.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 35624 – web hook deploy

ranu — Fri, 30 Jan 2026 16:13:35 +0530

ranu – 1 file(s) modified
web hook deploy

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 35617 – Filter invisible subcategory tickets for CRM and end users only ...

amit — Wed, 28 Jan 2026 19:13:05 +0530

amit – 3 file(s) modified
Filter invisible subcategory tickets for CRM and end users only

- CRM users: Cannot see tickets with visibility=0 subcategories
- Sales/RBM/ABM users: Can see all tickets (no filtering)
- End users in web module: CRM users filtered, others see all
- Uses getTicketSubCategoryMap() for efficient batch lookup
- Named query filters by tbc.visibility=true for recent tickets

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 35607 – Fix partner position assignment error for newly added partners ...

amit — Wed, 28 Jan 2026 17:03:18 +0530

amit – 1 file(s) modified
Fix partner position assignment error for newly added partners

- Changed validation from cached retailerService.getFofoRetailers(false) to direct fofoStoreRepository.selectAll() query
- This ensures newly added partners are validated correctly without waiting for cache to expire (30 mins)

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java

Rev 35603 – Allow Sales and RBM teams to resolve their own category ...

amit — Wed, 28 Jan 2026 13:41:15 +0530

amit – 2 file(s) modified
Allow Sales and RBM teams to resolve their own category tickets

- Sales team can now resolve tickets in Sales category
- RBM team can now resolve tickets in RBM category
- CRM team can still resolve all tickets
- Added isSalesUser, isRbmUser flags and category IDs to template model
- Updated ticket.vm canResolve logic to check user category against ticket category

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 35601 – Filter out Sales/RBM Escalation tickets from CRM user's My Tickets ...

amit — Wed, 28 Jan 2026 12:42:49 +0530

amit – 2 file(s) modified
Filter out Sales/RBM Escalation tickets from CRM user's My Tickets view

- CRM users should not see Sales Escalation (84) and RBM Escalation (83) subcategory tickets
- These escalation tickets are internal and not relevant for CRM team

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property

Rev 35594 – Ticket system: CRM access, category filtering, UI improvements CRM ...

amit — Tue, 27 Jan 2026 21:25:50 +0530

amit – 10 file(s) modified
Ticket system: CRM access, category filtering, UI improvements

CRM Team Access:
- CRM users can see all tickets in myticket and managerTicket views
- CRM users can assign/edit tickets from all views
- Only CRM can mark tickets as resolved

Category Filtering (hidden from CRM):
- Sales category (ID 4) and Sales Escalation subcategory (ID 84)
- RBM category (ID 18) and RBM Escalation subcategory (ID 83)

UI Improvements:
- Partner name link opens partnerPerformance in new tab (reusable via .partner-link class)
- Edit modal shows ticket ID and partner name in title
- Resolve confirm shows ticket ID and partner name
- Fixed duplicate class attributes in buttons
- Modal shows after content loads (removed data-toggle conflicts)

Version bump: JS 313, CSS 34

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-partner-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 35592 – Ticket system improvements: N+1 query fixes, authorization checks, CRM access, ...

amit — Tue, 27 Jan 2026 13:11:30 +0530

amit – 11 file(s) modified
Ticket system improvements: N+1 query fixes, authorization checks, CRM access, UI fixes

- Fix N+1 queries in getSubCategoryIdAndCategoryMap and getAuthUserAndEsclationByPartnerId
- Add authorization checks to ticket endpoints (getActivities, closeTicket, createActivity, editTicket, editPartnerTicket, createLastActivity)
- CRM users can now see all tickets to handle partner communications
- Only CRM team members can mark tickets as resolved
- Fix duplicate HTML IDs in ticket templates (changed to classes)
- Fix getSubCategoryId() bug in edit-ticket modals
- Add message field to create-ticket form
- Update cs.js to use class selectors

~ /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/TicketRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-partner-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 35590 – Require at least one partner in createPosition and updatePartnerPosition ...

amit — Fri, 23 Jan 2026 20:12:58 +0530

amit – 1 file(s) modified
Require at least one partner in createPosition and updatePartnerPosition

- Reject null or empty fofoIds with 'At least one partner must be specified'
- Position must have either [0] (All Partners) or specific partner IDs

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java

Rev 35589 – Fix fofoId validation to allow 0 (All Partners) in createPosition ...

amit — Fri, 23 Jan 2026 20:11:20 +0530

amit – 1 file(s) modified
Fix fofoId validation to allow 0 (All Partners) in createPosition and updatePartnerPosition

- fofoId=0 is a sentinel value meaning 'All Partners'
- Skip validation when fofoIds contains only 0
- Reject mixed lists like [0, 123, 456] to prevent inconsistent data
- Fixes regression introduced in r35570/r35571

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java

Rev 35585 – code updated by

ranu — Thu, 22 Jan 2026 18:59:30 +0530

ranu – 4 file(s) modified
code updated by

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SalesThoughtConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 35583 – code updated by

ranu — Wed, 21 Jan 2026 19:23:11 +0530

ranu – 18 file(s) modified
code updated by

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Bulletin.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinOfferModal.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinPostModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.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/cs/BulletinRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.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/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bulletin.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulletin-list.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm

Rev 35582 – Fix:DMS Code update issue

aman — Wed, 21 Jan 2026 19:04:54 +0530

aman – 1 file(s) modified
Fix:DMS Code update issue

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java

Rev 35579 – Feat:add lead id in lead report

aman — Tue, 20 Jan 2026 12:35:21 +0530

aman – 1 file(s) modified
Feat:add lead id in lead report

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 35578 – Fix: Protect admin-set hardLimit from being overwritten - Bug ...

amit — Mon, 19 Jan 2026 16:54:42 +0530

amit – 1 file(s) modified
Fix: Protect admin-set hardLimit from being overwritten

- Bug fix: Credit limit set by admin (hardLimit=true) was being overwritten
when other users updated SD credit requirements
- Performance: Removed redundant database query for SDCreditRequirement
- Fix: Calculate availableLimit after limit changes to ensure correct value
- Cleanup: Use fofoId variable instead of repeated method calls

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java

Rev 35572 – Fix: Remove duplicate persist in wallet approval The addWalletRequest ...

amit — Mon, 19 Jan 2026 01:04:54 +0530

amit – 1 file(s) modified
Fix: Remove duplicate persist in wallet approval

The addWalletRequest status was already being updated in memory,
and the entity is managed by Hibernate session - no explicit persist needed.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 35571 – Quick wins and medium effort improvements for ticket system ...

amit — Sun, 18 Jan 2026 21:44:17 +0530

amit – 5 file(s) modified
Quick wins and medium effort improvements for ticket system

Quick Wins:
- Add input validation to updatePartnerPosition (check positionId, regionId, fofoIds exist)
- Keep SortOrder import (from javax.swing, needed for pagination)

Medium Effort:
- Extract common modal CSS and HTML to shared partials (activity-modal-styles.vm, activity-modal.vm)
- Add null safety checks for maps in getTicket, getMyPartyTicketTicket, getManagerTickets
- Fix N+1 query in getMyPartyTicketTicket: batch fetch tickets using selectAllOpenTickets(fofoIds) instead of loop

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activity-modal-styles.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activity-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm