Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
36747 57 d 21 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Scheme extension: propagate new end date to scheme_item rows

extendAllScheme and extendSchemeById only updated scheme.end_date_time, leaving scheme_item.end_date at the original value, so item-level scheme eligibility did not honor the extension. Carry the new end date over to items that were tracking the scheme window (item end_date == previous scheme end date), preserving custom per-item windows, matching expireSchemeById behavior.
 
36629 68 d 16 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 68 d 16 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 92 d 19 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 145 d 17 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 153 d 18 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 161 d 18 h ranu /trunk/profitmandi-fofo/src/main/ imei wise margin / modal wise margin  
35771 162 d 16 h ranu /trunk/ imei wise margin  
35628 179 d 15 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Commented dashobard  
35458 220 d 13 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 266 d 21 h aman /trunk/ Feat:Expire Schemes by ids and lead assign to bgc too  
34813 372 d 15 h aman /trunk/ Partner Dashboard Analysis  
34788 380 d 18 h ranu /trunk/ method update for customer offer  
34587 434 d 15 h vikas.jangra /trunk/profitmandi-fofo/src/main/ Scheme notification  
34575 437 d 16 h vikas.jangra /trunk/ Liquidation/Bidding auto approval  
34568 439 d 14 h vikas.jangra /trunk/ Liquidation/Bidding push notification and Publish Email  
34516 453 d 13 h ranu /trunk/ code committed for customer offer additional info  
34409 473 d 17 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed Margin  
34369 483 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Check  
34317 496 d 21 h amit.gupta /trunk/ commit for scheme related changes  

Show All