SmartDukaan – /

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

Rev 35600 – Fix Redis serialization bug and add 15-min cache manager ...

amit — Wed, 28 Jan 2026 12:05:44 +0530

amit – 6 file(s) modified
Fix Redis serialization bug and add 15-min cache manager

- Fix SerializationException for publishedOffersWithAchievement cache
- Add @JsonIgnore to computed getters getBillingStartDate/getBillingEndDate
- Add @JsonIgnoreProperties(ignoreUnknown=true) to CreateOfferRequest,
ItemCriteriaPayout, TargetSlab for backward compatibility with cached data

- Add redisVeryShortCacheManager (15 min TTL) for frequently changing data
- brandStockPrices, partnerInvestments, partnerSales, partnerDailyInvestment
now use 15-min cache instead of 60-min

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.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/TargetSlab.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java

Rev 35599 – Add HikariCP dependency for connection pooling

amit — Tue, 27 Jan 2026 21:48:58 +0530

amit – 1 file(s) modified
Add HikariCP dependency for connection pooling

~ /trunk/profitmandi-web/build.gradle

Rev 35598 – Migrate from C3P0 to HikariCP connection pooling - Replace ...

amit — Tue, 27 Jan 2026 21:31:28 +0530

amit – 5 file(s) modified
Migrate from C3P0 to HikariCP connection pooling

- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min

~ /trunk/profitmandi-cron/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-cron/src/main/resources/META-INF/env.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

Rev 35597 – Migrate from C3P0 to HikariCP connection pooling - Replace ...

amit — Tue, 27 Jan 2026 21:31:22 +0530

amit – 4 file(s) modified
Migrate from C3P0 to HikariCP connection pooling

- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties

Rev 35596 – Migrate from C3P0 to HikariCP connection pooling - Update ...

amit — Tue, 27 Jan 2026 21:31:17 +0530

amit – 5 file(s) modified
Migrate from C3P0 to HikariCP connection pooling

- Update WebDBContextConfigure to use HikariDataSource instead of DriverManagerDataSource
- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 35595 – Migrate from C3P0 to HikariCP connection pooling - Replace ...

amit — Tue, 27 Jan 2026 21:31:11 +0530

amit – 9 file(s) modified
Migrate from C3P0 to HikariCP connection pooling

- Replace C3P0 properties with HikariCP settings in all properties files
- Delete unused persistence.xml (was not referenced by any code)
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min

~ /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/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/resources/META-INF/dev.properties
x /trunk/profitmandi-dao/src/main/resources/META-INF/persistence.xml
~ /trunk/profitmandi-dao/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-dao/src/main/resources/META-INF/staging.properties

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 35593 – Added Versioning

amit — Tue, 27 Jan 2026 16:03:28 +0530

amit – 1 file(s) modified
Added Versioning

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

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 35591 – Fix:Remove Account team from default partner and partner credit report ...

aman — Tue, 27 Jan 2026 13:01:45 +0530

aman – 1 file(s) modified
Fix:Remove Account team from default partner and partner credit report and only send to neeraj sir

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

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