SmartDukaan – /trunk/profitmandi-dao/src/main/resources/sql/

Rev 37074 – Add T3.1 re-tag SQL: manual scheme-reversal legs ADDITIONAL_SCHEME -> OTHERS ...

amit — Tue, 14 Jul 2026 10:12:16 +0530

amit – 1 file(s) modified
Add T3.1 re-tag SQL: manual scheme-reversal legs ADDITIONAL_SCHEME -> OTHERS

One-time reconciliation applied to hadb1: 19 manual scheme/incentive clawback
wallet legs (Rs 2,25,110) whose offer_payout was never rejected (MARGINS CN still
stands) were re-tagged ADDITIONAL_SCHEME -> OTHERS so the account-statement
scheme-adjustment line nets out. Money unchanged (reference_type + description
only). Includes backup + verify + rollback. Backup table
transaction._bak_addl_scheme_others_20260710.

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

Rev 37030 – Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs ...

amit — Tue, 07 Jul 2026 14:35:21 +0530

amit – 7 file(s) modified
Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs service methods

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditBlockAction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditBlockLog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditBlockLogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditBlockLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_credit_block_log.sql

Rev 36999 – Price-hike deduction (self-contained): revert hike logic from price-drop flow + ...

amit — Thu, 02 Jul 2026 17:31:00 +0530

amit – 11 file(s) modified
Price-hike deduction (self-contained): revert hike logic from price-drop flow + remove deduct_on_hike flag; add GRN hook (PurchaseServiceImpl, before schemes) and on-demand executor endpoint that debit under-charged units billed in the hike's [affected_on, created_on] window. Idempotent per (hike, imei).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/AsyncConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceHikeService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceHikeServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceHikeWorker.java
x /trunk/profitmandi-dao/src/main/resources/sql/add_deduct_on_hike_to_price_drop.sql

Rev 36977 – Price-hike deduction: add deduct_on_hike flag; process flagged hikes as symmetric ...

amit — Wed, 01 Jul 2026 13:59:36 +0530

amit – 4 file(s) modified
Price-hike deduction: add deduct_on_hike flag; process flagged hikes as symmetric mirror of drops (wallet debit + scheme reverse/recompute); remove getPayouts price-increase clamp so hikes raise scheme/offer margin

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_deduct_on_hike_to_price_drop.sql

Rev 36958 – Flagship credit: fire interest-free limits at billing + per-IMEI conversion ...

amit — Tue, 30 Jun 2026 15:22:32 +0530

amit – 12 file(s) modified
Flagship credit: fire interest-free limits at billing + per-IMEI conversion

- createLoanForBilling now detects flagship lines inside the billing transaction (fixes the
REQUIRES_NEW visibility bug where flagship detection re-queried uncommitted invoice_number and
never fired). Creates one combined flagship limit (is_flagship=1, limit_block=1, 30-day deadline)
plus one transaction.loan_imei row per device.
- convertFlagshipOnSale / IMEI activation now convert only the sold device's slice (matched by IMEI),
so same-model siblings and other billing tranches keep their interest-free window; full convert at
30-day expiry. Lock order aligned (loan -> loan_imei) to avoid sale/expiry deadlock.
- New transaction.loan_imei table + LoanImei entity/repository (migration_loan_imei_table.sql).
- selectAllLoansByInvoice: PurchaseReturn now settles BOTH the real loan and the flagship limit on a
flagship-invoice return (prevents credit leak from a stranded limit).
- Cap guard (flagship credit never exceeds amount drawn) and robust limit settlement (paisa threshold
instead of exact float equality).

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanImei.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanImeiRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanImeiRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.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/resources/sql/migration_loan_imei_table.sql

Rev 36943 – hdfc_payment: add credited flag to fix blocked manual add-money approval ...

amit — Fri, 26 Jun 2026 16:33:38 +0530

amit – 2 file(s) modified
hdfc_payment: add credited flag to fix blocked manual add-money approval

Since r36927 the HDFC push-credits flow captures every payment into
hdfc_payment BEFORE validating the virtual account, so VA-missing/unmatched
rows are stored uncredited. The manual add-money approval guarded on mere
row existence, wrongly blocking these recoverable payments.

Add a credited flag (default false) set true only when a wallet credit
actually happens. Includes migration + backfill (reference=id AUTOMATED_ADVANCE
match, plus pre-r36927 rows credited by construction).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/HdfcPayment.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_hdfc_payment_credited_flag.sql

Rev 36926 – Link returnorderinfo to credit_note in DN-refund path (approveDebitNoteRefund) approveDebitNoteRefund ...

amit — Thu, 25 Jun 2026 14:20:36 +0530

amit – 2 file(s) modified
Link returnorderinfo to credit_note in DN-refund path (approveDebitNoteRefund)

approveDebitNoteRefund issues a RETURNS credit note but created the
ReturnOrderInfo rows before the CN and never set credit_note_id, so DN
returns showed a null FK (blank CN in reports) despite a valid CN existing.
r36817 only wired this FK into applyInvoiceReturnViaCreditNote. Collect the
created ReturnOrderInfo rows and stamp credit_note_id after the CN is
persisted (parity with the invoice-return path).

Add backfill_dn_return_credit_note_id.sql to link existing null-FK rows by
invoice -> RETURNS CN, excluding ambiguous multi-CN invoices.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/backfill_dn_return_credit_note_id.sql

Rev 36910 – Internal PO: map created transaction to PO; block warehouse change ...

amit — Wed, 24 Jun 2026 11:53:31 +0530

amit – 6 file(s) modified
Internal PO: map created transaction to PO; block warehouse change for PO-mapped orders

- WarehousePurchaseOrder: add transactionId column + selectByTransactionId
- createOrderInternally returns txn id; createPurchaseOrder maps it onto the PO
- Block order.setWarehouseId for PO-mapped orders in changeFulfillmentWarehouse; cron moveOrders skips them
- Migration: add warehouse.purchaseorder.transactionId

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehousePurchaseOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_po_transaction_mapping.sql

Rev 36894 – HID allocation: requested qty is now an additional one-time allowance ...

amit — Mon, 22 Jun 2026 15:00:50 +0530

amit – 7 file(s) modified
HID allocation: requested qty is now an additional one-time allowance (purchase-limit override, HID target unchanged); add approved_by column; add 5-day billed/activated serial lookups for the edit screen

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RequestedHidAllocation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOpeningStockRepositoryImpl.java
~ /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/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_requested_hid_allocation_approved_by.sql

Rev 36888 – Feat: Editable Contact-Us page (add/edit/delete) for authorised users - ...

aman — Mon, 22 Jun 2026 12:28:17 +0530

aman – 7 file(s) modified
Feat: Editable Contact-Us page (add/edit/delete) for authorised users

- New fofo.contact_us table backs main + escalation lists (ContactUs entity, ContactUsRepository, contact_us.sql seed of current 40 rows)
- DashboardController: load lists from DB + editor flag; POST /contactUs/save and /contactUs/delete (soft delete), gated to kangan.monga/neha.sharma/gaurav.mathur1
- contact-us.vm renders dynamically with add/edit/delete + modal shown only to editors; contact.js handlers
- NOTE: run contact_us.sql on prod fofo DB before deploying the WAR (no auto-DDL)

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ContactUs.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ContactUsRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ContactUsRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/contact_us.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm

Rev 36817 – Link returnorderinfo to credit_note via credit_note_id FK Add a ...

amit — Wed, 10 Jun 2026 14:43:25 +0530

amit – 3 file(s) modified
Link returnorderinfo to credit_note via credit_note_id FK

Add a direct credit_note_id column on returnorderinfo so a return row
can be tied to the Credit Note it was refunded via, replacing the
indirect/ambiguous association through original_invoice_number + the CN
number embedded in refundDescription. Stamped in
applyInvoiceReturnViaCreditNote; migration adds the column and backfills
existing rows by parsing the CN number out of refundDescription.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnOrderInfo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_credit_note_id_to_returnorderinfo.sql

Rev 36796 – Add migration: void net-settled stranded status=0 orders Captures the ...

amit — Mon, 08 Jun 2026 13:44:16 +0530

amit – 1 file(s) modified
Add migration: void net-settled stranded status=0 orders

Captures the two ad-hoc cleanups run on hadb1 (the live DB): rejected-txn orders
the PO_REJECTED backfill missed (non-standard refund) -> PO_REJECTED(91), and
non-rejected status=0 orders whose wallet debit was reversed by a non-standard
entry -> refund_timestamp. Net-settled only; net-committed/awaiting-approval POs
left untouched. Temp-table form to avoid locking the live DB. Idempotent.

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

Rev 36795 – Add pending-indent phantom-cleanup migrations (drafts + PAYMENT_FAILED) selectPendingIndentWalletAmount counts ...

amit — Mon, 08 Jun 2026 13:06:28 +0530

amit – 2 file(s) modified
Add pending-indent phantom-cleanup migrations (drafts + PAYMENT_FAILED)

selectPendingIndentWalletAmount counts any billing/refund-NULL order regardless
of status, so abandoned draft orders and old PAYMENT_FAILED orders inflated
partner 'unbilled PO' and broke finance reco.

- cleanup_abandoned_draft_orders.sql: 2019-21 never-submitted, wallet-never-debited
drafts (status=0, not rejected) -> PAYMENT_FAILED + refund_timestamp. ~1970 rows.
- cleanup_phantom_payment_failed.sql: 2017-19 PAYMENT_FAILED orders counted as
unbilled PO -> drop ONLY phantom (no-debit or net-settled) via refund_timestamp;
KEEP net-committed (real payable). Temp-table form to avoid locking the live DB.

Both data-only (no code), idempotent, ran on hadb1; pending prod + replicas.

+ /trunk/profitmandi-dao/src/main/resources/sql/cleanup_abandoned_draft_orders.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/cleanup_phantom_payment_failed.sql

Rev 36790 – Add PO_REJECTED status and release rejected-PO orders from pending indent ...

amit — Fri, 05 Jun 2026 13:01:11 +0530

amit – 4 file(s) modified
Add PO_REJECTED status and release rejected-PO orders from pending indent

Rejected bulk-PO approvals refunded the wallet but left order rows in
status=0 (PAYMENT_PENDING) with billing/refund NULL, so they were counted
by pending indent forever and inflated the account-statement closing
balance with no matching wallet liability.

- OrderStatus.PO_REJECTED(91) new terminal status for approval rejection
- OrderRepository.cancelRejectedTransactionOrders sets status + refund_timestamp
on a rejected transaction's still-pending orders (side-effect free: wallet
already refunded at txn level, these never-processed orders hold no reservation)
- backfill_po_rejected_orders.sql releases 485 historically-stranded orders
(Group A: wallet already refunded). Deploy code before running.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/profitmandi-dao/src/main/resources/sql/backfill_po_rejected_orders.sql

Rev 36713 – PI idempotency fix: original_wallet_amount + order_wallet_adjustment tracking for price drops ...

amit — Wed, 27 May 2026 18:47:19 +0530

amit – 7 file(s) modified
PI idempotency fix: original_wallet_amount + order_wallet_adjustment tracking for price drops and splits. Modernize statement queries with INVOICE_CANCELLED and RETURNS_CN unions.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/OrderWalletAdjustment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderWalletAdjustmentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderWalletAdjustmentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_order_wallet_adjustment.sql

Rev 36711 – beat plan info commit

ranu — Wed, 27 May 2026 18:36:30 +0530

ranu – 5 file(s) modified
beat plan info commit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatRoute.java
~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36691 – fix account statement balance gap: include pending orders with NULL ...

amit — Tue, 26 May 2026 17:31:30 +0530

amit – 4 file(s) modified
fix account statement balance gap: include pending orders with NULL billing/refund in getPendingIndentValueMap, fix double query execution in selectOpeningAmount, remove verbose logging in selectDetailsBetween, add indexes for returnorderinfo and returnorder

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_idx_account_statement_perf.sql

Rev 36681 – beat plan info commit

ranu — Tue, 26 May 2026 13:34:44 +0530

ranu – 10 file(s) modified
beat plan info commit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/AuthUserLocation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/AuthUserLocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/AuthUserLocationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-base-location.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36675 – Add irn_error_message column to einvoice_details entity and migration SQL

amit — Mon, 25 May 2026 19:31:04 +0530

amit – 2 file(s) modified
Add irn_error_message column to einvoice_details entity and migration SQL

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/EInvoiceDetails.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_irn_error_message.sql

Rev 36655 – beat plan info commit

ranu — Sat, 23 May 2026 17:13:40 +0530

ranu – 5 file(s) modified
beat plan info commit

~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36650 – beat plan info commit

ranu — Sat, 23 May 2026 14:21:21 +0530

ranu – 8 file(s) modified
beat plan info commit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebSecurityConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 36644 – route plan map

ranu — Sat, 23 May 2026 02:50:05 +0530

ranu – 18 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Beat.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatRoute.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatSchedule.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadRoute.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRouteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatRouteRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRouteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRouteRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js

Rev 36642 – route plan map

ranu — Fri, 22 May 2026 20:18:47 +0530

ranu – 20 file(s) modified
route plan map

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadLiveLocation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadVisitApproval.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateLeacdActivityRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadLiveLocationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadLiveLocationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitApprovalRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitApprovalRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_live_location.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_lead_visit_approval.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-form.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-pending.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-review.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-thankyou.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 36567 – Add SQL migration for sidebar menu icons (ElegantIcons per parent ...

amit — Sat, 16 May 2026 14:07:27 +0530

amit – 1 file(s) modified
Add SQL migration for sidebar menu icons (ElegantIcons per parent menu)

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

Rev 36565 – Remove commented-out migration step from model_flagship DDL - no existing ...

amit — Sat, 16 May 2026 13:37:04 +0530

amit – 1 file(s) modified
Remove commented-out migration step from model_flagship DDL - no existing flagship data

~ /trunk/profitmandi-dao/src/main/resources/sql/model_flagship_schema.sql

Rev 36562 – Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, ...

amit — Sat, 16 May 2026 13:23:41 +0530

amit – 8 file(s) modified
Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, batch queries, extracted doConvertFlagshipToLoan helper, removed Catalog.isFlagship

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelFlagship.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/model_flagship_schema.sql

Rev 36557 – feat: Flagship Credit - 30 interest-free days for flagship models ...

amit — Sat, 16 May 2026 06:18:46 +0530

amit – 11 file(s) modified
feat: Flagship Credit - 30 interest-free days for flagship models with billing split, expiry conversion, API-driven T&C

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SDCreditRequirement.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SDCreditResponseOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/flagship_credit_schema.sql
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java

Rev 36515 – Update migration SQL to MySQL 5.7 compatible syntax (session variables ...

amit — Sun, 10 May 2026 19:10:24 +0530

amit – 1 file(s) modified
Update migration SQL to MySQL 5.7 compatible syntax (session variables instead of window functions)

~ /trunk/profitmandi-dao/src/main/resources/sql/migration_running_balance_wallet_history.sql

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 36512 – Add reconciliation SQL for inventory snapshot - standalone reference query ...

amit — Sun, 10 May 2026 16:21:01 +0530

amit – 1 file(s) modified
Add reconciliation SQL for inventory snapshot - standalone reference query for manual runs

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

Rev 36451 – Add reference field to catalog.offer and catalog.scheme for payout collation

amit — Sat, 02 May 2026 17:29:48 +0530

amit – 7 file(s) modified
Add reference field to catalog.offer and catalog.scheme for payout collation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateSchemeRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_reference_to_offer_scheme.sql

Rev 36446 – DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment ...

amit — Fri, 01 May 2026 23:48:55 +0530

amit – 8 file(s) modified
DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment flow

- Add DebitNoteStatus enum (CREATED/RECEIVED/APPROVED/REJECTED/CANCELLED) on debit_note table
- Add retailer_acknowledge_timestamp on purchase_return_order
- rejectReturn() no longer calls restoreReturnedItems() — inventory stays reduced until retailer confirms goods received back
- New acknowledgeRejectedReturn(): retailer confirms receipt, restores inventory+schemes+offers, DN→CANCELLED
- Set DN status in receiveDebitNoteItems (RECEIVED), refundOrder (APPROVED), rejectReturn (REJECTED)
- notifyReturnRejected: updated message, added Finance L1+L2 to CC
- notifyItemsReceived: added Finance L1
- New notifyRejectedGoodsAcknowledged notification
- SQL migration with backfill for existing data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/DebitNoteStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationServiceImpl.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/sql/migration_dn_status_retailer_ack.sql

Rev 36443 – Add ALTER TABLE migration to rename monitor_type normal to base

amit — Fri, 01 May 2026 15:59:46 +0530

amit – 1 file(s) modified
Add ALTER TABLE migration to rename monitor_type normal to base

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

Rev 36441 – Rename monitor type 'normal' to 'base' in enum and SQL ...

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

amit – 2 file(s) modified
Rename monitor type 'normal' to 'base' in enum and SQL schema

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

Rev 36439 – Add outlet_name field to FofoStore entity, set from address.name on ...

amit — Fri, 01 May 2026 12:15:46 +0530

amit – 3 file(s) modified
Add outlet_name field to FofoStore entity, set from address.name on store creation

Adds outlet_name (VARCHAR 255) to FofoStore entity so the store's display
name is persisted directly on fofo_store instead of requiring a join through
retailer_registered_address -> address every time it is needed.

Sets fofoStore.setOutletName(retailerAddress.getName()) in both creation
paths: RetailerServiceImpl.createFofoStoreCodeByRetailerId (primary) and
RetailerController.createFofoStore (secondary).

Includes migration SQL script (migration_outlet_name_to_fofo_store.sql) to
ALTER TABLE and backfill existing rows from address.name. Must be run during
low-traffic window - fofo_store is heavily queried and ALTER takes a metadata
lock that blocks all concurrent SELECTs.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_outlet_name_to_fofo_store.sql

Rev 36423 – Fix catalog_monitor_type table charset to utf8 for consistency

amit — Wed, 29 Apr 2026 11:26:48 +0530

amit – 1 file(s) modified
Fix catalog_monitor_type table charset to utf8 for consistency

~ /trunk/profitmandi-dao/src/main/resources/sql/catalog_monitor_type.sql

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 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 36362 – Make fofo_order creation idempotent on (fofo_id, invoice_number) Fixes insert-intention ...

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

amit – 2 file(s) modified
Make fofo_order creation idempotent on (fofo_id, invoice_number)

Fixes insert-intention gap-lock deadlocks on idx_invoice_number observed in
SHOW ENGINE INNODB STATUS at 2026-04-22 13:01:54 — two concurrent requests
inserting the same invoice_number for the same customer (client retry /
upstream webhook retry pattern).

- OrderServiceImpl.createAndGetFofoOrder: select-then-insert idempotency.
Fast path returns existing row if already created; slow-race path catches
DataIntegrityViolationException and re-selects the winner's row.
- add_uk_fofo_order_fofo_invoice.sql: adds UNIQUE KEY (fofo_id, invoice_number)
so the loser of a concurrent-insert race gets a clean DIVE instead of a
silent duplicate row (pre-check showed zero existing dup groups, safe).

findExistingFofoOrder wraps the repo call to swallow the repo's declared
ProfitMandiBusinessException — the impl actually returns null on not-found
(constructs an exception but never throws), so the swallow matches reality.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_uk_fofo_order_fofo_invoice.sql