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
36629 63 d 7 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ fix: validate extend date is not before scheme start date

extendAllSchemes and extendSchemeById now reject extend dates that would create inverted date ranges (end before start). Prevents bad scheme data that bypasses scheme_item date constraints.
 
36628 63 d 7 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 87 d 10 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 140 d 7 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 148 d 8 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 156 d 9 h ranu /trunk/profitmandi-fofo/src/main/ imei wise margin / modal wise margin  
35771 157 d 6 h ranu /trunk/ imei wise margin  
35628 174 d 6 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Commented dashobard  
35458 215 d 3 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 261 d 12 h aman /trunk/ Feat:Expire Schemes by ids and lead assign to bgc too  
34813 367 d 6 h aman /trunk/ Partner Dashboard Analysis  
34788 375 d 8 h ranu /trunk/ method update for customer offer  
34587 429 d 5 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Scheme notification  
34575 432 d 7 h vikas.jangra /trunk/ Liquidation/Bidding auto approval  
34568 434 d 5 h vikas.jangra /trunk/ Liquidation/Bidding push notification and Publish Email  
34516 448 d 4 h ranu /trunk/ code committed for customer offer additional info  
34409 468 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed Margin  
34369 478 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Check  
34317 491 d 11 h amit.gupta /trunk/ commit for scheme related changes  
34211 519 d 11 h vikas.jangra /trunk/ Changed email Ids  

Show All