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

Rev 37126 – Password override persistence + bulk download/upload (dev/staging): PasswordOverride repo, resetPasswordById ...

amit — Mon, 20 Jul 2026 19:43:04 +0530

amit – 7 file(s) modified
Password override persistence + bulk download/upload (dev/staging): PasswordOverride repo, resetPasswordById returns stored value, ExcelUtils password-override read/write

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PasswordOverrideRow.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/devtools
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/devtools/PasswordOverrideRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/devtools/PasswordOverrideRepositoryImpl.java
~ /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 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 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 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 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 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 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 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 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 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 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 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 36957 – Add AI assistant lead intake endpoint (POST /add/lead) tagging source=AI ...

aman — Tue, 30 Jun 2026 13:31:47 +0530

aman – 10 file(s) modified
Add AI assistant lead intake endpoint (POST /add/lead) tagging source=AI Assistant in Lead Management

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AiLeadRequest.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/webapp/WEB-INF/views/ftl/lead.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

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 36914 – code committed for some change on app

ranu — Wed, 24 Jun 2026 12:39:39 +0530

ranu – 2 file(s) modified
code committed for some change on app

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.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 36897 – Location Tracking Dashboard

vikas — Mon, 22 Jun 2026 17:36:25 +0530

vikas – 7 file(s) modified
Location Tracking Dashboard

~ /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-dao/src/main/java/com/spice/profitmandi/dao/service/BeatJourneyService.java
~ /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/resources/js/beat-journey.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

Rev 36896 – Mark Agenda Filled: Update logic

vikas — Mon, 22 Jun 2026 15:25:34 +0530

vikas – 6 file(s) modified
Mark Agenda Filled: Update logic

~ /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-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-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 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 36868 – code committed fo bgc lead

ranu — Thu, 18 Jun 2026 16:20:46 +0530

ranu – 5 file(s) modified
code committed fo bgc lead

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepositoryImpl.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/LeadGeoLocationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm

Rev 36867 – pendig visit should be come in defered

ranu — Thu, 18 Jun 2026 13:06:45 +0530

ranu – 3 file(s) modified
pendig visit should be come in defered

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

Rev 36860 – code committed by some bug fix in pjp

ranu — Tue, 16 Jun 2026 22:19:41 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 36852 – code committed by some bug fix in pjp

ranu — Tue, 16 Jun 2026 14:32:28 +0530

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

~ /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-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-web/src/main/java/com/spice/profitmandi/web/controller/BeatTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LocationTrackingController.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties

Rev 36850 – Account statement: anchor split-child pending indent to transaction root (any ...

amit — Tue, 16 Jun 2026 12:41:28 +0530

amit – 1 file(s) modified
Account statement: anchor split-child pending indent to transaction root (any depth)

selectPendingIndentWalletAmount now dates any split order off the split-chain ROOT's
createTimestamp via MIN(createTimestamp) over transactionId, replacing the one-level
originalOrderId parent hop (r36830). All orders of a transaction share one wallet debit
posted at the root order's creation, so this resolves the root at any split depth and keeps
multi-level split children in pending indent from the debit date. Fixes account-statement
FLOAT DIFF for multi-level split chains (e.g. GERMAN UPBLY836 +27,998 -> 0). Correlated MIN
is backed by ix_order_transaction_id.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java

Rev 36848 – Update BeatTrackingController to update total_distance

vikas — Mon, 15 Jun 2026 16:39:31 +0530

vikas – 4 file(s) modified
Update BeatTrackingController to update total_distance

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 36830 – Account statement: anchor split-child pending indent to originalOrderId parent date ...

amit — Thu, 11 Jun 2026 14:59:46 +0530

amit – 1 file(s) modified
Account statement: anchor split-child pending indent to originalOrderId parent date

selectPendingIndentWalletAmount now dates a quantity-split child order (originalOrderId
set) off its parent's createTimestamp, so the owed split-out quantity stays in pending
indent from the parent's date and bridges the single wallet debit to the later billing
across a month boundary. Fixes account-statement FLOAT DIFF gaps for partners with
month-end order splits. One-level resolution (parents are chain roots).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.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 36802 – some enhancement and bug fixes

ranu — Mon, 08 Jun 2026 18:52:35 +0530

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

~ /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/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.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 36790 – Add PO_REJECTED status and release rejected-PO orders from pending indent ...

amit — Fri, 05 Jun 2026 13:01:11 +0530

amit – 4 file(s) modified
Add PO_REJECTED status and release rejected-PO orders from pending indent

Rejected bulk-PO approvals refunded the wallet but left order rows in
status=0 (PAYMENT_PENDING) with billing/refund NULL, so they were counted
by pending indent forever and inflated the account-statement closing
balance with no matching wallet liability.

- OrderStatus.PO_REJECTED(91) new terminal status for approval rejection
- OrderRepository.cancelRejectedTransactionOrders sets status + refund_timestamp
on a rejected transaction's still-pending orders (side-effect free: wallet
already refunded at txn level, these never-processed orders hold no reservation)
- backfill_po_rejected_orders.sql releases 485 historically-stranded orders
(Group A: wallet already refunded). Deploy code before running.

~ /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/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/profitmandi-dao/src/main/resources/sql/backfill_po_rejected_orders.sql