SmartDukaan – /

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 36801 – Fixed Stock Purchase sAle ageing days, added fields to mail

amit — Mon, 08 Jun 2026 17:40:18 +0530

amit – 1 file(s) modified
Fixed Stock Purchase sAle ageing days, added fields to mail

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

Rev 36800 – some enhancement and bug fixes

ranu — Mon, 08 Jun 2026 17:05:02 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VisitRequestController.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 36799 – Add standalone Route Scheduling (PJP) analytics dashboard at /route-analytics, restricted ...

amit — Mon, 08 Jun 2026 16:07:07 +0530

amit – 3 file(s) modified
Add standalone Route Scheduling (PJP) analytics dashboard at /route-analytics, restricted to amit.gupta and tarun.verma

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RouteAnalyticsController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/route-analytics-denied.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/route-analytics.vm

Rev 36798 – Add RouteAnalyticsService for Beat Plan (PJP) analytics dashboard (read-only native ...

amit — Mon, 08 Jun 2026 14:45:38 +0530

amit – 2 file(s) modified
Add RouteAnalyticsService for Beat Plan (PJP) analytics dashboard (read-only native SQL)

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/RouteAnalyticsService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/RouteAnalyticsServiceImpl.java

Rev 36797 – some enhancement and bug fixes

ranu — Mon, 08 Jun 2026 13:46:56 +0530

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

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VisitRequestController.java

Rev 36796 – Add migration: void net-settled stranded status=0 orders Captures the ...

amit — Mon, 08 Jun 2026 13:44:16 +0530

amit – 1 file(s) modified
Add migration: void net-settled stranded status=0 orders

Captures the two ad-hoc cleanups run on hadb1 (the live DB): rejected-txn orders
the PO_REJECTED backfill missed (non-standard refund) -> PO_REJECTED(91), and
non-rejected status=0 orders whose wallet debit was reversed by a non-standard
entry -> refund_timestamp. Net-settled only; net-committed/awaiting-approval POs
left untouched. Temp-table form to avoid locking the live DB. Idempotent.

+ /trunk/profitmandi-dao/src/main/resources/sql/void_net_settled_stranded_orders.sql

Rev 36795 – Add pending-indent phantom-cleanup migrations (drafts + PAYMENT_FAILED) selectPendingIndentWalletAmount counts ...

amit — Mon, 08 Jun 2026 13:06:28 +0530

amit – 2 file(s) modified
Add pending-indent phantom-cleanup migrations (drafts + PAYMENT_FAILED)

selectPendingIndentWalletAmount counts any billing/refund-NULL order regardless
of status, so abandoned draft orders and old PAYMENT_FAILED orders inflated
partner 'unbilled PO' and broke finance reco.

- cleanup_abandoned_draft_orders.sql: 2019-21 never-submitted, wallet-never-debited
drafts (status=0, not rejected) -> PAYMENT_FAILED + refund_timestamp. ~1970 rows.
- cleanup_phantom_payment_failed.sql: 2017-19 PAYMENT_FAILED orders counted as
unbilled PO -> drop ONLY phantom (no-debit or net-settled) via refund_timestamp;
KEEP net-committed (real payable). Temp-table form to avoid locking the live DB.

Both data-only (no code), idempotent, ran on hadb1; pending prod + replicas.

+ /trunk/profitmandi-dao/src/main/resources/sql/cleanup_abandoned_draft_orders.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/cleanup_phantom_payment_failed.sql

Rev 36794 – Fix:Branding->Verification

aman — Sat, 06 Jun 2026 16:22:35 +0530

aman – 1 file(s) modified
Fix:Branding->Verification

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

Rev 36793 – some enhancement and bug fixes

ranu — Fri, 05 Jun 2026 20:47:59 +0530

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

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

Rev 36792 – some enhancement and bug fixes

ranu — Fri, 05 Jun 2026 18:55:17 +0530

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

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

Rev 36791 – Mark rejected PO order rows on transaction rejection In ...

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

amit – 1 file(s) modified
Mark rejected PO order rows on transaction rejection

In OrderController.updateApprovalStatus reject branch, after the wallet
refund and loan settlement, call cancelRejectedTransactionOrders so the
rejected PO's order rows move to PO_REJECTED and drop out of pending
indent. Previously they were left in status=0, permanently inflating the
partner's account-statement pending indent. Requires dao r36790.

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

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

Rev 36789 – some enhancement and bug fixes

ranu — Fri, 05 Jun 2026 11:46:53 +0530

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

Rev 36788 – some enhancement and bug fixes

ranu — Fri, 05 Jun 2026 11:11:34 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js

Rev 36787 – some enhancement and bug fixes

ranu — Fri, 05 Jun 2026 10:38:44 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/LeadVisitRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadVisitRequestRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm

Rev 36786 – some enhancement and bug fixes

ranu — Thu, 04 Jun 2026 17:33:03 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 36785 – some enhancement and bug fixes

ranu — Thu, 04 Jun 2026 17:26:48 +0530

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

~ /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-bulk.vm

Rev 36784 – Location Tracking - From Punch IN

vikas — Thu, 04 Jun 2026 16:55:12 +0530

vikas – 1 file(s) modified
Location Tracking - From Punch IN

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

Rev 36783 – Location Tracking - From Punch IN

vikas — Thu, 04 Jun 2026 15:58:23 +0530

vikas – 4 file(s) modified
Location Tracking - From Punch IN

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-data.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-task-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-user-detail.vm

Rev 36782 – Fix YearMonth equals-predicate to match LocalDate columns (account statement 500) ...

amit — Thu, 04 Jun 2026 15:20:21 +0530

amit – 1 file(s) modified
Fix YearMonth equals-predicate to match LocalDate columns (account statement 500)

The generic repo's YearMonth branch always built LocalDateTime bounds. For a
LocalDate column (CreditNote.marginMonth) those bounds are bound through the
auto-applied LocalDateAttributeConverter, which casts the value to LocalDate
and throws 'Error attempting to apply AttributeConverter' (GE_1007).

Surfaced by selectByMarginMonth (r36769) - the first YearMonth query against a
LocalDate column - which crashed the /account/statement endpoint for any
full-calendar-month range. Now mirrors the DateRangeModel branch: LocalDate
bounds for LocalDate columns, LocalDateTime bounds otherwise.

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

Rev 36781 – some Enhancements or changes

ranu — Thu, 04 Jun 2026 13:58:00 +0530

ranu – 4 file(s) modified
some Enhancements or changes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadGeoLocationController.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 36780 – Rename reco CSV column header In Transit -> Unbilled PO ...

amit — Thu, 04 Jun 2026 13:49:10 +0530

amit – 1 file(s) modified
Rename reco CSV column header In Transit -> Unbilled PO (label only; calculation unchanged)

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

Rev 36779 – Fix NPE in selectPendingIndentWalletAmount for all-partners reco: exclude null-retailerId orphan ...

amit — Thu, 04 Jun 2026 13:28:57 +0530

amit – 1 file(s) modified
Fix NPE in selectPendingIndentWalletAmount for all-partners reco: exclude null-retailerId orphan orders (which formed a null GROUP BY key) and guard null group sums

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

Rev 36778 – Fix account closing queries: cn.created_at -> cn.create_timestamp in selectOpeningAmount (r36719 ...

amit — Thu, 04 Jun 2026 13:14:44 +0530

amit – 2 file(s) modified
Fix account closing queries: cn.created_at -> cn.create_timestamp in selectOpeningAmount (r36719 missed it); remove dead single-partner selectOpeningAmount overload; correct pending-indent filter to exclude orders billed-before but refunded-after closingDate

Rev 36777 – Remove unused getOpeningTillExcludingPurchase (no callers)

amit — Thu, 04 Jun 2026 13:03:45 +0530

amit – 2 file(s) modified
Remove unused getOpeningTillExcludingPurchase (no callers)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 36776 – Remove redundant /account/closing-statements; repoint wallet-details closing button to /account/reco (now ...

amit — Thu, 04 Jun 2026 13:03:21 +0530

amit – 2 file(s) modified
Remove redundant /account/closing-statements; repoint wallet-details closing button to /account/reco (now on the wallet+PI-loan model)

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm

Rev 36775 – Align /account/reco closing with individual account statement: closing = wallet ...

amit — Thu, 04 Jun 2026 12:21:23 +0530

amit – 1 file(s) modified
Align /account/reco closing with individual account statement: closing = wallet + pending indent - loan outstanding; add Loan Outstanding column

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

Rev 36774 – Add bulk getLoanOutstandingAtDate (principal+interest per partner at a date) for ...

amit — Thu, 04 Jun 2026 12:20:37 +0530

amit – 3 file(s) modified
Add bulk getLoanOutstandingAtDate (principal+interest per partner at a date) for account reco closing

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

Rev 36773 – some Enhancements or changes

ranu — Thu, 04 Jun 2026 11:35:07 +0530

ranu – 1 file(s) modified
some Enhancements or changes

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

Rev 36772 – Account statement: per-CN scheme/margin lines + non-month-end raw-scheme fallback. ...

amit — Wed, 03 Jun 2026 20:01:27 +0530

amit – 1 file(s) modified
Account statement: per-CN scheme/margin lines + non-month-end raw-scheme fallback.

- Month-end: one 'Margin / Scheme Payout' line PER credit note (MARGINS net >=0 -> Credit Note (CN); CN_CANCELLATION or negative net -> Debit Note (DN), reducing the balance), referenced by CN number.
- Non-month-end statements: the trailing month's MARGINS CN isn't issued yet, so consolidate that month's raw scheme wallet entries into a single 'Margin / Scheme Payout' line placed at the end, just before the FLOAT DIFF. Keeps partial-period statements reconciling (verified AYAAN 01-15/04 float -1.97 vs 36,462 in the diff without it).

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

Rev 36771 – code commit for self lead creation

ranu — Wed, 03 Jun 2026 19:45:44 +0530

ranu – 2 file(s) modified
code commit for self lead creation

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

Rev 36770 – Fix:Get Invoice Number is order detail

aman — Wed, 03 Jun 2026 18:39:30 +0530

aman – 1 file(s) modified
Fix:Get Invoice Number is order detail

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 36769 – Account statement: select the month-end scheme/margin credit notes by margin_month ...

amit — Wed, 03 Jun 2026 18:18:09 +0530

amit – 3 file(s) modified
Account statement: select the month-end scheme/margin credit notes by margin_month instead of cn_date.

Added CreditNoteRepository.selectByMarginMonth(fofoId, YearMonth) - fofo-scoped, keyed on margin_month passed as a YearMonth so the generic repo matches it as a whole-month range (robust to the stored day). populateData now uses it for the month-end CN block. margin_month is the explicit margin-period field (always populated for MARGINS and CN_CANCELLATION; RETURNS have none and are naturally excluded, consistent with returns being sourced from returnorderinfo).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 36768 – Restore ActivatedImei.checked idempotency guard (revert r36579) r36579 removed the ...

amit — Wed, 03 Jun 2026 17:59:40 +0530

amit – 2 file(s) modified
Restore ActivatedImei.checked idempotency guard (revert r36579)

r36579 removed the 'ai.checked = false' filter from selectMissedActivationSale
and dropped the checked field, treating it as dead. It was not: the filter
prevented the daily activation-scheme sweep from re-processing the ~163K
already-evaluated historical activations (checked=1). Without it, the sweep
resurrected those old activations as PENDING scheme_in_out rows, and the
oldest ones (whose legacy orders have no fofo_order) made processActivation
throw FFORDR_1000 and roll back the entire batch every run since 2026-05-18,
stalling all special-support credits.

Restores the checked field + accessors and the 'ai.checked = false' filter.
checked column repopulated on fofo.activated_imei from backup; rogue PENDING
rows cleaned up separately.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java

Rev 36767 – Fixed Stock Purchase sAle ageing days, added fields to mail

amit — Wed, 03 Jun 2026 17:30:08 +0530

amit – 1 file(s) modified
Fixed Stock Purchase sAle ageing days, added fields to mail

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

Rev 36766 – Punch, Check, Deferred handling improvements and mapbox

vikas — Wed, 03 Jun 2026 11:28:34 +0530

vikas – 1 file(s) modified
Punch, Check, Deferred handling improvements and mapbox

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

Rev 36765 – Punch, Check, Deferred handling improvements and mapbox

vikas — Wed, 03 Jun 2026 11:26:57 +0530

vikas – 1 file(s) modified
Punch, Check, Deferred handling improvements and mapbox

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

Rev 36764 – some Enhancements or changes

ranu — Tue, 02 Jun 2026 20:10:23 +0530

ranu – 1 file(s) modified
some Enhancements or changes

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

Rev 36763 – some Enhancements or changes

ranu — Tue, 02 Jun 2026 20:09:27 +0530

ranu – 2 file(s) modified
some Enhancements or changes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java