Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37009 7 h 46 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fix Selling Price - DP in IMEI drill-down to use actual inventory-item DP

selectLastMonthFrontEndImei (the per-IMEI breakdown behind each brand/model row)
still passed foi.dp (frozen list DP) into LastMonthFrontEndImeiModel, so the
drill-down did not reconcile with the brand/model totals fixed in r37008. Now
uses ii.unitPrice-ii.priceDropAmount, matching selectLastMonthFrontEndByImei.		  
37008 7 h 47 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fix Selling Price - DP to use actual inventory-item DP instead of frozen list DP

Brand-wise (selectFrontIncomeByBrand) and model-wise (selectFrontIncomeBrandWise)
front-income queries computed the margin as (foi.sellingPrice - foi.dp), where
foi.dp is the TagListing list price frozen on the sale line at order time. This
produced spurious negative margins (e.g. -6000 for units sold at cost). Now uses
the actual per-IMEI acquisition DP (ii.unitPrice - ii.priceDropAmount), the same
net-DP basis used elsewhere (InventoryItem.getNetPrice / scheme payout calc).		  
37007 8 h 49 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ new app v2 version access to rbm  
37006 9 h 8 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ new app v2 version access to rbm  
37005 10 h 2 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ new app v2 version access to rbm  
37004 11 h 44 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37003 16 h 54 m ranu /trunk/profitmandi-fofo/src/main/ positions without partner  
37002 1 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Price-hike: reprocess schemes as per price-drop logic on deduction (updatePriceDrop + reverse/reprocess) and remove getPayouts clamp so hike raises DP -> higher margin. GRN path adjusts basis only (GRN's own processSchemeIn recomputes); endpoint does full reprocess on already-GRN'd units.  
37001 1 d 9 h ranu /trunk/ rbm calling target issue fix according to aquil  
37000 1 d 10 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Price-hike deduction: revert hike edits from price-drop flow; add GET /priceHike/process/{priceDropId} to trigger the on-demand per-retailer hike deduction executor  
36999 1 d 10 h amit /trunk/profitmandi-dao/src/main/ Price-hike deduction (self-contained): revert hike logic from price-drop flow + remove deduct_on_hike flag; add GRN hook (PurchaseServiceImpl, before schemes) and on-demand executor endpoint that debit under-charged units billed in the hike's [affected_on, created_on] window. Idempotent per (hike, imei).  
36998 1 d 11 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ rbm calling target issue fix according to aquil  
36997 1 d 12 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ rbm calling target issue fix according to aquil  
36996 1 d 13 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ rbm calling target issue fix according to aquil  
36995 1 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Price-hike deduction Option 2 (under-charge recovery): gate hike eligibility on order bill date within [affected_on, created_on]; paid-DP Check 2 restricted to its reconciled-guard role  
36994 1 d 14 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ rbm calling target issue fix according to aquil  
36993 1 d 14 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Thread dryRun through sendCreditNote; --sendCreditNote defaults to dry-run (--live for real); add 06:00-on-1st monthlyMarginsCnDryRun scheduled job  
36992 1 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ Add dryRun param to issueMonthlyMarginsCN; gate real work behind runActual (isProd && !dryRun) so the pipeline can run harmlessly on prod  
36991 1 d 14 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ code commited  
36990 1 d 16 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ v2 version some fixes  

←Prev12Next→

Show All