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

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

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 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 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 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 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 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 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 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 36971 – Surface active flagship models as a 'flagship' Solr label (prepended, ...

amit — Tue, 30 Jun 2026 20:03:35 +0530

amit – 3 file(s) modified
Surface active flagship models as a 'flagship' Solr label (prepended, shows first) in catalog indexing; add no-arg selectActiveFlagshipCatalogIds

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java

Rev 36967 – Add date-range query methods for approved HID allocations (filter by ...

amit — Tue, 30 Jun 2026 17:42:20 +0530

amit – 2 file(s) modified
Add date-range query methods for approved HID allocations (filter by approval date)

~ /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

Rev 36966 – Updated WhatsApp APIs

vikas — Tue, 30 Jun 2026 17:39:14 +0530

vikas – 1 file(s) modified
Updated WhatsApp APIs

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

Rev 36964 – L4 and Above can now assign beat on same day

vikas — Tue, 30 Jun 2026 15:34:08 +0530

vikas – 3 file(s) modified
L4 and Above can now assign beat on same day

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappListRow.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappListSection.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappReplyButton.java

Rev 36962 – L4 and Above can now assign beat on same day

vikas — Tue, 30 Jun 2026 15:27:46 +0530

vikas – 12 file(s) modified
L4 and Above can now assign beat on same day

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/CpassWhatsappService.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/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.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/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm
~ /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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-data.vm

Rev 36960 – Combo cancellation: resolve combo linkage from catalog definition; force-cancel linked ...

amit — Tue, 30 Jun 2026 15:23:18 +0530

amit – 2 file(s) modified
Combo cancellation: resolve combo linkage from catalog definition; force-cancel linked main on non-FOC secondary cancel (confirmation) and auto-cancel FOC freebies when main is cancelled

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