SmartDukaan – /trunk/profitmandi-dao/src/main/java/

Rev 37121 – Added leads in Beat Creation

vikas — Fri, 17 Jul 2026 17:49:38 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadDisposition.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadStage.java

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 37119 – old version app disabled for rbm

ranu — Fri, 17 Jul 2026 17:03:47 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 37114 – Map refurbished mobile (category 10007) to Solr categoryId_i=3 like new ...

amit — Thu, 16 Jul 2026 18:17:37 +0530

amit – 1 file(s) modified
Map refurbished mobile (category 10007) to Solr categoryId_i=3 like new mobile (10006), so refurb catalogs/combos surface under the Mobile deal category in both indexers (populateTagItems + updateSingleCatalog)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java

Rev 37112 – Source trial-registration GST duplicate check from fofo_store instead of counter/privatedealuser: ...

amit — Thu, 16 Jul 2026 17:47:10 +0530

amit – 4 file(s) modified
Source trial-registration GST duplicate check from fofo_store instead of counter/privatedealuser: add FofoStoreRepository.existsByGstNumber, remove now-dead PrivateDealUserRepository.isActiveByGst (last reader of Counter.gstin)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.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

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 37104 – Add UserService.resetPasswordById for non-prod password reset by id

amit — Thu, 16 Jul 2026 16:14:40 +0530

amit – 2 file(s) modified
Add UserService.resetPasswordById for non-prod password reset by id

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java

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 37099 – GRN: default supplier invoiceDate to received date when blank ...

amit — Thu, 16 Jul 2026 13:55:07 +0530

amit – 1 file(s) modified
GRN: default supplier invoiceDate to received date when blank

Operators frequently leave invoiceDate empty on PO-based GRN uploads
(addPORowModels), persisting NULL invoice.invoiceDate (~26% of received
invoices historically). This breaks the warehouse ageing/valuation
reports that key off invoiceDate. Default it to the received date at the
single feed into addWarehouseSupplierInvoice, matching the historical
backfill convention. Fofo newReceiveInvoice already enforces this.

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

Rev 37098 – Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName) ...

amit — Thu, 16 Jul 2026 12:24:14 +0530

amit – 1 file(s) modified
Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName)

Interface declared (brand, modelName, modelNumber) while CatalogRepositoryImpl
binds equalsMap keys off its own params (brand, modelNumber, modelName). The lone
caller, ItemLoaderService.addItem, passes impl order, so lookups worked by accident.
Any new caller trusting the interface signature would have silently swapped
modelName/modelNumber and minted phantom catalogs on lookup miss.

Names only; binary signature (String,String,String) is unchanged, so behaviour and
all callers are unaffected.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java

Rev 37097 – bulletin api giving us error

ranu — Wed, 15 Jul 2026 18:58:09 +0530

ranu – 1 file(s) modified
bulletin api giving us error

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

Rev 37091 – Bulk orders: enforce combo requirements for RBM/SALES creators Bulk ...

amit — Tue, 14 Jul 2026 19:41:04 +0530

amit – 1 file(s) modified
Bulk orders: enforce combo requirements for RBM/SALES creators

Bulk PO path skipped combo validation, letting RBM/SALES-created bulk orders bill a
combo main without its required side(s). Now, when the creator holds an RBM(18) or
SALES(4) position, run the existing cart-path comboService.validateCombo on the
per-partner cart (already built via cartService.setCartItems) right before the
transaction is created. Restrict-only: throws 'Missing required Qty for Combo' if a
side is missing; never auto-injects. Gate fail-open; other creators (incl AUTO PO) unaffected.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.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 37086 – Remove dead rejectPriceDropsOfApprovedImeis (superseded by PriceDropBatchService) The noon reprocess ...

amit — Tue, 14 Jul 2026 15:01:01 +0530

amit – 2 file(s) modified
Remove dead rejectPriceDropsOfApprovedImeis (superseded by PriceDropBatchService)

The noon reprocess now runs via PriceDropBatchService (per-drop REQUIRES_NEW);
the old single-transaction PriceDropService.rejectPriceDropsOfApprovedImeis and
its interface declaration have no remaining callers.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 37085 – Show PO No and Order Date on transaction invoices/delivery challans ...

amit — Tue, 14 Jul 2026 15:00:57 +0530

amit – 1 file(s) modified
Show PO No and Order Date on transaction invoices/delivery challans

Populate InvoicePdfModel.orderDate (order createTimestamp) on every invoice
and delivery challan. Populate poNumber from the mapped warehouse PO for
internal-PO-derived orders, falling back to the transaction id as the PO
number for non-internal orders. Display-only; no e-invoice/IRN impact.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 37082 – Fix noon price-drop lock storm + wallet-rollback divergence Per-drop ...

amit — Tue, 14 Jul 2026 13:49:19 +0530

amit – 3 file(s) modified
Fix noon price-drop lock storm + wallet-rollback divergence

Per-drop transaction isolation for the noon price-drop reprocess, mirroring
the offer batch pattern (OfferBatchService / OfferProcessingHelper):
- PriceDropProcessingHelper: readOnly id fetch + REQUIRES_NEW per-drop
reprocess (processPriceDrop) + markItemSuccess
- PriceDropBatchService: no-@Transactional orchestrator - fetch ids,
createBatch, per-drop loop with markItemFailed, finalizeBatch

Previously the whole reprocess ran under ScheduledTasks' class-level
@Transactional as one ~20-min transaction, holding user_wallet
PESSIMISTIC_WRITE locks for the entire run and timing out live
/addAmountToWallet, /create-order and /scanSerialized at noon
(LockAcquisitionException).

Also narrow the rollback catch in PriceDropServiceImpl from Exception to
ProfitMandiBusinessException: lock/DB failures now propagate and roll back
the drop's REQUIRES_NEW unit (stays APPROVED, retried next run) instead of
being swallowed while the IMEI is marked REJECTED with the payout still in
the partner's wallet.

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropBatchService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropProcessingHelper.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 37080 – T16: split ShippingRequest.java into one-class-per-file (Services/Request/Consignee/ReturnAddress/Commodity/Dimension/ItemDetail/Shipper/Profile) to fix intermittent gradle ...

amit — Tue, 14 Jul 2026 13:28:12 +0530

amit – 10 file(s) modified
T16: split ShippingRequest.java into one-class-per-file (Services/Request/Consignee/ReturnAddress/Commodity/Dimension/ItemDetail/Shipper/Profile) to fix intermittent gradle incremental 'cannot find symbol Services/Request' Bluedart build failures; no logic change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Commodity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Consignee.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Dimension.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/ItemDetail.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Profile.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Request.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/ReturnAddress.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Services.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/Shipper.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/ShippingRequest.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 37068 – processSchemeOut: resolve OUT schemes on order create date, not GRN ...

amit — Mon, 13 Jul 2026 16:09:33 +0530

amit – 1 file(s) modified
processSchemeOut: resolve OUT schemes on order create date, not GRN billing date

OUT schemes (sellout, special support, category, hygiene) are earned at the
sale event, so scheme eligibility must be pulled on fofoOrder.createTimestamp,
not each IMEI's GRN billing date. Reverts the r36397 date-basis change (which
pinned OUT to GRN date to 'align with IN behaviour' - but IN and OUT are
different events). The scheme_item date-windowing feature from r36397 is kept
intact; only the lookup date reverts to the order create timestamp.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 37067 – Fix null state code on FOFO partner-to-customer sale-return credit note: ...

amit — Fri, 10 Jul 2026 20:04:41 +0530

amit – 1 file(s) modified
Fix null state code on FOFO partner-to-customer sale-return credit note: populate partner/customer address state codes via StateRepository lookup (were unset)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 37059 – Revert order date and PO number wiring from invoice model ...

amit — Fri, 10 Jul 2026 14:49:23 +0530

amit – 1 file(s) modified
Revert order date and PO number wiring from invoice model in InvoiceService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.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

~ /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/FofoOpeningStockRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java

Rev 37054 – Invoicing: durably record terminal IRN failures via markEInvoiceFailed (REQUIRES_NEW) with ...

amit — Fri, 10 Jul 2026 13:05:08 +0530

amit – 1 file(s) modified
Invoicing: durably record terminal IRN failures via markEInvoiceFailed (REQUIRES_NEW) with einvoice_details.irn_error_message; add regenerateBilledInvoices for in-place PDF regeneration over a billing window; stamp order date and mapped PO number onto transaction invoices; use the real interest-bearing loan (not the flagship limit block) for credit terms

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 37053 – Add FLAGSHIP_UPDATED tag-listing event to trigger Solr reindex when a ...

amit — Fri, 10 Jul 2026 12:17:39 +0530

amit – 2 file(s) modified
Add FLAGSHIP_UPDATED tag-listing event to trigger Solr reindex when a model's flagship status changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/event/TagListingChangedEvent.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/event/TagListingEventPublisher.java

Rev 37051 – Fix ALL-region scheme notifications reaching zero partners: expand ALL_PARTNERS_REGION (5) ...

amit — Fri, 10 Jul 2026 12:16:41 +0530

amit – 1 file(s) modified
Fix ALL-region scheme notifications reaching zero partners: expand ALL_PARTNERS_REGION (5) to all active partners via selectAllDtrUserIds instead of the empty partner_region lookup

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

Rev 37042 – targeted calling count on today po rbm

ranu — Thu, 09 Jul 2026 15:03:43 +0530

ranu – 2 file(s) modified
targeted calling count on today po rbm

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadSource.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 37041 – changeList

ranu — Thu, 09 Jul 2026 13:16:40 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java

Rev 37038 – Beat Report: Gaurav Mathur can see all sales employees data, ...

vikas — Wed, 08 Jul 2026 18:51:45 +0530

vikas – 5 file(s) modified
Beat Report: Gaurav Mathur can see all sales employees data, also added past discussions

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatJourneyController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

Rev 37033 – Offer report: treat catalogIds as authoritative in item criteria ...

amit — Tue, 07 Jul 2026 15:06:43 +0530

amit – 1 file(s) modified
Offer report: treat catalogIds as authoritative in item criteria

When an offer item criteria specifies catalogIds, match exactly those catalog
ids and skip the brand/category(smartWatch,led)/hsn(smartPhone,featuredPhone)
filters. Previously smartWatch/led ANDed a categoryId filter unconditionally, so
a catalog wrongly flagged smartWatch (e.g. Oppo ENCO Buds, offer 9661) matched
zero items and the download report came back empty despite real purchases.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java

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 37029 – AI lead intake - conform to chatbot spec: accept & ...

aman — Tue, 07 Jul 2026 13:50:20 +0530

aman – 3 file(s) modified
AI lead intake - conform to chatbot spec: accept & store 'state' (canonical, nullable) from payload; default status to 'pending' so leads land in the Open/New view (was followUp); return 401 (not 403) on bad Auth-Token; show Outlet/Shop Name column in lead search results

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AiLeadRequest.java
~ /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 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 37026 – targeted calling count on today po rbm

ranu — Tue, 07 Jul 2026 12:49:35 +0530

ranu – 1 file(s) modified
targeted calling count on today po rbm

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 37024 – FOFO add-to-cart: show held Live Demo IMEIs as disabled 'Sellable ...

amit — Tue, 07 Jul 2026 12:40:43 +0530

amit – 1 file(s) modified
FOFO add-to-cart: show held Live Demo IMEIs as disabled 'Sellable from <date>' checkboxes instead of falling back to quantity field

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 37022 – targeted calling count on today po rbm

ranu — Tue, 07 Jul 2026 12:29:18 +0530

ranu – 4 file(s) modified
targeted calling count on today po rbm

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmCallTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityInsightsService.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 37020 – Beat Report Enhancements

vikas — Tue, 07 Jul 2026 10:52:41 +0530

vikas – 3 file(s) modified
Beat Report Enhancements

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BeatJourneyServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatJourneyController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

Rev 37017 – revival and focus bill be active on next billing

ranu — Mon, 06 Jul 2026 17:25:08 +0530

ranu – 1 file(s) modified
revival and focus bill be active on next billing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 37016 – revival and focus bill be active on next billing

ranu — Mon, 06 Jul 2026 17:19:52 +0530

ranu – 2 file(s) modified
revival and focus bill be active on next billing

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ActivationType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 37013 – tried call given on rbm dashboard

ranu — Mon, 06 Jul 2026 15:26:49 +0530

ranu – 1 file(s) modified
tried call given on rbm dashboard

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