Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
37319 18 h 43 m amit /trunk/ Fix partner-performance tertiary: aggregate order items (qty*mop), not the POS-typed order header

The tertiary panel summed fofo_order.total_amount - a price typed at the partner POS
and never validated against the catalogue - and attributed each whole order to its
first line item's brand via .get(0). One mistyped digit inflated reported sell-out
10x, and mixed-brand orders booked 100% to the first brand, leaving the rest at zero.
Defect dates from r32000/r32034 (May 2023); the panel was the only tertiary consumer
diverging from the qty*mop basis.

- New FofoOrder.selectMonthlyBrandTertiary: sum(quantity*mop) grouped by
(year*100+month) and item brand - the same basis selectPartnerTertiarySales
already uses for the DSR and the partner tier calculation
- PerformanceController: replaces two entity-loading queries (every FofoOrder and
FofoOrderItem for 6 months) with one aggregate; all items now count, each under
its own brand
- Month labels unchanged - toMonthLabel rebuilds the MMM''uu key, template untouched
- Remove V2FofoPerformanceController, the /v2/fofo JSON copy carrying the same defect

Verified against dev DB for fofo_id 175139501: Jul 2026 now 16,94,939 (panel
previously showed 50,92,440); all six months match the qty*mop basis.
 
37312 1 d 0 h ranu /trunk/ one assist ew at 99 up to 20k  
37310 1 d 16 h vikas /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch/ Scratch Offers now selects only active partners  
37309 1 d 18 h vikas /trunk/ Scratch Offers now selects only active partners  
37288 4 d 18 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ all active brand in hot deals  
37287 4 d 19 h ranu /trunk/ warehouse access  
37286 4 d 19 h ranu /trunk/ warehouse access  
37285 4 d 19 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ warehouse access  
37282 4 d 20 h amit /trunk/profitmandi-fofo/src/main/ hot deals: remove legacy tag_listing hot-deals endpoints and catalog-item UI (replaced by model_hot_deal admin flow)  
37277 5 d 0 h vikas /trunk/profitmandi-fofo/src/main/ Updated Escalation Level  
37272 5 d 1 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix duplicate super-catalog mapping rows on save

The add-row flow in super_catalog.js always posts mapping id 0, so saving a
catalog that was already mapped inserted a second row. That duplicated the
catalog inside superCatalogVariants_s, which surfaced as repeated storage
variant chips on the partner catalog card.

processCatalogMapping now falls back to a (catalogId, superCatalogId) lookup
when no mapping id is supplied and updates the existing row instead of
inserting. Also removes a latent NPE when a stale mapping id was posted.

Backed by a new UNIQUE(catalog_id, super_catalog_id) on
catalog.super_catalog_mapping; 5 pre-existing surplus rows were removed.
 
37270 5 d 2 h amit /trunk/profitmandi-fofo/src/main/ Hot deals admin: activated -> fresh (labels, params, row editors); manual Push to Solr for selected models (checkbox selection + /hotDeals/pushSolr calling FofoSolr.updateSingleCatalog directly, bypasses prod-gated event so Category team curation is searchable immediately); jsVersion 395  
37264 5 d 19 h ranu /trunk/ rbm assignement event and new edm mail committed  
37263 5 d 21 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ commit for loi form  
37262 7 d 19 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ commit for loi form  
37261 7 d 20 h ranu /trunk/ hot deal show all items  
37256 8 d 21 h amit /trunk/profitmandi-fofo/src/main/ feat: hot-deals admin — all-brands searchable/paginated table

- /hotDeals/all replaces per-brand /hotDeals table: server-side search (model/
brand), 20/page with prev/next, Brand column, newest window first
- /hotDeals/slots: active-slot usage per brand (n / 15) for the add form
- jsVersion 394
 
37248 8 d 22 h vikas /trunk/ Updated Escalation Level  
37246 9 d 2 h amit /trunk/profitmandi-fofo/src/main/ Hot deals admin: five mandatory attribute inputs (no defaults) on add + inline row edit, table columns, updateDeal params; jsVersion 393  
37243 9 d 18 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ state head should be l4 and l5  

Show All