SmartDukaan – /

Rev 36013 – supplier on edit internal false fix

ranu — Wed, 18 Mar 2026 15:18:58 +0530

ranu – 1 file(s) modified
supplier on edit internal false fix

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

Rev 36012 – Fix:Delay report

aman — Wed, 18 Mar 2026 13:22:53 +0530

aman – 1 file(s) modified
Fix:Delay report

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

Rev 36011 – now in breaks logs duration less than 1 mint do ...

ranu — Wed, 18 Mar 2026 12:02:05 +0530

ranu – 1 file(s) modified
now in breaks logs duration less than 1 mint do not fetch and save in entity

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

Rev 36010 – Fix:Redesign the Po Approval page add total count, Add mail ...

aman — Tue, 17 Mar 2026 19:58:52 +0530

aman – 1 file(s) modified
Fix:Redesign the Po Approval page add total count, Add mail in bcc for testing , partnerpending task api response optimisation,

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

Rev 36009 – Fix duplicate IMEI handling in GRN and debit note return ...

amit — Tue, 17 Mar 2026 19:56:51 +0530

amit – 2 file(s) modified
Fix duplicate IMEI handling in GRN and debit note return flows

- Add duplicate serial number check in V2 GRN path (WarehouseServiceImpl.addInventoryItem)
Rejects GRN if IMEI already exists with currentQuantity > 0
- Harden serial→whItem lookup in receiveDebitNoteItems and rejectReturn
Use composite key (serialNumber|itemId) instead of serialNumber alone
Prevents wrong inventory item selection when same IMEI has multiple records
- Add orderId cross-validation in receiveDebitNoteItems for SALE scan mismatch detection
- Fix missing supplierWarehouseId on SALE_RET and reversal scans in debit note flows

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

Rev 36008 – Fix:Redesign the Po Approval page add total count, Add mail ...

aman — Tue, 17 Mar 2026 19:39:37 +0530

aman – 16 file(s) modified
Fix:Redesign the Po Approval page add total count, Add mail in bcc for testing , partnerpending task api response optimisation,

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransactionApprovalModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.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/fofo/FofoOpeningStockRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepositoryImpl.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/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-dao/src/main/resources/trial-activation-email.vm
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.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/PartnerPendingTasksController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm

Rev 36007 – mapping profitmandi constant

ranu — Tue, 17 Mar 2026 19:26:56 +0530

ranu – 1 file(s) modified
mapping profitmandi constant

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

Rev 36006 – mapping profitmandi constant

ranu — Tue, 17 Mar 2026 19:22:09 +0530

ranu – 2 file(s) modified
mapping profitmandi constant

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

Rev 36005 – mapping profitmandi constant

ranu — Tue, 17 Mar 2026 19:02:51 +0530

ranu – 1 file(s) modified
mapping profitmandi constant

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

Rev 36004 – Added Store Code in Visit Report

vikas — Tue, 17 Mar 2026 13:15:31 +0530

vikas – 2 file(s) modified
Added Store Code in Visit Report

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

Rev 36003 – Fix:Delay report

aman — Tue, 17 Mar 2026 12:42:03 +0530

aman – 3 file(s) modified
Fix:Delay report

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

Rev 36002 – Show total pcs, total DP value, and total selling price ...

amit — Mon, 16 Mar 2026 20:15:56 +0530

amit – 1 file(s) modified
Show total pcs, total DP value, and total selling price in pending approval header

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

Rev 36001 – Add totals to pending approval page and use FormattingUtils for ...

amit — Mon, 16 Mar 2026 20:15:50 +0530

amit – 2 file(s) modified
Add totals to pending approval page and use FormattingUtils for consistent number formatting

Rev 36000 – available status ...modification

ranu — Mon, 16 Mar 2026 15:36:21 +0530

ranu – 2 file(s) modified
available status ...modification

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/AgentLiveStatusService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.java

Rev 35999 – Invoice Return: role-based auth (receive/refund), remove unused finance fields, warehouse ...

amit — Sat, 14 Mar 2026 23:55:25 +0530

amit – 2 file(s) modified
Invoice Return: role-based auth (receive/refund), remove unused finance fields, warehouse column in debit notes table

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm

Rev 35998 – Invoice Return: controller endpoints, UI views (receive/refund/reject/details/search), JS handlers, role-based ...

amit — Sat, 14 Mar 2026 19:31:27 +0530

amit – 9 file(s) modified
Invoice Return: controller endpoints, UI views (receive/refund/reject/details/search), JS handlers, role-based access, dashboard menu

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-results.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refund-debit-note.vm

Rev 35997 – Invoice Return: PurchaseReturnOrder entity, ReturnAction DAO enum, receive/refund/reject service, ReturnOrderInfo ...

amit — Sat, 14 Mar 2026 19:31:04 +0530

amit – 10 file(s) modified
Invoice Return: PurchaseReturnOrder entity, ReturnAction DAO enum, receive/refund/reject service, ReturnOrderInfo selectByOrderId

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnOrderInfo.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ReturnAction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java

Rev 35996 – Add REJECTED(2) to ReturnAction enum for return rejection flow

amit — Sat, 14 Mar 2026 19:30:04 +0530

amit – 1 file(s) modified
Add REJECTED(2) to ReturnAction enum for return rejection flow

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnAction.java

Rev 35995 – Fix:Redesign the Po Approval page, and po creation logic for ...

aman — Fri, 13 Mar 2026 19:36:54 +0530

aman – 12 file(s) modified
Fix:Redesign the Po Approval page, and po creation logic for first po, trail mails formatting fix

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LineItemModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SalesThoughtConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransactionApprovalModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/EmailServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionApproval.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-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
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/transaction-approval.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm

Rev 35994 – available status ...modification

ranu — Fri, 13 Mar 2026 13:08:33 +0530

ranu – 3 file(s) modified
available status ...modification

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35993 – Added Apple provider for Apple SignIn

vikas — Fri, 13 Mar 2026 12:57:35 +0530

vikas – 1 file(s) modified
Added Apple provider for Apple SignIn

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

Rev 35992 – Added Apple provider for Apple SignIn

vikas — Fri, 13 Mar 2026 12:25:11 +0530

vikas – 1 file(s) modified
Added Apple provider for Apple SignIn

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

Rev 35991 – on invoice if customer is internal then shivam number will ...

ranu — Thu, 12 Mar 2026 19:13:09 +0530

ranu – 1 file(s) modified
on invoice if customer is internal then shivam number will hit on pdf modal

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

Rev 35990 – Fix:Welcome call UI improvement

aman — Thu, 12 Mar 2026 18:52:34 +0530

aman – 1 file(s) modified
Fix:Welcome call UI improvement

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-verification-checkbox-model.vm

Rev 35989 – warehouse mapped

ranu — Thu, 12 Mar 2026 15:19:04 +0530

ranu – 1 file(s) modified
warehouse mapped

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

Rev 35988 – Added Apple provider for Apple SignIn

vikas — Thu, 12 Mar 2026 14:47:38 +0530

vikas – 2 file(s) modified
Added Apple provider for Apple SignIn

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GoogleLoginRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/SocialType.java

Rev 35987 – warehouse mapped

ranu — Thu, 12 Mar 2026 14:29:56 +0530

ranu – 1 file(s) modified
warehouse mapped

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

Rev 35986 – warehouse mapped

ranu — Thu, 12 Mar 2026 13:53:22 +0530

ranu – 1 file(s) modified
warehouse mapped

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

Rev 35985 – breaking time given to rbm call log

ranu — Thu, 12 Mar 2026 12:38:13 +0530

ranu – 2 file(s) modified
breaking time given to rbm call log

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

Rev 35984 – breaking time given to rbm call log

ranu — Wed, 11 Mar 2026 19:54:02 +0530

ranu – 4 file(s) modified
breaking time given to rbm call log

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

Rev 35983 – Fix: No bcc caused the Welcome Mail shooting to fail.

aman — Wed, 11 Mar 2026 18:55:08 +0530

aman – 2 file(s) modified
Fix: No bcc caused the Welcome Mail shooting to fail.

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

Rev 35982 – Fix store deactivation/closure flow: deactivate first then ask closure separately, ...

amit — Wed, 11 Mar 2026 18:45:55 +0530

amit – 3 file(s) modified
Fix store deactivation/closure flow: deactivate first then ask closure separately, validate empty store code, bump jsVersion to 327

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inactive-stores.vm

Rev 35981 – Fix processPriceDrop crash when purchaseIds list is empty - guard ...

amit — Wed, 11 Mar 2026 15:48:01 +0530

amit – 1 file(s) modified
Fix processPriceDrop crash when purchaseIds list is empty - guard empty list before selectAllByIds query

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

Rev 35980 – Removed cron optimized logic for smartdukaan

amit — Wed, 11 Mar 2026 14:19:07 +0530

amit – 4 file(s) modified
Removed cron optimized logic for smartdukaan

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/GiftRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/GiftRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java

Rev 35979 – breaking time given to rbm call log

ranu — Wed, 11 Mar 2026 13:23:08 +0530

ranu – 1 file(s) modified
breaking time given to rbm call log

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.java

Rev 35978 – Fix: Add empty check for inventoryItemsToProcess in processPriceDrop to prevent ...

amit — Tue, 10 Mar 2026 21:01:12 +0530

amit – 1 file(s) modified
Fix: Add empty check for inventoryItemsToProcess in processPriceDrop to prevent 'List should not be empty' error when no matching inventory items found

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

Rev 35977 – Fix:Full stock payment approval for kamini ma'am add threshold , ...

aman — Tue, 10 Mar 2026 18:22:13 +0530

aman – 6 file(s) modified
Fix:Full stock payment approval for kamini ma'am add threshold , Mail shootting if no loi done and some improvement

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/full-stock-payment-panel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiData.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm

Rev 35976 – Fix:Contact Us list update

aman — Tue, 10 Mar 2026 16:40:26 +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 35975 – Fix:Contact Us list update

aman — Tue, 10 Mar 2026 16:34:04 +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 35974 – Fixed selectById issue

amit — Tue, 10 Mar 2026 13:34:24 +0530

amit – 1 file(s) modified
Fixed selectById issue

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