Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
37620 22 d 7 h amit /trunk/profitmandi-fofo/src/main/ Offer creation suggests only active models unless asked for all

/entity accepted activeOnly but always searched with false, so the offer
screen's model picker listed every catalog of the brand, delisted ones included.
It now honours the flag. The default becomes false so the pages that never pass
it keep their current results; the notification product search, which already
asked for active-only, now gets it.

Each item-criteria block gets an Include inactive checkbox, off by default.
Ticking Exclude ticks it too: a brand-level offer still pays on delisted models
partners hold stock of, and they cannot be excluded if they cannot be picked.
Inactive models are labelled, and reloading the list keeps picks still present.

The reload flag is now per block; the old global one let a brand change in one
block be consumed by opening another, leaving the first with a stale list.
Brand names are URL-encoded so a brand like Ai+ is not sent as 'Ai '.

Requires profitmandi-common r37619 for the inactive label.
 
37217 63 d 9 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ external api v2: fix derive endpoint - declare throws Exception (createResponseString)  
37216 63 d 9 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ external api v2: /content/specs/derive one-time backfill endpoint  
37214 63 d 9 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ external api v2: SpecValue columns 8-12 in content CSV (header-sniffed, legacy layout still parses)  
37208 63 d 11 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ external api v2: stamp categoryId on content upload  
37184 68 d 8 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ ai + fixed brand display  
36404 162 d 9 h amit /trunk/profitmandi-fofo/src/ Add catalog monitor type upload, sample sheet, Placement Plan UI tagging (orange/yellow), Today PO csv column, placement-plan-statement.xlsx header coloring  
35583 258 d 4 h ranu /trunk/ code updated by  
35549 264 d 11 h ranu /trunk/ bulletin updated on dashboard and give access category department  
35529 273 d 5 h ranu /trunk/ lead repo done  
35528 273 d 6 h ranu /trunk/ content pojo chwcking  
35525 273 d 6 h ranu /trunk/profitmandi-fofo/src/main/ content exception added  
35523 273 d 6 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ lead repo done  
35487 287 d 7 h ranu /trunk/ place ment plan page show catalog status wise  
35458 290 d 3 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
 
35348 302 d 12 h ranu /trunk/profitmandi-fofo/src/main/ upload code for video url  
35346 305 d 4 h ranu /trunk/ upload code for video url  
33973 684 d 5 h tejus.lohani /trunk/ Added super catalogs  
33501 830 d 4 h ranu /trunk/ print banners updated  
33463 837 d 12 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed machine  
33443 845 d 8 h ranu /trunk/ print resource and order cancel by partner and cron dao mail shoot for Live Demo  
32952 966 d 12 h amit.gupta /trunk/ Added Item bulk uplaoder  
32305 1159 d 12 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixe  
32304 1159 d 12 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixe  
31711 1303 d 7 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Added ActiveOnly to false  
31330 1386 d 11 h tejbeer /trunk/ change  
31238 1397 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/ Removed unwanted files  
30267 1646 d 5 h amit.gupta /trunk/ Fixed category logic  
30262 1649 d 6 h amit.gupta /trunk/ Fixed  
30080 1684 d 12 h amit.gupta /trunk/ Fixed ahead issue  
29900 1717 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed notification  
29881 1721 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
28320 1985 d 10 h tejbeer /trunk/profitmandi-fofo/src/main/ change  
28266 1994 d 13 h tejbeer /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
28264 1994 d 13 h tejbeer /trunk/ url generation code  
27608 2097 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
27600 2098 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
27185 2185 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
26635 2337 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
25986 2492 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/