Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
35622 6 h 51 m aman /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fix:Last name is not required check  
35621 7 h 6 m vikas /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Youtube Video issue: Update iframe  
35620 7 h 14 m vikas /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ separate  
35619 12 h 16 m amit /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ 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
 
35618 1 d 4 h amit /trunk/ 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
 
35617 1 d 4 h amit /trunk/ 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
 
35616 1 d 5 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ Fixed delay to 5  
35615 1 d 5 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Revert ticket visibility changes from TicketChatActivityController  
35614 1 d 5 h amit /trunk/ 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
 
35613 1 d 6 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Fix: Remove method-level @Transactional, use class-level transaction management  
35612 1 d 6 h 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 1 d 6 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/controller/ Fix: Use ResponseEntity.status(500) for Spring Boot 2.0 compatibility  
35610 1 d 6 h 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 1 d 6 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/ Add resolveOldEscalationTickets endpoint to security whitelist  
35608 1 d 6 h 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 1 d 7 h 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 1 d 7 h 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 1 d 9 h 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 1 d 10 h 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 1 d 10 h 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
 

Show All