Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37018 5 h 22 m ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ revival and focus bill be active on next billing  
37017 6 h 21 m ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ revival and focus bill be active on next billing  
37016 6 h 26 m ranu /trunk/ revival and focus bill be active on next billing  
37015 7 h 48 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37014 7 h 51 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37013 8 h 19 m ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ tried call given on rbm dashboard  
37012 10 h 13 m ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ tried call given on rbm dashboard  
37011 2 d 6 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ tried call given on rbm dashboard  
37010 2 d 8 h ranu /trunk/ tried call given on rbm dashboard  
37009 3 d 3 h 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 3 d 3 h 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 3 d 4 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ new app v2 version access to rbm  
37006 3 d 5 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ new app v2 version access to rbm  
37005 3 d 5 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ new app v2 version access to rbm  
37004 3 d 7 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37003 3 d 12 h ranu /trunk/profitmandi-fofo/src/main/ positions without partner  
37002 4 d 4 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 4 d 5 h ranu /trunk/ rbm calling target issue fix according to aquil  
37000 4 d 6 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 4 d 6 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).  

←Prev12Next→

Show All