SmartDukaan – /

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 35639 – Skip escalations in ticket overview Message column, compact escalation styling ...

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

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

- Add getLastMessageActivitiesForTickets to CsService to fetch most recent
communication activity (COMMUNICATION_IN/OUT/INTERNAL, OPENED) per ticket
- Ticket overview Message column now shows last communication, not escalation
- Ticket detail dialog renders escalation activities (ESCALATED, ASSIGNED,
CATEGORY_CHANGED, ESCALATED_FINAL) as compact centered system messages
instead of chat bubbles

~ /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

Rev 35638 – code commit for calling target

ranu — Sat, 31 Jan 2026 13:39:12 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35637 – code commit for calling target

ranu — Sat, 31 Jan 2026 13:35:37 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35636 – code commit for calling target

ranu — Sat, 31 Jan 2026 13:33:30 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35635 – code commit for calling target

ranu — Sat, 31 Jan 2026 13:21:44 +0530

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

~ /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

Rev 35634 – code commit for calling target

ranu — Sat, 31 Jan 2026 13:17:59 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OutOfSequenceDetailModel.java

Rev 35633 – Add hikari.keepaliveTime property to all environment configs

amit — Sat, 31 Jan 2026 13:12:37 +0530

amit – 13 file(s) modified
Add hikari.keepaliveTime property to all environment configs

~ /trunk/profitmandi-cron/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-cron/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-cron/src/main/resources/META-INF/run.properties
~ /trunk/profitmandi-cron/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-dao/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-dao/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-dao/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 35632 – call target related changes

ranu — Sat, 31 Jan 2026 12:55:30 +0530

ranu – 2 file(s) modified
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

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 35630 – Fix:Error handling

aman — Fri, 30 Jan 2026 19:13:04 +0530

aman – 2 file(s) modified
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

Rev 35629 – Fixed SchemeService

amit — Fri, 30 Jan 2026 17:56:02 +0530

amit – 5 file(s) modified
Fixed SchemeService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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

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 35627 – Commented dashobard

amit — Fri, 30 Jan 2026 17:39:41 +0530

amit – 1 file(s) modified
Commented dashobard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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 35625 – Fix:getpartner error handling

aman — Fri, 30 Jan 2026 17:19:13 +0530

aman – 1 file(s) modified
Fix:getpartner error handling

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.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 35623 – Switch Reportico service calls from GET to POST to send ...

amit — Fri, 30 Jan 2026 13:47:28 +0530

amit – 2 file(s) modified
Switch Reportico service calls from GET to POST to send params as form body

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 35622 – Fix:Last name is not required check

aman — Thu, 29 Jan 2026 17:16:46 +0530

aman – 1 file(s) modified
Fix:Last name is not required check

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js

Rev 35621 – Youtube Video issue: Update iframe

vikas — Thu, 29 Jan 2026 17:02:04 +0530

vikas – 1 file(s) modified
Youtube Video issue: Update iframe

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 35620 – separate

vikas — Thu, 29 Jan 2026 16:54:02 +0530

vikas – 2 file(s) modified
separate

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm

Rev 35619 – Reduce ticket dialog spacing to accommodate more content - ...

amit — Thu, 29 Jan 2026 11:52:17 +0530

amit – 3 file(s) modified
Reduce ticket dialog spacing to accommodate more content

- Reduced padding in modal header, body, and footer
- Smaller h3 headings (14px)
- Compact form controls and buttons
- Reduced row and form-group margins
- Removed hardcoded 650px width for responsive layout

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activity-modal-styles.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

Rev 35618 – Fix: Apply visibility filter only for CRM users in viewRecentTickets ...

amit — Wed, 28 Jan 2026 19:58:10 +0530

amit – 2 file(s) modified
Fix: Apply visibility filter only for CRM users in viewRecentTickets

- Reverted named query visibility filter (was filtering all users)
- Added role-based filtering in viewRecentTickets and viewRecentTickets/{fofoId}
- CRM users: Filter by visible subcategory names
- Sales/RBM/ABM users: See all tickets without filtering

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.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 35616 – Fixed delay to 5

amit — Wed, 28 Jan 2026 18:33:07 +0530

amit – 1 file(s) modified
Fixed delay to 5

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java

Rev 35615 – Revert ticket visibility changes from TicketChatActivityController

amit — Wed, 28 Jan 2026 18:29:50 +0530

amit – 1 file(s) modified
Revert ticket visibility changes from TicketChatActivityController

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

Rev 35614 – Hide RBM and Sales escalation tickets from end user ticket ...

amit — Wed, 28 Jan 2026 18:24:46 +0530

amit – 2 file(s) modified
Hide RBM and Sales escalation tickets from end user ticket view

- Filter out subcategory IDs 83 (RBM_L2_ESCALATION) and 84 (SALES_ESCALATION) in viewTickets endpoints
- Update selectRecentClosedTicket named query to exclude these escalation types

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

Rev 35613 – Fix: Remove method-level @Transactional, use class-level transaction management

amit — Wed, 28 Jan 2026 17:51:06 +0530

amit – 1 file(s) modified
Fix: Remove method-level @Transactional, use class-level transaction management

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 35612 – Fix: Add @Transactional(propagation=REQUIRES_NEW) to resolveOldEscalationTickets to fix Hibernate session error

amit — Wed, 28 Jan 2026 17:47:55 +0530

amit – 1 file(s) modified
Fix: Add @Transactional(propagation=REQUIRES_NEW) to resolveOldEscalationTickets to fix Hibernate session error

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 35611 – Fix: Use ResponseEntity.status(500) for Spring Boot 2.0 compatibility

amit — Wed, 28 Jan 2026 17:40:47 +0530

amit – 1 file(s) modified
Fix: Use ResponseEntity.status(500) for Spring Boot 2.0 compatibility

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/controller/ExposeController.java

Rev 35610 – Add endpoint to resolve old escalation tickets created before Sept ...

amit — Wed, 28 Jan 2026 17:38:43 +0530

amit – 2 file(s) modified
Add endpoint to resolve old escalation tickets created before Sept 30, 2025

- Added resolveOldEscalationTickets method in RunOnceTasks.java
- Added GET /resolveOldEscalationTickets endpoint in ExposeController.java
- Supports dryRun=true (preview) and dryRun=false (execute)
- Marks Sales/RBM Escalation tickets (subcategory 83, 84) as RESOLVED on behalf of Gaurav CRM

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/controller/ExposeController.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 35609 – Add resolveOldEscalationTickets endpoint to security whitelist

amit — Wed, 28 Jan 2026 17:28:25 +0530

amit – 1 file(s) modified
Add resolveOldEscalationTickets endpoint to security whitelist

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/SecurityConfig.java

Rev 35608 – Fix DB connection pooling to reduce service restarts - ...

amit — Wed, 28 Jan 2026 17:15:30 +0530

amit – 8 file(s) modified
Fix DB connection pooling to reduce service restarts

- Add pool_timeout=30 to fail fast instead of hanging indefinitely
- Add pool_pre_ping=True to detect stale MySQL connections before use
- Reduce pool_recycle from 7200s to 3600s for fresher connections
- Disable SQL echo logging (echo=False) to reduce memory/CPU usage
- Fix MongoDB connection with thread-safe initialization and proper pooling

Modified services: helper, user, inventory, order, payment, logistics, catalog

~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataService.py
~ /trunk/PyProj/src/shop2020/utils/ContentUploadUtil.py

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 35606 – Fix JavaScript errors: $ is not defined and $retailers is ...

amit — Wed, 28 Jan 2026 17:00:34 +0530

amit – 4 file(s) modified
Fix JavaScript errors: $ is not defined and $retailers is not defined

- ticket.vm, managerTicket.vm, my-partner-tickets.vm: Wrap all jQuery code in $(document).ready() to ensure jQuery is loaded before executing
- admin.vm: Check each variable independently (retailers, warehouses, authId) before assigning to prevent undefined variable errors

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.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 35605 – Reduce ticket dialog spacing and move time inside with smaller ...

amit — Wed, 28 Jan 2026 14:41:08 +0530

amit – 2 file(s) modified
Reduce ticket dialog spacing and move time inside with smaller font

- Reduced message spacing from 26px to 8px margin
- Added explicit incoming_msg margin style
- Time now displays smaller (10px) in gray, right-aligned inside bubble
- Removed extra line breaks from pseudo-elements
- Removed br tags between modal-body and modal-footer

~ /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

Rev 35604 – Fix modal backdrop not removing after ticket assignment - ...

amit — Wed, 28 Jan 2026 14:04:01 +0530

amit – 1 file(s) modified
Fix modal backdrop not removing after ticket assignment

- Close modal and remove backdrop in changeTicket callback before reloading page
- Same fix applied to changeMyPartnerTicket function

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js

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 35602 – Fix modal backdrop not being removed on close in ticket ...

amit — Wed, 28 Jan 2026 13:30:33 +0530

amit – 3 file(s) modified
Fix modal backdrop not being removed on close in ticket pages

- Add cleanup handlers for #theModal and #theModal2 on hidden.bs.modal event
- Add global fallback to remove backdrop when all modals are closed
- Add proper modal attributes (tabindex, role, data-backdrop, data-keyboard)
- Prevents screen from becoming unusable after closing assign ticket dialog

Affected pages: My Ticket, My Partner Tickets, Manager Ticket

~ /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 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