SmartDukaan – /

Rev 36942 – Clean Up Old Emails and added Raja's Email

vikas — Fri, 26 Jun 2026 15:58:25 +0530

vikas – 5 file(s) modified
Clean Up Old Emails and added Raja's Email

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoDashboardController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoFinServiceController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoMonitorController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPartnerOnBoardingPanelController.java

Rev 36941 – Location Tracking Dashboard: Period Analytics - Removed L5 and Final

vikas — Fri, 26 Jun 2026 15:56:15 +0530

vikas – 8 file(s) modified
Location Tracking Dashboard: Period Analytics - Removed L5 and Final

~ /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/java/com/spice/profitmandi/web/controller/FinServiceController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-journey.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm

Rev 36940 – caching fix fofo icici

ranu — Fri, 26 Jun 2026 14:55:32 +0530

ranu – 1 file(s) modified
caching fix fofo icici

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

Rev 36939 – caching fix fofo icici

ranu — Fri, 26 Jun 2026 14:25:51 +0530

ranu – 1 file(s) modified
caching fix fofo icici

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

Rev 36938 – caching fix fofo icici

ranu — Fri, 26 Jun 2026 14:18:21 +0530

ranu – 1 file(s) modified
caching fix fofo icici

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

Rev 36937 – caching fix fofo icici

ranu — Fri, 26 Jun 2026 14:16:42 +0530

ranu – 1 file(s) modified
caching fix fofo icici

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

Rev 36936 – Update Email Ids

vikas — Fri, 26 Jun 2026 13:38:12 +0530

vikas – 8 file(s) modified
Update Email Ids

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java

Rev 36935 – caching fix fofo icici

ranu — Fri, 26 Jun 2026 13:21:07 +0530

ranu – 1 file(s) modified
caching fix fofo icici

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

Rev 36934 – caching fix fofo icici

ranu — Fri, 26 Jun 2026 11:55:01 +0530

ranu – 2 file(s) modified
caching fix fofo icici

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

Rev 36933 – caching fix fofo icici

ranu — Thu, 25 Jun 2026 18:40:10 +0530

ranu – 4 file(s) modified
caching fix fofo icici

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

Rev 36932 – rbm rating weekly -> monthly

ranu — Thu, 25 Jun 2026 17:50:29 +0530

ranu – 1 file(s) modified
rbm rating weekly -> monthly

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

Rev 36931 – Location Tracking Dashboard: Period Analytics - Removed L5 and Final

vikas — Thu, 25 Jun 2026 17:38:58 +0530

vikas – 2 file(s) modified
Location Tracking Dashboard: Period Analytics - Removed L5 and Final

Rev 36930 – rbm rating weekly -> monthly

ranu — Thu, 25 Jun 2026 16:55:05 +0530

ranu – 1 file(s) modified
rbm rating weekly -> monthly

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

Rev 36929 – Location Tracking Dashboard: Period Analytics

vikas — Thu, 25 Jun 2026 16:09:28 +0530

vikas – 3 file(s) modified
Location Tracking Dashboard: Period Analytics

Rev 36928 – Fix wallet-edit transaction search showing raw Velocity vars for credit ...

amit — Thu, 25 Jun 2026 14:22:03 +0530

amit – 1 file(s) modified
Fix wallet-edit transaction search showing raw Velocity vars for credit summary

getWalletHistory (/getWalletHistory, the Search-by-transaction-id flow) rendered
wallet-history.vm without populating totalDue/creditlimit/availableLimit, so the
template printed the references literally. Populate them from
sdCreditService.getCreditSummary (same helper the dashboard uses).

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

Rev 36927 – HDFC push-credits: stop lost/uncaptured credits and cut burst contention ...

amit — Thu, 25 Jun 2026 14:21:37 +0530

amit – 2 file(s) modified
HDFC push-credits: stop lost/uncaptured credits and cut burst contention

- Capture every payment in hdfc_payment before VA validation; never 500 a
missing/unmatched VA. Acknowledge as success so HDFC stops retrying, leaving
the row uncredited for reconciliation (dedupe against add_wallet_request).
- On a row-lock conflict (lock-wait/deadlock), roll back fully and let HDFC retry
instead of mis-acking as 'duplicate', which silently lost valid-partner credits.
- Resolve VA/retailer (cached, read-only) before the INSERT to shorten the
hdfc_payment index-lock window.
- Scope READ-COMMITTED to the push-credits transaction only (no app-wide change)
to drop gap-lock contention on concurrent hdfc_payment inserts.
- Lower innodb_lock_wait_timeout to 10s per HikariCP connection so blocked
transactions fail fast instead of starving the pool.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 36926 – Link returnorderinfo to credit_note in DN-refund path (approveDebitNoteRefund) approveDebitNoteRefund ...

amit — Thu, 25 Jun 2026 14:20:36 +0530

amit – 2 file(s) modified
Link returnorderinfo to credit_note in DN-refund path (approveDebitNoteRefund)

approveDebitNoteRefund issues a RETURNS credit note but created the
ReturnOrderInfo rows before the CN and never set credit_note_id, so DN
returns showed a null FK (blank CN in reports) despite a valid CN existing.
r36817 only wired this FK into applyInvoiceReturnViaCreditNote. Collect the
created ReturnOrderInfo rows and stamp credit_note_id after the CN is
persisted (parity with the invoice-return path).

Add backfill_dn_return_credit_note_id.sql to link existing null-FK rows by
invoice -> RETURNS CN, excluding ambiguous multi-CN invoices.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/backfill_dn_return_credit_note_id.sql

Rev 36925 – Vendor catalog pricing: validate single-create path (reject non-positive ids/prices, null ...

amit — Thu, 25 Jun 2026 11:01:00 +0530

amit – 1 file(s) modified
Vendor catalog pricing: validate single-create path (reject non-positive ids/prices, null effectedOn) and gate vendor_item_pricing propagation behind the effected-date check so back-dated approvals no longer overwrite item-level prices

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

Rev 36924 – Allow fulfilment warehouse change for internal-PO orders within same physical ...

amit — Wed, 24 Jun 2026 21:49:09 +0530

amit – 1 file(s) modified
Allow fulfilment warehouse change for internal-PO orders within same physical warehouse

changeFulfillmentWarehouse previously blocked any warehouse change for orders
mapped to an internal PO. Relax it to permit changing the virtual fulfilment
warehouse as long as the physical (billing) warehouse stays the same; only a
change of the physical/billing warehouse is now rejected. The change-billing-
warehouse path remains fully blocked for internal POs.

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

Rev 36923 – code committed for some change on app

ranu — Wed, 24 Jun 2026 19:24:38 +0530

ranu – 2 file(s) modified
code committed for some change on app

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoContentController.java

Rev 36922 – Remove unused Digify retailer integration and fix slim-jQuery clobber on ...

amit — Wed, 24 Jun 2026 18:01:49 +0530

amit – 12 file(s) modified
Remove unused Digify retailer integration and fix slim-jQuery clobber on partner-performance/today_po/today_target pages

- Delete Digify controller, views and Buyback asset; drop dead .digify-retailer-login handler and buyback links/buttons
- Load full jQuery (3.5.1) instead of jquery slim on partner-performance/today_po/today_target so injected pages no longer overwrite the dashboard jQuery (restores $.ajax / slideUp)
- Bump jsVersion to 365

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify
x /trunk/profitmandi-fofo/src/main/webapp/resources/images/Buyback-Mobile.png
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-role.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-login.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-register.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_target.vm

Rev 36921 – Remove unused Digify retailer integration (controllers, entity, repository, model, views, ...

amit — Wed, 24 Jun 2026 18:01:38 +0530

amit – 1 file(s) modified
Remove unused Digify retailer integration (controllers, entity, repository, model, views, JS handler, assets)

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoDigifyController.java

Rev 36920 – Remove unused Digify retailer integration (controllers, entity, repository, model, views, ...

amit — Wed, 24 Jun 2026 18:01:37 +0530

amit – 3 file(s) modified
Remove unused Digify retailer integration (controllers, entity, repository, model, views, JS handler, assets)

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DigifyRetailer.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DigifyRetailerRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DigifyRetailerRepositoryImpl.java

Rev 36919 – Remove unused Digify retailer integration (controllers, entity, repository, model, views, ...

amit — Wed, 24 Jun 2026 18:01:36 +0530

amit – 1 file(s) modified
Remove unused Digify retailer integration (controllers, entity, repository, model, views, JS handler, assets)

x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DigifyRetailerModel.java

Rev 36918 – code committed for some change on app

ranu — Wed, 24 Jun 2026 17:24:09 +0530

ranu – 3 file(s) modified
code committed for some change on app

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoMonitorController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSchemeController.java

Rev 36917 – Location Tracking Dashboard

vikas — Wed, 24 Jun 2026 16:14:39 +0530

vikas – 2 file(s) modified
Location Tracking Dashboard

~ /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 36916 – Location Tracking Dashboard

vikas — Wed, 24 Jun 2026 15:14:51 +0530

vikas – 2 file(s) modified
Location Tracking Dashboard

~ /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 36915 – code committed for some change on app

ranu — Wed, 24 Jun 2026 12:41:20 +0530

ranu – 1 file(s) modified
code committed for some change on app

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/response/ActivatedImeiResponse.java

Rev 36914 – code committed for some change on app

ranu — Wed, 24 Jun 2026 12:39:39 +0530

ranu – 2 file(s) modified
code committed for some change on app

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.java

Rev 36913 – Location Tracking Dashboard

vikas — Wed, 24 Jun 2026 12:31:16 +0530

vikas – 3 file(s) modified
Location Tracking Dashboard

Rev 36912 – Internal PO: block billing-warehouse change for PO-mapped orders Throw ...

amit — Wed, 24 Jun 2026 11:53:42 +0530

amit – 1 file(s) modified
Internal PO: block billing-warehouse change for PO-mapped orders

Throw if the order's transaction is mapped to an internal PO before changing warehouse in changeBillingWarehouse.

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

Rev 36911 – Internal PO: block billing-warehouse change for PO-mapped orders Throw ...

amit — Wed, 24 Jun 2026 11:53:41 +0530

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

Rev 36910 – Internal PO: map created transaction to PO; block warehouse change ...

amit — Wed, 24 Jun 2026 11:53:31 +0530

amit – 6 file(s) modified
Internal PO: map created transaction to PO; block warehouse change for PO-mapped orders

- WarehousePurchaseOrder: add transactionId column + selectByTransactionId
- createOrderInternally returns txn id; createPurchaseOrder maps it onto the PO
- Block order.setWarehouseId for PO-mapped orders in changeFulfillmentWarehouse; cron moveOrders skips them
- Migration: add warehouse.purchaseorder.transactionId

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehousePurchaseOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_po_transaction_mapping.sql

Rev 36909 – deploy rating performace dashboard

ranu — Tue, 23 Jun 2026 19:40:58 +0530

ranu – 1 file(s) modified
deploy rating performace dashboard

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

Rev 36908 – deploy rating performace dashboard

ranu — Tue, 23 Jun 2026 19:38:54 +0530

ranu – 2 file(s) modified
deploy rating performace dashboard

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

Rev 36907 – deploy rating performace dashboard

ranu — Tue, 23 Jun 2026 19:17:31 +0530

ranu – 1 file(s) modified
deploy rating performace dashboard

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

Rev 36906 – deploy rating performace dashboard

ranu — Tue, 23 Jun 2026 19:14:46 +0530

ranu – 1 file(s) modified
deploy rating performace dashboard

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

Rev 36905 – Location Tracking Dashboard

vikas — Tue, 23 Jun 2026 17:14:51 +0530

vikas – 2 file(s) modified
Location Tracking Dashboard

~ /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 36904 – Fix FSP wallet approval blocked by cross-store reference collision ...

aman — Tue, 23 Jun 2026 16:45:09 +0530

aman – 1 file(s) modified
Fix FSP wallet approval blocked by cross-store reference collision

Scope the duplicate-reference guard in /addAmountToWallet to the same retailer.
Reference numbers (e.g. cheque no '000310') are not globally unique, so an
already-approved request from a different store falsely tripped 'Entry already
Approved Please reject' and blocked a legitimate Full Stock Payment approval.

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

Rev 36903 – Location Tracking Dashboard

vikas — Tue, 23 Jun 2026 14:53:58 +0530

vikas – 2 file(s) modified
Location Tracking Dashboard

~ /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