DeepnaPooja
b7f58e6b73
Merge pull request 'Fix dashoard issues' ( #85 ) from dev into production
...
Reviewed-on: #85
2026-10-22 10:55:41 +05:30
DeepnaPooja
e13ec0f109
Merge pull request 'Fix dashboard stat card handling issue' ( #84 ) from feat-notification into dev
...
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 12m59s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 16m29s
Reviewed-on: #84
2026-10-22 10:54:52 +05:30
DeepnaPooja
2c39b34c5f
feat: add discount amount to invoice response and display in invoice view
2026-10-22 10:44:18 +05:30
DeepnaPooja
99832df134
feat: add interactive sales trend and region sales pie components to dashboard
2026-10-22 10:43:39 +05:30
DeepnaPooja
2be9d9b396
feat: add DiscountAmount property to Invoice model for discount calculations
2026-10-22 10:41:58 +05:30
DeepnaPooja
a12e170205
Add DiscountAmount column to Invoices table
2026-10-22 10:41:20 +05:30
DeepnaPooja
fdfca7cf5e
feat: add HasLockedInvoiceAsync method to check invoice status and prevent scheme application
2026-10-22 10:40:43 +05:30
DeepnaPooja
e84ce29064
feat: update SoldLines method to use InvoiceItem and improve sales calculations
2026-10-22 10:40:09 +05:30
DeepnaPooja
2be2928ad1
feat: add scheme discount calculation to invoice processing
2026-10-22 10:39:01 +05:30
DeepnaPooja
872fd42c4a
feat: enhance dashboard report with receivables and discounts calculations
2026-10-22 10:37:56 +05:30
DeepnaPooja
13fdb28ec7
Merge pull request 'Dev' ( #83 ) from dev into production
...
Reviewed-on: #83
2026-10-21 13:14:19 +05:30
DeepnaPooja
39ad424d21
Merge pull request 'Invoice flow' ( #82 ) from feat-notification into dev
...
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 12m58s
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 14m20s
Reviewed-on: #82
2026-10-21 13:13:21 +05:30
DeepnaPooja
d79c5e55d0
Update doc for Shop PO to Invoice operations flow
2026-10-21 13:06:06 +05:30
DeepnaPooja
50d3113c28
Update Po invoice flow.md file
2026-10-21 13:04:44 +05:30
DeepnaPooja
34d33571de
feat: enhance invoice item updates
2026-10-21 13:01:23 +05:30
DeepnaPooja
0f575370d4
Add migrations
2026-10-21 13:00:30 +05:30
DeepnaPooja
e4061fa94c
feat: implement invoice formatting and document loading hooks
2026-10-21 12:55:29 +05:30
DeepnaPooja
5f8bc70174
feat: add standalone printable invoice page with paper size selection
2026-10-21 12:54:51 +05:30
DeepnaPooja
f2d5c9f50a
fix invoice action dialog and order view with editing and printing capabilities
2026-10-21 12:51:02 +05:30
DeepnaPooja
9e39981c9a
Fix invoice editing
2026-10-21 12:49:02 +05:30
DeepnaPooja
bd8b2d8b44
Replace toggle group with invoice configuration
2026-10-21 12:47:59 +05:30
DeepnaPooja
f26557a66e
Enhance invoice processing by adding items and versioning
2026-10-21 12:46:56 +05:30
DeepnaPooja
91959913a8
feat: add invoice versioning models and enums
2026-10-21 12:44:58 +05:30
DeepnaPooja
48f607d623
Invoice handling with versioning and item updates
2026-10-21 12:41:20 +05:30
DeepnaPooja
ee9a5385bf
Merge pull request 'Dev' ( #81 ) from dev into production
...
Reviewed-on: #81
2026-10-20 17:31:19 +05:30
DeepnaPooja
82be251878
Merge dev into feat-notification
...
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 12m21s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 16m5s
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com >
2026-10-20 17:19:51 +05:30
DeepnaPooja
209ee7da2d
fe integration for notification system with context, components, and API integration
2026-10-20 16:53:15 +05:30
DeepnaPooja
6b9f27573b
Introduced NotificationService for managing notification logic and recipient resolution.
...
- Integrated SignalR for real-time notification delivery to users.
2026-10-20 16:51:01 +05:30
DeepnaPooja
a0df2a1bbf
feat: integrate notification system across PO,store,supplier claims,delivery task and ride
2026-10-20 16:49:05 +05:30
DeepnaPooja
d1c3d4e22f
feat: implement notification system with repository, service, and controller layers
2026-10-20 16:45:48 +05:30
kalana_Thilakarathna
138bf2f925
Merge pull request 'Add invoice creation mode support to Shop PO flow' ( #79 ) from dev into production
...
Reviewed-on: #79
2026-10-20 14:02:31 +05:30
Kalana B. Thilakarathna
a80512994b
Add invoice creation mode support to Shop PO flow
...
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 11m8s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 14m56s
Introduce invoice creation mode feature using invoiceCreationModeApi and DEFAULT_INVOICE_CREATION_MODE. Update confirmation logic to call confirmAndCreateInvoice and show draft invoice messaging in ModeA. Update types and UI in page.tsx and confirm-shop-po-dialog.tsx for consistent behavior.
2026-10-20 14:02:11 +05:30
kalana_Thilakarathna
1b4461dc12
Merge pull request 'Add manual invoice creation mode with new API & UI flow' ( #78 ) from dev into production
...
Reviewed-on: #78
2026-10-20 13:39:12 +05:30
Kalana B. Thilakarathna
2de9e5e4ad
Add manual invoice creation mode with new API & UI flow
...
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 13m13s
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 14m28s
Introduced "ModeB" for manual invoice creation in system config. Added backend endpoints and service logic for creating invoices from confirmed Shop POs, with validation and error handling. Updated DTOs to support optional CreatedByUserId. On the frontend, added configuration card to toggle modes, a dialog for manual invoice creation, and UI updates to support the new workflow. Enables admins to choose between automatic and manual invoice creation.
2026-10-20 13:38:43 +05:30
kalana_Thilakarathna
cc33ecdd54
Merge pull request 'Implement store credit tracking and enforcement' ( #77 ) from dev into production
...
Reviewed-on: #77
2026-10-20 11:51:10 +05:30
Kalana B. Thilakarathna
5707bd4c31
Implement store credit tracking and enforcement
...
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 12m30s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 16m1s
Introduced StoreCreditMovement entity and migration to track store credit usage and settlements. Updated payment flow to enforce credit limits and record credit movements. Modified outstanding balance calculation to use credit movements. Enhanced frontend to display real-time credit info and prevent over-credit payments. Updated API types, seed data, and DI registrations accordingly.
2026-10-20 11:45:11 +05:30
kalana_Thilakarathna
f77db46a02
Merge pull request 'Dev' ( #76 ) from dev into production
...
Reviewed-on: #76
2026-10-19 23:38:07 +05:30
Kalana B. Thilakarathna
28c465f59b
feat: refactor TopLoader to use a hook for active state management and improve CSS for fixed positioning
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 10m33s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 14m21s
2026-10-19 23:37:45 +05:30
Kalana B. Thilakarathna
21b38b5276
feat: enhance DataTable with custom empty state support and update GrnClient to utilize it
2026-10-19 23:23:18 +05:30
kalana_Thilakarathna
267144f7a1
Merge pull request 'feat: add EmptyState component for improved no-data display in supplier payments' ( #75 ) from dev into production
...
Reviewed-on: #75
2026-10-19 22:35:48 +05:30
Kalana B. Thilakarathna
992cd292fa
feat: add EmptyState component for improved no-data display in supplier payments
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 12m51s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 16m39s
2026-10-19 22:35:01 +05:30
kalana_Thilakarathna
efb5657b6b
Merge pull request 'feat: update row actions to include payment functionality and add corresponding icon' ( #74 ) from dev into production
...
Reviewed-on: #74
2026-10-19 22:13:07 +05:30
Kalana B. Thilakarathna
7b6c9ac92a
feat: update row actions to include payment functionality and add corresponding icon
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 10m33s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 14m20s
2026-10-19 22:12:40 +05:30
kalana_Thilakarathna
622b75e187
Merge pull request 'feat: integrate payment functionality with new payment sheet and enhance supplier payments UI' ( #73 ) from dev into production
...
Reviewed-on: #73
2026-10-19 22:02:45 +05:30
Kalana B. Thilakarathna
eb0b042f0c
feat: integrate payment functionality with new payment sheet and enhance supplier payments UI
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Successful in 1m51s
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 10m54s
2026-10-19 22:02:15 +05:30
kalana_Thilakarathna
293df41d4e
Merge pull request 'Dev' ( #72 ) from dev into production
...
Reviewed-on: #72
2026-10-19 21:41:42 +05:30
Kalana B. Thilakarathna
a980e636f5
Merge branch 'dev' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution into dev
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 11m57s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 15m40s
2026-10-19 21:36:08 +05:30
Kalana B. Thilakarathna
b992d07689
feat: add supplier payment and allocation models, API, and frontend components
...
- Created `SupplierPayment` and `SupplierPaymentGRN` models for managing supplier payments and their allocations.
- Implemented API endpoints for listing and creating supplier payments.
- Developed frontend components for displaying and recording supplier payments, including a dialog for payment creation.
- Integrated GRN allocations into the payment creation process, ensuring total allocations match the payment amount.
- Added pagination and loading states for the payments list.
2026-10-19 21:36:01 +05:30
DeepnaPooja
5e81fd77b1
Merge pull request 'Dev' ( #71 ) from dev into production
...
Reviewed-on: #71
2026-10-19 16:47:06 +05:30
DeepnaPooja
a4d58f3377
Merge pull request 'Fix changes' ( #70 ) from fix-changes into dev
...
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 11m33s
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 15m20s
Reviewed-on: #70
2026-10-19 16:45:55 +05:30