Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
38016 4 h 33 m amit /trunk/profitmandi-fofo/src/main/ Hot Deals admin UI rework + Brand Identifier CSV upload (needs dao r38015)

Hot Deals (Catalog > Hot Deals):
- every Hot Deal model listed, incl. ones with no attributes saved; stat cards + Needs attention filter
- OEM brand dropdown (form + per row), pre-filled from model name, required on save
- row save keeps the OEM model mapping; Clear button; Updated By column

Content page: Brand Identifier CSV (itemId,brandIdentifier) -> catalog.item.brand_identifier
- POST /catalog/brandIdentifier/upload?apply= : preview (NEW/REPLACE/UNCHANGED/ERROR) then apply; replaces existing values
- all-or-nothing; rejects unknown/duplicate items, blank or >100 chars, Hot Deal and Any Colour items; max 5000 rows
- GET /catalog/brandIdentifier/template.csv

jsVersion 453
 
37950 15 d 5 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ fix(catalog): mark Brand Identifier column optional in catalog upload template  
37945 15 d 10 h amit /trunk/profitmandi-fofo/src/main/ fix(catalog): serve bulk upload template with Brand Identifier column

Download Template linked to /download/catalog-template.xls which 404s.
Add GET /catalog/template.xlsx generating the 21-column loader layout
(column U = Brand Identifier, mandatory for flagged smartphone brands).
 
37620 54 d 6 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 95 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 95 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 95 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 95 d 11 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ external api v2: stamp categoryId on content upload  
37184 100 d 8 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ ai + fixed brand display  
36404 194 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 290 d 4 h ranu /trunk/ code updated by  
35549 296 d 11 h ranu /trunk/ bulletin updated on dashboard and give access category department  
35529 305 d 5 h ranu /trunk/ lead repo done  
35528 305 d 6 h ranu /trunk/ content pojo chwcking  
35525 305 d 6 h ranu /trunk/profitmandi-fofo/src/main/ content exception added  
35523 305 d 6 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ lead repo done  
35487 319 d 7 h ranu /trunk/ place ment plan page show catalog status wise  
35458 322 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 334 d 11 h ranu /trunk/profitmandi-fofo/src/main/ upload code for video url  
35346 337 d 4 h ranu /trunk/ upload code for video url  
33973 716 d 5 h tejus.lohani /trunk/ Added super catalogs  
33501 862 d 3 h ranu /trunk/ print banners updated  
33463 869 d 12 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed machine  
33443 877 d 8 h ranu /trunk/ print resource and order cancel by partner and cron dao mail shoot for Live Demo  
32952 998 d 12 h amit.gupta /trunk/ Added Item bulk uplaoder  
32305 1191 d 11 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixe  
32304 1191 d 11 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixe  
31711 1335 d 7 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Added ActiveOnly to false  
31330 1418 d 11 h tejbeer /trunk/ change  
31238 1429 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/ Removed unwanted files  
30267 1678 d 5 h amit.gupta /trunk/ Fixed category logic  
30262 1681 d 5 h amit.gupta /trunk/ Fixed  
30080 1716 d 12 h amit.gupta /trunk/ Fixed ahead issue  
29900 1749 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed notification  
29881 1753 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
28320 2017 d 10 h tejbeer /trunk/profitmandi-fofo/src/main/ change  
28266 2026 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
28264 2026 d 13 h tejbeer /trunk/ url generation code  
27608 2129 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/  
27600 2130 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/