SmartDukaan – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/

Rev 37122 – Replace satish.kumar with abhishek.yadav in monthly margins CN mail recipients

amit — Sat, 18 Jul 2026 15:00:22 +0530

amit – 1 file(s) modified
Replace satish.kumar with abhishek.yadav in monthly margins CN mail recipients

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

Rev 37102 – Remove dead Counter/PrivateDealUser code: drop unused isFofo, bulkShipmentAmountLimit, verifiedOn, documentVerified ...

amit — Thu, 16 Jul 2026 15:24:00 +0530

amit – 10 file(s) modified
Remove dead Counter/PrivateDealUser code: drop unused isFofo, bulkShipmentAmountLimit, verifiedOn, documentVerified fields and accessors; remove dead selectByIds repo methods; drop redundant Counter/PrivateDealUser repository injections in OrderServiceImpl and InvoiceService

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Counter.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.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/invoicing/InvoiceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 37085 – Show PO No and Order Date on transaction invoices/delivery challans ...

amit — Tue, 14 Jul 2026 15:00:57 +0530

amit – 1 file(s) modified
Show PO No and Order Date on transaction invoices/delivery challans

Populate InvoicePdfModel.orderDate (order createTimestamp) on every invoice
and delivery challan. Populate poNumber from the mapped warehouse PO for
internal-PO-derived orders, falling back to the transaction id as the PO
number for non-internal orders. Display-only; no e-invoice/IRN impact.

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

Rev 37059 – Revert order date and PO number wiring from invoice model ...

amit — Fri, 10 Jul 2026 14:49:23 +0530

amit – 1 file(s) modified
Revert order date and PO number wiring from invoice model in InvoiceService

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

Rev 37054 – Invoicing: durably record terminal IRN failures via markEInvoiceFailed (REQUIRES_NEW) with ...

amit — Fri, 10 Jul 2026 13:05:08 +0530

amit – 1 file(s) modified
Invoicing: durably record terminal IRN failures via markEInvoiceFailed (REQUIRES_NEW) with einvoice_details.irn_error_message; add regenerateBilledInvoices for in-place PDF regeneration over a billing window; stamp order date and mapped PO number onto transaction invoices; use the real interest-bearing loan (not the flagship limit block) for credit terms

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

Rev 37030 – Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs ...

amit — Tue, 07 Jul 2026 14:35:21 +0530

amit – 7 file(s) modified
Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs service methods

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditBlockAction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditBlockLog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditBlockLogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditBlockLogRepositoryImpl.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/add_credit_block_log.sql

Rev 37026 – targeted calling count on today po rbm

ranu — Tue, 07 Jul 2026 12:49:35 +0530

ranu – 1 file(s) modified
targeted calling count on today po rbm

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

Rev 37017 – revival and focus bill be active on next billing

ranu — Mon, 06 Jul 2026 17:25:08 +0530

ranu – 1 file(s) modified
revival and focus bill be active on next billing

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

Rev 37016 – revival and focus bill be active on next billing

ranu — Mon, 06 Jul 2026 17:19:52 +0530

ranu – 2 file(s) modified
revival and focus bill be active on next billing

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

Rev 36992 – Add dryRun param to issueMonthlyMarginsCN; gate real work behind runActual ...

amit — Thu, 02 Jul 2026 13:03:24 +0530

amit – 2 file(s) modified
Add dryRun param to issueMonthlyMarginsCN; gate real work behind runActual (isProd && !dryRun) so the pipeline can run harmlessly on prod

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

Rev 36991 – code commited

ranu — Thu, 02 Jul 2026 13:01:19 +0530

ranu – 1 file(s) modified
code commited

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

Rev 36958 – Flagship credit: fire interest-free limits at billing + per-IMEI conversion ...

amit — Tue, 30 Jun 2026 15:22:32 +0530

amit – 12 file(s) modified
Flagship credit: fire interest-free limits at billing + per-IMEI conversion

- createLoanForBilling now detects flagship lines inside the billing transaction (fixes the
REQUIRES_NEW visibility bug where flagship detection re-queried uncommitted invoice_number and
never fired). Creates one combined flagship limit (is_flagship=1, limit_block=1, 30-day deadline)
plus one transaction.loan_imei row per device.
- convertFlagshipOnSale / IMEI activation now convert only the sold device's slice (matched by IMEI),
so same-model siblings and other billing tranches keep their interest-free window; full convert at
30-day expiry. Lock order aligned (loan -> loan_imei) to avoid sale/expiry deadlock.
- New transaction.loan_imei table + LoanImei entity/repository (migration_loan_imei_table.sql).
- selectAllLoansByInvoice: PurchaseReturn now settles BOTH the real loan and the flagship limit on a
flagship-invoice return (prevents credit leak from a stranded limit).
- Cap guard (flagship credit never exceeds amount drawn) and robust limit settlement (paisa threshold
instead of exact float equality).

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanImei.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanImeiRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanImeiRepositoryImpl.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/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.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/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_loan_imei_table.sql

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 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 36750 – Keep e-invoice PrdDesc as IMEI count within NIC 300-char limit ...

amit — Mon, 01 Jun 2026 16:01:04 +0530

amit – 2 file(s) modified
Keep e-invoice PrdDesc as IMEI count within NIC 300-char limit while invoice PDF lists full IMEIs (complements r36749 IMEI-listing restore)

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

Rev 36749 – code commited miss beat

ranu — Mon, 01 Jun 2026 15:48:44 +0530

ranu – 1 file(s) modified
code commited miss beat

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

Rev 36719 – Add total_amount to credit_note: new column + backfill from lines, ...

amit — Wed, 27 May 2026 20:18:27 +0530

amit – 4 file(s) modified
Add total_amount to credit_note: new column + backfill from lines, populate at all 5 CN/DN creation points, fix account statement query (cn.created_at -> cn.create_timestamp)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.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/CreditNoteServiceImpl.java

Rev 36715 – Fix Credit Note IRN PrdDesc exceeding 300 char NIC limit ...

amit — Wed, 27 May 2026 19:02:45 +0530

amit – 2 file(s) modified
Fix Credit Note IRN PrdDesc exceeding 300 char NIC limit — show IMEI count instead of listing all serial numbers, add 300-char safety truncation

Rev 36713 – PI idempotency fix: original_wallet_amount + order_wallet_adjustment tracking for price drops ...

amit — Wed, 27 May 2026 18:47:19 +0530

amit – 7 file(s) modified
PI idempotency fix: original_wallet_amount + order_wallet_adjustment tracking for price drops and splits. Modernize statement queries with INVOICE_CANCELLED and RETURNS_CN unions.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/OrderWalletAdjustment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderWalletAdjustmentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderWalletAdjustmentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_order_wallet_adjustment.sql

Rev 36691 – fix account statement balance gap: include pending orders with NULL ...

amit — Tue, 26 May 2026 17:31:30 +0530

amit – 4 file(s) modified
fix account statement balance gap: include pending orders with NULL billing/refund in getPendingIndentValueMap, fix double query execution in selectOpeningAmount, remove verbose logging in selectDetailsBetween, add indexes for returnorderinfo and returnorder

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_idx_account_statement_perf.sql

Rev 36684 – Add null check for IRN in updatePdfModelWithIrnDetails - skip QR ...

amit — Tue, 26 May 2026 13:48:31 +0530

amit – 1 file(s) modified
Add null check for IRN in updatePdfModelWithIrnDetails - skip QR code generation when einvoice_details has no IRN

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

Rev 36672 – Wrap email sends in try-catch in IRN/EWB error paths to ...

amit — Mon, 25 May 2026 18:48:53 +0530

amit – 2 file(s) modified
Wrap email sends in try-catch in IRN/EWB error paths to prevent mail AuthenticationFailedException from blocking PDF generation

Rev 36667 – Fixed scroll in offers modal

amit — Mon, 25 May 2026 14:43:00 +0530

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

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

Rev 36624 – Thrift cleanup: migrate types, remove dead code, add moved files ...

amit — Thu, 21 May 2026 14:45:45 +0530

amit – 13 file(s) modified
Thrift cleanup: migrate types, remove dead code, add moved files

- Added Affiliate.java POJO (replaces Thrift struct)
- Moved from profitmandi-common: WalletHistoryModel, ExcelUtils, CustomOrder
- Removed dead createReturnTransaction method from ReturnService/Impl
- Removed dead getPartnerStockOnDate from InventoryService/Impl
- Replaced CatalogServiceException with Exception in PdfPoSheetGenerator
- Removed Thrift client imports from UserServiceImpl

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/model
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/model/CustomOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/common/util/WalletHistoryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PdfPoSheetGenerator.java
+ /trunk/profitmandi-dao/src/main/java/in/shop2020/model/v1/user/Affiliate.java

Rev 36582 – Flagship credit: remove 50% cap, add conversion notification, expose utilization ...

amit — Sun, 17 May 2026 15:57:39 +0530

amit – 2 file(s) modified
Flagship credit: remove 50% cap, add conversion notification, expose utilization to partner app

- Removed FLAGSHIP_CREDIT_LIMIT_PERCENT cap logic — flagship uses 100% of credit limit
- Added push notification on flagship-to-loan conversion (sale/activation/expiry)
- Updated T&C: mentions credit limit utilization, activation trigger, whichever-is-earlier
- Added flagshipUtilization field to SDCreditResponseOut for partner app UI

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

Rev 36578 – Flagship credit: fix sale conversion to use invoice reference, add ...

amit — Sun, 17 May 2026 15:15:25 +0530

amit – 6 file(s) modified
Flagship credit: fix sale conversion to use invoice reference, add IMEI activation trigger

- Sale flow: removed unnecessary model_flagship table lookup at sale time. The flagship loan's invoice number already links to the purchase orders, making the date-based check redundant and incorrect (would miss conversions if flagship entry removed after billing).
- IMEI activation: added flagship conversion in addActivatedImeis() for newly activated serials. Groups by partner, checks flagship limits, converts via invoice matching. Covers Samsung/Vivo/Oppo/Realme activation crons and manual UI uploads.
- Repository: added date-parameterized selectActiveFlagshipCatalogIds(catalogIds, asOfDate) overload for future use. Existing method delegates with LocalDate.now().

~ /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/inventory/InventoryServiceImpl.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 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 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 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 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 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 36532 – Fix moveToBill to use net availability, add bulk PO items ...

amit — Wed, 13 May 2026 12:14:59 +0530

amit – 8 file(s) modified
Fix moveToBill to use net availability, add bulk PO items upload UI with template download

~ /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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm

Rev 36516 – Refactor CreditNoteServiceImpl: use atStartOfDay for cnDate, extract DN generation into ...

amit — Sun, 10 May 2026 19:17:12 +0530

amit – 1 file(s) modified
Refactor CreditNoteServiceImpl: use atStartOfDay for cnDate, extract DN generation into REQUIRES_NEW transactional method, cache generated CN PDFs to disk in downloadCN

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

Rev 36505 – DN date: use CN month-end instead of CN date — ...

amit — Sat, 09 May 2026 08:34:22 +0530

amit – 1 file(s) modified
DN date: use CN month-end instead of CN date — avoids NIC 30-day backdating rejection

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

Rev 36504 – DN generation: DUPIRN reconciliation flow + fix cnDate to use ...

amit — Sat, 09 May 2026 07:20:34 +0530

amit – 2 file(s) modified
DN generation: DUPIRN reconciliation flow + fix cnDate to use NIC acknowledge date + extract /A prefix handling

Rev 36502 – DN generation for cancelled MARGINS CNs + fix /A CN ...

amit — Fri, 08 May 2026 22:43:40 +0530

amit – 5 file(s) modified
DN generation for cancelled MARGINS CNs + fix /A CN prefix extraction NPE

- Add generateDebitNotesForCancelled(List<String>) for explicit CN list
- Add selectByCreditNoteNumbers repository method
- Fix GstProService sandbox: use SANDBOX_GST_NUMBER before isGstEnabled check, sandbox buyer details
- Fix prefix extraction NPE for /A suffixed CN numbers (getCreditNotePdfModel, existingCNMap, extractPrefix)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java

Rev 36498 – Add CN_CANCELLATION type for cancellation-reversal debit notes, distinguish from regular ...

amit — Fri, 08 May 2026 16:44:15 +0530

amit – 2 file(s) modified
Add CN_CANCELLATION type for cancellation-reversal debit notes, distinguish from regular MARGINS

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNoteType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java

Rev 36497 – Fix dedup key to distinguish CRN vs DBN — existing ...

amit — Fri, 08 May 2026 16:36:13 +0530

amit – 1 file(s) modified
Fix dedup key to distinguish CRN vs DBN — existing CRN no longer blocks DBN for same vendor

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

Rev 36496 – Consolidate 3 redundant eInvoiceDetails lookups into single fetch in issueMonthlyMarginsCN

amit — Fri, 08 May 2026 16:34:58 +0530

amit – 1 file(s) modified
Consolidate 3 redundant eInvoiceDetails lookups into single fetch in issueMonthlyMarginsCN

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