Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
36922 26 d 4 h amit /trunk/profitmandi-fofo/src/main/ Remove unused Digify retailer integration and fix slim-jQuery clobber on partner-performance/today_po/today_target pages

- Delete Digify controller, views and Buyback asset; drop dead .digify-retailer-login handler and buyback links/buttons
- Load full jQuery (3.5.1) instead of jquery slim on partner-performance/today_po/today_target so injected pages no longer overwrite the dashboard jQuery (restores $.ajax / slideUp)
- Bump jsVersion to 365
 
36819 40 d 7 h amit /trunk/profitmandi-fofo/src/main/ Fix idempotency dedup to be server-authoritative (content + partner scoped)

PostInterceptor now keys duplicates on sha256(fofoId|method|uri|bodyHash) for
mutating methods only, instead of the client-supplied IdempotencyKey header.
The header was rotated per-request by the frontend (and old/sticky clients),
so identical submissions produced distinct keys and were never deduped - e.g.
a create-offer burst created 147 duplicate rows. Keying on the request body
makes dedup independent of client behaviour; partner scoping prevents cross-
partner collisions; distinct payloads (one-offer-per-partner) are unaffected.
GET/HEAD are now never deduped (removes spurious GET 400s).

common.js: attach IdempotencyKey only to mutating methods; stop rotating the
key on every ajaxComplete (kept reset on ajaxSuccess only). version 355.
 
36697 55 d 3 h amit /trunk/profitmandi-fofo/src/main/ fix: FY date range end date missing endOf day in account statement picker, bump version to 342  
36598 62 d 6 h amit /trunk/profitmandi-fofo/src/main/ Flagship models: catalog-level typeahead with 70K min price filter, add menu_category access  
36572 65 d 8 h amit /trunk/ fix: add debit note PDF labels, HDFC UTR duplicate lock, AJAX error handlers in common.js  
35626 171 d 5 h amit /trunk/ Ticket system: add unread tracking, pagination, search, and partner notifications  
35594 174 d 1 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
 
35544 191 d 5 h amit /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Handle scientific notation (e.g., 1.37E7) in numberToComma() function  
35533 194 d 9 h amit /trunk/profitmandi-fofo/src/main/ Fixed AppConfig  
35510 201 d 6 h amit /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed method Number to comma for Cr. Values  
35459 212 d 2 h amit /trunk/ Revert non-Java file changes from r35458  
35458 212 d 2 h amit /trunk/ Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level

Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories

Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor

Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility
 
35289 247 d 13 h amit /trunk/ Added trial franchisee feature  
34859 348 d 4 h vikas /trunk/ Web Pages Management  
34813 364 d 4 h aman /trunk/ Partner Dashboard Analysis  
34546 433 d 6 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Liquidation/Bidding push notification and Publish  
34387 468 d 3 h vikas.jangra /trunk/ Liquidation/Bidding initial work  
34236 510 d 3 h ranu /trunk/ credit note report given to finnace and partner  
33973 606 d 3 h tejus.lohani /trunk/ Added super catalogs  
33927 613 d 10 h tejus.lohani /trunk/ add retailerId in PartnerDealerMapping and fix some bugs  
33790 665 d 7 h ranu /trunk/profitmandi-fofo/src/main/ config version change  
33788 665 d 9 h ranu /trunk/ aging maintain  
33780 671 d 5 h tejus.lohani /trunk/profitmandi-fofo/src/main/webapp/resources/js/ add mail validation function in commomJs and use this to validate mail in loi_form email input  
33765 677 d 4 h ranu /trunk/profitmandi-fofo/src/main/ try catch of bad request handle  
33759 677 d 9 h ranu /trunk/profitmandi-fofo/src/main/ exculde reports url in post interceptor  
33758 677 d 9 h ranu /trunk/profitmandi-fofo/src/main/ js version change  
33756 677 d 10 h ranu /trunk/profitmandi-fofo/src/main/ post interceptor for every post handling  
33612 725 d 9 h amit.gupta /trunk/ Fixed logic to bill only top 5  
33508 751 d 4 h tejus.lohani /trunk/profitmandi-fofo/src/main/webapp/resources/js/ These files are related to Loi form and LOI form data flow to the required tables  
33400 784 d 7 h ranu /trunk/profitmandi-fofo/src/main/ complete spilit order and payment by l2 of pending order item  
33220 828 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed account statement  
33167 843 d 6 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed bug related to online order billing  
33141 851 d 3 h amit.gupta /trunk/profitmandi-fofo/src/main/ patch for  
32979 879 d 6 h amit.gupta /trunk/ Fixed changes related to offer.  
32826 920 d 11 h shampa /trunk/profitmandi-fofo/src/main/webapp/resources/js/ datatable  
32567 1004 d 4 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/ Checked in changes regarding supplier  
32308 1079 d 1 h amit.gupta /trunk/ Added  
32301 1082 d 2 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed comment  
32195 1106 d 4 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/resources/js/  
32130 1135 d 5 h amit.gupta /trunk/ Fixed additional scheme logic