SmartDukaan – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/

Rev 37120 – Added leads in Beat Creation

vikas — Fri, 17 Jul 2026 17:48:18 +0530

vikas – 9 file(s) modified
Added leads in Beat Creation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Region.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateRefferalRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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/WEB-INF/views/ftl/beat-plan-day-view.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm

Rev 37110 – Business-agreement e-sign gate between Full Stock Payment and PO creation ...

aman — Thu, 16 Jul 2026 17:01:51 +0530

aman – 11 file(s) modified
Business-agreement e-sign gate between Full Stock Payment and PO creation

New AGREEMENT_ESIGN onboarding stage, verified by Legal (Gaurav Sharma):
- Hard-blocks first PO creation until the e-sign is verified (BulkOrderService),
mirroring the existing Full Stock Payment block.
- Agreement E-Sign panel (Partner Acquisition menu) listing FSP-done partners who
have not yet created their first PO: upload signed agreement + Gaurav-only verify.
- New agreement_esign table/entity + repository for the signed doc and audit trail.
- Timeline grid column + stepper stage for the new event.

Prod DB (separate, with sign-off): CREATE TABLE user.agreement_esign;
INSERT auth.menu + auth.menu_category rows for the panel.

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/AgreementEsign.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/StoreTimeline.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AgreementEsignRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AgreementEsignRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.java
~ /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/webapp/resources/js/panel-listing.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/agreement-esign-panel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm

Rev 37102 – Remove dead Counter/PrivateDealUser code: drop unused isFofo, bulkShipmentAmountLimit, verifiedOn, documentVerified ...

amit — Thu, 16 Jul 2026 15:24:00 +0530

amit – 10 file(s) modified
Remove dead Counter/PrivateDealUser code: drop unused isFofo, bulkShipmentAmountLimit, verifiedOn, documentVerified fields and accessors; remove dead selectByIds repo methods; drop redundant Counter/PrivateDealUser repository injections in OrderServiceImpl and InvoiceService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Counter.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.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/invoicing/InvoiceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 37089 – Optimize partnerPerformance data access: fofoId-scoped + month-bucketed query variants ...

amit — Tue, 14 Jul 2026 15:07:47 +0530

amit – 13 file(s) modified
Optimize partnerPerformance data access: fofoId-scoped + month-bucketed query variants

- Order: fofoId-scoped billing-avg named queries (replace all-partner scan+filter)
- MonthlyTarget: selectByDatesAndFofoId batches 7 per-month lookups into one
- SchemeInOut/OfferPayout: month-bucketed ...ByMonth earnings queries collapsing the
per-month loop; new MonthlyBrandIncomeModel / MonthlyOfferPayoutModel
All additive; existing shared queries and their callers unchanged.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MonthlyBrandIncomeModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MonthlyOfferPayoutModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyTargetRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyTargetRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.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

Rev 37077 – old version app disabled for rbm

ranu — Tue, 14 Jul 2026 11:28:29 +0530

ranu – 1 file(s) modified
old version app disabled for rbm

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 37071 – Normalize whitespace on Catalog/Item setters + ItemLoaderService bulk upload (T9.5 ...

amit — Mon, 13 Jul 2026 18:32:57 +0530

amit – 3 file(s) modified
Normalize whitespace on Catalog/Item setters + ItemLoaderService bulk upload (T9.5 sanitizer)

~ /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/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java

Rev 37055 – allocation of hid and opening stock suggested qty logic updated ...

ranu — Fri, 10 Jul 2026 13:41:13 +0530

ranu – 3 file(s) modified
allocation of hid and opening stock suggested qty logic updated as per tarun sir

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 37027 – AI leads: fix /add/lead 500 (set NOT-NULL 'state' + null-safe ...

aman — Tue, 07 Jul 2026 13:13:51 +0530

aman – 5 file(s) modified
AI leads: fix /add/lead 500 (set NOT-NULL 'state' + null-safe last_name/city/address so voice/chat leads persist instead of crashing) and add call-recording support - new user.lead.recording_url column mapped on Lead, recordingUrl accepted on AiLeadRequest and stored in aiLead(), Recording play button in lead management (main dashboard + search/closed results). Prod needs: ALTER TABLE user.lead ADD COLUMN recording_url VARCHAR(1024) NULL;

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AiLeadRequest.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 37009 – Fix Selling Price - DP in IMEI drill-down to use ...

amit — Fri, 03 Jul 2026 20:08:04 +0530

amit – 1 file(s) modified
Fix Selling Price - DP in IMEI drill-down to use actual inventory-item DP

selectLastMonthFrontEndImei (the per-IMEI breakdown behind each brand/model row)
still passed foi.dp (frozen list DP) into LastMonthFrontEndImeiModel, so the
drill-down did not reconcile with the brand/model totals fixed in r37008. Now
uses ii.unitPrice-ii.priceDropAmount, matching selectLastMonthFrontEndByImei.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java

Rev 37008 – Fix Selling Price - DP to use actual inventory-item DP ...

amit — Fri, 03 Jul 2026 20:07:07 +0530

amit – 1 file(s) modified
Fix Selling Price - DP to use actual inventory-item DP instead of frozen list DP

Brand-wise (selectFrontIncomeByBrand) and model-wise (selectFrontIncomeBrandWise)
front-income queries computed the margin as (foi.sellingPrice - foi.dp), where
foi.dp is the TagListing list price frozen on the sale line at order time. This
produced spurious negative margins (e.g. -6000 for units sold at cost). Now uses
the actual per-IMEI acquisition DP (ii.unitPrice - ii.priceDropAmount), the same
net-DP basis used elsewhere (InventoryItem.getNetPrice / scheme payout calc).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java

Rev 37001 – rbm calling target issue fix according to aquil

ranu — Thu, 02 Jul 2026 18:33:04 +0530

ranu – 2 file(s) modified
rbm calling target issue fix according to aquil

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RetailerContact.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

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 36974 – changeList

ranu — Wed, 01 Jul 2026 12:43:48 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java

Rev 36972 – changeList

ranu — Wed, 01 Jul 2026 12:34:04 +0530

ranu – 20 file(s) modified
changeList

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
~ /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/ReturnOrderInfo.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/BrandWiseModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepositoryImpl.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/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java

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 36920 – Remove unused Digify retailer integration (controllers, entity, repository, model, views, ...

amit — Wed, 24 Jun 2026 18:01:37 +0530

amit – 3 file(s) modified
Remove unused Digify retailer integration (controllers, entity, repository, model, views, JS handler, assets)

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DigifyRetailer.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DigifyRetailerRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DigifyRetailerRepositoryImpl.java

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 36901 – HID requested-allocations: fully batch HID computation (batched tier + SUM(current_qty) ...

amit — Mon, 22 Jun 2026 19:29:59 +0530

amit – 5 file(s) modified
HID requested-allocations: fully batch HID computation (batched tier + SUM(current_qty) + 2-day sales per pair, replacing per-partner query) and add Pending list pagination

Rev 36898 – HID allocation: batch the requested-allocations screen (catalog-filtered HID query + ...

amit — Mon, 22 Jun 2026 18:16:25 +0530

amit – 9 file(s) modified
HID allocation: batch the requested-allocations screen (catalog-filtered HID query + batched billed/activated serial lookups) and add approved-list pagination (50/page) reusing GenericRepository paginated+count helpers

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOpeningStock.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOpeningStockRepository.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/fofo/RequestedHidAllocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RequestedHidAllocationRepositoryImpl.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

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 36834 – code committed by some bug fix in pjp

ranu — Fri, 12 Jun 2026 15:17:27 +0530

ranu – 8 file(s) modified
code committed by some bug fix in pjp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatSchedule.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/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/logistics/CompanyOfficeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/CompanyOfficeRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java

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 36811 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 00:13:08 +0530

ranu – 5 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatRoute.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/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 36809 – code commit for agenda fill time stamp

ranu — Tue, 09 Jun 2026 19:57:29 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/CompanyOffice.java

Rev 36808 – code commit for agenda fill time stamp

ranu — Tue, 09 Jun 2026 19:53:29 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/CompanyOffice.java

Rev 36805 – some enhancement and bug fixes

ranu — Tue, 09 Jun 2026 18:50:26 +0530

ranu – 3 file(s) modified
some enhancement and bug fixes

Rev 36787 – some enhancement and bug fixes

ranu — Fri, 05 Jun 2026 10:38:44 +0530

ranu – 8 file(s) modified
some enhancement and bug fixes

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadVisitRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitRequestRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm

Rev 36774 – Add bulk getLoanOutstandingAtDate (principal+interest per partner at a date) for ...

amit — Thu, 04 Jun 2026 12:20:37 +0530

amit – 3 file(s) modified
Add bulk getLoanOutstandingAtDate (principal+interest per partner at a date) for account reco closing

Rev 36768 – Restore ActivatedImei.checked idempotency guard (revert r36579) r36579 removed the ...

amit — Wed, 03 Jun 2026 17:59:40 +0530

amit – 2 file(s) modified
Restore ActivatedImei.checked idempotency guard (revert r36579)

r36579 removed the 'ai.checked = false' filter from selectMissedActivationSale
and dropped the checked field, treating it as dead. It was not: the filter
prevented the daily activation-scheme sweep from re-processing the ~163K
already-evaluated historical activations (checked=1). Without it, the sweep
resurrected those old activations as PENDING scheme_in_out rows, and the
oldest ones (whose legacy orders have no fofo_order) made processActivation
throw FFORDR_1000 and roll back the entire batch every run since 2026-05-18,
stalling all special-support credits.

Restores the checked field + accessors and the 'ai.checked = false' filter.
checked column repopulated on fofo.activated_imei from backup; rogue PENDING
rows cleaned up separately.

~ /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/fofo/ActivatedImei.java

Rev 36762 – Punch, Check, Deferred handling improvements and mapbox

vikas — Tue, 02 Jun 2026 20:00:44 +0530

vikas – 8 file(s) modified
Punch, Check, Deferred handling improvements and mapbox

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTrackingPath.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatDeferredVisit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.java

Rev 36760 – Punch, Check, Deferred handling improvements and mapbox

vikas — Tue, 02 Jun 2026 19:51:24 +0530

vikas – 2 file(s) modified
Punch, Check, Deferred handling improvements and mapbox

Rev 36759 – Punch, Check, Deferred handling improvements and mapbox

vikas — Tue, 02 Jun 2026 19:46:37 +0530

vikas – 1 file(s) modified
Punch, Check, Deferred handling improvements and mapbox

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java

Rev 36758 – Punch, Check, Deferred handling improvements and mapbox

vikas — Tue, 02 Jun 2026 19:29:17 +0530

vikas – 10 file(s) modified
Punch, Check, Deferred handling improvements and mapbox

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTrackingPath.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatDeferredVisit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingPathModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.java

Rev 36754 – Account statement (Excel): reconcile running balance to net standing (wallet ...

amit — Tue, 02 Jun 2026 12:09:06 +0530

amit – 6 file(s) modified
Account statement (Excel): reconcile running balance to net standing (wallet + pending indent - loan).

- populateData: categorised lines, scheme/margin shown as month-end MARGINS credit note (CN_CANCELLATION and negative-net CNs rendered as debit notes), interest-accrued line as the standing-moving loan cost, and a net-pending-indent/diff line that lands the running balance on closing.
- Returns shown individually from returnorderinfo (one credit line per return, against its invoice on refundedAt); billing-query RETURNED/RETURNS_CN suppressed to avoid double count.
- Exclude PURCHASE and CREDIT_LIMIT/CREDIT_UTILIZED (loan cash legs) from the wallet body.
- LoanStatementRepository.getInterestAccruedBetween; ReturnOrderInfoRepository.selectReturnsBetween.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 36743 – Surface internally-sourced serialized stock in warehouse billing Removed the ...

amit — Sat, 30 May 2026 18:03:07 +0530

amit – 1 file(s) modified
Surface internally-sourced serialized stock in warehouse billing

Removed the su.internal=0 filter from the imeisToSecondaryForWarehouseBilling
named query. The query's intent is to find whatever serialized stock is
physically present in the billing warehouse and report its original ageing;
the supplier filter was wrongly excluding units whose original purchase came
from an internal/group supplier (e.g. inter-warehouse transfers), making real
available stock invisible to billing and forcing the UI into a quantity-input
fallback instead of the IMEI picker.

Ageing ordering is preserved: AgeingService dedups by serial keeping the
earliest invoice date, so transferred stock still ages from its original
external purchase. Only 4 internal-only serial units exist network-wide;
those now age from their internal invoice (their only origin).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/BrandAgeingLimit.java

Rev 36739 – beat deffer

ranu — Fri, 29 May 2026 23:56:18 +0530

ranu – 3 file(s) modified
beat deffer

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatDeferredVisit.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatDeferredVisitRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatDeferredVisitRepositoryImpl.java