New_REP_SYSTEM/ERP_Distribution
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
187 Commits 35 Branches 0 Tags
e4e12aa05a4bbb230fc2402ecf71b3c763a306bc
Commit Graph

187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kalana_Thilakarathna e4e12aa05a Merge pull request 'build fix' (#28) from dev into production 
Reviewed-on: #28
 2026-09-20 10:42:24 +00:00
Kalana B. Thilakarathna 6a31ad0190 build fix
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 10m55s
Details
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 14m48s
Details
2026-09-20 16:12:04 +05:30
kalana_Thilakarathna 3103fb66ef Merge pull request 'Dev' (#27) from dev into production 
Reviewed-on: #27
 2026-09-20 10:35:40 +00:00
Kalana B. Thilakarathna 502bf25cc0 Merge branch 'dev' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution into dev
CI/CD - ERP Distribution / Build & Deploy Frontend (pull_request) Failing after 11m11s
Details
CI/CD - ERP Distribution / Build & Deploy Backend (pull_request) Failing after 12m39s
Details
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
Kalana B. Thilakarathna 93f2f1bd3b Refactor sales pipeline: ShopPO, Invoice, SysConfig models 
Major refactor replacing Sale/Order with ShopPO → Invoice → LoadingSheet flow. Removed legacy Sale/Order models and features; introduced ShopPO, ShopPOItem, Invoice, LoadingSheetOrder, and SysConfig models. Updated related entities, enums, repositories, and controllers. Added new migrations for schema changes and system config. Overhauled business logic and DI registrations. Updated documentation with migration plan.
 2026-09-17 10:03:22 +05:30
Kalana B. Thilakarathna 93355d34f1 Merge branch 'dev' into production 2026-09-16 11:30:37 +05:30
Kalana B. Thilakarathna 6c40421b2d Revamp dispatch pipeline and PO cancellation docs 
Updated documentation to clarify and redesign dispatch pipeline, loading event, and order/invoice lifecycle. Added PO cancellation flow for both Shop and Confirmed POs, introduced new API endpoint for cancellation, and simplified loading sheet model and endpoints. Added new permissions for loading operations, improved auditability, and detailed migration steps. Highlighted open questions on cancellation cascades, permissions, and vehicle capacity checks for future resolution.
 2026-09-16 11:30:21 +05:30
Kalana B. Thilakarathna 9151f47d15 Merge branch 'production' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution into production 2026-09-16 10:58:02 +05:30
Kalana B. Thilakarathna 661b522b7d Merge branch 'dev' into production 2026-09-16 10:57:55 +05:30
Kalana B. Thilakarathna 541f59b15d Merge branch 'dev' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution into dev 2026-09-16 10:57:40 +05:30
Kalana B. Thilakarathna b68e5043c7 refactor update 2026-09-16 10:57:31 +05:30
DeepnaPooja e0bb17d0ff Merge pull request 'Dev' (#25) from dev into production 
Reviewed-on: #25
 2026-09-16 05:13:39 +00:00
DeepnaPooja 436f7c10a0 Merge pull request 'Add invoice collection plan for cash, cheque, and credit payments post-finalization' (#24) from fixes into dev 
Reviewed-on: #24
 2026-09-16 05:12:49 +00:00
Kalana B. Thilakarathna 0f29413375 Merge branch 'dev' into production 2026-09-16 10:41:32 +05:30
Kalana B. Thilakarathna 8739e8e1a7 refactor 2026-09-16 10:41:16 +05:30
Kalana B. Thilakarathna 308be2f5ce refactor invoice and po life cycle 2026-09-16 10:39:42 +05:30
DeepnaPooja eccc80eaad Add invoice collection plan for cash, cheque, and credit payments post-finalization 2026-09-16 10:35:41 +05:30
DeepnaPooja ef17f7da0a Merge pull request 'Dev' (#23) from dev into production 
Reviewed-on: #23
 2026-09-14 06:29:20 +00:00
DeepnaPooja ca2507a904 Merge pull request 'Refactor order invoice lifecycle and ride lifecycle documentation' (#22) from fixes into dev 
Reviewed-on: #22
 2026-09-14 06:28:31 +00:00
DeepnaPooja fb62448e2c Refactor order invoice lifecycle and ride lifecycle documentation 2026-09-14 11:53:04 +05:30
DeepnaPooja 307055f8e1 Merge pull request 'Fixes' (#21) from fixes into dev 
Reviewed-on: #21
 2026-09-10 10:30:04 +00:00
DeepnaPooja 2000ba67f4 Add refactor order_invoice_lifecycle.md file 2026-09-10 15:53:57 +05:30
DeepnaPooja b8836a1e87 Add refactor ride lifecylcle plan 2026-09-10 15:53:05 +05:30
DeepnaPooja 6c6d30f4f9 Add RetailPrice and AgencyMarginPercent to PriceListItem and related API updates 2026-09-09 16:32:57 +05:30
DeepnaPooja 9bb4c52efb Add AgencyMarginPercent and RetailPrice to PriceListItems 2026-09-09 16:32:20 +05:30
DeepnaPooja 617c0713a1 remove PriceListSheet component and integrate new price list creation page 2026-09-09 16:31:35 +05:30
DeepnaPooja eb0303fa3f Fix Isactive issue 2026-09-09 16:30:38 +05:30
DeepnaPooja f9e4bb3a97 Update scheme management to include IsActive 2026-09-09 16:29:54 +05:30
DeepnaPooja 7dbeaa722a Add PriceList functionality with RetailPrice and AgencyMarginPercent 2026-09-09 16:28:57 +05:30
DeepnaPooja 58d67495d2 Add supplier claims management components and API integration 2026-09-08 16:14:33 +05:30
DeepnaPooja e53db290c8 Add order return management 2026-09-08 16:12:44 +05:30
DeepnaPooja 2a5562a355 Add ClaimSettleDialog, ClaimSheet, ClaimViewSheet, and ClaimsClient 2026-09-08 16:12:05 +05:30
DeepnaPooja 5a6eca1f07 Add GrnViewSheet in GrnClient 2026-09-08 16:11:11 +05:30
DeepnaPooja 6ba8d2fd19 Implement GetAll and Update functionality for Supplier Claims 2026-09-08 16:08:41 +05:30
DeepnaPooja e267f94d46 Add GetAll and UpdateReasons endpoints to ReturnController 2026-09-08 16:08:07 +05:30
DeepnaPooja 81d92e16bb Fix user ID handling in purchase return creation when auth is unavailable 2026-09-08 16:07:28 +05:30
DeepnaPooja ddbe56c5df Fix user ID handling in GRN and PO 2026-09-08 16:06:59 +05:30
DeepnaPooja 5f303321d0 Add CRUD operations for claims 2026-09-08 16:05:45 +05:30
DeepnaPooja 19ff0b5578 Fix seed stock movement external locations in migrations 2026-09-08 13:20:45 +05:30