| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 35613 |
7 m |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ |
Fix: Remove method-level @Transactional, use class-level transaction management |
|
| 35612 |
10 m |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ |
Fix: Add @Transactional(propagation=REQUIRES_NEW) to resolveOldEscalationTickets to fix Hibernate session error |
|
| 35611 |
17 m |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/controller/ |
Fix: Use ResponseEntity.status(500) for Spring Boot 2.0 compatibility |
|
| 35610 |
19 m |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ |
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 |
|
| 35609 |
30 m |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/ |
Add resolveOldEscalationTickets endpoint to security whitelist |
|
| 35608 |
42 m |
amit |
/trunk/PyProj/src/shop2020/ |
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 |
|
| 35607 |
55 m |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
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) |
|
| 35606 |
57 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
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 |
|
| 35605 |
3 h 17 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
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 |
|
| 35604 |
3 h 54 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
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 |
|
| 35603 |
4 h 17 m |
amit |
/trunk/profitmandi-fofo/src/main/ |
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 |
|
| 35602 |
4 h 27 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
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 |
|
| 35601 |
5 h 15 m |
amit |
/trunk/profitmandi-fofo/src/main/ |
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 |
|
| 35600 |
5 h 52 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
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 |
|
| 35599 |
20 h 9 m |
amit |
/trunk/profitmandi-web/ |
Add HikariCP dependency for connection pooling |
|
| 35598 |
20 h 27 m |
amit |
/trunk/profitmandi-cron/src/main/resources/META-INF/ |
Migrate from C3P0 to HikariCP connection pooling
- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min |
|
| 35597 |
20 h 27 m |
amit |
/trunk/profitmandi-fofo/src/main/resources/META-INF/ |
Migrate from C3P0 to HikariCP connection pooling
- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min |
|
| 35596 |
20 h 27 m |
amit |
/trunk/profitmandi-web/src/main/ |
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 |
|
| 35595 |
20 h 27 m |
amit |
/trunk/profitmandi-dao/ |
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 |
|
| 35594 |
20 h 32 m |
amit |
/trunk/ |
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 |
|