From ae195a3cec7e169ed4f719582a85011b447ed671 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Fri, 9 Feb 2024 07:31:04 +0000 Subject: [PATCH 1/4] 3.805.0 --- Directory.Build.props | 2 +- src/VirtoCommerce.OrdersModule.Web/module.manifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 346fc896..22040461 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.804.0 + 3.805.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest index 1f15f719..567411e5 100644 --- a/src/VirtoCommerce.OrdersModule.Web/module.manifest +++ b/src/VirtoCommerce.OrdersModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Orders - 3.804.0 + 3.805.0 3.800.0 From aecede1c8c7de671ebf48ad36585832a89924702 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Fri, 9 Feb 2024 09:52:00 +0000 Subject: [PATCH 2/4] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index be974857..413fa82f 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.800.0 +# v3.800.1 name: Module CI on: @@ -127,7 +127,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' && github.event_name != 'workflow_dispatch' }} uses: VirtoCommerce/vc-github-actions/publish-nuget@master - name: Publish to Blob From a3bc6814163771f3c65b0c8623a768331ac5cb35 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 13 Feb 2024 04:53:50 +0000 Subject: [PATCH 3/4] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 17 +++++++++-------- .github/workflows/module-release-hotfix.yml | 13 +++++++------ .github/workflows/publish-nugets.yml | 9 +++++---- .github/workflows/release.yml | 5 +++-- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 413fa82f..3a9a9f6b 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,5 @@ -# v3.800.1 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 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 @@ -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.800.0 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.2 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.800.0 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.2 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 35b5ef8a..519c5a82 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,5 @@ -# v3.800.0 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Release hotfix on: @@ -12,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.0 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.0 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2 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.800.0 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.2 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 8fa76b71..f92e2d6d 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,5 @@ -# v3.800.0 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Publish nuget on: @@ -12,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.0 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.2 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.0 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.2 with: uploadPackage: 'true' uploadDocker: 'false' @@ -28,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.0 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.2 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52cc02ce..034cf006 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,5 @@ -# v3.800.0 +# v3.800.2 +# https://virtocommerce.atlassian.net/browse/VCST-349 name: Release on: @@ -6,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.0 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.2 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 17c91b3a2452750ffe05c0b3435e5cdc605006c3 Mon Sep 17 00:00:00 2001 From: Oleg Zhuk Date: Tue, 13 Feb 2024 15:14:31 +0200 Subject: [PATCH 4/4] VCST-398: Close Transaction switcher in Capture document should not be active for editing (#405) feat: The Close Transaction switcher in the Capture document is now disabled for editing. It is preventing any unintended effects on the Payment provider. --- .../Scripts/blades/capture-detail.html | 6 +++--- src/VirtoCommerce.OrdersModule.Web/Scripts/order.js | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/capture-detail.html b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/capture-detail.html index c93e8b51..0c7ae052 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/capture-detail.html +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/blades/capture-detail.html @@ -32,19 +32,19 @@ -
+ diff --git a/src/VirtoCommerce.OrdersModule.Web/Scripts/order.js b/src/VirtoCommerce.OrdersModule.Web/Scripts/order.js index 3510055d..a2161e3b 100644 --- a/src/VirtoCommerce.OrdersModule.Web/Scripts/order.js +++ b/src/VirtoCommerce.OrdersModule.Web/Scripts/order.js @@ -258,8 +258,13 @@ angular.module(moduleName, [ isReadOnly: true, title: "orders.blades.capture-detail.labels.transactionId", valueType: "ShortText" - } - , + }, + { + name: 'closeTransaction', + isReadOnly: true, + title: 'orders.blades.capture-details.labels.closeTransaction', + valueType: "ShortText" + }, { name: 'outerId', isReadOnly: true,