Subversion Repositories SmartDukaan

Rev

Go to most recent revision | Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36628 27 d 5 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ fix: /schemes/update endpoint now uses addSchemeItemWithDates to prevent duplicate scheme_item rows

The old code directly persisted SchemeItem with NULL start_date/end_date, which bypassed the unique constraint (MySQL treats NULLs as distinct). Now uses the same service method as /addItemToScheme, which sets dates from scheme window and checks for overlapping entries before insert.
 
36394 51 d 7 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 104 d 5 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 112 d 6 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 120 d 6 h ranu /trunk/profitmandi-fofo/src/main/ imei wise margin / modal wise margin  
35771 121 d 4 h ranu /trunk/ imei wise margin  
35628 138 d 3 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Commented dashobard  
35458 179 d 1 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 225 d 9 h aman /trunk/ Feat:Expire Schemes by ids and lead assign to bgc too  
34813 331 d 3 h aman /trunk/ Partner Dashboard Analysis  
34788 339 d 6 h ranu /trunk/ method update for customer offer  
34587 393 d 3 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Scheme notification  
34575 396 d 5 h vikas.jangra /trunk/ Liquidation/Bidding auto approval  
34568 398 d 2 h vikas.jangra /trunk/ Liquidation/Bidding push notification and Publish Email  
34516 412 d 1 h ranu /trunk/ code committed for customer offer additional info  
34409 432 d 5 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed Margin  
34369 442 d 2 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Check  
34317 455 d 9 h amit.gupta /trunk/ commit for scheme related changes  
34211 483 d 9 h vikas.jangra /trunk/ Changed email Ids  
33795 630 d 22 h ranu /trunk/ upgrade offer live  

Show All