SmartDukaan – /

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 36887 – Fix:Update Contact-us - remove Mohit Gulati from escalations

aman — Mon, 22 Jun 2026 11:58:40 +0530

aman – 1 file(s) modified
Fix:Update Contact-us - remove Mohit Gulati from escalations

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

Rev 36886 – contact updated

aman — Mon, 22 Jun 2026 11:48:56 +0530

aman – 1 file(s) modified
contact updated

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

Rev 36885 – Fix partner-performance loan table columns and add missing lastUnbilledActivated attribute ...

amit — Mon, 22 Jun 2026 11:38:12 +0530

amit – 2 file(s) modified
Fix partner-performance loan table columns and add missing lastUnbilledActivated attribute

- Add lastUnbilledActivated model attribute (from investment.getUnbilledAmount()) so the Unbilled Activated Stock gate renders
- Align Active Loans table to its 9 headers: add serial # column and Total Pending cell
- Pending Interest = interest accrued - interest paid
- Total Pending = pending principal + pending interest

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm

Rev 36884 – deena nath gupta has all access to bulk order approve

ranu — Sat, 20 Jun 2026 18:21:44 +0530

ranu – 1 file(s) modified
deena nath gupta has all access to bulk order approve

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

Rev 36883 – calling target given

ranu — Sat, 20 Jun 2026 14:13:40 +0530

ranu – 2 file(s) modified
calling target given

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java

Rev 36882 – Location Tracking Dashboard: Add BeatJourneyController

vikas — Fri, 19 Jun 2026 19:04:48 +0530

vikas – 2 file(s) modified
Location Tracking Dashboard: Add BeatJourneyController

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatJourneyController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm

Rev 36881 – download

ranu — Fri, 19 Jun 2026 17:58:13 +0530

ranu – 2 file(s) modified
download

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hid-allocation.vm

Rev 36880 – Harden bulk vendor catalog pricing upload: set creator authId, skip ...

amit — Fri, 19 Jun 2026 17:49:30 +0530

amit – 1 file(s) modified
Harden bulk vendor catalog pricing upload: set creator authId, skip null rows, aggregate row errors, validate price sanity (tp/dp/mop>0) and duplicate/pending requests

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

Rev 36879 – Fix loan summary detail: map columns to correct loan fields ...

amit — Fri, 19 Jun 2026 17:44:34 +0530

amit – 1 file(s) modified
Fix loan summary detail: map columns to correct loan fields

Pending Interest now derived as totalPending - pendingPrincipal, and
Total Pending now uses getTotalPending() instead of getInterestPaid().
Headers renamed accordingly (Principal Amount, Pending Principal,
Pending Interest, Total Pending).

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loan-summary-detail.vm

Rev 36878 – donotcommit

aman — Fri, 19 Jun 2026 15:14:34 +0530

aman – 1 file(s) modified
donotcommit

~ /trunk/profitmandi-fofo/build.gradle

Rev 36877 – Location Tracking Dashboard: Add BeatJourneyController

vikas — Fri, 19 Jun 2026 15:00:54 +0530

vikas – 6 file(s) modified
Location Tracking Dashboard: Add BeatJourneyController

+ /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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 36876 – Bump profitmandi-fofo version to 0.0.2-SNAPSHOT

aman — Fri, 19 Jun 2026 14:42:43 +0530

aman – 1 file(s) modified
Bump profitmandi-fofo version to 0.0.2-SNAPSHOT

~ /trunk/profitmandi-fofo/build.gradle

Rev 36875 – Fix STORE_CODE_CREATED timeline: commit event before best-effort notifications; use containsKey ...

aman — Fri, 19 Jun 2026 14:39:16 +0530

aman – 2 file(s) modified
Fix STORE_CODE_CREATED timeline: commit event before best-effort notifications; use containsKey in onboarding-timeline-detail.vm so Done badge shows even when timestamp is null

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm

Rev 36874 – kamini mam access issue on pending loi

ranu — Fri, 19 Jun 2026 13:00:52 +0530

ranu – 1 file(s) modified
kamini mam access issue on pending loi

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

Rev 36873 – kamini mam access issue on pending loi

ranu — Fri, 19 Jun 2026 12:42:56 +0530

ranu – 5 file(s) modified
kamini mam access issue on pending loi

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap-theme.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/fofo-form/css/bootstrap.min.css

Rev 36872 – tech access to rudy

ranu — Fri, 19 Jun 2026 12:31:47 +0530

ranu – 1 file(s) modified
tech access to rudy

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

Rev 36871 – Removed Status Column From Summary Sheet

vikas — Fri, 19 Jun 2026 00:43:23 +0530

vikas – 1 file(s) modified
Removed Status Column From Summary Sheet

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

Rev 36870 – tech access to rudy

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

ranu – 3 file(s) modified
tech access to rudy

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java

Rev 36869 – code committed fo bgc lead

ranu — Thu, 18 Jun 2026 16:21:56 +0530

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

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

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 36866 – code committed fo bgc lead

ranu — Thu, 18 Jun 2026 11:47:14 +0530

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

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

Rev 36865 – code committed fo bgc lead

ranu — Wed, 17 Jun 2026 12:43:05 +0530

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

~ /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 36864 – code committed by some bug fix in pjp

ranu — Wed, 17 Jun 2026 11:37:49 +0530

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

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

Rev 36863 – Updated Redesigned Tracking Report

vikas — Wed, 17 Jun 2026 00:22:00 +0530

vikas – 2 file(s) modified
Updated Redesigned Tracking Report

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java

Rev 36862 – Redesigned Employee Tracking Report + PDF

vikas — Wed, 17 Jun 2026 00:02:43 +0530

vikas – 1 file(s) modified
Redesigned Employee Tracking Report + PDF

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

Rev 36861 – Redesigned Employee Tracking Report + PDF

vikas — Tue, 16 Jun 2026 23:23:23 +0530

vikas – 1 file(s) modified
Redesigned Employee Tracking Report + PDF

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.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 36859 – Redesigned Employee Tracking Report + PDF

vikas — Tue, 16 Jun 2026 19:50:33 +0530

vikas – 1 file(s) modified
Redesigned Employee Tracking Report + PDF

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

Rev 36858 – Redesigned Employee Tracking Report + PDF

vikas — Tue, 16 Jun 2026 19:30:30 +0530

vikas – 3 file(s) modified
Redesigned Employee Tracking Report + PDF

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingService.java
~ /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 36857 – Redesigned Employee Tracking Report

vikas — Tue, 16 Jun 2026 17:38:26 +0530

vikas – 1 file(s) modified
Redesigned Employee Tracking Report

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

Rev 36856 – code committed fo bgc lead

ranu — Tue, 16 Jun 2026 16:59:58 +0530

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

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

Rev 36855 – Location Tracking - From Punch IN

vikas — Tue, 16 Jun 2026 15:55:09 +0530

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

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

Rev 36854 – Redesigned Employee Tracking Report

vikas — Tue, 16 Jun 2026 15:53:25 +0530

vikas – 3 file(s) modified
Redesigned Employee Tracking Report

Rev 36853 – code committed by some bug fix in pjp

ranu — Tue, 16 Jun 2026 15:09:58 +0530

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

~ /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 36851 – Fix LOI Acquired Date validation rejecting manually-typed dates; bump asset ...

aman — Tue, 16 Jun 2026 13:41:00 +0530

aman – 2 file(s) modified
Fix LOI Acquired Date validation rejecting manually-typed dates; bump asset version to 359

Validate the Acquired Date range on blur instead of change so typing the
year digit-by-digit in the type=date field no longer rejects intermediate
values. Bump cache-buster version 358->359 so clients reload the updated JS.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js

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 36849 – code committed fo bgc lead

ranu — Mon, 15 Jun 2026 23:32:35 +0530

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

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