213 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DeepnaPooja	a4f5d12234	Merge pull request 'Refactor/main flow' (#47) from refactor/main_flow into dev ... Reviewed-on: #47	2026-09-28 07:39:07 +00:00
DeepnaPooja	ee50f0932d	fix open add product in new tab	2026-09-28 13:03:11 +05:30
DeepnaPooja	7dd012f926	Add PO confirmation btutton and the status badge	2026-09-28 12:36:21 +05:30
DeepnaPooja	aebfa6e3cc	Add search to dropdown	2026-09-28 12:00:59 +05:30
DeepnaPooja	d6fd685b3c	Merge pull request 'Add loading sheet edit flow' (#45) from refactor/main_flow into dev ... Reviewed-on: #45	2026-09-25 08:37:39 +00:00
DeepnaPooja	a892aec527	Add loading sheet edit flow	2026-09-25 14:02:24 +05:30
DeepnaPooja	aaf6e5f12d	Merge pull request 'Refactor/main flow' (#43) from refactor/main_flow into dev ... Reviewed-on: #43	2026-09-24 12:00:17 +00:00
DeepnaPooja	75b0a802c3	update the migrations	2026-09-24 17:24:43 +05:30
DeepnaPooja	e8692b2474	fix the loading sheet view	2026-09-24 17:23:31 +05:30
DeepnaPooja	be38777ebb	Fixes for the route	2026-09-24 15:50:35 +05:30
DeepnaPooja	41f992b824	store page fixes	2026-09-24 15:05:48 +05:30
DeepnaPooja	1ec5426d15	PO shops fe fixes	2026-09-24 15:04:42 +05:30
DeepnaPooja	3b0a5f0d3f	remove store kyc features	2026-09-24 14:56:17 +05:30
DeepnaPooja	96e12972b9	fix store profile fields	2026-09-24 14:18:52 +05:30
DeepnaPooja	556dedb8a3	Merge pull request 'Refactor/main flow' (#41) from refactor/main_flow into dev ... Reviewed-on: #41	2026-09-23 08:36:57 +00:00
DeepnaPooja	80db899091	Fix user role bug for invoice actions	2026-09-23 14:01:32 +05:30
DeepnaPooja	c290a1e778	Add user fallback for invoice actions	2026-09-23 13:59:49 +05:30
DeepnaPooja	6f72f7a0e9	Merge pull request 'Refactor/main flow' (#39) from refactor/main_flow into dev ... Reviewed-on: #39	2026-09-23 07:23:19 +00:00
DeepnaPooja	ee672da9f7	Add user selection to Shop PO flow	2026-09-23 12:47:53 +05:30
DeepnaPooja	4b95e03e05	Add user fallback for Shop PO actions	2026-09-23 12:47:08 +05:30
DeepnaPooja	ae302d0c9c	Fix loading sheet creation flow	2026-09-23 12:46:23 +05:30
DeepnaPooja	53dcdf929a	Merge pull request 'Refactor/main flow' (#37) from refactor/main_flow into dev ... Reviewed-on: #37	2026-09-22 11:43:52 +00:00
DeepnaPooja	35fa3b19e3	Add loading sheet item selection	2026-09-22 17:03:24 +05:30
DeepnaPooja	b7db6a83e6	Add Shop PO management actions	2026-09-22 17:00:38 +05:30
DeepnaPooja	8bb3b3d192	Update loading sheet filters and orders	2026-09-22 16:59:38 +05:30
DeepnaPooja	e5dadef863	Add invoice print and finalize flow	2026-09-22 16:58:38 +05:30
DeepnaPooja	44e335d542	Add ride cancellation details for the fe	2026-09-22 12:12:42 +05:30
DeepnaPooja	d20e4a532f	Add cancel ride type code and the cancel reason	2026-09-22 12:10:37 +05:30
DeepnaPooja	52845b5d87	Use client-side pagination for rides	2026-09-22 11:24:21 +05:30
Kalana B. Thilakarathna	3c17047550	Improve filter handling in SalesClient to reset values for empty selections	2026-09-21 09:35:05 +05:30
Kalana B. Thilakarathna	34ffc7f97a	Fix ride selection logic to handle empty values in LoadingSheetsClient	2026-09-21 09:30:57 +05:30
kalana_Thilakarathna	b3840b47ce	Merge pull request 'Update sales pages' (#34) from refactor/FE-fixes into dev ... Reviewed-on: #34	2026-09-21 03:46:58 +00:00
DeepnaPooja	a9a201cce1	Update sales pages	2026-09-20 21:33:44 +05:30
Kalana B. Thilakarathna	3c2dee5b4a	Add build argument for NEXT_PUBLIC_API_URL in Dockerfile and CI/CD workflow	2026-09-20 16:51:13 +05:30
Kalana B. Thilakarathna	1579936baf	Add Dockerfile and .dockerignore; configure Next.js output settings	2026-09-20 16:36:33 +05:30
Kalana B. Thilakarathna	a8b6503a8a	docker log	2026-09-20 16:32:48 +05:30
Kalana B. Thilakarathna	dc32ae7ea6	pipline update	2026-09-20 16:23:16 +05:30
Kalana B. Thilakarathna	6a31ad0190	build fix	2026-09-20 16:12:04 +05:30
Kalana B. Thilakarathna	502bf25cc0	Merge branch 'dev' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution into dev	2026-09-20 16:03:00 +05:30
Kalana B. Thilakarathna	484aa3fece	Update appsettings.json URLs and add CI/CD workflow for ERP Distribution	2026-09-20 16:02:53 +05:30
DeepnaPooja	1c9ca179df	Merge pull request 'Refactor/ride lifecycle' (#26) from refactor/ride_lifecycle into dev ... Reviewed-on: #26	2026-09-18 06:51:51 +00:00
Kalana B. Thilakarathna	c8c04c357d	refactor plan created	2026-09-18 12:18:00 +05:30
DeepnaPooja	b63f264551	Add cn package as a dependency	2026-09-18 12:00:04 +05:30
DeepnaPooja	7ced279ad5	Add toggle controls and payment API fields	2026-09-18 11:56:11 +05:30
DeepnaPooja	4d7b8d8a56	Add payment method cheque enum	2026-09-18 11:54:01 +05:30
DeepnaPooja	1f6d63a0b3	Add cheque to payment UI	2026-09-18 11:47:34 +05:30
DeepnaPooja	63e7ddba82	Add payment cheque fields and seed invoice payments	2026-09-18 11:45:30 +05:30
DeepnaPooja	e132e29c82	Add cheque and entry mode details to payments	2026-09-18 11:43:43 +05:30
DeepnaPooja	e2cec66d6b	remove the ride cancel request	2026-09-17 14:37:56 +05:30
Kalana B. Thilakarathna	03d01d4c4e	name: CI/CD - ERP Core Monorepo ... on: pull_request: branches: - production types: - closed jobs: backend-build-and-deploy: name: Build & Deploy ERP Core Backend runs-on: linux if: github.event.pull_request.merged == true steps: - name: Checkout code run: | git clone \ --depth 1 \ --branch production \ https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \ . - name: Restore backend run: dotnet restore Backend/ERPCore.sln - name: Publish backend run: | rm -rf /tmp/erpcore-deploy mkdir -p /tmp/erpcore-deploy dotnet publish Backend/ERPCore/ERPCore.csproj \ -c Release \ -r linux-x64 \ --self-contained true \ -o /tmp/erpcore-deploy - name: Stop backend service run: systemctl stop erpcore.service - name: Copy backend to deploy folder run: | mkdir -p /home/erp/core/publish rm -rf /home/erp/core/publish/* cp -r /tmp/erpcore-deploy/* /home/erp/core/publish/ - name: Fix backend ownership and permissions run: | chown -R erpuser:erpuser /home/erp/core/publish find /home/erp/core/publish -type d -exec chmod 755 {} + find /home/erp/core/publish -type f -exec chmod 644 {} + chmod +x /home/erp/core/publish/ERPCore - name: Restart backend service run: systemctl restart erpcore.service - name: Verify backend run: | systemctl is-active erpcore.service && echo "Backend service running" || echo "Backend service failed" frontend-build-and-deploy: name: Build & Deploy ERP Core Frontend runs-on: linux needs: backend-build-and-deploy if: github.event.pull_request.merged == true steps: - name: Checkout code run: | git clone \ --depth 1 \ --branch Production \ https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \ . - name: Build frontend Docker image run: docker build -t erpcore-frontend:latest Frontend/erp-system - name: Stop & remove existing frontend container run: | docker stop erpcore-frontend 2>/dev/null || true docker rm erpcore-frontend 2>/dev/null || true - name: Start frontend container run: | docker run -d \ --name erpcore-frontend \ -p 6702:6702 \ --add-host=host.docker.internal:host-gateway \ -e BACKEND_ORIGIN=http://host.docker.internal:6701 \ --restart unless-stopped \ --memory="512m" \ --cpus="1.0" \ --cap-drop ALL \ --security-opt no-new-privileges \ erpcore-frontend:latest - name: Remove old frontend images run: docker image prune -f - name: Verify frontend run: | docker ps --filter name=erpcore-frontend --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \ | grep erpcore-frontend && echo "Frontend container running" || echo "Frontend container failed"	2026-09-17 13:59:05 +05:30