SmartDukaan – //trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/

Rev 36532 – Fix moveToBill to use net availability, add bulk PO items ...

amit — Wed, 13 May 2026 12:14:59 +0530

amit – 8 file(s) modified
Fix moveToBill to use net availability, add bulk PO items upload UI with template download

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm

Rev 36531 – Fix:Remove hold onboardings from the timeline

aman — Wed, 13 May 2026 11:19:41 +0530

aman – 2 file(s) modified
Fix:Remove hold onboardings from the timeline

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm

Rev 36530 – Add bulk PO items upload and template download endpoints for ...

amit — Tue, 12 May 2026 21:54:34 +0530

amit – 2 file(s) modified
Add bulk PO items upload and template download endpoints for PurchaseOrder creation

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulkPORowModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 36529 – warehouse summary model removed from today po

ranu — Tue, 12 May 2026 18:28:55 +0530

ranu – 2 file(s) modified
warehouse summary model removed from today po

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm

Rev 36523 – Fix:Wod and fin code and wod-fin-mapping storetimeline fix

aman — Mon, 11 May 2026 17:04:32 +0530

aman – 3 file(s) modified
Fix:Wod and fin code and wod-fin-mapping storetimeline fix

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/ServiceConfigContoller.java

Rev 36521 – Added RequestCachingFilter

amit — Mon, 11 May 2026 16:20:01 +0530

amit – 4 file(s) modified
Added RequestCachingFilter

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java

Rev 36519 – Fix:First Po

aman — Mon, 11 May 2026 15:17:15 +0530

aman – 2 file(s) modified
Fix:First Po

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepository.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 36513 – Add running_balance to userwallethistory: persist wallet balance after each transaction ...

amit — Sun, 10 May 2026 18:10:51 +0530

amit – 9 file(s) modified
Add running_balance to userwallethistory: persist wallet balance after each transaction for instant ledger display. Populate at all write paths (WalletService, adjustTransaction). Read directly in wallet statement template and CSV download. Includes backfill migration SQL. Renamed walletSummart to walletSummary.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WalletSummaryReportModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_running_balance_wallet_history.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWalletController.java

Rev 36506 – Fix:Pre Booking

aman — Sat, 09 May 2026 15:58:48 +0530

aman – 1 file(s) modified
Fix:Pre Booking

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

Rev 36501 – Fixed Offer edit logic only finance team can edit

amit — Fri, 08 May 2026 19:00:00 +0530

amit – 2 file(s) modified
Fixed Offer edit logic only finance team can edit

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm

Rev 36500 – l3 and avobe show all warehouse stock

ranu — Fri, 08 May 2026 18:59:38 +0530

ranu – 1 file(s) modified
l3 and avobe show all warehouse stock

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

Rev 36492 – Fixed scheme item enddate to expire when scheme is expired

amit — Fri, 08 May 2026 15:42:07 +0530

amit – 1 file(s) modified
Fixed scheme item enddate to expire when scheme is expired

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

Rev 36487 – offer process: stamp processedTimestamp on click, block reprocess if batch ...

amit — Thu, 07 May 2026 17:33:02 +0530

amit – 1 file(s) modified
offer process: stamp processedTimestamp on click, block reprocess if batch unfinished

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

Rev 36481 – l3 and avobe show all warehouse stock

ranu — Wed, 06 May 2026 18:57:20 +0530

ranu – 1 file(s) modified
l3 and avobe show all warehouse stock

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

Rev 36480 – without vendor catalog pricing po will not create

ranu — Wed, 06 May 2026 18:47:54 +0530

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

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

Rev 36477 – Invoice return: IRN/EWB cancellation on approve, Logistics L2+ permission, DL ...

amit — Tue, 05 May 2026 20:05:29 +0530

amit – 6 file(s) modified
Invoice return: IRN/EWB cancellation on approve, Logistics L2+ permission, DL GST disabled

- approveInvoiceReturn now cancels IRN+EWB when cancellable (path B) before falling back to Credit Note (path A)
- DC/challan EWB cancelled best-effort before Credit Note path
- Added enabled flag to GstEInvoiceUser; DL GSTIN disabled in E_INVOICE_USERS and EWB_USERS
- isGstEnabled guard added to all public GST API methods in GstProService
- Logistics L2+ can now approve/reject invoice returns (not just Finance)
- invoice-return.vm uses canApproveInvoiceReturn for INV-prefix button visibility

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/api/model/GstEInvoiceUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.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/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm

Rev 36468 – fix NPE in downloadPriceCircularReport: skip internal vendors and missing catalog ...

amit — Mon, 04 May 2026 15:37:20 +0530

amit – 1 file(s) modified
fix NPE in downloadPriceCircularReport: skip internal vendors and missing catalog items

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

Rev 36464 – Add vendor pricing changes Excel download report on Vendor Price ...

amit — Mon, 04 May 2026 13:15:03 +0530

amit – 7 file(s) modified
Add vendor pricing changes Excel download report on Vendor Price Circular page. Flat file with Vendor/Date/Model/CatalogId/TP/DP/MOP columns, filterable by vendor. Shows baseline pricing as of start date plus subsequent TP changes within period for all non-internal suppliers.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/VendorCatalogPricingLog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-price-circular.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoVendorController.java

Rev 36454 – Add request/response logging to refundDebitNote endpoint

amit — Sat, 02 May 2026 18:49:21 +0530

amit – 1 file(s) modified
Add request/response logging to refundDebitNote endpoint

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

Rev 36447 – DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS ...

amit — Fri, 01 May 2026 23:49:24 +0530

amit – 3 file(s) modified
DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS handler

- Add PUT /return/debit-note/reject/acknowledge/{debitNoteId} endpoint
- invoice-return.vm: Rejected-Pending Acknowledgment + Cancelled status labels, Acknowledge Receipt button
- return.js: click handler for acknowledge-rejected-return

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm

Rev 36442 – Rename monitor type 'normal' to 'base' in controller, validator, UI, ...

amit — Fri, 01 May 2026 13:44:42 +0530

amit – 8 file(s) modified
Rename monitor type 'normal' to 'base' in controller, validator, UI, and tests

~ /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/controller/PlacementPlanControllerUploadTest.java
~ /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 36436 – without vendor catalog pricing po will not create

ranu — Thu, 30 Apr 2026 17:55:17 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmPerformanceDashboardModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po_rbm.vm

Rev 36435 – Fix:Mark Inauguration Timestamp & Create Store Timeline Entry on Training ...

aman — Thu, 30 Apr 2026 13:27:31 +0530

aman – 1 file(s) modified
Fix:Mark Inauguration Timestamp & Create Store Timeline Entry on Training Completion

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

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 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 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 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 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 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 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 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 36373 – login talktime hours cap on 100%

ranu — Fri, 24 Apr 2026 13:00:57 +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 36371 – HDFC webhook: INSERT IGNORE on hdfc_payment to fix concurrent-duplicate 500 ...

amit — Fri, 24 Apr 2026 12:10:46 +0530

amit – 4 file(s) modified
HDFC webhook: INSERT IGNORE on hdfc_payment to fix concurrent-duplicate 500 storm

Replaces persist() with a native INSERT IGNORE so concurrent same-UTR webhook
retries serialize on the unique-index check, and the loser gets a 0-row no-op
(warning, not exception). Outer @Transactional session stays clean, Spring
commits normally, HDFC sees 200 on both the winner (Success) and the loser
(Duplicate) - retry amplification ends.

Flow:
persist(hdfcPayment) -> insertIgnore(hdfcPayment) + selectByUtrNo(utr)
- inserted == 1: proceed with wallet / sidbi side-effects using fetched id
- inserted == 0: respond Duplicate, skip side-effects (owned by winning tx)
- defensive: log warn if insertIgnore returned 0 but selectByUtrNo finds
no row (could mean IGNORE swallowed a non-duplicate issue like truncation)

Also drops HdfcProcessingHelper (r36366) which used REQUIRES_NEW for the same
goal; that approach required a second JDBC connection and is no longer needed
with SQL-level idempotency.

Does NOT touch the wallet-side lost-update hole (user_wallet read-modify-write
without FOR UPDATE). That is a separate commit.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/HdfcPaymentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/HdfcPaymentRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/HdfcProcessingHelper.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 36370 – Fix: App login

vikas — Thu, 23 Apr 2026 23:36:33 +0530

vikas – 1 file(s) modified
Fix: App login

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

Rev 36369 – Fix: Sale purchase invoice item quantity calculation

vikas — Thu, 23 Apr 2026 19:47:05 +0530

vikas – 5 file(s) modified
Fix: Sale purchase invoice item quantity calculation

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.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/webapp/WEB-INF/views/ftl/retailer-info.vm

Rev 36367 – HDFC webhook: delegate writes to HdfcProcessingHelper; always respond OK ...

amit — Thu, 23 Apr 2026 17:07:24 +0530

amit – 1 file(s) modified
HDFC webhook: delegate writes to HdfcProcessingHelper; always respond OK

Fixes the concurrent-duplicate deadlock observed on hadb1 2026-04-23 12:54:11
(two HDFC retries inserting same utr='308490624083' → InnoDB deadlock →
LockAcquisitionException → 500 → HDFC retries again → amplification).

- addPayment: the HDFC row build + persist + wallet/sidbi is now a single call
to hdfcProcessingHelper.processPayment() which runs in REQUIRES_NEW. The
helper catches DataIntegrityViolationException and logs silently; our tx
is unaffected.
- The else branch (pre-select found an existing row) now returns the same
code=100 status=Success as the main path instead of code=200 Duplicate.
Per product direction: HDFC should see 'OK' regardless of whether the row
already existed from a prior webhook, manual entry, or reconciliation —
retries stop cleanly, no 'Duplicate' surface distinction.

Did NOT add @Transactional(readOnly=true) on the outer method despite its
read-heavy shape — checkManualPayments() at line 277 has a write side-effect
(rejecting pending manual wallet requests for the same utr) which would be
silently dropped in a read-only session. Kept class-level writable tx for
the outer; only HDFC writes moved to REQUIRES_NEW helper.

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

Rev 36363 – Idempotent fofo_order creation in UpSaleController (mirrors r36362 in dao) ...

amit — Wed, 22 Apr 2026 19:49:51 +0530

amit – 1 file(s) modified
Idempotent fofo_order creation in UpSaleController (mirrors r36362 in dao)

Same change as OrderServiceImpl.createAndGetFofoOrder: pre-select by
(fofo_id, invoice_number) and catch DataIntegrityViolationException as the
slow-race fallback. Paired with uk_fofo_order_fofo_invoice unique key.

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

Rev 36360 – login talktime hours cap on 100%

ranu — Wed, 22 Apr 2026 18:42:25 +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 36356 – rbm rating dashboard view commited

ranu — Wed, 22 Apr 2026 17:16:50 +0530

ranu – 4 file(s) modified
rbm rating dashboard view commited

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RbmRating.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java