SmartDukaan – /

Rev 36573 – refactor: extract RTV methods from PurchaseReturnService into ReturnToVendorService, add ReturnPermissionHelper ...

amit — Sat, 16 May 2026 14:41:29 +0530

amit – 5 file(s) modified
refactor: extract RTV methods from PurchaseReturnService into ReturnToVendorService, add ReturnPermissionHelper and PurchaseReturnOrderStatus

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/PurchaseReturnOrderStatus.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-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnPermissionHelper.java

Rev 36572 – fix: add debit note PDF labels, HDFC UTR duplicate lock, ...

amit — Sat, 16 May 2026 14:40:08 +0530

amit – 3 file(s) modified
fix: add debit note PDF labels, HDFC UTR duplicate lock, AJAX error handlers in common.js

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 36571 – fix: add transient orderItems list field to FofoOrder for order ...

amit — Sat, 16 May 2026 14:34:03 +0530

amit – 1 file(s) modified
fix: add transient orderItems list field to FofoOrder for order creation response

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java

Rev 36570 – Fix header/content layout: header pinned top:0 left:180px, wrapper block+border-box, dashboard ...

amit — Sat, 16 May 2026 14:29:32 +0530

amit – 4 file(s) modified
Fix header/content layout: header pinned top:0 left:180px, wrapper block+border-box, dashboard zoom on wrapper only, visible menu arrows, accessories tile aligned with brand tiles

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style-responsive.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 36569 – Replace generic icons with distinct ElegantIcons in partner dashboard sidebar

amit — Sat, 16 May 2026 14:12:51 +0530

amit – 1 file(s) modified
Replace generic icons with distinct ElegantIcons in partner dashboard sidebar

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

Rev 36568 – refactor: RTV - add local caching, batch queries, typed DTO, ...

amit — Sat, 16 May 2026 14:10:17 +0530

amit – 8 file(s) modified
refactor: RTV - add local caching, batch queries, typed DTO, fix documentNumber overwrite and settledAmount validation

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DebitNoteLineInfo.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ImeiInvoiceGroup.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/PurchaseReturn.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ReturnToVendorService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ReturnToVendorServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnToVendorController.java

Rev 36567 – Add SQL migration for sidebar menu icons (ElegantIcons per parent ...

amit — Sat, 16 May 2026 14:07:27 +0530

amit – 1 file(s) modified
Add SQL migration for sidebar menu icons (ElegantIcons per parent menu)

+ /trunk/profitmandi-dao/src/main/resources/sql/migration_menu_icons.sql

Rev 36566 – UI modernization: sidebar redesign with CSS transitions, distinct menu icons, ...

amit — Sat, 16 May 2026 14:07:16 +0530

amit – 6 file(s) modified
UI modernization: sidebar redesign with CSS transitions, distinct menu icons, ellipsis overflow, flexbox header, HTML cleanup, improved text contrast

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style-responsive.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scripts.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/12dashboard34.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 36565 – Remove commented-out migration step from model_flagship DDL - no existing ...

amit — Sat, 16 May 2026 13:37:04 +0530

amit – 1 file(s) modified
Remove commented-out migration step from model_flagship DDL - no existing flagship data

~ /trunk/profitmandi-dao/src/main/resources/sql/model_flagship_schema.sql

Rev 36564 – Flagship credit: add @Scheduled cron for expired flagship limit conversion ...

amit — Sat, 16 May 2026 13:23:48 +0530

amit – 1 file(s) modified
Flagship credit: add @Scheduled cron for expired flagship limit conversion (daily 1 AM)

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

Rev 36563 – Flagship credit: admin UI for date-wise flagship model management, jsVersion ...

amit — Sat, 16 May 2026 13:23:47 +0530

amit – 5 file(s) modified
Flagship credit: admin UI for date-wise flagship model management, jsVersion bump to 338

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/flagship.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/manage-flagship.vm

Rev 36562 – Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, ...

amit — Sat, 16 May 2026 13:23:41 +0530

amit – 8 file(s) modified
Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, batch queries, extracted doConvertFlagshipToLoan helper, removed Catalog.isFlagship

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ModelFlagship.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ModelFlagshipRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/model_flagship_schema.sql

Rev 36561 – Flagship credit: @Scheduled daily 1AM for expired flagship conversion

amit — Sat, 16 May 2026 12:34:41 +0530

amit – 1 file(s) modified
Flagship credit: @Scheduled daily 1AM for expired flagship conversion

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

Rev 36560 – Flagship credit: sale-time conversion with FOR UPDATE locking and performance ...

amit — Sat, 16 May 2026 12:34:36 +0530

amit – 5 file(s) modified
Flagship credit: sale-time conversion with FOR UPDATE locking and performance optimizations

- convertFlagshipOnSale: partial conversion at billed price when retailer sells flagship stock
- hasActiveFlagshipLimits: cheap COUNT check to skip catalog lookup for non-flagship partners
- selectActiveFlagshipLimitBlocksForUpdate: pessimistic lock prevents double-conversion from concurrent sales/cron
- selectFlagshipLoansForConversion: added FOR UPDATE lock for cron expiry path
- Batch order fetch instead of per-limit queries
- Wired into OrderServiceImpl.createOrder after stock update

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 36559 – feat: auto-generate debit notes on RTV with proper DN/{prefix}/{sequence} numbering

amit — Sat, 16 May 2026 12:24:49 +0530

amit – 3 file(s) modified
feat: auto-generate debit notes on RTV with proper DN/{prefix}/{sequence} numbering

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseLineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/finance-debit-note-generated.vm

Rev 36558 – RTV: always set lastScanType to PURCHASE_RETURN in markItemReturned (informational, not ...

amit — Sat, 16 May 2026 11:34:53 +0530

amit – 1 file(s) modified
RTV: always set lastScanType to PURCHASE_RETURN in markItemReturned (informational, not conditional on full drain)

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

Rev 36557 – feat: Flagship Credit - 30 interest-free days for flagship models ...

amit — Sat, 16 May 2026 06:18:46 +0530

amit – 11 file(s) modified
feat: Flagship Credit - 30 interest-free days for flagship models with billing split, expiry conversion, API-driven T&C

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SDCreditRequirement.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SDCreditResponseOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/flagship_credit_schema.sql
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java

Rev 36556 – Fixed scroll in offers modal

amit — Sat, 16 May 2026 06:14:56 +0530

amit – 1 file(s) modified
Fixed scroll in offers modal

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

Rev 36555 – Fixed scroll in offers modal

amit — Sat, 16 May 2026 06:14:09 +0530

amit – 1 file(s) modified
Fixed scroll in offers modal

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/mandii/AccountStatusResponseOut.java

Rev 36554 – feat: one-off credit note posting for duplicate invoice NSNOI8965 against ...

amit — Sat, 16 May 2026 06:09:57 +0530

amit – 2 file(s) modified
feat: one-off credit note posting for duplicate invoice NSNOI8965 against NSNOI8966

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 36553 – fix: prevent concurrent billing race condition - add billingTimestamp check ...

amit — Sat, 16 May 2026 06:09:52 +0530

amit – 1 file(s) modified
fix: prevent concurrent billing race condition - add billingTimestamp check in validateOrdersForBilling

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

Rev 36552 – changeList

ranu — Fri, 15 May 2026 19:25:22 +0530

ranu – 1 file(s) modified
changeList

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

Rev 36551 – Fixed scroll in offers modal

amit — Fri, 15 May 2026 19:11:33 +0530

amit – 1 file(s) modified
Fixed scroll in offers modal

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm

Rev 36550 – changeList

ranu — Fri, 15 May 2026 19:04:29 +0530

ranu – 1 file(s) modified
changeList

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

Rev 36549 – changeList

ranu — Fri, 15 May 2026 19:00:04 +0530

ranu – 1 file(s) modified
changeList

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

Rev 36548 – Monitor type upload: allow duplicate catalog_id (keep first), make dialog ...

amit — Fri, 15 May 2026 18:51:49 +0530

amit – 3 file(s) modified
Monitor type upload: allow duplicate catalog_id (keep first), make dialog scrollable

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CatalogMonitorTypeCsvValidator.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
~ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/web/controller/PlacementPlanControllerUploadTest.java

Rev 36547 – changeList

ranu — Fri, 15 May 2026 18:51:30 +0530

ranu – 1 file(s) modified
changeList

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

Rev 36546 – changeList

ranu — Fri, 15 May 2026 18:38:18 +0530

ranu – 1 file(s) modified
changeList

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

Rev 36545 – mail out box queue added in default loans

ranu — Fri, 15 May 2026 18:38:04 +0530

ranu – 1 file(s) modified
mail out box queue added in default loans

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

Rev 36544 – Refactor RTV (Return to Vendor) flow: replace native SQL with ...

amit — Fri, 15 May 2026 16:22:18 +0530

amit – 3 file(s) modified
Refactor RTV (Return to Vendor) flow: replace native SQL with repository/service methods, extract reusable helpers (resolvePurchase, resolveLineItem, markItemReturned, createPurchaseReturnEntity), fix availability bug by adding saholicInventoryService.reduceAvailability, validate returnability by currentQuantity>0 instead of lastScanType

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

Rev 36543 – Add Others row to PartnerPerformance Secondary/Tertiary/Earning tabs so brandwise sum ...

amit — Thu, 14 May 2026 21:29:56 +0530

amit – 2 file(s) modified
Add Others row to PartnerPerformance Secondary/Tertiary/Earning tabs so brandwise sum matches total

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

Rev 36542 – Validate oldItemId exists on invoice at GRN correction request creation ...

amit — Thu, 14 May 2026 19:49:06 +0530

amit – 1 file(s) modified
Validate oldItemId exists on invoice at GRN correction request creation time

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

Rev 36541 – Fix duplicate invoice number: use scalar query to avoid Hibernate ...

amit — Thu, 14 May 2026 18:02:46 +0530

amit – 3 file(s) modified
Fix duplicate invoice number: use scalar query to avoid Hibernate cache poisoning before FOR UPDATE lock

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

Rev 36540 – Simplify moveToBill: auto-pick best available warehouse, remove manual qty/warehouse prompt ...

amit — Thu, 14 May 2026 17:45:42 +0530

amit – 3 file(s) modified
Simplify moveToBill: auto-pick best available warehouse, remove manual qty/warehouse prompt dialog

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js

Rev 36539 – Fix:Fix customer address update

aman — Thu, 14 May 2026 15:36:28 +0530

aman – 3 file(s) modified
Fix:Fix customer address update

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

Rev 36538 – code committed for buy mode(v2)

ranu — Thu, 14 May 2026 15:36:02 +0530

ranu – 1 file(s) modified
code committed for buy mode(v2)

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

Rev 36537 – Fixed scroll in offers modal

amit — Thu, 14 May 2026 10:41:01 +0530

amit – 1 file(s) modified
Fixed scroll in offers modal

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

Rev 36536 – moveToBill: fix response unwrapping, auto-move qty=1 orders to warehouse with ...

amit — Wed, 13 May 2026 19:48:15 +0530

amit – 2 file(s) modified
moveToBill: fix response unwrapping, auto-move qty=1 orders to warehouse with gross stock

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js

Rev 36535 – moveToBill: fix response unwrapping, auto-move qty=1 orders to warehouse with ...

amit — Wed, 13 May 2026 19:48:14 +0530

amit – 1 file(s) modified
moveToBill: fix response unwrapping, auto-move qty=1 orders to warehouse with gross stock

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

Rev 36534 – Fix:First Po check (is it pending )

aman — Wed, 13 May 2026 15:45:20 +0530

aman – 1 file(s) modified
Fix:First Po check (is it pending )

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