SmartDukaan – /

Rev 35754 – Fixed selectById issue

amit — Thu, 12 Feb 2026 18:07:07 +0530

amit – 1 file(s) modified
Fixed selectById issue

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

Rev 35753 – Fixed selectById issue

amit — Thu, 12 Feb 2026 17:15:17 +0530

amit – 1 file(s) modified
Fixed selectById issue

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

Rev 35752 – Fixed selectById issue

amit — Thu, 12 Feb 2026 17:14:34 +0530

amit – 4 file(s) modified
Fixed selectById issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java

Rev 35751 – TransactionServer: add session.expunge_all() and periodic gc.collect() in close_session() to prevent ...

amit — Thu, 12 Feb 2026 13:38:14 +0530

amit – 1 file(s) modified
TransactionServer: add session.expunge_all() and periodic gc.collect() in close_session() to prevent memory growth from ORM identity map accumulation and Python 2.7 memory fragmentation

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 35750 – Fixed SchemeService

amit — Thu, 12 Feb 2026 12:17:18 +0530

amit – 1 file(s) modified
Fixed SchemeService

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

Rev 35749 – now recording also fetching

ranu — Wed, 11 Feb 2026 20:11:33 +0530

ranu – 1 file(s) modified
now recording also fetching

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

Rev 35748 – Fix: handle parallel timeline check in checkForWodFinMapping gracefully Catch ...

amit — Wed, 11 Feb 2026 19:49:57 +0530

amit – 1 file(s) modified
Fix: handle parallel timeline check in checkForWodFinMapping gracefully

Catch ProfitMandiBusinessException from validateEvent when checking
WOD_FINANCE_MAPPING, since WOD and FIN_CODE are parallel timelines
and either may not be complete when the other finishes.

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

Rev 35747 – bump js version

amit — Wed, 11 Feb 2026 18:54:55 +0530

amit – 1 file(s) modified
bump js version

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

Rev 35746 – Fix: Handle empty item list in searchOrderDetails endpoint Added ...

amit — Wed, 11 Feb 2026 18:54:01 +0530

amit – 1 file(s) modified
Fix: Handle empty item list in searchOrderDetails endpoint

Added empty check before calling itemRepository.selectByIds() to prevent
invalid SQL IN clause exception when invoice has no items.

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

Rev 35745 – fix offer details dialog bugs

amit — Wed, 11 Feb 2026 18:49:02 +0530

amit – 4 file(s) modified
fix offer details dialog bugs

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm

Rev 35744 – Fix batch vendor pricing query: add effected_on date filter to ...

amit — Wed, 11 Feb 2026 18:18:48 +0530

amit – 1 file(s) modified
Fix batch vendor pricing query: add effected_on date filter to both subqueries to match per-item query behavior

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

Rev 35743 – Added cache annotation to TodayOfferServiceImpl

vikas — Wed, 11 Feb 2026 17:41:56 +0530

vikas – 1 file(s) modified
Added cache annotation to TodayOfferServiceImpl

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

Rev 35742 – GenericRepository: use session.get() for selectById to leverage Hibernate first-level cache

amit — Wed, 11 Feb 2026 17:36:52 +0530

amit – 1 file(s) modified
GenericRepository: use session.get() for selectById to leverage Hibernate first-level cache

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

Rev 35741 – rbm calls date wise filter given

ranu — Wed, 11 Feb 2026 17:00:50 +0530

ranu – 1 file(s) modified
rbm calls date wise filter given

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java

Rev 35740 – Fix sgstRate using cgst_rate instead of sgst_rate in PurchaseInvoicesReport query

amit — Wed, 11 Feb 2026 16:29:05 +0530

amit – 1 file(s) modified
Fix sgstRate using cgst_rate instead of sgst_rate in PurchaseInvoicesReport query

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

Rev 35739 – rbm calls date wise filter given

ranu — Wed, 11 Feb 2026 16:18:19 +0530

ranu – 1 file(s) modified
rbm calls date wise filter given

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java

Rev 35738 – Add session.expunge_all() after commits in inventory cache update functions to ...

amit — Wed, 11 Feb 2026 16:11:43 +0530

amit – 1 file(s) modified
Add session.expunge_all() after commits in inventory cache update functions to prevent ORM object accumulation

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 35737 – OrderController: fix N+1 queries, replace e.printStackTrace with LOGGER, fix string ...

amit — Wed, 11 Feb 2026 16:10:14 +0530

amit – 1 file(s) modified
OrderController: fix N+1 queries, replace e.printStackTrace with LOGGER, fix string concat in logging, make accessoriesDeals static final

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

Rev 35736 – Fix remaining coding issues in FOFO order creation - ...

amit — Wed, 11 Feb 2026 16:00:25 +0530

amit – 1 file(s) modified
Fix remaining coding issues in FOFO order creation

- Remove unused changedTotalBillAmount dead code
- Fix NPE when serializedInventoryItemMap returns null for an item
- Replace break-in-loop with iterator().next() in createAndGetFofoOrderItem
- Replace e.printStackTrace() with proper LOGGER.error()
- Log actual exception in state rate lookup instead of swallowing it
- Skip processScratchOffer when no smartphone in order

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

Rev 35735 – Remove AlertClient dependency from CRMServiceHandler

amit — Wed, 11 Feb 2026 15:31:28 +0530

amit – 1 file(s) modified
Remove AlertClient dependency from CRMServiceHandler

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 35734 – Remove AlertClient dependency from order DataAccessors and ObsoleteDataAccessors

amit — Wed, 11 Feb 2026 15:31:27 +0530

amit – 2 file(s) modified
Remove AlertClient dependency from order DataAccessors and ObsoleteDataAccessors

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/ObsoleteDataAccessors.py

Rev 35733 – Fix noGST bug, remove dead price validation code, optimize live ...

amit — Wed, 11 Feb 2026 15:30:07 +0530

amit – 1 file(s) modified
Fix noGST bug, remove dead price validation code, optimize live demo query in order creation

- noGST: compute once before loop with anyMatch instead of last-item-wins
- Remove pricingService.getPurchasePriceMopPriceNotFound call and empty validateDpPrice/validateMopPrice (disabled since 11 sep 2025)
- Replace selectAllSerialNumber full table load with targeted selectBySerialNumbers for order serials only

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

Rev 35732 – Replace Warehouse ORM queries with raw SQL cache in inventory ...

amit — Wed, 11 Feb 2026 15:16:19 +0530

amit – 1 file(s) modified
Replace Warehouse ORM queries with raw SQL cache in inventory DataAcessors - same approach as logistics fix

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 35731 – rbm calls date wise filter given

ranu — Wed, 11 Feb 2026 14:58:07 +0530

ranu – 1 file(s) modified
rbm calls date wise filter given

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

Rev 35730 – rbm calls date wise filter given

ranu — Wed, 11 Feb 2026 13:35:27 +0530

ranu – 4 file(s) modified
rbm calls date wise filter given

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetService.java
~ /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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35729 – Change fresh money utilization window from same day (T+0) to ...

amit — Wed, 11 Feb 2026 12:40:53 +0530

amit – 1 file(s) modified
Change fresh money utilization window from same day (T+0) to T+7 for credit-blocked partners

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

Rev 35728 – Hide 0 Tenure Offers for PineLabs

vikas — Wed, 11 Feb 2026 12:25:11 +0530

vikas – 3 file(s) modified
Hide 0 Tenure Offers for PineLabs

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 35727 – Pinelabs Offers fetching item wise and caching and today offers ...

vikas — Tue, 10 Feb 2026 20:16:17 +0530

vikas – 2 file(s) modified
Pinelabs Offers fetching item wise and caching and today offers api

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TodayOfferController.java

Rev 35726 – Pinelabs offer discovery on billing and stock page

vikas — Tue, 10 Feb 2026 20:15:33 +0530

vikas – 13 file(s) modified
Pinelabs offer discovery on billing and stock page

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOfferCacheService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/resources/messages_en.properties
~ /trunk/profitmandi-fofo/src/main/resources/message_en.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm

Rev 35725 – now recording also fetching

ranu — Tue, 10 Feb 2026 15:22:12 +0530

ranu – 3 file(s) modified
now recording also fetching

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.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 35724 – now recording also fetching

ranu — Tue, 10 Feb 2026 13:24:00 +0530

ranu – 5 file(s) modified
now recording also fetching

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/AgentCallLog.java
~ /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/service/integrations/kommuno/RecordingService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 35723 – code commit for calling target / retailer contact

ranu — Tue, 10 Feb 2026 12:13:06 +0530

ranu – 1 file(s) modified
code commit for calling target / retailer contact

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

Rev 35722 – perf: use raw SQL for logistics startup caches to avoid ...

amit — Tue, 10 Feb 2026 12:03:10 +0530

amit – 1 file(s) modified
perf: use raw SQL for logistics startup caches to avoid ORM memory overhead

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 35721 – code commit for calling target / retailer contact

ranu — Tue, 10 Feb 2026 12:01:32 +0530

ranu – 1 file(s) modified
code commit for calling target / retailer contact

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

Rev 35720 – code commit for calling target / retailer contact

ranu — Tue, 10 Feb 2026 11:52:17 +0530

ranu – 1 file(s) modified
code commit for calling target / retailer contact

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

Rev 35719 – Fix performance issues and email bug in PurchaseOrderServiceImpl - ...

amit — Tue, 10 Feb 2026 01:08:57 +0530

amit – 1 file(s) modified
Fix performance issues and email bug in PurchaseOrderServiceImpl

- createPurchaseOrder: batch item loading (selectByIds) and vendor pricing (getVendorPricesOnDate) instead of per-item DB calls; remove duplicate itemIds computation
- grnPoModels: batch load all items upfront instead of selectById per GRN model in nested loop
- generatePdf: fix bug where supplier email recipients were never assigned (Arrays.asList result was discarded)

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

Rev 35718 – fix: use session.remove() instead of session.close() to prevent memory leaks ...

amit — Tue, 10 Feb 2026 00:17:06 +0530

amit – 12 file(s) modified
fix: use session.remove() instead of session.close() to prevent memory leaks in all services

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CompetitorScraping.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py

Rev 35717 – Fix performance issues in PurchaseOrderController - Replace supplierRepository.selectAll() with ...

amit — Mon, 09 Feb 2026 23:59:47 +0530

amit – 3 file(s) modified
Fix performance issues in PurchaseOrderController

- Replace supplierRepository.selectAll() with targeted selectBySupplierIds() in 2 endpoints
- Replace sellerRepository.selectAll() with new selectByIds() in 2 endpoints
- Add SellerRepository.selectByIds(List<Integer>) batch method
- Remove dead code: unused totalUnitPrice and totalPriceOfLineItem computations

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 35716 – Refactor GrnController and PurchaseOrderController: extract business logic into focused services ...

amit — Mon, 09 Feb 2026 23:56:47 +0530

amit – 10 file(s) modified
Refactor GrnController and PurchaseOrderController: extract business logic into focused services and fix N+1 query performance issues

- Create InvoiceService: invoice item CRUD, validation, vendor price matching
- Create GrnRequestService: GRN request lifecycle, mismatch resolution state machine
- Create DebitNoteService: debit note generation, PDF model building
- Move PO amendment logic from PurchaseOrderController to PurchaseOrderService
- Delegate generateDebitNote from PurchaseOrderServiceImpl to DebitNoteService
- Thin GrnController from ~1215 to ~717 lines, remove 15 unused autowired dependencies
- Thin PurchaseOrderController editPurchaseOrder from 40+ lines to 3 lines

Performance fixes:
- InvoiceServiceImpl.validateInvoiceDetail: batch item/vendor pricing/GST loading (4N+3 queries -> ~5)
- DebitNoteServiceImpl: batch item loading in buildDebitNotePdfModel and generateDebitNote
- GrnController.generateDebitNote: eliminate 2 redundant DB fetches
- Replace 3x supplierRepository.selectAll() with targeted selectBySupplierIds()

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/DebitNoteService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/DebitNoteServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/GrnRequestService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/GrnRequestServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InvoiceService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InvoiceServiceImpl.java
~ /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
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 35715 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 19:55:21 +0530

ranu – 1 file(s) modified
code commit for calling target / retailer contact

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/model/PushCallLogModel.java