Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
36231 34 d 16 h ranu /trunk/profitmandi-fofo/src/main/ any rbm can see activity his partner ticket  
/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/my-partner-tickets-content.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
36040 51 d 17 h ranu /trunk/profitmandi-fofo/src/main/ filter and some other requirement addded in tickets view  
/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/ticket-content.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
35640 102 d 17 h amit /trunk/profitmandi-fofo/src/main/ Skip escalations in ticket overview Message column, compact escalation styling in detail dialog

- Pass lastMessageMap to ticket overview templates for all three views
(myTicket, managerTicket, myPartnerTicket)
- Template Message column prefers lastMessageMap over activityMap
- Escalation activities in detail dialog render as compact centered
system messages with pill styling instead of chat bubbles
- Add .system-activity CSS for compact centered gray pill style
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activity-modal-styles.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/cs.js
35626 103 d 16 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
35604 105 d 19 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
 
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
35594 106 d 12 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 106 d 20 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
35569 115 d 12 h amit /trunk/profitmandi-fofo/src/main/ CRM-only external communication + performance & security improvements

Feature:
- Restrict external communication (COMMUNICATION_OUT) to CRM team only (category_id=9)
- Non-CRM users can only send internal communications
- Hide internal/external checkbox for non-CRM users in UI

Performance:
- Eliminate duplicate AuthUser fetch in getTicket() - reuse variable
- Eliminate duplicate activity query (selectAll called twice)
- Fetch only needed AuthUsers instead of all users for activity display
- Same optimizations applied to getMyPartyTicketTicket()

Security:
- Add escapeHtml() function to prevent XSS in activity messages
- Applied to all user-generated content display

UX:
- Add loading spinner while fetching activities

Code Quality:
- Add ActivityType constants for consistent usage
- Add toBool() helper for cleaner boolean checks
- Refactored loadActivities() for better readability
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/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
34913 259 d 8 h ranu /trunk/profitmandi-fofo/src/main/ show all parties ticket to abm  
/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/my-partner-tickets.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
33081 793 d 20 h ranu /trunk/profitmandi-fofo/src/main/ ticket category internal and external  
/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-category.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
32885 840 d 18 h shampa /trunk/profitmandi-fofo/src/main/webapp/resources/js/ remove refresh loader  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
31771 1136 d 16 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
31762 1140 d 17 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
31414 1224 d 11 h amit.gupta /trunk/profitmandi-fofo/src/main/ F  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
31412 1224 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed formatting  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
27755 1920 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed live with on  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/banner-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
/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/feature.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/notification-panel.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-target.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/product-detail.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/refferal.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
27754 1920 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed live with on  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/banner-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/feature.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/franchisee-visit.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/hygiene.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/item.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/jio-recharge.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/live_demo_billing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/map-index.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/notification-panel.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-target.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/product-detail.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/recharge.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/refferal.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/role.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/send-message.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/unsettled-payments.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/user-profile.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/web-listing.js
27410 1999 d 15 h tejbeer /trunk/ position related change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/position-partner.vm
/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-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-position.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/position-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
27285 2021 d 23 h tejbeer /trunk/ change  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ContentType.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
27270 2023 d 15 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/ActivityAttachment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityAttachmentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityAttachmentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Activity.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/FileUploadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js

Show All