SmartDukaan – /

Rev 36419 – OkHttp→HttpClientFactory migration for Digify controller

amit — Tue, 28 Apr 2026 18:18:01 +0530

amit – 1 file(s) modified
OkHttp→HttpClientFactory migration for Digify controller

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify/DigifyController.java

Rev 36418 – OkHttp→Apache HttpClient migration. HyperTrackController/TrackingController now use RestClient, DB reads extracted ...

amit — Tue, 28 Apr 2026 18:17:56 +0530

amit – 5 file(s) modified
OkHttp→Apache HttpClient migration. HyperTrackController/TrackingController now use RestClient, DB reads extracted to HyperTrackService to release connections before external HTTP calls. V2FofoDigifyController uses HttpClientFactory.

~ /trunk/profitmandi-web/build.gradle
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/HyperTrackController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/HyperTrackService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoDigifyController.java

Rev 36417 – Fix:PO item swap — update/delete old PURCHASE scan record when ...

amit — Tue, 28 Apr 2026 18:17:53 +0530

amit – 1 file(s) modified
Fix:PO item swap — update/delete old PURCHASE scan record when reducing quantity on swapped inventory item

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 36416 – Drop OkHttp, standardise on Apache HttpClient via HttpClientFactory. RestClient pool ...

amit — Tue, 28 Apr 2026 18:17:35 +0530

amit – 3 file(s) modified
Drop OkHttp, standardise on Apache HttpClient via HttpClientFactory. RestClient pool raised to 20/8, all construction routed through factory. Lint guard added to block direct OkHttp/createDefault usage.

~ /trunk/profitmandi-common/build.gradle
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/HttpClientFactory.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 36415 – GstProService: cancel EWB before IRN in within-24h cancellation NIC ...

amit — Tue, 28 Apr 2026 17:22:39 +0530

amit – 1 file(s) modified
GstProService: cancel EWB before IRN in within-24h cancellation

NIC rejects IRN cancellation with 'This IRN cannot be cancelled because
e-way bill has been generated' when an EWB is still active against the
invoice. Existing within-24h branch went straight to cancelIrn and hit
this rejection on every cancellation that had a generated EWB.

Mirror the DC branch's EWB-cancel pattern: when eInvoiceDetails.ewbNo is
non-null, resolve sellerGstin (prod gstin / sandbox), parse ewbNo, call
cancelEwb first, then proceed to cancelIrn. EWB-cancel is wrapped in
try/catch + WARN — already-cancelled EWBs (transient or manual) don't
block the IRN cancel that follows; a genuinely-active EWB still surfaces
via the IRN cancel error.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java

Rev 36414 – without vendor catalog pricing po will not create

ranu — Tue, 28 Apr 2026 16:48:05 +0530

ranu – 1 file(s) modified
without vendor catalog pricing po will not create

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 36413 – Added Rising Star/NEW

amit — Tue, 28 Apr 2026 13:31:20 +0530

amit – 1 file(s) modified
Added Rising Star/NEW

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/MonitorType.java

Rev 36412 – Added Rising Star/NEW

amit — Tue, 28 Apr 2026 13:31:11 +0530

amit – 1 file(s) modified
Added Rising Star/NEW

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java

Rev 36411 – Fix lock contention: REQUIRES_NEW for wallet lock in createLoanForBilling, handle ...

amit — Tue, 28 Apr 2026 13:28:23 +0530

amit – 2 file(s) modified
Fix lock contention: REQUIRES_NEW for wallet lock in createLoanForBilling, handle HDFC payment deadlock as duplicate

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 36410 – Added Rising Star/NEW

amit — Tue, 28 Apr 2026 12:11:20 +0530

amit – 1 file(s) modified
Added Rising Star/NEW

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/MonitorType.java

Rev 36409 – V2 REST: mirror INV reject endpoint + restore !isShipped guard ...

amit — Mon, 27 Apr 2026 19:57:10 +0530

amit – 1 file(s) modified
V2 REST: mirror INV reject endpoint + restore !isShipped guard

/return/invoice/reject/{proId} — REST sibling of the fofo controller's
new endpoint. Finance-role-gated, requires non-blank rejectRemark.

/return/invoice/process — autoApprove now isIrnCancellable && !isShipped,
matching the fofo controller. Shipped goods route through manual approval
even within 24h.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPurchaseReturnController.java

Rev 36408 – Sale-return reversal: controller wiring + UI for cancellability gate + ...

amit — Mon, 27 Apr 2026 19:57:02 +0530

amit – 7 file(s) modified
Sale-return reversal: controller wiring + UI for cancellability gate + INV reject + date filter

PurchaseReturnController:
/return/invoice/process — autoApprove now isIrnCancellable && !isShipped.
!isShipped guard restored: shipped goods route through manual approval
even within 24h, so the physical return goes through CN flow.
/return/invoice/reject/{proId} — new endpoint for finance to reject a
pending INV PRO (sale stands, no inventory/wallet/GST action).
/return/invoice — date filter (fromDate/toDate query params, default
last 30 days) backed by selectByWarehouseIdsAndDateRange. Limit
bumped to 200 to accommodate longer ranges.
receive-debit-note view — passes $requiresFinanceApproval so the
template can render the finance-approval banner when DN's IRN is
past the 24h window.

invoice-return.vm:
Added From/To date inputs + Apply button.
Added Reject button next to Approve & Refund for pending INV PROs.

receive-debit-note.vm:
Added one informational banner (#if $requiresFinanceApproval) above
the receipt form. No layout / JS / submit-URL change.

return.js:
#invoice-return-date-apply handler — POSTs the selected range to
/return/invoice and refreshes the table.
.reject-invoice-return handler — prompts for reason, calls the new
reject endpoint.

dev/staging/prod.properties: feature flag finance.receipt.approval.email.enabled
(default false, flip per env when mail infra is ready).

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm

Rev 36407 – Sale-return reversal: cancellability gate, CN on approve, INV reject, ROI ...

amit — Mon, 27 Apr 2026 19:54:23 +0530

amit – 6 file(s) modified
Sale-return reversal: cancellability gate, CN on approve, INV reject, ROI semantics

GstProService.isIrnCancellable(invoiceNumber): predicate extracted from
the inline 24h check used in cancelInvoiceGst, so callers outside the
service can decide branching without duplicating the rule. DC and no-IRN
cases return false — those paths use EWB cancel / credit-note issuance.

PurchaseReturnServiceImpl: split single-phase return-receive into
submitReceiptForApproval + applyReceipt. Submit persists per-item return
type on PurchaseReturnItem so apply (called inline on auto-approve, or
later from refundOrder when finance clicks Process Refund) can replay
the scan loop without the original itemReturnTypes map.

processInvoiceReturn(autoApprove=true) no longer creates a PRO. Routes
through new cancelInvoiceFully which calls gstProService.cancelInvoiceGst
(the canonical IRN-cancel path setting Order.status=INVOICE_CANCELLED)
and adds wallet credit + warehouse-stock restoration. Cancellations now
live on Order/EInvoiceDetails screens, not in the returns ledger —
matches standard ERP practice and the existing cancelInvoiceGst flow.

processInvoiceReturn(autoApprove=false) creates an INV-prefix PRO in
pending state and calls notifyFinanceApprovalPending (Finance L1+L2
emails resolved dynamically from PositionRepository).

approveInvoiceReturn now runs applyInvoiceReturnViaCreditNote — raises
local CreditNote + CreditNoteLine rows (sequential CN# from
SellerWarehouse), issues CRN at GST via generateCreditNoteIrn, restores
warehouse stock, populates ReturnOrderInfo (this path IS a customer
return without DN — ROI is the right anchor), credits wallet. Drops the
old applyInvoiceReturnEffects helper which mishandled both cancel and
return-via-CN as the same path.

rejectInvoiceReturn: new method for finance to reject pending INV PROs.
Sale stands — only stamps reject_timestamp/reject_remark. No inventory,
no wallet, no GST action, no ROI. Closes the gap where finance had
Approve as the only option on a pending INV PRO.

refundOrder gains a refund guard (PRO must exist, not refunded, not
rejected) and applyReceipt-if-needed at the top — Finance's existing
Process Refund button now drives approve+refund atomically.

PurchaseReturnOrderRepository.selectByWarehouseIdsAndDateRange: Hibernate
query for a date-range listing on /return/invoice (default last 30
days, limit 200).

@Transactional(rollbackFor=Exception.class) at class level —
ProfitMandiBusinessException is checked, so Spring's default rollback
didn't fire on guard failures, allowing partial commits. Closing that
silently broken behaviour.

LineItemImei N+1 fix: receiveDebitNoteItems / refundOrder / rejectReturn
each iterated orders calling selectByLineItemId per row. Switched to the
existing batch selectByLineItemIds(List).

Email template finance-receipt-approval-pending.vm and SQL migration
migration_imei_net_margin_modal_api.sql added (registers the
/getImeiNetMarginModal endpoint in dtr.api and grants access to the
roles that currently access /order).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/finance-receipt-approval-pending.vm
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_imei_net_margin_modal_api.sql

Rev 36406 – Add scheme_item windowing migration script. Migrates fofo.scheme_item from composite ...

amit — Mon, 27 Apr 2026 17:43:00 +0530

amit – 1 file(s) modified
Add scheme_item windowing migration script.

Migrates fofo.scheme_item from composite (scheme_id, catalog_id) PK to
surrogate id BIGINT, adds audit columns, swaps the old uniqueness to
the 4-column window key, adds a date-driven lookup index, and installs
BEFORE INSERT/UPDATE triggers that enforce start<=end, containment in
parent scheme window, and non-overlap within (catalog_id, scheme_id).

Step 4b drops the legacy UNIQUE scheme_catalog (scheme_id, catalog_id);
without this the windowing feature is functionally blocked.

Applied on hadb1 in this revision.

+ /trunk/profitmandi-dao/src/main/resources/sql/migration_scheme_item_windowing.sql

Rev 36405 – Fix duplicate SchemeInOut on concurrent GRN: SELECT FOR UPDATE on ...

amit — Mon, 27 Apr 2026 17:41:14 +0530

amit – 3 file(s) modified
Fix duplicate SchemeInOut on concurrent GRN: SELECT FOR UPDATE on inventory_item before createSchemeInOut to serialise concurrent GRN calls per IMEI

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 36404 – Add catalog monitor type upload, sample sheet, Placement Plan UI ...

amit — Mon, 27 Apr 2026 14:58:30 +0530

amit – 13 file(s) modified
Add catalog monitor type upload, sample sheet, Placement Plan UI tagging (orange/yellow), Today PO csv column, placement-plan-statement.xlsx header coloring

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidator.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/controller
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/controller/PlacementPlanControllerUploadTest.java
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/util
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidatorTest.java
+ /trunk/profitmandi-fofo/src/test/resources/catalog_monitor_type_10rows.csv

Rev 36403 – Add catalog.catalog_monitor_type table, entity, and repository for per-catalog focused/normal monitor ...

amit — Mon, 27 Apr 2026 14:57:42 +0530

amit – 5 file(s) modified
Add catalog.catalog_monitor_type table, entity, and repository for per-catalog focused/normal monitor type tagging

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CatalogMonitorType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/MonitorType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogMonitorTypeRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogMonitorTypeRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/catalog_monitor_type.sql

Rev 36402 – Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

amit — Mon, 27 Apr 2026 14:53:33 +0530

amit – 7 file(s) modified
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/razorpay/FetchPartnersDisbursementTask.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/Reconciliation.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/TicketRelatedScheduledTask.java

Rev 36401 – Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

amit — Mon, 27 Apr 2026 14:53:25 +0530

amit – 8 file(s) modified
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RefferalController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 36400 – Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

amit — Mon, 27 Apr 2026 14:53:17 +0530

amit – 14 file(s) modified
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SupportController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoHdfcPaymentController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoLoiFormController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPartnerOnBoardingPanelController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoRefferalController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWalletController.java

Rev 36399 – Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

amit — Mon, 27 Apr 2026 14:52:32 +0530

amit – 21 file(s) modified
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/OtpProcessor.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AuthServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/CustomerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/EmailService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/mail/MailOutboxService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PerformanceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/scheduled/SDCreditScheduler.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 36398 – Replace mailSender (SendGrid) with gmailRelaySender across all modules - SendGrid ...

amit — Mon, 27 Apr 2026 14:52:21 +0530

amit – 1 file(s) modified
Replace mailSender (SendGrid) with gmailRelaySender across all modules - SendGrid API key expired/revoked

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/EmailServiceImpl.java

Rev 36397 – Scheme item windowing: add startDate/endDate per scheme_item. Each fofo.scheme_item ...

amit — Mon, 27 Apr 2026 14:38:57 +0530

amit – 7 file(s) modified
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.

- SchemeItem entity: composite (schemeId, catalogId) PK -> surrogate
long id (IDENTITY), unique (catalog_id, scheme_id, start_date, end_date),
audit cols (updatedBy, updatedOn).
- Scheme + TagListing named queries: gated by
'(si.start_date is null or :onDate between si.start_date and si.end_date)'.
- SchemeItemRepository: + selectById, selectBySchemeId,
existsOverlapping (half-open, with self-exclude), selectItemsOutsideWindow.
- SchemeService: + updateSchemeItemWindow / addSchemeItemWithDates /
clampSchemeItems with containment + overlap validation; drop dead
getTotalMargin.
- SchemeServiceImpl.processSchemeOut: pin 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.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 36396 – Scheme item windowing: add startDate/endDate per scheme_item. Each fofo.scheme_item ...

amit — Mon, 27 Apr 2026 14:38:44 +0530

amit – 1 file(s) modified
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.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SchemeItems.java

Rev 36395 – login talktime hours cap on 100%

ranu — Mon, 27 Apr 2026 14:36:06 +0530

ranu – 1 file(s) modified
login talktime hours cap on 100%

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmPerformanceDashboardModel.java

Rev 36394 – Add IMEI net-margin modal on order-index billing panel. New ...

amit — Mon, 27 Apr 2026 14:14:14 +0530

amit – 6 file(s) modified
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.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/imei-net-margin.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/imei-net-margin-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 36393 – Fix:Update contact-us list

aman — Mon, 27 Apr 2026 13:23:35 +0530

aman – 1 file(s) modified
Fix:Update contact-us list

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm

Rev 36392 – login talktime hours cap on 100%

ranu — Mon, 27 Apr 2026 12:26:38 +0530

ranu – 1 file(s) modified
login talktime hours cap on 100%

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java

Rev 36391 – Feat:LocalDateTime fix for insurance

aman — Fri, 24 Apr 2026 19:47:40 +0530

aman – 1 file(s) modified
Feat:LocalDateTime fix for insurance

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2OrderController.java

Rev 36390 – Feat:LocalDateTime fix for insurance

aman — Fri, 24 Apr 2026 19:36:48 +0530

aman – 1 file(s) modified
Feat:LocalDateTime fix for insurance

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2OrderController.java

Rev 36389 – Feat:LocalDateTime fix for insurance

aman — Fri, 24 Apr 2026 19:21:46 +0530

aman – 1 file(s) modified
Feat:LocalDateTime fix for insurance

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2OrderController.java

Rev 36388 – Feat:LocalDateTime fix for insurance

aman — Fri, 24 Apr 2026 19:18:29 +0530

aman – 1 file(s) modified
Feat:LocalDateTime fix for insurance

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2OrderController.java

Rev 36387 – code commit for reports section v2

ranu — Fri, 24 Apr 2026 18:31:25 +0530

ranu – 4 file(s) modified
code commit for reports section v2

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoReportsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/enumeration/PartnerReportType.java

Rev 36386 – Revert r36385: drop DataIntegrityViolationException handler from profitmandi-web V1 and V2 ...

amit — Fri, 24 Apr 2026 18:22:41 +0530

amit – 2 file(s) modified
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.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/exception/V2GlobalExceptionHandler.java

Rev 36385 – Add DataIntegrityViolationException handler to V1 GlobalExceptionHandler and V2GlobalExceptionHandler. Translates MySQL ...

amit — Fri, 24 Apr 2026 18:05:32 +0530

amit – 2 file(s) modified
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).

Rev 36384 – GlobalExceptionHandler: handle DataIntegrityViolationException via DbErrorTranslator so MySQL truncation / duplicate ...

amit — Fri, 24 Apr 2026 18:05:29 +0530

amit – 1 file(s) modified
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).

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java

Rev 36383 – Add DbErrorTranslator: translates Spring DataIntegrityViolationException (truncation / duplicate key / ...

amit — Fri, 24 Apr 2026 18:05:26 +0530

amit – 2 file(s) modified
Add DbErrorTranslator: translates Spring DataIntegrityViolationException (truncation / duplicate key / FK violation) into ProfitMandiBusinessException with prettified field label.

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/exception
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/exception/DbErrorTranslator.java

Rev 36382 – Add DB_TRUNCATION / DB_DUPLICATE / DB_FK_VIOLATION / DB_CONSTRAINT response codes ...

amit — Fri, 24 Apr 2026 18:05:24 +0530

amit – 1 file(s) modified
Add DB_TRUNCATION / DB_DUPLICATE / DB_FK_VIOLATION / DB_CONSTRAINT response codes for the new DataIntegrityViolationException auto-translator.

~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 36381 – Dashboard API

vikas — Fri, 24 Apr 2026 17:58:47 +0530

vikas – 1 file(s) modified
Dashboard API

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2HomeController.java

Rev 36380 – Dashboard API

vikas — Fri, 24 Apr 2026 17:36:43 +0530

vikas – 1 file(s) modified
Dashboard API

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/response/AddMoneyPageResponse.java