| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 35605 |
1 h 32 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 |
2 h 10 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 |
2 h 32 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 |
2 h 43 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 |
3 h 31 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 |
4 h 8 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 |
18 h 25 m |
amit |
/trunk/profitmandi-web/ |
Add HikariCP dependency for connection pooling |
|
| 35598 |
18 h 42 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 |
18 h 42 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 |
18 h 42 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 |
18 h 42 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 |
18 h 48 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 |
|
| 35593 |
1 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Added Versioning |
|
| 35592 |
1 d 3 h |
amit |
/trunk/ |
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 |
|
| 35591 |
1 d 3 h |
aman |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ |
Fix:Remove Account team from default partner and partner credit report and only send to neeraj sir |
|
| 35590 |
4 d 20 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
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 |
|
| 35589 |
4 d 20 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
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 |
|
| 35588 |
4 d 21 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ |
Fix ClassCastException in selectByfofoIds - flatten list properly instead of nesting ArrayList in Arrays.asList() |
|
| 35587 |
4 d 22 h |
ranu |
/trunk/ |
code diploy for bulletins |
|
| 35586 |
5 d 17 h |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/ |
Fix: Set HikariCP autoCommit=false to enable Hibernate dirty checking for transaction management |
|