New changes to coop staging environment (#10445)

* 9681 improvements in supplier payment management (#10385) * Hotfix multiple payment not display and not update in pharmacy income report (#10394) * 10388 opd credit cogs report wireframe (#10395) * 10390 bht issue cogs report wireframe (#10396) * bugfixes (#10405) * 9752 there must be facility to enable label printing (#10399) * 10392 opd sale cogs report wireframe (#10406) * 10260 after grn is canceled it must be removed from the suppler payment list (#10407) * Issue#10373 Improvements in BHT Pharmacy Issue Report (#10424) * Create development_pr_validation.yml * Update development_pr_validation.yml (#10427) * Gs mgeeth patch 1 (#10428) * Update development_pr_validation.yml * Update development_pr_validation.yml * Update development_pr_validation.yml (#10429) * Update .gitignore * 9679 need grn details for supplier payment voucher (#10408) * Coop test (#10442) * Closes #10386 (#10443) * fact: add expense section to direct purchase and update bill with net total Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #7830 now can search supplier credit bills Make sure you select the option "Approveal necessary is required for Supplier Payments" as false Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #3832 For Institutions where GRN payment approval is NOT necessary (Make the configuration) Payments Menu > SUpplier Payment > Settle Bills by SUpplier * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Improved supplier payment management where Approval is necessary Need to improve UIs, navigations, have to check GRN Returns, not checked Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9681 Improved supplier payment management where Approval is necessary Need to improve UIs, navigations, have to check GRN Returns, not checked Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> * Closes #10387 (#10444) Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: Dr. M H B Ariyaratne <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Imesh Ranawella <[email protected]> Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
hmislk · Feb 7, 2025 · 05b1d8b · 05b1d8b
1 parent 25b66e9
commit 05b1d8b
Show file tree

Hide file tree

Showing 108 changed files with 6,506 additions and 863 deletions.
diff --git a/.github/workflows/coop_test_ci_cd.yml b/.github/workflows/coop_test_ci_cd.yml
@@ -0,0 +1,143 @@
+name: Coop Test Environment(QA) CI-CD Workflow
+
+on:
+  push:
+    branches:
+      - coop-test
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Cache Maven Packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Update JDBC Data Sources in persistence.xml
+        run: |
+          sed -i 's|<jta-data-source>${JDBC_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/coop</jta-data-source>|' src/main/resources/META-INF/persistence.xml
+          sed -i 's|<jta-data-source>${JDBC_AUDIT_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/coopAudit</jta-data-source>|' src/main/resources/META-INF/persistence.xml
+
+      - name: Verify JDBC Data Sources in persistence.xml
+        run: |
+          grep '<jta-data-source>' src/main/resources/META-INF/persistence.xml
+
+      - name: Build with Maven
+        run: mvn clean package -DskipTests
+
+      - name: Archive Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: target/*.war
+          overwrite: true
+
+      # - name: Run Tests
+      #   run: mvn test
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Download Build Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+          path: ./
+
+      - name: Deploy to Payara
+        env:
+          SERVER_IP: ${{ secrets.QA_SERVER_IP }}
+          SERVER_USER: ${{ secrets.QA_SERVER_USER }}
+          SSH_PRIVATE_KEY: ${{ secrets.QA_SSH_PRIVATE_KEY }}
+          PAYARA_ADMIN_PASS: ${{ secrets.QA_PAYARA_ADMIN_PASS }}
+        run: |
+          # Add SSH private key to the SSH agent
+          echo "$SSH_PRIVATE_KEY" > private_key.pem
+          chmod 600 private_key.pem
+
+          # Variables
+          WAR_NAME="coop-test.war"
+          WAR_DIR="/home/appuser/app/latest"
+          APP_NAME="coop-test"
+          SUBDOMAIN="qa"
+          CONTEXT_PATH="coop-test"
+
+          # Ensure deployment directory exists
+          ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
+            mkdir -p $WAR_DIR
+            chown -R appuser:appuser $WAR_DIR
+            cd $WAR_DIR
+
+            # Remove old backup if it exists
+            if [ -f $WAR_NAME.old ]; then
+              rm $WAR_NAME.old
+            fi
+
+            # If the current WAR file exists, back it up
+            if [ -f $WAR_NAME ]; then
+              mv $WAR_NAME $WAR_NAME.old
+            fi
+          "
+ 
+          # Copy new WAR file to the server
+          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
+
+          # Set the WAR file permission
+          ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
+            chown appuser:appuser $WAR_DIR/$WAR_NAME
+          "
+
+          # Deploy the WAR using asadmin
+          ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
+            /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
+            /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $CONTEXT_PATH $WAR_DIR/$WAR_NAME
+            rm /tmp/payara-admin-pass.txt
+          "
+
+          # Validate if the application is running
+          ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
+            if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
+              echo 'Application is running.'
+            else
+              echo 'Application failed to start.'
+            fi
+            rm /tmp/payara-admin-pass.txt
+          "
+ 
+          # Check if the application is reachable
+          for i in {1..5}; do
+            RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" https://$SUBDOMAIN.carecode.org/$CONTEXT_PATH/faces/index1.xhtml)
+            if [ "$RESPONSE_CODE" == "200" ]; then
+              echo "Application is reachable and healthy."
+              break
+            elif [ "$i" == "5" ]; then
+              echo "Application is not reachable or unhealthy at https://$SUBDOMAIN.carecode.org/$CONTEXT_PATH (HTTP $RESPONSE_CODE)"
+              break
+            fi
+            sleep 10
+          done
+
+          # Cleanup
+          rm -f private_key.pem
+
diff --git a/.github/workflows/development_pr_validation.yml b/.github/workflows/development_pr_validation.yml
@@ -0,0 +1,37 @@
+name: PR Validator
+
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+    branches:
+      - development
+
+jobs:
+  validate-jdbc-data-sources:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Verify JDBC Data Sources in persistence.xml
+        run: |
+          grep -q '<jta-data-source>${JDBC_DATASOURCE}</jta-data-source>' src/main/resources/META-INF/persistence.xml
+          grep -q '<jta-data-source>${JDBC_AUDIT_DATASOURCE}</jta-data-source>' src/main/resources/META-INF/persistence.xml
+
+  validate-compilation:
+      needs: validate-jdbc-data-sources
+      runs-on: ubuntu-latest
+
+      steps:
+        - name: Checkout Code
+          uses: actions/checkout@v3
+
+        - name: Set up JDK 11
+          uses: actions/setup-java@v3
+          with:
+            distribution: 'temurin'
+            java-version: '11'
+
+        - name: Compile with Maven
+          run: mvn clean compile