| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 35626 |
103 d 21 h |
amit |
/trunk/ |
Ticket system: add unread tracking, pagination, search, and partner notifications |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketReadStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketReadStatusRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketReadStatusRepositoryImpl.java
/trunk/profitmandi-dao/src/main/resources/partner-ticket-update.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-content.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/my-partner-tickets-content.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-content.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ticket-manager.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ticket-renderer.js
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TicketViewModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/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/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.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/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
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
|
| 35606 |
105 d 22 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 |
|
/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
|
| 35602 |
106 d 2 h |
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 |
|
/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
|
| 35594 |
106 d 18 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 |
|
/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/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
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 35592 |
107 d 2 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 |
|
/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/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
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 33779 |
604 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
tickt created by showed |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
|
| 33778 |
604 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
created by showed on manager tickets |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
|
| 33653 |
647 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
manager ticket assigned to added auth user last name and emp code |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
|
| 31762 |
1140 d 23 h |
tejbeer |
/trunk/ |
ticket and imei wise scheme related changes |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-categories.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-escalationtype.vm
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/TicketRelatedScheduledTask.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreatePositionModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/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/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-position.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/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/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/resources/js/scheme.js
|
| 26318 |
2287 d 22 h |
tejbeer |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
change |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/franchisee-visit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/instruction-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reports.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/review_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-partner-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-partner-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
|
| 24824 |
2600 d 4 h |
govind |
/trunk/ |
Internal Communication |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.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/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 24788 |
2606 d 21 h |
govind |
/trunk/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
|
| 24748 |
2612 d 4 h |
govind |
/trunk/profitmandi-fofo/src/main/webapp/ |
|
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 24747 |
2612 d 4 h |
govind |
/trunk/ |
Search for Manager Ticket |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketSearchType.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/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 24699 |
2618 d 0 h |
govind |
/trunk/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/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/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 24640 |
2627 d 3 h |
govind |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
|
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
|
| 24620 |
2630 d 22 h |
govind |
/trunk/ |
closing ticket |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivityType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.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/WEB-INF/views/ftl/managerTicket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|
| 24569 |
2635 d 2 h |
govind |
/trunk/ |
Issues resolved in ticket |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/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/TicketRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
|
| 24530 |
2641 d 5 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
1. Fixed styling issues in dialogs
2. Added count to the IMEIS |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
|
| 24500 |
2651 d 23 h |
govind |
/trunk/ |
Ticket Changes |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketAssigned.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketAssignedRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketAssignedRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
/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/WEB-INF/views/ftl/edit-ticket-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
|