Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
36394 17 d 3 h amit /trunk/profitmandi-fofo/src/main/ Add IMEI net-margin modal on order-index billing panel.

New /getImeiNetMarginModal endpoint: given an IMEI, derives the
purchase-billed date from the IMEI's purchase order
(InventoryItem.purchaseId -> Purchase.purchaseReference -> Order.billingTimestamp),
fetches schemes applicable on that date via PriceCircular, and shows
per-scheme contribution, NLC, and net margin in a slim modal.

Effective DP = inventory_item.unit_price - max(0, price_drop_amount)
to match SchemeServiceImpl.createSchemeInOut/PriceCircularService.getPayouts.
Offers are intentionally excluded. Per-IMEI price-drop history is
shown for reference.
 
35938 70 d 1 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix scheme IMEI search performance: remove entity list logging causing lazy load, batch PriceDrop queries  
35848 78 d 2 h amit /trunk/ Refactor investment logic to use own investment (total - utilized), remove minimumInvestmentOld, add OK_INVESTMENT_SHORT_PERCENTAGE constant, update thresholds CUTOFF_INVESTMENT=10 MIN_INVESTMENT_PERCENTAGE=5  
35775 86 d 2 h ranu /trunk/profitmandi-fofo/src/main/ imei wise margin / modal wise margin  
35771 87 d 0 h ranu /trunk/ imei wise margin  
35628 103 d 23 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Commented dashobard  
35458 144 d 21 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
 
35252 191 d 5 h aman /trunk/ Feat:Expire Schemes by ids and lead assign to bgc too  
34813 296 d 23 h aman /trunk/ Partner Dashboard Analysis  
34788 305 d 2 h ranu /trunk/ method update for customer offer  
34587 358 d 23 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Scheme notification  
34575 362 d 0 h vikas.jangra /trunk/ Liquidation/Bidding auto approval  
34568 363 d 22 h vikas.jangra /trunk/ Liquidation/Bidding push notification and Publish Email  
34516 377 d 21 h ranu /trunk/ code committed for customer offer additional info  
34409 398 d 1 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed Margin  
34369 407 d 22 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Check  
34317 421 d 5 h amit.gupta /trunk/ commit for scheme related changes  
34211 449 d 4 h vikas.jangra /trunk/ Changed email Ids  
33795 596 d 18 h ranu /trunk/ upgrade offer live  
33313 741 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed Scheme Calcluation missing Front end  
33306 742 d 3 h amit.gupta /trunk/ Fixed logic for sale in inventory history  
33248 754 d 3 h ranu /trunk/ exception added  
33182 769 d 22 h shampa /trunk/ add fields in price drop table. Add purchase billing summery and sale summery table.  
33030 805 d 4 h amit.gupta /trunk/ Fixed offers  
32905 834 d 0 h shampa /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ water mark partner code  
32776 867 d 21 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Minor refactoring  
32331 1004 d 6 h amit.gupta /trunk/ Added changes related to schemes  
32299 1015 d 1 h jai.hind /trunk/profitmandi-fofo/src/main/ In Finance Automate Process SellIn SellOut  
32236 1023 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed additional scheme logic  
32235 1023 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed additional scheme logic  
32232 1023 d 22 h amit.gupta /trunk/ Fixed my income  
31762 1141 d 1 h tejbeer /trunk/ ticket and imei wise scheme related changes  
31741 1150 d 5 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Handling  
31520 1198 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Skip invalid catalog ids that are being added  
31505 1199 d 20 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Removed logic  
31504 1199 d 22 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ F  
31482 1207 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed scheme  
31387 1227 d 5 h amit.gupta /trunk/ Added scheme related changes
Added Sellout scheme
Extend All wont extend Sp.Support/Activation/Sellout Scheme
 
31383 1228 d 2 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ F  
31379 1228 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed investment payout logic