SmartDukaan – /

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

Rev 35714 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 19:35:19 +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 35713 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 19:18:59 +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 35712 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 19:13:04 +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 35711 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 19:04:41 +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 35710 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 18:54:49 +0530

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

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

Rev 35709 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 18:45:29 +0530

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

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

Rev 35708 – now recording also fetching

ranu — Mon, 09 Feb 2026 18:41:36 +0530

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

~ /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 35707 – fix: make refund amount field editable in return order view

amit — Mon, 09 Feb 2026 18:38:15 +0530

amit – 1 file(s) modified
fix: make refund amount field editable in return order view

~ /trunk/Crm/src/main/webapp/WEB-INF/content/view-return-order.vm

Rev 35706 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 18:30:07 +0530

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

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

Rev 35705 – Include resource files (cfg, xml, xls) in egg build via ...

amit — Mon, 09 Feb 2026 18:21:45 +0530

amit – 1 file(s) modified
Include resource files (cfg, xml, xls) in egg build via package_data

~ /trunk/PyProj/src/setup.py

Rev 35704 – Fixed SchemeService

amit — Mon, 09 Feb 2026 18:15:51 +0530

amit – 1 file(s) modified
Fixed SchemeService

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

Rev 35703 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 18:10:39 +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 35702 – now recording also fetching

ranu — Mon, 09 Feb 2026 18:09:48 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerCollectionRemark.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CalledPartnerDetailModel.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/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/integrations/kommuno/RecordingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 35701 – Performance fix: reduce logging level to WARNING, remove incompatible pool_pre_ping, ...

amit — Mon, 09 Feb 2026 16:59:51 +0530

amit – 14 file(s) modified
Performance fix: reduce logging level to WARNING, remove incompatible pool_pre_ping, fix tornado dependency

- Changed logging.basicConfig from DEBUG to WARNING in 6 service files to stop
SQLAlchemy query spam that caused memory bloat (TransactionServer 553MB -> 63MB)
- Set echoOn=False as default in PurchaseServiceHandler
- Removed pool_pre_ping=True from 7 DataService files (incompatible with SQLAlchemy 0.6.6)
- Updated tornado dependency from 1.0.1 to 1.0 in setup.py (1.0.1 unavailable on PyPI)

~ /trunk/PyProj/src/setup.py
~ /trunk/PyProj/src/shop2020/content/main/handler/ContentHandler.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/EcomExpressService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/ObsoleteDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataService.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 35700 – Prevent duplicate sale returns by matching inventory item to specific ...

amit — Mon, 09 Feb 2026 15:42:24 +0530

amit – 4 file(s) modified
Prevent duplicate sale returns by matching inventory item to specific order

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 35699 – Upgrade EHCache from 2.4.4 to 3.10.6

amit — Mon, 09 Feb 2026 15:42:22 +0530

amit – 1 file(s) modified
Upgrade EHCache from 2.4.4 to 3.10.6

~ /trunk/HotspotDashboard/pom.xml

Rev 35698 – Remove replacement option from returns, make refund amount read-only

amit — Mon, 09 Feb 2026 15:42:21 +0530

amit – 2 file(s) modified
Remove replacement option from returns, make refund amount read-only

~ /trunk/Crm/src/main/webapp/WEB-INF/content/return-transactions-view.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/view-return-order.vm

Rev 35697 – Slab progress: skip message for 1pc first slab, show criteria ...

amit — Mon, 09 Feb 2026 12:59:21 +0530

amit – 1 file(s) modified
Slab progress: skip message for 1pc first slab, show criteria name per line

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

Rev 35696 – Fixed SchemeService

amit — Mon, 09 Feb 2026 12:55:26 +0530

amit – 1 file(s) modified
Fixed SchemeService

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

Rev 35695 – Perf: N+1 fix in FOFO OrderServiceImpl.createOrder - batch fetch live ...

amit — Mon, 09 Feb 2026 12:47:38 +0530

amit – 3 file(s) modified
Perf: N+1 fix in FOFO OrderServiceImpl.createOrder - batch fetch live demo serials and collect FofoOrderItems during loop

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LiveDemoBillingRespository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/LiveDemoBillingRespositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 35694 – Fixed SchemeService

amit — Mon, 09 Feb 2026 12:24:33 +0530

amit – 1 file(s) modified
Fixed SchemeService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java

Rev 35693 – Fixed SchemeService

amit — Mon, 09 Feb 2026 12:24:15 +0530

amit – 1 file(s) modified
Fixed SchemeService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SellerWarehouse.java

Rev 35692 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 11:54:56 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.java

Rev 35691 – code commit for calling target / retailer contact

ranu — Mon, 09 Feb 2026 11:41:23 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.java

Rev 35690 – Optimize order creation performance: add overloaded focusedModelShortageValidation with pre-fetched data, ...

amit — Mon, 09 Feb 2026 07:53:37 +0530

amit – 6 file(s) modified
Optimize order creation performance: add overloaded focusedModelShortageValidation with pre-fetched data, add overloaded payThroughWallet and processTransaction to avoid duplicate fetches, fix N+1 queries in BulkOrderService by batch-fetching items and tagListings

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/CommonPaymentService.java

Rev 35689 – Optimize transaction order creation: restrict investment check to hard_limit partners, ...

amit — Mon, 09 Feb 2026 07:53:34 +0530

amit – 1 file(s) modified
Optimize transaction order creation: restrict investment check to hard_limit partners, eliminate duplicate DB queries, batch-fetch categories and high-demand items, reuse pre-fetched data in focusedModelShortageValidation and transaction processing

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

Rev 35688 – web deploye for active category

ranu — Sun, 08 Feb 2026 00:26:28 +0530

ranu – 1 file(s) modified
web deploye for active category

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/RecordingService.java