SmartDukaan – /

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

Rev 35588 – Fix ClassCastException in selectByfofoIds - flatten list properly instead of ...

amit — Fri, 23 Jan 2026 18:41:20 +0530

amit – 1 file(s) modified
Fix ClassCastException in selectByfofoIds - flatten list properly instead of nesting ArrayList in Arrays.asList()

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerRegionRepositoryImpl.java

Rev 35587 – code diploy for bulletins

ranu — Fri, 23 Jan 2026 17:24:05 +0530

ranu – 5 file(s) modified
code diploy for bulletins

~ /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/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm

Rev 35586 – Fix: Set HikariCP autoCommit=false to enable Hibernate dirty checking for ...

amit — Thu, 22 Jan 2026 22:34:43 +0530

amit – 1 file(s) modified
Fix: Set HikariCP autoCommit=false to enable Hibernate dirty checking for transaction management

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/DBConfig.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 35584 – code updated by

ranu — Wed, 21 Jan 2026 19:39:57 +0530

ranu – 2 file(s) modified
code updated by

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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 35581 – icici lombard service

ranu — Wed, 21 Jan 2026 11:46:05 +0530

ranu – 1 file(s) modified
icici lombard service

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java

Rev 35580 – Fix:Partner Pending Indents Data issue

aman — Tue, 20 Jan 2026 16:36:48 +0530

aman – 1 file(s) modified
Fix:Partner Pending Indents Data issue

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-pending-indent-item.vm

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 35577 – Feat:add item ID in Aging Stock List: Items that are ...

aman — Mon, 19 Jan 2026 15:22:27 +0530

aman – 5 file(s) modified
Feat:add item ID in Aging Stock List: Items that are 4 days old or older report.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/CatalogAgedModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java

Rev 35576 – Feat:Add lead id and auth id in respective data table

aman — Mon, 19 Jan 2026 12:27:55 +0530

aman – 3 file(s) modified
Feat:Add lead id and auth id in respective data table

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 35575 – Return full CartResponse on cart validation failure - Return ...

amit — Mon, 19 Jan 2026 02:47:08 +0530

amit – 1 file(s) modified
Return full CartResponse on cart validation failure

- Return cartValidationResponse instead of generic CART_CHANGED error
- Allows app to display specific price change messages to user

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

Rev 35574 – Fix price mismatch false positives in cart validation - ...

amit — Mon, 19 Jan 2026 02:47:01 +0530

amit – 1 file(s) modified
Fix price mismatch false positives in cart validation

- Handle cart price = 0/unset: silently update to current price (client bug)
- Use tolerance comparison (0.01) instead of exact Float.compare
- Prevents false PRICE_CHANGED errors from float precision issues

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java

Rev 35573 – Feature: Add price mismatch detection in cart - Detect ...

amit — Mon, 19 Jan 2026 01:05:01 +0530

amit – 1 file(s) modified
Feature: Add price mismatch detection in cart

- Detect when cart item price differs from current TagListing price
- Notify user with PRICE_CHANGED message showing old vs new price
- Auto-update cart line with current price
- Add logging for price mismatch events

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.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

Rev 35570 – Ticket system improvements: Fix N+1 query in getActivity, add input ...

amit — Sun, 18 Jan 2026 21:31:29 +0530

amit – 3 file(s) modified
Ticket system improvements: Fix N+1 query in getActivity, add input validation in createPosition, optimize getManagerTickets

- DocumentRepository: Add selectByIds for batch fetching documents
- CsController.getActivity: Replace N+1 document fetch with batch query, remove incorrect persist during GET
- CsController.createPosition: Add validation for authUserId, categoryId, regionId, and fofoIds before creating position
- CsController.getManagerTickets: Fix duplicate activity query, fetch only required AuthUsers instead of all users

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DocumentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DocumentRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java

Rev 35569 – CRM-only external communication + performance & security improvements Feature: ...

amit — Sun, 18 Jan 2026 21:00:39 +0530

amit – 4 file(s) modified
CRM-only external communication + performance & security improvements

Feature:
- Restrict external communication (COMMUNICATION_OUT) to CRM team only (category_id=9)
- Non-CRM users can only send internal communications
- Hide internal/external checkbox for non-CRM users in UI

Performance:
- Eliminate duplicate AuthUser fetch in getTicket() - reuse variable
- Eliminate duplicate activity query (selectAll called twice)
- Fetch only needed AuthUsers instead of all users for activity display
- Same optimizations applied to getMyPartyTicketTicket()

Security:
- Add escapeHtml() function to prevent XSS in activity messages
- Applied to all user-generated content display

UX:
- Add loading spinner while fetching activities

Code Quality:
- Add ActivityType constants for consistent usage
- Add toBool() helper for cleaner boolean checks
- Refactored loadActivities() for better readability

~ /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/my-partner-tickets.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 35568 – Refactor ticket scheduled tasks: fix bugs, add test mode, improve ...

amit — Sat, 17 Jan 2026 12:06:59 +0530

amit – 4 file(s) modified
Refactor ticket scheduled tasks: fix bugs, add test mode, improve performance

Bug fixes:
- Remove break statement in alertforTicket that stopped after first user
- Remove duplicate ticketClosed() method (used 7 calendar days vs 8 working days)
- Update Application.java CLI handler to use refactored escalateTicket()

New features:
- Add email test mode: redirect all emails to tester via config
- ticket.email.testMode.enabled=true/false
- ticket.email.testMode.recipient=tester@email.com
- Add configurable auto-escalation: ticket.autoEscalation.enabled
- Working days calculation using WorkingDaysService (excludes Sun + holidays)

Performance improvements:
- Batch fetch ticketSubCategoryMap once per job, not per email
- All repository calls moved outside loops (N+1 query fix)

Escalation thresholds updated:
- L1 -> L2: 3 working days
- L2 -> L3: 3 working days
- L3 -> Final: 2 working days

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

~ /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-cron/src/main/java/com/smartdukaan/cron/scheduled/TicketRelatedScheduledTask.java