SmartDukaan – /

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

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

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

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

vikas — Tue, 02 Jun 2026 20:00:44 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTrackingPath.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatDeferredVisit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/LocationTrackingRepositoryImpl.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 36761 – some Enhancements or changes

ranu — Tue, 02 Jun 2026 19:58:48 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.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-day-view.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-deferred.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 36760 – Punch, Check, Deferred handling improvements and mapbox

vikas — Tue, 02 Jun 2026 19:51:24 +0530

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

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

vikas — Tue, 02 Jun 2026 19:46:37 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java

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

vikas — Tue, 02 Jun 2026 19:29:17 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTracking.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/LocationTrackingPath.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatDeferredVisit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingPathModel.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
~ /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 36757 – Fixed Stock Purchase sAle ageing days, added fields to mail

amit — Tue, 02 Jun 2026 18:35:14 +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/config/AppConfig.java

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

amit — Tue, 02 Jun 2026 18:33:09 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js

Rev 36755 – Account statement: relabel the reconciling line as 'FLOAT DIFF' (rounding/float ...

amit — Tue, 02 Jun 2026 13:47:23 +0530

amit – 1 file(s) modified
Account statement: relabel the reconciling line as 'FLOAT DIFF' (rounding/float only).

It is not pending indent or a cross-period movement - with clean data it is only a few rupees of float. A large value indicates a data issue (e.g. MARGINS CN not yet rolled out) and is surfaced by the existing reconciliation warning.

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

Rev 36754 – Account statement (Excel): reconcile running balance to net standing (wallet ...

amit — Tue, 02 Jun 2026 12:09:06 +0530

amit – 6 file(s) modified
Account statement (Excel): reconcile running balance to net standing (wallet + pending indent - loan).

- populateData: categorised lines, scheme/margin shown as month-end MARGINS credit note (CN_CANCELLATION and negative-net CNs rendered as debit notes), interest-accrued line as the standing-moving loan cost, and a net-pending-indent/diff line that lands the running balance on closing.
- Returns shown individually from returnorderinfo (one credit line per return, against its invoice on refundedAt); billing-query RETURNED/RETURNS_CN suppressed to avoid double count.
- Exclude PURCHASE and CREDIT_LIMIT/CREDIT_UTILIZED (loan cash legs) from the wallet body.
- LoanStatementRepository.getInterestAccruedBetween; ReturnOrderInfoRepository.selectReturnsBetween.

~ /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
~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 36753 – Fix:Contact us list update

aman — Tue, 02 Jun 2026 12:01:26 +0530

aman – 1 file(s) modified
Fix:Contact us list update

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

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

amit — Tue, 02 Jun 2026 11:39:58 +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/config/AppConfig.java

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

amit — Tue, 02 Jun 2026 11:34:50 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js

Rev 36750 – Keep e-invoice PrdDesc as IMEI count within NIC 300-char limit ...

amit — Mon, 01 Jun 2026 16:01:04 +0530

amit – 2 file(s) modified
Keep e-invoice PrdDesc as IMEI count within NIC 300-char limit while invoice PDF lists full IMEIs (complements r36749 IMEI-listing restore)

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

Rev 36749 – code commited miss beat

ranu — Mon, 01 Jun 2026 15:48:44 +0530

ranu – 1 file(s) modified
code commited miss beat

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

Rev 36748 – beat plan info commit

ranu — Mon, 01 Jun 2026 12:54:04 +0530

ranu – 1 file(s) modified
beat plan info commit

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

Rev 36747 – Scheme extension: propagate new end date to scheme_item rows ...

amit — Mon, 01 Jun 2026 12:30:32 +0530

amit – 1 file(s) modified
Scheme extension: propagate new end date to scheme_item rows

extendAllScheme and extendSchemeById only updated scheme.end_date_time, leaving scheme_item.end_date at the original value, so item-level scheme eligibility did not honor the extension. Carry the new end date over to items that were tracking the scheme window (item end_date == previous scheme end date), preserving custom per-item windows, matching expireSchemeById behavior.

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

Rev 36746 – Restore Total Payables and Credit Utilization fields on wallet statement ...

amit — Mon, 01 Jun 2026 09:15:07 +0530

amit – 2 file(s) modified
Restore Total Payables and Credit Utilization fields on wallet statement dashboard (NPE-safe via creditSummary)

~ /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 36745 – code commited miss beat

ranu — Mon, 01 Jun 2026 00:14:09 +0530

ranu – 4 file(s) modified
code commited miss beat

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/beatmiss
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/beatmiss/BeatMissDetectorRunner.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 36744 – beat defers

ranu — Sun, 31 May 2026 20:47:01 +0530

ranu – 1 file(s) modified
beat defers

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

Rev 36743 – Surface internally-sourced serialized stock in warehouse billing Removed the ...

amit — Sat, 30 May 2026 18:03:07 +0530

amit – 1 file(s) modified
Surface internally-sourced serialized stock in warehouse billing

Removed the su.internal=0 filter from the imeisToSecondaryForWarehouseBilling
named query. The query's intent is to find whatever serialized stock is
physically present in the billing warehouse and report its original ageing;
the supplier filter was wrongly excluding units whose original purchase came
from an internal/group supplier (e.g. inter-warehouse transfers), making real
available stock invisible to billing and forcing the UI into a quantity-input
fallback instead of the IMEI picker.

Ageing ordering is preserved: AgeingService dedups by serial keeping the
earliest invoice date, so transferred stock still ages from its original
external purchase. Only 4 internal-only serial units exist network-wide;
those now age from their internal invoice (their only origin).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/BrandAgeingLimit.java

Rev 36742 – beat plan info commit

ranu — Sat, 30 May 2026 18:00:45 +0530

ranu – 1 file(s) modified
beat plan info commit

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

Rev 36741 – beat plan info commit

ranu — Sat, 30 May 2026 17:59:29 +0530

ranu – 4 file(s) modified
beat plan info commit

~ /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/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm