feat: Update redefinition with develop branch (#1138)

* Remove duplicated series (#981) * Fix Pos (#977) * Fixe POs * fixes Currency * delete comment Co-authored-by: elsiosanchez <[email protected]> * sopporte a reversar transsaccion (#979) Co-authored-by: elsiosanchez <[email protected]> * search in the process audit by user (#980) Co-authored-by: elsiosanchez <[email protected]> * Supporte Pin Point Of Sales (#978) * Fixe POs * fixes Currency * Supporte Pin Point Of Sales * focus ping Co-authored-by: elsiosanchez <[email protected]> * dashboard (#983) * fixing dashboard errors (#985) Co-authored-by: elsiosanchez <[email protected]> * Add support to list document type service (#986) * Switching from document type (#987) * Switching from document type * minimal changes Co-authored-by: elsiosanchez <[email protected]> * check-price (#988) * product information (#992) * Support workflow activities (#972) * support workflow activities * minimal changes * add Workflows and services * add state semantics * rename fille * add info the node Co-authored-by: elsiosanchez <[email protected]> * guide component (#995) * Add activity notifications (#997) Co-authored-by: elsiosanchez <[email protected]> * Add guide (#1002) Co-authored-by: elsiosanchez <[email protected]> * flujo de trabajo y actividades (#1005) * feat: Update to element-ui 2.15.3 (#1004) * fix: Tab name style. (#1003) * fix: Tab name style. * fix tooltip text. * feat: Improve documentation deploy. (#1007) * feature: Improve documentation deploy. * minimal changes. * support Upload Excel (#991) * support Upload Excel * change button * Adjust cell contents according to formatting type Co-authored-by: elsiosanchez <[email protected]> * Fixing error when searching for product (#1009) * Fixing error when searching for product * Reducing calls to the Api Co-authored-by: elsiosanchez <[email protected]> * Add packages lock for project (#1013) * feat: Push docker image github package registry. (#1014) * feat: Push docker image github package registry. * Docker image in Github Package * change npm ci to npm i * Add docker file. * remove docs lock files * feat: Add support docker hub continuous delivery. (#1016) * feat: Add support docker hub continuous delivery. * remove comments * Fixed syntax errors and deleting console.log (#1012) * Overdrawn Invoice * rename computed * add service Overdrawn Invoice * Duplicate key error and deleting console.log * fixe minor errors * add params to router * fixe pin * fixe Price Checking * fix constants Co-authored-by: elsiosanchez <[email protected]> * feat: Add github secret org name (#1017) * fix: Docker image files. (#1019) * Fix Overdrawn Invoice (#1018) Co-authored-by: elsiosanchez <[email protected]> * Adjust the product information pop-up window. (#1025) Co-authored-by: elsiosanchez <[email protected]> * Intuitive output on the point-of-sale product search panel (#1024) * Intuitive output on the point-of-sale product search panel * Update index.vue Co-authored-by: elsiosanchez <[email protected]> * adding converted currency symbol (#1026) Co-authored-by: elsiosanchez <[email protected]> * Support Attachment (#1008) * Support Attachment * adjust size Co-authored-by: elsiosanchez <[email protected]> * support Product Configuration (#969) * support Product Configuration * paint flowchart dynamically * minimal changes Workflow * remove comment Co-authored-by: elsiosanchez <[email protected]> * Change readme for run (#1028) * Support Assign PO-Invoice-Receipt-Invoice (#960) * setting up initial structure * add service Co-authored-by: elsiosanchez <[email protected]> * Support for the Read Weight form (From Scale) (#945) * Support Get Weight * changing the position of the buttons Co-authored-by: elsiosanchez <[email protected]> * Update README.md * Update README.es.md * fix point-of-sale options (#1036) * fix point-of-sale options * minimal change Co-authored-by: elsiosanchez <[email protected]> * fix: Documentation tag view not fixed. (#1040) * Click incremented POS line quantities (#1050) * Add functionality to the quantity increment and decrement button * Validate minimum quantity Co-authored-by: elsiosanchez <[email protected]> * infinite loop in product table (#1043) * infinite loop in product table * Show suggestions when input gets focus Co-authored-by: elsiosanchez <[email protected]> * Improve the display when recording the location (#1051) Co-authored-by: elsiosanchez <[email protected]> * Error starting section (#1052) Co-authored-by: elsiosanchez <[email protected]> * Display order footer do not display data if no order is mounted (#1053) Co-authored-by: elsiosanchez <[email protected]> * Lock Order Complete (#1057) Co-authored-by: elsiosanchez <[email protected]> * Amount converted to payment (#1066) * Correcting total amount converted in the payment * minimal changes * delete console Co-authored-by: elsiosanchez <[email protected]> * Error creating order (#1063) * fixe new orden * delete comment Co-authored-by: elsiosanchez <[email protected]> * feat: Push docker image with commit. (#1071) * feat: Push docker image with commit. * only use develop as main branch. * fixe discount (#1069) Co-authored-by: elsiosanchez <[email protected]> * Pagination of tables (#1070) Co-authored-by: elsiosanchez <[email protected]> * Add converted order total (#1072) Co-authored-by: elsiosanchez <[email protected]> * feat: Add docker image to main branches. (#1081) * Changing service of creating business partner by point of sale (#1083) Co-authored-by: elsiosanchez <[email protected]> * validate terminal configurator (#1082) * Add validation for the pin according to the configuration of the terminal of the point of sale * validate advisor options * validate terminal configurator * add pin to Return Order * remove console Co-authored-by: elsiosanchez <[email protected]> * List Orders to be invoiced (#1080) * List Orders to be invoiced * minimla changes * fixe style Co-authored-by: elsiosanchez <[email protected]> * - Validate POS options (#1085) - Fixe Delete Line Service Co-authored-by: elsiosanchez <[email protected]> * Modify dimensions of the order to be invoiced table (#1087) * Modify dimensions of the order to be invoiced table * add traslate Co-authored-by: elsiosanchez <[email protected]> * Add daily limit and limit per transaction (#1089) Co-authored-by: elsiosanchez <[email protected]> * Add function for number formatting in decimals (#1088) * Add function for number formatting in decimals * minimal changes * rename function Co-authored-by: elsiosanchez <[email protected]> * Error adding payment (#1091) Co-authored-by: elsiosanchez <[email protected]> * Select a sales order (#1090) Co-authored-by: elsiosanchez <[email protected]> * Support for payment types in the return of funds (#1096) * Support for payment types in the return of funds * renaming the file Co-authored-by: elsiosanchez <[email protected]> * Support for zelle payment types in the return of funds (#1097) Co-authored-by: elsiosanchez <[email protected]> * Support for cash payment types in the return of funds (#1101) Co-authored-by: elsiosanchez <[email protected]> * error when adding payment (#1099) Co-authored-by: elsiosanchez <[email protected]> * Payment method not supported (#1098) Co-authored-by: elsiosanchez <[email protected]> * Validation when the order is complete (#1094) Co-authored-by: elsiosanchez <[email protected]> * Support for Gift Card payment types in the return of funds (#1103) * Add different types of cards for return * minimal changes * Support for Gift Carts payment types in the return of funds * translate * minimal changes * minimal changes Co-authored-by: elsiosanchez <[email protected]> * fix: Load window for the first time (#1095) * Add image at the point of sale (#1104) * add image to pos * minimal changes Co-authored-by: elsiosanchez <[email protected]> * Change document type at the point of sale (#1108) Co-authored-by: elsiosanchez <[email protected]> * show price base the info product (#1106) * show price base the info product * fixe style * minimal changes Co-authored-by: elsiosanchez <[email protected]> * Support Maximum Allowable Reimbursement (#1110) * Support Maximum Allowable Reimbursement * remove console Co-authored-by: elsiosanchez <[email protected]> * validate refund (#1109) * validate refund * minimal changes Co-authored-by: elsiosanchez <[email protected]> * fixe translation (#1111) Co-authored-by: elsiosanchez <[email protected]> * change the tender type service (#1113) * change the tender type service * display of the fields Co-authored-by: elsiosanchez <[email protected]> * Correcting point of sale style (#1114) * Correcting point of sale style * minimal changes Co-authored-by: elsiosanchez <[email protected]> * Bugfix/close pin (#1115) * Correcting point of sale style * minimal changes Co-authored-by: elsiosanchez <[email protected]> * Add service create a customer account (#1117) Co-authored-by: elsiosanchez <[email protected]> * Close pin dialog (#1121) Co-authored-by: elsiosanchez <[email protected]> * change in the order converting the business partner into a customer (#1124) Co-authored-by: elsiosanchez <[email protected]> * Add service create a customer accountChanging the position of the bus… (#1118) * Add service create a customer accountChanging the position of the business partner * change positiion * minimal changes * fast order Co-authored-by: elsiosanchez <[email protected]> * Load the fields in the options (#1120) * Load the fields with only one of the payment types in the return. * remove console * remove console Co-authored-by: elsiosanchez <[email protected]> * change service currency (#1125) * change service the currency * defaul config Co-authored-by: elsiosanchez <[email protected]> * Feature/add service print ticket (#1126) * Support print ticket service * rename dispacht Co-authored-by: elsiosanchez <[email protected]> * Enter for product line options section (#1127) Co-authored-by: elsiosanchez <[email protected]> * Fix image size for a better visualization (#1128) Co-authored-by: elsiosanchez <[email protected]> * associate type of payment (#1129) * associate type of payment * minimal change * minimal changes Co-authored-by: elsiosanchez <[email protected]> * change cash back (#1130) change cash back Co-authored-by: elsiosanchez <[email protected]> * Default payment rule (#1131) Co-authored-by: elsiosanchez <[email protected]> * Remove popover from converted amount (#1132) Co-authored-by: elsiosanchez <[email protected]> * Fixing Refund Errors (#1133) * fixe refund * minimal changes Co-authored-by: elsiosanchez <[email protected]> * fix: Docker compose up. (#1134) * Customer support at the Point of Sale (#1136) * Support Edtit Customer * minimal changes * minimal changes * close ppover * change the style by 2 columns Co-authored-by: elsiosanchez <[email protected]> * validate payment method (#1137) Co-authored-by: elsiosanchez <[email protected]> * fix packages. Co-authored-by: Yamel Senih <[email protected]> Co-authored-by: Elsio Sanchez <[email protected]> Co-authored-by: elsiosanchez <[email protected]> Co-authored-by: TaniaLucena <[email protected]>
adempiere · Aug 29, 2021 · b119976 · b119976
1 parent 80e2b6e
commit b119976
Show file tree

Hide file tree

Showing 163 changed files with 43,146 additions and 1,068 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,51 +2,61 @@
 # For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
 # This file was contributed by Carlos Parada and Yamel Senih from ERP Consultores y Asociados, C.A
 
-name: Build Project
+name: Deploy on Github Pages
 
 # Controls when the action will run. 
 on:
   push:
-    branches: [ master, develop ]
-  release:
-    types: [created]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+    branches: 
+      # Push events on master and develop branchs
+      - master
+      - develop
+    # takes only the directory changes
+    paths:
+      - 'docs/**'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
+    name: Build and deploy ADempiere-Vue docs
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         node-version: [14.x]
+
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Node configuration
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      - run: set -e
-      - run: |
-             cd docs
-             npm i
-             npm run build
-      - run: |
-            cd docs
-            git clone https://github.com/adempiere/adempiere-vue.git --branch gh-pages --single-branch gh-pages
-            cp -r .vuepress/dist/* gh-pages/
-            cd gh-pages
-            touch .nojekyll 
-            git init 
-            git config --local user.email "[email protected]"
-            git config --local user.name "GitHub Action"
-            git add .
-            git commit -m "Update documentation" -a || true
-      - uses: ad-m/github-push-action@master
+
+      - name: Generate static vuepress files
+        run: |
+          cd docs
+          npm i
+          npm run build
+
+      - name: Init new repo in dist folder and commit generated files
+        run: |
+          cd docs/.vuepress/dist
+          touch .nojekyll
+          git init
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+          git add -A
+          git commit -m "docs: ${{ github.event.head_commit.message }}" -a || true
+
+      - name: Force push to destination branch
+        uses: ad-m/[email protected]
         with:
           branch: gh-pages
-          directory: docs/gh-pages
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          force: true
+          directory: docs/.vuepress/dist
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,47 +6,224 @@ name: Publish Project
 
 on:
   release:
-    types: [created]
+    types:
+      - created
+      - edited
 
 jobs:
-  build:
+
+  # Build dist application ADempiere-Vue
+  build-app:
+    name: Build dist ADempiere-Vue
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 13.x, 14.x]
-
+        node-version: [12.x]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Node configuration
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm i
-      - run: npm test
-      - run: npm run build:prod --if-present
-      - run: set -e
-      - run: |
-             cd docs
-             npm i
-             npm run build
-
-  publish-dist:
-    needs: build
+          cache: 'npm'
+
+      - name: Set tag version into config file
+        run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json
+      - name: Install packages
+        run: npm ci
+      - name: Run test
+        run: npm test
+      - name: Compile dist
+        run: npm run build:prod --if-present
+
+      - name: Upload dist app
+        uses: actions/upload-artifact@v2
+        with:
+          name: adempiere-vue
+          path: dist
+
+
+  # Publish dist binaries to application
+  publish-app-dist:
+    name: Upload ADempiere-Vue binaries
+    needs:
+      - build-app
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - name: Download build dist app
+        uses: actions/download-artifact@v2
         with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - run: npm i
-      - run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json
-      - run: npm run build:prod --if-present
-      - uses: TheDoctor0/[email protected]
+          name: adempiere-vue
+
+      - name: Compress files for application dist
+        uses: TheDoctor0/[email protected]
         with:
           filename: 'Adempiere-Vue.zip'
-          path: 'dist/'
-      - uses: skx/github-action-publish-binaries@master
+          path: './'
+
+      - name: Publish application binary in repository
+        uses: skx/github-action-publish-binaries@master
         env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN_ACCESS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           args: 'Adempiere-Vue.zip'
+
+
+  # Publish docker image in Github Container Registry to application
+  push-imame-ghcr:
+    name: Push Docker image to GitHub Container
+    needs:
+      - build-app
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Download build dist app
+        uses: actions/download-artifact@v2
+        with:
+          name: adempiere-vue
+          path: dist
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set Lower Case to owner and repository
+        run: |
+          echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
+          echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV}
+        env:
+          OWNER: '${{ github.repository_owner }}'
+          NAME: '${{ github.event.repository.name }}'
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./build/Dockerfile.prod
+          push: true
+          # load: true
+          tags: |
+            ghcr.io/${{ env.OWNER_LC }}/${{ env.REPO_LC }}:latest
+            ghcr.io/${{ env.OWNER_LC }}/${{ env.REPO_LC }}:${{ github.sha }}
+            ghcr.io/${{ env.OWNER_LC }}/${{ env.REPO_LC }}:${{ github.event.release.tag_name }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+
+  # Publish docker image in Docker Hub registry to application
+  push-imame-dhr:
+    name: Push Docker image to Docker Hub
+    needs:
+      - build-app
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Download build dist app
+        uses: actions/download-artifact@v2
+        with:
+          name: adempiere-vue
+          path: dist
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          # CONFIGURE DOCKER SECRETS INTO REPOSITORY
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set Lower Case to owner and repository
+        run: |
+          ORG=$OWNER
+          if [ -n "${{ secrets.DOCKERHUB_ORG }}" ]; then
+            echo "Set secret DOCKERHUB_ORG as namespace"
+            ORG=${{ secrets.DOCKERHUB_ORG }}
+          else
+            echo "Set OWNER ($OWNER) as namespace "
+          fi
+          echo "ORG_LC=${ORG,,}" >> ${GITHUB_ENV}
+          echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
+          echo "REPO_LC=${NAME,,}" >> ${GITHUB_ENV}
+        env:
+          # to docker image namespace
+          OWNER: '${{ github.repository_owner }}'
+          NAME: '${{ github.event.repository.name }}'
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./build/Dockerfile.prod
+          push: true
+          tags: |
+            ${{ env.ORG_LC }}/${{ env.REPO_LC }}:latest
+            ${{ env.ORG_LC }}/${{ env.REPO_LC }}:${{ github.sha }}
+            ${{ env.ORG_LC }}/${{ env.REPO_LC }}:${{ github.event.release.tag_name }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+
+  # Build dist documentation ADempiere-Vue
+  build-docs:
+    name: Build dist ADempiere-Vue docs
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Node configuration
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+
+      - name: Generate dist docs
+        run: |
+          cd docs
+          npm i
+          npm run build --if-present
+
+      - name: Upload dist docs
+        uses: actions/upload-artifact@v2
+        with:
+          name: adempiere-vue-docs
+          path: docs/.vuepress/dist
+
+
+  # Publish dist binaries to documentation
+  publish-docs-dist:
+    name: Upload ADempiere-Vue docs binaries
+    needs:
+      - build-docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download build dist docs
+        uses: actions/download-artifact@v2
+        with:
+          name: adempiere-vue-docs
+
+      - name: Compress files for documentation dist
+        uses: TheDoctor0/[email protected]
+        with:
+          filename: 'Adempiere-Vue-Documentation.zip'
+          path: './'
+
+      - name: Publish documentation binary in repository
+        uses: skx/github-action-publish-binaries@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: 'Adempiere-Vue-Documentation.zip'