SmartDukaan – /

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

~ /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/webapp/WEB-INF/views/ftl/rbm_call_target.vm

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

Rev 36995 – Price-hike deduction Option 2 (under-charge recovery): gate hike eligibility on ...

amit — Thu, 02 Jul 2026 13:50:34 +0530

amit – 1 file(s) modified
Price-hike deduction Option 2 (under-charge recovery): gate hike eligibility on order bill date within [affected_on, created_on]; paid-DP Check 2 restricted to its reconciled-guard role

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

Rev 36994 – rbm calling target issue fix according to aquil

ranu — Thu, 02 Jul 2026 13:45:49 +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 36993 – Thread dryRun through sendCreditNote; --sendCreditNote defaults to dry-run (--live for ...

amit — Thu, 02 Jul 2026 13:15:44 +0530

amit – 3 file(s) modified
Thread dryRun through sendCreditNote; --sendCreditNote defaults to dry-run (--live for real); add 06:00-on-1st monthlyMarginsCnDryRun scheduled job

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 36992 – Add dryRun param to issueMonthlyMarginsCN; gate real work behind runActual ...

amit — Thu, 02 Jul 2026 13:03:24 +0530

amit – 2 file(s) modified
Add dryRun param to issueMonthlyMarginsCN; gate real work behind runActual (isProd && !dryRun) so the pipeline can run harmlessly on prod

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

Rev 36991 – code commited

ranu — Thu, 02 Jul 2026 13:01:19 +0530

ranu – 1 file(s) modified
code commited

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

Rev 36990 – v2 version some fixes

ranu — Thu, 02 Jul 2026 10:59:26 +0530

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

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

Rev 36989 – Changed mail sender password and Duplicate Req interceptor behavior

vikas — Wed, 01 Jul 2026 19:40:13 +0530

vikas – 5 file(s) modified
Changed mail sender password and Duplicate Req interceptor behavior

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/PostInterceptor.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 36988 – Changed mail sender password and Duplicate Req interceptor behavior

vikas — Wed, 01 Jul 2026 19:38:58 +0530

vikas – 3 file(s) modified
Changed mail sender password and Duplicate Req interceptor behavior

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/PostInterceptor.java

Rev 36987 – optimize code

ranu — Wed, 01 Jul 2026 18:33:29 +0530

ranu – 1 file(s) modified
optimize code

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

Rev 36986 – changeList

ranu — Wed, 01 Jul 2026 18:30:29 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

Rev 36985 – Price-hike deduction: make /priceHike/generateImeis/{id} a GET (consistent with /priceDropImeis; still ...

amit — Wed, 01 Jul 2026 18:13:08 +0530

amit – 1 file(s) modified
Price-hike deduction: make /priceHike/generateImeis/{id} a GET (consistent with /priceDropImeis; still idempotent, no debit)

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

Rev 36984 – Lead Management: (1) fix date-range CSV download to mirror the ...

aman — Wed, 01 Jul 2026 17:53:42 +0530

aman – 6 file(s) modified
Lead Management: (1) fix date-range CSV download to mirror the on-screen view - all statuses in range PLUS follow-ups - so it no longer returns empty or 500s on empty windows; guard empty result set. (2) Add global lead search (name/mobile/outlet/city across ALL leads, any status/date) wired to the existing lead-table search box (Enter = search all). Bump JS cache version to 369.

~ /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/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 36983 – Price-hike deduction: add POST /priceHike/generateImeis/{id} to generate (review-only, no debit) ...

amit — Wed, 01 Jul 2026 17:27:42 +0530

amit – 1 file(s) modified
Price-hike deduction: add POST /priceHike/generateImeis/{id} to generate (review-only, no debit) IMEI rows for a flagged hike

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

Rev 36982 – Lead download (downloadDateWiseLead): date-range export now returns all selected statuses ...

aman — Wed, 01 Jul 2026 17:01:42 +0530

aman – 1 file(s) modified
Lead download (downloadDateWiseLead): date-range export now returns all selected statuses including follow-up within From-To. Previously follow-ups ignored the date range and selecting All dropped the other statuses.

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

Rev 36981 – changeList

ranu — Wed, 01 Jul 2026 14:57:41 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyTargetRepositoryImpl.java

Rev 36980 – optimize bi report

ranu — Wed, 01 Jul 2026 14:57:32 +0530

ranu – 2 file(s) modified
optimize bi report

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/MonthlyTargetRepository.java

Rev 36979 – changeList

ranu — Wed, 01 Jul 2026 14:35:55 +0530

ranu – 2 file(s) modified
changeList

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

Rev 36978 – Price-hike deduction: generate IMEIs in process path (priceDropStatus) so the ...

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

amit – 1 file(s) modified
Price-hike deduction: generate IMEIs in process path (priceDropStatus) so the existing Process button handles a flagged hike

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

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

ranu — Wed, 01 Jul 2026 13:11:59 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

Rev 36975 – changeList

ranu — Wed, 01 Jul 2026 12:53:45 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

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

ranu — Wed, 01 Jul 2026 12:36:22 +0530

ranu – 1 file(s) modified
changeList

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.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