diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index b7d5f3e..c798dd1 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,5 @@ -# v3.200.36 +# v3.800.4 +# https://virtocommerce.atlassian.net/browse/VCST-488 name: Module CI on: @@ -56,13 +57,13 @@ jobs: steps: - - name: Set up Node 18 - uses: actions/setup-node@v3 + - name: Set up Node 20 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Set up Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -72,7 +73,7 @@ jobs: run: | echo "RELEASE_STATUS=true" >> $GITHUB_ENV - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -127,7 +128,7 @@ jobs: run: vc-build Compress -skip Clean+Restore+Compile+Test - name: Publish Nuget - if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }} + if: ${{ github.ref == 'refs/heads/master' }} uses: VirtoCommerce/vc-github-actions/publish-nuget@master - name: Publish to Blob @@ -191,13 +192,13 @@ jobs: fi - name: Setup Git Credentials - if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }} + if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }} uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master with: githubToken: ${{ secrets.REPO_TOKEN }} - name: Publish Manifest - if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }} + if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }} uses: VirtoCommerce/vc-github-actions/publish-manifest@master with: packageUrl: ${{ steps.artifactUrl.outputs.download_url }} @@ -240,7 +241,7 @@ jobs: if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) || (github.event_name == 'workflow_dispatch')}} needs: 'ci' - uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.4 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -260,7 +261,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.4 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml index 1aef6b0..b8ac070 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,5 @@ -# v3.200.36 +# v3.800.4 +# https://virtocommerce.atlassian.net/browse/VCST-488 name: Release hotfix on: @@ -12,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4 with: uploadPackage: 'true' uploadDocker: 'false' @@ -34,7 +35,7 @@ jobs: changelog: ${{ steps.changelog.outputs.changelog }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -45,7 +46,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' @@ -62,7 +63,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install VirtoCommerce.GlobalTool uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml index 45820cb..76dffa4 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,5 @@ -# v3.200.36 +# v3.800.4 +# https://virtocommerce.atlassian.net/browse/VCST-488 name: Publish nuget on: @@ -12,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4 with: uploadPackage: 'true' uploadDocker: 'false' @@ -28,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 888f8d0..036f4c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,5 @@ -# v3.200.36 +# v3.800.4 +# https://virtocommerce.atlassian.net/browse/VCST-488 name: Release on: @@ -6,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.36 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.4 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 3550f76..70293de 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.801.0 + 3.802.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/subscription-list.tpl.html b/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/subscription-list.tpl.html index a869071..3de0497 100644 --- a/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/subscription-list.tpl.html +++ b/src/VirtoCommerce.SubscriptionModule.Web/Scripts/blades/subscription-list.tpl.html @@ -17,10 +17,6 @@ -

- {{'platform.list.count' | translate}}: - {{pageSettings.totalItems}} -

diff --git a/src/VirtoCommerce.SubscriptionModule.Web/module.manifest b/src/VirtoCommerce.SubscriptionModule.Web/module.manifest index 026dfb7..ec0bda5 100644 --- a/src/VirtoCommerce.SubscriptionModule.Web/module.manifest +++ b/src/VirtoCommerce.SubscriptionModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Subscription - 3.801.0 + 3.802.0 3.800.0