SmartDukaan – /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm

Rev 36477 – Invoice return: IRN/EWB cancellation on approve, Logistics L2+ permission, DL ...

amit — Tue, 05 May 2026 20:05:29 +0530

amit – 6 file(s) modified
Invoice return: IRN/EWB cancellation on approve, Logistics L2+ permission, DL GST disabled

- approveInvoiceReturn now cancels IRN+EWB when cancellable (path B) before falling back to Credit Note (path A)
- DC/challan EWB cancelled best-effort before Credit Note path
- Added enabled flag to GstEInvoiceUser; DL GSTIN disabled in E_INVOICE_USERS and EWB_USERS
- isGstEnabled guard added to all public GST API methods in GstProService
- Logistics L2+ can now approve/reject invoice returns (not just Finance)
- invoice-return.vm uses canApproveInvoiceReturn for INV-prefix button visibility

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/api/model/GstEInvoiceUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.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/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm

Rev 36447 – DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS ...

amit — Fri, 01 May 2026 23:49:24 +0530

amit – 3 file(s) modified
DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS handler

- Add PUT /return/debit-note/reject/acknowledge/{debitNoteId} endpoint
- invoice-return.vm: Rejected-Pending Acknowledgment + Cancelled status labels, Acknowledge Receipt button
- return.js: click handler for acknowledge-rejected-return

Rev 36408 – Sale-return reversal: controller wiring + UI for cancellability gate + ...

amit — Mon, 27 Apr 2026 19:57:02 +0530

amit – 7 file(s) modified
Sale-return reversal: controller wiring + UI for cancellability gate + INV reject + date filter

PurchaseReturnController:
/return/invoice/process — autoApprove now isIrnCancellable && !isShipped.
!isShipped guard restored: shipped goods route through manual approval
even within 24h, so the physical return goes through CN flow.
/return/invoice/reject/{proId} — new endpoint for finance to reject a
pending INV PRO (sale stands, no inventory/wallet/GST action).
/return/invoice — date filter (fromDate/toDate query params, default
last 30 days) backed by selectByWarehouseIdsAndDateRange. Limit
bumped to 200 to accommodate longer ranges.
receive-debit-note view — passes $requiresFinanceApproval so the
template can render the finance-approval banner when DN's IRN is
past the 24h window.

invoice-return.vm:
Added From/To date inputs + Apply button.
Added Reject button next to Approve & Refund for pending INV PROs.

receive-debit-note.vm:
Added one informational banner (#if $requiresFinanceApproval) above
the receipt form. No layout / JS / submit-URL change.

return.js:
#invoice-return-date-apply handler — POSTs the selected range to
/return/invoice and refreshes the table.
.reject-invoice-return handler — prompts for reason, calls the new
reject endpoint.

dev/staging/prod.properties: feature flag finance.receipt.approval.email.enabled
(default false, flip per env when mail infra is ready).

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /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

Rev 36027 – Sale Returns: finance approval endpoint, invoice links in all views, ...

amit — Thu, 19 Mar 2026 19:52:58 +0530

amit – 7 file(s) modified
Sale Returns: finance approval endpoint, invoice links in all views, invoice map for INV: returns, purchase reference check fix

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

Rev 36022 – Sale Returns: invoice return flow with auto-approve, rename to Sale ...

amit — Wed, 18 Mar 2026 19:24:24 +0530

amit – 6 file(s) modified
Sale Returns: invoice return flow with auto-approve, rename to Sale Returns, role-based search results, Finance L2+ access

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