SmartDukaan – /

Rev 36827 – code committed for buy mode(v2)

ranu — Wed, 10 Jun 2026 19:53:38 +0530

ranu – 1 file(s) modified
code committed for buy mode(v2)

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

Rev 36826 – Export Report and Refine

vikas — Wed, 10 Jun 2026 18:41:07 +0530

vikas – 1 file(s) modified
Export Report and Refine

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

Rev 36825 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 17:36:14 +0530

ranu – 2 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style-responsive.css

Rev 36824 – Punch, Check, Deferred handling improvements

vikas — Wed, 10 Jun 2026 17:21:43 +0530

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

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

Rev 36823 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 16:55:43 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/company-office-list.vm

Rev 36822 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 16:46:34 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

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

Rev 36821 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 16:45:55 +0530

ranu – 3 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VisitRequestController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-day-view.vm

Rev 36820 – code commited miss beat

ranu — Wed, 10 Jun 2026 16:03:44 +0530

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

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

Rev 36819 – Fix idempotency dedup to be server-authoritative (content + partner scoped) ...

amit — Wed, 10 Jun 2026 15:33:58 +0530

amit – 3 file(s) modified
Fix idempotency dedup to be server-authoritative (content + partner scoped)

PostInterceptor now keys duplicates on sha256(fofoId|method|uri|bodyHash) for
mutating methods only, instead of the client-supplied IdempotencyKey header.
The header was rotated per-request by the frontend (and old/sticky clients),
so identical submissions produced distinct keys and were never deduped - e.g.
a create-offer burst created 147 duplicate rows. Keying on the request body
makes dedup independent of client behaviour; partner scoping prevents cross-
partner collisions; distinct payloads (one-offer-per-partner) are unaffected.
GET/HEAD are now never deduped (removes spurious GET 400s).

common.js: attach IdempotencyKey only to mutating methods; stop rotating the
key on every ajaxComplete (kept reset on ajaxSuccess only). version 355.

Rev 36818 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 15:25:43 +0530

ranu – 2 file(s) modified
code commit for agenda fill time stamp

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

Rev 36817 – Link returnorderinfo to credit_note via credit_note_id FK Add a ...

amit — Wed, 10 Jun 2026 14:43:25 +0530

amit – 3 file(s) modified
Link returnorderinfo to credit_note via credit_note_id FK

Add a direct credit_note_id column on returnorderinfo so a return row
can be tied to the Credit Note it was refunded via, replacing the
indirect/ambiguous association through original_invoice_number + the CN
number embedded in refundDescription. Stamped in
applyInvoiceReturnViaCreditNote; migration adds the column and backfills
existing rows by parsing the CN number out of refundDescription.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnOrderInfo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_credit_note_id_to_returnorderinfo.sql

Rev 36816 – Updated IT Emails

aman — Wed, 10 Jun 2026 13:21:21 +0530

aman – 1 file(s) modified
Updated IT Emails

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

Rev 36815 – Fix broken header logo on lead-geo store verification form: use ...

aman — Wed, 10 Jun 2026 13:16:20 +0530

aman – 1 file(s) modified
Fix broken header logo on lead-geo store verification form: use CDN-hosted logo URL

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

Rev 36814 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 12:03:44 +0530

ranu – 3 file(s) modified
code commit for agenda fill time stamp

Rev 36813 – ok

amit — Wed, 10 Jun 2026 11:30:15 +0530

amit – 1 file(s) modified
ok

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

Rev 36812 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 00:14:33 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/BeatVisitType.java

Rev 36811 – code commit for agenda fill time stamp

ranu — Wed, 10 Jun 2026 00:13:08 +0530

ranu – 5 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatRoute.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/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 36810 – Punch, Check, Deferred handling improvements

vikas — Wed, 10 Jun 2026 00:12:25 +0530

vikas – 3 file(s) modified
Punch, Check, Deferred handling improvements

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LocationTrackingModel.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 36809 – code commit for agenda fill time stamp

ranu — Tue, 09 Jun 2026 19:57:29 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/CompanyOffice.java

Rev 36808 – code commit for agenda fill time stamp

ranu — Tue, 09 Jun 2026 19:53:29 +0530

ranu – 1 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/CompanyOffice.java

Rev 36807 – Fix:Lead Location->Verification

aman — Tue, 09 Jun 2026 19:31:42 +0530

aman – 4 file(s) modified
Fix:Lead Location->Verification

x /trunk/profitmandi-fofo/src/main/webapp/resources/images/checkbox_icon.png
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-pending.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-geo-thankyou.vm

Rev 36806 – code commit for agenda fill time stamp

ranu — Tue, 09 Jun 2026 19:31:18 +0530

ranu – 5 file(s) modified
code commit for agenda fill time stamp

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
~ /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.vm

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

~ /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/BeatScheduleRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepositoryImpl.java

Rev 36804 – some enhancement and bug fixes

ranu — Tue, 09 Jun 2026 13:38:52 +0530

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

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

Rev 36803 – Exclude loan legs from analysis-dashboard account-statement bodies Match WalletController's ...

amit — Mon, 08 Jun 2026 19:56:01 +0530

amit – 1 file(s) modified
Exclude loan legs from analysis-dashboard account-statement bodies

Match WalletController's running-balance filter: also exclude CREDIT_LIMIT,
CREDIT_UTILIZED, LOAN, LOAN_REPAYMENT (were only excluding PURCHASE +
CN_WALLET_REFERENCES) in /analysis/account/statement and the analysis-account
-statement views, so loan churn no longer distorts the running body.

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

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