Subversion Repositories SmartDukaan

Rev

Go to most recent revision | Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
35596 172 d 23 h 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 172 d 23 h 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 172 d 23 h 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 173 d 4 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Added Versioning  
35592 173 d 7 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 173 d 7 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 177 d 0 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 177 d 0 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 177 d 1 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 177 d 3 h ranu /trunk/ code diploy for bulletins  
35586 177 d 22 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  
35585 178 d 1 h ranu /trunk/ code updated by  
35584 179 d 0 h ranu /trunk/profitmandi-fofo/src/main/ code updated by  
35583 179 d 1 h ranu /trunk/ code updated by  
35582 179 d 1 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix:DMS Code update issue  
35581 179 d 8 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/ icici lombard service  
35580 180 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Partner Pending Indents Data issue  
35579 180 d 8 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Feat:add lead id in lead report  
35578 181 d 3 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ 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
 
35577 181 d 5 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Feat:add item ID in Aging Stock List: Items that are 4 days old or older report.  

Show All