Subversion Repositories SmartDukaan

Rev

Go to most recent revision | Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36396 83 d 18 h amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ Scheme item windowing: add startDate/endDate per scheme_item.

Each fofo.scheme_item row now carries an optional [start_date, end_date]
window so the same (scheme_id, catalog_id) pair can be applicable for
different date ranges. Backward compatible: NULL window = always active.

Also pins processSchemeOut scheme resolution to each IMEI's GRN
billing date (Purchase -> Order.billingTimestamp via
PurchaseService.getBillingDateOfPurchase) instead of fofoOrder
createTimestamp, aligning OUT with the existing IN behaviour.

Common DTO: SchemeItems gains startDate/endDate fields.		  
36395 83 d 18 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ login talktime hours cap on 100%  
36394 83 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.		  
36393 83 d 20 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update contact-us list  
36392 83 d 20 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/ login talktime hours cap on 100%  
36391 86 d 13 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ Feat:LocalDateTime fix for insurance  
36390 86 d 13 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ Feat:LocalDateTime fix for insurance  
36389 86 d 14 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ Feat:LocalDateTime fix for insurance  
36388 86 d 14 h aman /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ Feat:LocalDateTime fix for insurance  
36387 86 d 14 h ranu /trunk/ code commit for reports section v2  
36386 86 d 15 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ Revert r36385: drop DataIntegrityViolationException handler from profitmandi-web V1 and V2 global exception handlers. Default DB-error translation is kept only in the FOFO module for now.  
36385 86 d 15 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ Add DataIntegrityViolationException handler to V1 GlobalExceptionHandler and V2GlobalExceptionHandler. Translates MySQL truncation / duplicate / FK errors into HTTP 400 with a friendly message via the new DbErrorTranslator (V1 uses ResponseSender; V2 uses ApiResponse + ErrorDetail).  
36384 86 d 15 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ GlobalExceptionHandler: handle DataIntegrityViolationException via DbErrorTranslator so MySQL truncation / duplicate / FK errors surface as HTTP 400 with a friendly ProfitMandiBusinessException payload (rendered by common.js badRequestAlert).  
36383 86 d 15 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/exception/ Add DbErrorTranslator: translates Spring DataIntegrityViolationException (truncation / duplicate key / FK violation) into ProfitMandiBusinessException with prettified field label.  
36382 86 d 15 h amit /trunk/profitmandi-common/src/main/resources/ Add DB_TRUNCATION / DB_DUPLICATE / DB_FK_VIOLATION / DB_CONSTRAINT response codes for the new DataIntegrityViolationException auto-translator.  
36381 86 d 15 h vikas /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ Dashboard API  
36380 86 d 15 h vikas /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/response/ Dashboard API  
36379 86 d 15 h vikas /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/response/ Dashboard API  
36378 86 d 16 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/ code commit for reports section v2  
36377 86 d 16 h vikas /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ Dashboard API  

←Prev12Next→

Show All