Skip to content

Commit

Permalink
Merge branch 'release/3.809.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Dec 19, 2024
2 parents 09a96a1 + 6b971b2 commit 04f6154
Show file tree
Hide file tree
Showing 16 changed files with 257 additions and 23 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/module-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# v3.800.9
# https://virtocommerce.atlassian.net/browse/VCST-1260
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
name: Module CI

on:
Expand Down Expand Up @@ -239,9 +239,9 @@ jobs:
module-katalon-tests:
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
(github.event_name == 'workflow_dispatch')}}
(github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
needs: 'ci'
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.10

with:
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
Expand All @@ -260,7 +260,7 @@ jobs:
deploy-cloud:
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
needs: ci
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.10
with:
releaseSource: module
moduleId: ${{ needs.ci.outputs.moduleId }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/module-release-hotfix.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# v3.800.9
# https://virtocommerce.atlassian.net/browse/VCST-1260
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
name: Release hotfix

on:
Expand All @@ -13,12 +13,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
publish-github-release:
needs:
[build, test, get-metadata]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-nugets.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# v3.800.9
# https://virtocommerce.atlassian.net/browse/VCST-1260
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
name: Publish nuget

on:
Expand All @@ -13,12 +13,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -29,7 +29,7 @@ jobs:
publish-nuget:
needs:
[build, test]
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
forceGithub: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# v3.800.9
# https://virtocommerce.atlassian.net/browse/VCST-1260
# v3.800.10
# https://virtocommerce.atlassian.net/browse/VCST-1738
name: Release

on:
workflow_dispatch:

jobs:
release:
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.9
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10
secrets:
envPAT: ${{ secrets.REPO_TOKEN }}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<!-- These properties will be shared for all projects -->
<PropertyGroup>
<VersionPrefix>3.808.0</VersionPrefix>
<VersionPrefix>3.809.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/de.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Skyflow-Integration"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Skyflow Vault-ID. Sie können diese in den Skyflow Studio-Einstellungen finden"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "Skyflow Vault-URL. Sie können diese in den Skyflow Studio-Einstellungen finden"
},
"TableName": {
"title": "TableName",
"description": "Name der Tabelle, in der Sie Kartendaten speichern"
}
}
}
}
6 changes: 3 additions & 3 deletions src/VirtoCommerce.Skyflow.Web/Localizations/en.Skyflow.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Id of the skyflow vault. Get it in the Skyflow Studio Settings."
"description": "Skyflow vault Id. You can get it in the Skyflow Studio settings"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "Url of the skyflow vault. Get it in the Skyflow Studio Settings."
"description": "Skyflow vault URL. You can get it in the Skyflow Studio settings"
},
"TableName": {
"title": "TableName",
"description": "The name of the table where you store card data."
"description": "Name of the table where you store card data"
}
}
}
Expand Down
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/es.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Integración con Skyflow"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "ID del vault de Skyflow. Puedes obtenerlo en la configuración de Skyflow Studio"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "URL del vault de Skyflow. Puedes obtenerlo en la configuración de Skyflow Studio"
},
"TableName": {
"title": "TableName",
"description": "Nombre de la tabla donde almacenas los datos de las tarjetas"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/fr.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Intégration Skyflow"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Identifiant de coffre Skyflow. Disponible dans les paramètres de Skyflow Studio"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "URL du coffre Skyflow. Disponible dans les paramètres de Skyflow Studio"
},
"TableName": {
"title": "TableName",
"description": "Nom de la table où sont stockées les données de carte"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/it.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Integrazione Skyflow"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "ID del Vault di Skyflow. Puoi trovarlo nelle impostazioni di Skyflow Studio"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "URL del Vault di Skyflow. Puoi trovarlo nelle impostazioni di Skyflow Studio"
},
"TableName": {
"title": "TableName",
"description": "Nome della tabella dove vengono memorizzati i dati delle carte"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/ja.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Skyflow統合"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Skyflow Vault ID。Skyflow Studio設定で取得可能です"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "Skyflow Vault URL。Skyflow Studio設定で取得可能です"
},
"TableName": {
"title": "TableName",
"description": "カードデータを保存するテーブル名"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/pl.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Integracja z Skyflow"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Identyfikator Vault Skyflow. Możesz go znaleźć w ustawieniach Skyflow Studio"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "URL Vault Skyflow. Możesz go znaleźć w ustawieniach Skyflow Studio"
},
"TableName": {
"title": "TableName",
"description": "Nazwa tabeli, w której przechowywane są dane kart"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/pt.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Integração Skyflow"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "ID do cofre Skyflow. Você pode obtê-lo nas configurações do Skyflow Studio"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "URL do cofre Skyflow. Você pode obtê-lo nas configurações do Skyflow Studio"
},
"TableName": {
"title": "TableName",
"description": "Nome da tabela onde você armazena os dados do cartão"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/ru.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Интеграция с Skyflow"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Идентификатор хранилища Skyflow. Его можно найти в настройках Skyflow Studio"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "URL хранилища Skyflow. Его можно найти в настройках Skyflow Studio"
},
"TableName": {
"title": "TableName",
"description": "Название таблицы, где хранятся данные карт"
}
}
}
}
26 changes: 26 additions & 0 deletions src/VirtoCommerce.Skyflow.Web/Localizations/zh.Skyflow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"payment": {
"labels": {
"SkyflowPaymentMethod": {
"name": "Skyflow",
"description": "Skyflow 集成"
}
}
},
"settings": {
"VirtoCommerce.Payment.Skyflow": {
"VaultId": {
"title": "VaultId",
"description": "Skyflow Vault ID。可以在 Skyflow Studio 设置中获取"
},
"VaultUrl": {
"title": "VaultUrl",
"description": "Skyflow Vault URL。可以在 Skyflow Studio 设置中获取"
},
"TableName": {
"title": "TableName",
"description": "存储卡数据的表名称"
}
}
}
}
2 changes: 1 addition & 1 deletion src/VirtoCommerce.Skyflow.Web/module.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<module>
<id>VirtoCommerce.Skyflow</id>
<version>3.808.0</version>
<version>3.809.0</version>
<version-tag></version-tag>

<platformVersion>3.841.0</platformVersion>
Expand Down

0 comments on commit 04f6154

Please sign in to comment.