SmartDukaan – /

Rev 37035 – AI lead intake in fofo app (deployable via fofo_deploy): add ...

aman — Tue, 07 Jul 2026 17:41:03 +0530

aman – 5 file(s) modified
AI lead intake in fofo app (deployable via fofo_deploy): add POST /add/lead to fofo LeadController mirroring the profitmandi-web contract (Auth-Token->401, dedup by mobile, NOT-NULL coalesced, stores state+recordingUrl, status=pending, SUCCESS envelope); exclude /add/lead from auth/role/post interceptors in WebConfig; add ai.lead.intake.token to dev/staging/prod (same values as profitmandi-web). Bot repoints host apis.smartdukaan.com -> partners.smartdukaan.com, same path/token/payload.

~ /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/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties

Rev 37034 – Beat Report Enhancements

vikas — Tue, 07 Jul 2026 15:16:03 +0530

vikas – 1 file(s) modified
Beat Report Enhancements

~ /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 37032 – Beat Report Enhancements

vikas — Tue, 07 Jul 2026 14:47:45 +0530

vikas – 1 file(s) modified
Beat Report Enhancements

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

Rev 37031 – Credit block/unblock UI + Kred cleanup (fofo): rename activateKred/deactivateKred -> ...

amit — Tue, 07 Jul 2026 14:36:06 +0530

amit – 6 file(s) modified
Credit block/unblock UI + Kred cleanup (fofo): rename activateKred/deactivateKred -> blockCredit(reason)/unblockCredit(logs)/switchCreditGateway, add block/unblock modals + credit-block-logs fragment, bump jsVersion 372->373

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-credit-detail.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-block-logs.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail-row.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail.vm

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 37028 – Beat Report Enhancements

vikas — Tue, 07 Jul 2026 13:24:18 +0530

vikas – 1 file(s) modified
Beat Report Enhancements

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

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 37025 – FOFO add-to-cart: show held Live Demo IMEIs as disabled 'Sellable ...

amit — Tue, 07 Jul 2026 12:41:23 +0530

amit – 2 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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js

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 37023 – FOFO add-to-cart: show held Live Demo IMEIs as disabled 'Sellable ...

amit — Tue, 07 Jul 2026 12:40:42 +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-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.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 37021 – Lead Dashboard: make the lead-table Search box a global partner ...

aman — Tue, 07 Jul 2026 11:46:21 +0530

aman – 3 file(s) modified
Lead Dashboard: make the lead-table Search box a global partner search (search-as-you-type, debounced) - matches any lead by name/mobile/outlet/city across ALL statuses and dates via /globalLeadSearch; add placeholder + results heading; bump asset version to 371

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.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 37019 – Contact Us: add position control - 'place after' dropdown + ...

aman — Tue, 07 Jul 2026 01:10:39 +0530

aman – 5 file(s) modified
Contact Us: add position control - 'place after' dropdown + up/down reorder for Main & Escalation tables (editor-gated); self-heal missing columns in ContactUsTableBootstrap (adds id/PK to pre-existing tables to fix GE_1007); bump asset version to 370

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/bootstrap/ContactUsTableBootstrap.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/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 37018 – revival and focus bill be active on next billing

ranu — Mon, 06 Jul 2026 18:24:15 +0530

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

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

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 37015 – v2 version some fixes

ranu — Mon, 06 Jul 2026 15:58:40 +0530

ranu – 1 file(s) modified
v2 version some fixes

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

Rev 37014 – v2 version some fixes

ranu — Mon, 06 Jul 2026 15:55:27 +0530

ranu – 1 file(s) modified
v2 version some fixes

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

Rev 37012 – tried call given on rbm dashboard

ranu — Mon, 06 Jul 2026 13:33:43 +0530

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

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

Rev 37011 – tried call given on rbm dashboard

ranu — Sat, 04 Jul 2026 17:02:25 +0530

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

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

Rev 37010 – tried call given on rbm dashboard

ranu — Sat, 04 Jul 2026 15:24:49 +0530

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

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 37007 – new app v2 version access to rbm

ranu — Fri, 03 Jul 2026 19:05:22 +0530

ranu – 1 file(s) modified
new app v2 version access to rbm

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-readonly-info.vm

Rev 37006 – new app v2 version access to rbm

ranu — Fri, 03 Jul 2026 18:46:16 +0530

ranu – 1 file(s) modified
new app v2 version access to rbm

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

Rev 37005 – new app v2 version access to rbm

ranu — Fri, 03 Jul 2026 17:51:57 +0530

ranu – 1 file(s) modified
new app v2 version access to rbm

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-readonly-info.vm

Rev 37004 – v2 version some fixes

ranu — Fri, 03 Jul 2026 16:10:31 +0530

ranu – 3 file(s) modified
v2 version some fixes

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

Rev 37003 – positions without partner

ranu — Fri, 03 Jul 2026 11:00:21 +0530

ranu – 5 file(s) modified
positions without partner

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.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/VisitRequestController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js

Rev 37002 – Price-hike: reprocess schemes as per price-drop logic on deduction (updatePriceDrop ...

amit — Thu, 02 Jul 2026 19:11:32 +0530

amit – 3 file(s) modified
Price-hike: reprocess schemes as per price-drop logic on deduction (updatePriceDrop + reverse/reprocess) and remove getPayouts clamp so hike raises DP -> higher margin. GRN path adjusts basis only (GRN's own processSchemeIn recomputes); endpoint does full reprocess on already-GRN'd units.

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

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 37000 – Price-hike deduction: revert hike edits from price-drop flow; add GET ...

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

amit – 1 file(s) modified
Price-hike deduction: revert hike edits from price-drop flow; add GET /priceHike/process/{priceDropId} to trigger the on-demand per-retailer hike deduction executor

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.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 36998 – rbm calling target issue fix according to aquil

ranu — Thu, 02 Jul 2026 16:43:10 +0530

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

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

Rev 36997 – rbm calling target issue fix according to aquil

ranu — Thu, 02 Jul 2026 15:21:16 +0530

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

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

Rev 36996 – rbm calling target issue fix according to aquil

ranu — Thu, 02 Jul 2026 14:45:21 +0530

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

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