SmartDukaan – //

Rev 36304 – Fix:Show ICICI Bank Ltd in fullstock req pannel

aman — Fri, 17 Apr 2026 19:10:55 +0530

aman – 1 file(s) modified
Fix:Show ICICI Bank Ltd in fullstock req pannel

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/full-stock-payment-panel.vm

Rev 36303 – Feat:Separate partner name and code into different columns in Partner ...

aman — Fri, 17 Apr 2026 18:39:52 +0530

aman – 1 file(s) modified
Feat:Separate partner name and code into different columns in Partner Credit Report

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

Rev 36302 – Add 2-min cache on Catalog.selectAllGoodStockBrandWise Hottest query right now ...

amit — Fri, 17 Apr 2026 18:15:45 +0530

amit – 1 file(s) modified
Add 2-min cache on Catalog.selectAllGoodStockBrandWise

Hottest query right now on the DB: 3851 execs x 297ms = ~1143 s over
2.9h uptime. Fired once per target-slab in TodayOfferServiceImpl's
findAllTodayOffer loop whenever the slab has no explicit catalog IDs.

Input is a single String brand (only ~10 brands), output is a list of
Catalog entities with no associations (all primitive/String columns,
no lazy-init risk) and the caller only invokes getBrand/getId on the
results. Safe to cache in the existing in-memory Caffeine
twoMintimeoutCacheManager.

Default Spring key (= brand) is stable; unless skips empty results.

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

Rev 36301 – code optimization of today po rbm page

ranu — Fri, 17 Apr 2026 17:31:40 +0530

ranu – 1 file(s) modified
code optimization of today po rbm page

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/Sold15daysOldAgingModel.java

Rev 36300 – Bump JS version to 331 to bust cache for GRN ...

amit — Fri, 17 Apr 2026 16:38:10 +0530

amit – 1 file(s) modified
Bump JS version to 331 to bust cache for GRN correction auto-approve UI change

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

Rev 36299 – GRN correction: surface autoApproved flag to UI Controller returns ...

amit — Fri, 17 Apr 2026 16:26:10 +0530

amit – 2 file(s) modified
GRN correction: surface autoApproved flag to UI

Controller returns {status, autoApproved} JSON; JS shows an
'auto-approved' message when the request bypasses approval, otherwise
the existing 'raised for approval' message. Pairs with dao r36298.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 36298 – GRN correction: auto-approve IMEI-only and color-only changes When a ...

amit — Fri, 17 Apr 2026 16:26:01 +0530

amit – 2 file(s) modified
GRN correction: auto-approve IMEI-only and color-only changes

When a correction request contains only IMEI swaps or item swaps where
old and new items share modelName+modelNumber (color-only change), the
request is persisted as APPROVED with requester as approver and applied
immediately. Mixed/model/qty changes continue to go through the existing
PENDING approval flow.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 36297 – Fix MonitorController autowiring after @Cacheable proxy UserWalletRepositoryImpl now has ...

amit — Fri, 17 Apr 2026 15:36:23 +0530

amit – 1 file(s) modified
Fix MonitorController autowiring after @Cacheable proxy

UserWalletRepositoryImpl now has @Cacheable (r36296), which makes Spring
wrap it in a JDK interface proxy. MonitorController autowired the concrete
class, breaking startup with BeanNotOfRequiredTypeException. Switch to the
interface UserWalletRepository, matching every other repository injection
in the file.

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

Rev 36296 – Add 2-min cache on dashboard-family queries Three queries dominate ...

amit — Fri, 17 Apr 2026 15:23:56 +0530

amit – 3 file(s) modified
Add 2-min cache on dashboard-family queries

Three queries dominate dashboard DB time (~830 s / 30 min combined) because
they re-execute on every dashboard refresh with near-identical parameters:

- OrderRepositoryImpl.selectPartnersBilledBetweenDates: dynamic endDate is
LocalDateTime.now(), so cache key bucketed to 2-minute boundaries via SpEL
(endDate.toEpochSecond / 120) so calls in the same bucket share an entry.
- UserWalletRepositoryImpl.getPartnerWiseCollectionAchievement and
RbmTargetServiceImpl.getWeeklyBillingDataForMonth: default Spring key
(fofoIds + startDate) is stable, no bucketing needed.

All three use the existing Caffeine 'twoMintimeoutCacheManager' (in-memory,
per-JVM, expireAfterWrite=2min). unless clause skips caching empty results
so legitimately-empty responses don't pin a bad entry.

~ /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/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

Rev 36295 – Plug response-entity leak in RestClient Apache HttpClient connections are ...

amit — Fri, 17 Apr 2026 14:57:15 +0530

amit – 1 file(s) modified
Plug response-entity leak in RestClient

Apache HttpClient connections are released back to the PoolingConnectionManager
only when the response entity is fully consumed. Error paths in execute(),
executeMandii(), and executeJson() threw before consumeQuietly was called,
leaking pool slots and accumulating CLOSE_WAIT sockets against Solr, Tomcat,
and external APIs. Wrap each in try/finally with EntityUtils.consumeQuietly
so the connection is always returned. Methods that return raw HttpResponse
(getResponse, postResponse) are still caller-close responsibility.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 36294 – Remove @Cacheable from getFirstBillingDate Temporary revert while cache null-handling ...

amit — Fri, 17 Apr 2026 13:48:09 +0530

amit – 1 file(s) modified
Remove @Cacheable from getFirstBillingDate

Temporary revert while cache null-handling is reviewed end-to-end.
The method returns null for partners with no billing history; the
Redis cache (disableCachingNullValues) was causing log noise even
after unless="#result == null" was added. Reverting to direct DB
lookup until a proper caching strategy (e.g. per-cache nulls or
Optional return type) is decided.

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

Rev 36293 – Fix IllegalArgumentException when caching null firstBillingDate Redis cache manager ...

amit — Fri, 17 Apr 2026 13:40:44 +0530

amit – 1 file(s) modified
Fix IllegalArgumentException when caching null firstBillingDate

Redis cache manager (redisEternalCacheManager) has disableCachingNullValues,
so every partner with no billing history threw IllegalArgumentException
from RedisCache.put. Added unless="#result == null" to skip cache writes
for null results; non-null results still cache normally.

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

Rev 36292 – Reduce DB scan pressure from runaway IMEI and IRN crons ...

amit — Fri, 17 Apr 2026 13:17:01 +0530

amit – 1 file(s) modified
Reduce DB scan pressure from runaway IMEI and IRN crons

- IRN cron (updateIrnsToInvoices): fixedDelay 2s -> 5s; migration cron
has finished but keeps full-scanning 821k orders every 2s for 0 rows
(every billed order already has irnGenerated populated true/false).
- IMEI activation crons: fixedDelay 60s -> 5min across all 6 methods
(vivoImeiActivation, vivoImeiActivationTertiary, oppo, oppoTertiary,
realme, realmeTertiary). Each was scanning orders since 2021-01-01
every minute; 5min is well within activation-latency tolerance.

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

Rev 36291 – Optimize slow DB queries: split fan-out join, FORCE INDEX on ...

amit — Fri, 17 Apr 2026 13:16:51 +0530

amit – 3 file(s) modified
Optimize slow DB queries: split fan-out join, FORCE INDEX on wallet history

- CurrentInventorySnapshotRepositoryImpl.getSpilitStockBatch: split
LEFT-JOIN fan-out into two independent aggregates (~8x faster);
fixes SUM(DISTINCT) undercounting bug where same availability/qty
values across items collapsed into one.
- UserWalletRepositoryImpl.getWarehousewiseCollection: HQL -> native
SQL with FORCE INDEX(idx_uwh_wallet_timestamp) so timestamp range
filters at index level instead of row filter (~4x faster, 3.1s -> 722ms).
- PartnerCollectionPlanRepositoryImpl.getCommitmentCollectionSummary:
Criteria 3-Root CROSS JOIN -> explicit INNER JOIN + FORCE INDEX
(idx_uwh_wallet_timestamp) (~3.5x faster).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java

Rev 36290 – Fix:Finance code to finance team after code creation

aman — Fri, 17 Apr 2026 13:14:33 +0530

aman – 2 file(s) modified
Fix:Finance code to finance team after code creation

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

Rev 36289 – hadb1 perf: add SD_CREDIT_LOCK to prevent deadlock on sd_credit_requirement, sort ...

amit — Fri, 17 Apr 2026 12:38:49 +0530

amit – 1 file(s) modified
hadb1 perf: add SD_CREDIT_LOCK to prevent deadlock on sd_credit_requirement, sort updatePartnerLimit by fofoId

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

Rev 36288 – hadb1 perf: cache firstBillingDate, fix N+1 item query, push eInvoice ...

amit — Fri, 17 Apr 2026 12:38:35 +0530

amit – 4 file(s) modified
hadb1 perf: cache firstBillingDate, fix N+1 item query, push eInvoice filter to SQL, sort updateRisk by fofoId

~ /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/TransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 36287 – sales dispostion updated

ranu — Thu, 16 Apr 2026 19:55:10 +0530

ranu – 3 file(s) modified
sales dispostion updated

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RatingReminder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RatingReminderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RatingReminderRepositoryImpl.java

Rev 36286 – sales dispostion updated

ranu — Thu, 16 Apr 2026 19:47:41 +0530

ranu – 1 file(s) modified
sales dispostion updated

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

Rev 36285 – Force idx_order_customer_billing index on spilitStock queries — optimizer picks wrong ...

amit — Thu, 16 Apr 2026 19:46:06 +0530

amit – 2 file(s) modified
Force idx_order_customer_billing index on spilitStock queries — optimizer picks wrong index (978K global scan vs 902 rows per partner)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java

Rev 36284 – code optimization of today po rbm page

ranu — Thu, 16 Apr 2026 19:38:41 +0530

ranu – 7 file(s) modified
code optimization of today po rbm page

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentCallLogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/AgentCallLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerContactRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerContactRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

Rev 36283 – uday sing maill added in po approval

ranu — Thu, 16 Apr 2026 19:26:14 +0530

ranu – 1 file(s) modified
uday sing maill added in po approval

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

Rev 36282 – Optimize /partner/hidAllocation: replace N+1 getSpilitStock loop with batch call, add ...

amit — Thu, 16 Apr 2026 19:24:59 +0530

amit – 2 file(s) modified
Optimize /partner/hidAllocation: replace N+1 getSpilitStock loop with batch call, add fofo_id filter to sales subquery, fix DATE() preventing index usage on create_timestamp

~ /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/FofoOpeningStockRepositoryImpl.java

Rev 36281 – Replace retailerBlockBrands with DMS code-based brand eligibility check in OrderController.createOrder ...

amit — Thu, 16 Apr 2026 17:54:38 +0530

amit – 1 file(s) modified
Replace retailerBlockBrands with DMS code-based brand eligibility check in OrderController.createOrder - use partnerIneligibleBrands from partner_dealer_mapping instead of retailer_block_brands table

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

Rev 36280 – Fix:Contact-us list update

aman — Thu, 16 Apr 2026 17:42:37 +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 36279 – Fix NPE in PurchaseInvoiceModel when grnDate or invoiceDate is null

amit — Thu, 16 Apr 2026 11:55:53 +0530

amit – 1 file(s) modified
Fix NPE in PurchaseInvoiceModel when grnDate or invoiceDate is null

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PurchaseInvoiceModel.java

Rev 36278 – ADD OPENING STOCK

ranu — Thu, 16 Apr 2026 10:50:56 +0530

ranu – 1 file(s) modified
ADD OPENING STOCK

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/SmartCartServiceImpl.java

Rev 36277 – unique call and recording will show on dashboard

ranu — Wed, 15 Apr 2026 18:54:54 +0530

ranu – 1 file(s) modified
unique call and recording will show on dashboard

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

Rev 36276 – unique call and recording will show on dashboard

ranu — Wed, 15 Apr 2026 16:39:23 +0530

ranu – 3 file(s) modified
unique call and recording will show on dashboard

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmCallTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36275 – Fix:Fix unbilled stock sign

aman — Wed, 15 Apr 2026 16:37:08 +0530

aman – 1 file(s) modified
Fix:Fix unbilled stock sign

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

Rev 36274 – Hide Receive/Refund actions on Recent Debit Notes from non-admin partners

amit — Wed, 15 Apr 2026 15:31:36 +0530

amit – 1 file(s) modified
Hide Receive/Refund actions on Recent Debit Notes from non-admin partners

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm

Rev 36273 – Fix app config

amit — Wed, 15 Apr 2026 11:08:58 +0530

amit – 1 file(s) modified
Fix app config

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java

Rev 36272 – Add receiveDate to WarehouseSupplierInvoice Added receiveDate field to warehouse.invoice ...

amit — Tue, 14 Apr 2026 18:29:09 +0530

amit – 2 file(s) modified
Add receiveDate to WarehouseSupplierInvoice

Added receiveDate field to warehouse.invoice entity to track when goods
were physically received. Set from PORowModel.getReceivedDate() during
GRN processing in PurchaseOrderServiceImpl.addPORowModels.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 36271 – Fix processInvoiceReturn skipping SALE_RET for non-serialized items processInvoiceReturn was ...

amit — Tue, 14 Apr 2026 17:36:23 +0530

amit – 1 file(s) modified
Fix processInvoiceReturn skipping SALE_RET for non-serialized items

processInvoiceReturn was only creating warehouse.scanNew SALE_RET entries
for serialized items (looked up by serial number). Non-serialized items
like accessories were silently skipped, leaving warehouse inventory
unreturned.

Fixed by working directly off SALE scans from warehouse.scanNew instead
of serial number lookup. This handles both serialized and non-serialized
items uniformly. Also uses actual sale quantity instead of hardcoded 1.

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

Rev 36270 – Fix purchase.receivedOn to use actual GRN time instead of invoice ...

amit — Tue, 14 Apr 2026 17:35:14 +0530

amit – 2 file(s) modified
Fix purchase.receivedOn to use actual GRN time instead of invoice registration date

Rev 36269 – consolidate email sent of l3 escaltion

ranu — Tue, 14 Apr 2026 16:22:07 +0530

ranu – 1 file(s) modified
consolidate email sent of l3 escaltion

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

Rev 36268 – escaltions updated on dashboard detail

ranu — Tue, 14 Apr 2026 15:49:55 +0530

ranu – 2 file(s) modified
escaltions updated on dashboard detail

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

Rev 36267 – sales dispostion updated

ranu — Tue, 14 Apr 2026 15:43:59 +0530

ranu – 4 file(s) modified
sales dispostion updated

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth/CollectionRemark.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 36266 – Fix NPE in PlacementPlanController when warehouse has no saholic stock ...

amit — Tue, 14 Apr 2026 15:41:50 +0530

amit – 1 file(s) modified
Fix NPE in PlacementPlanController when warehouse has no saholic stock data

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

Rev 36265 – Fix:Block first order through App

aman — Tue, 14 Apr 2026 15:30:00 +0530

aman – 1 file(s) modified
Fix:Block first order through App

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