From 240300d88e71d3b6378df2550165e784b12c447a Mon Sep 17 00:00:00 2001 From: Jan Teuber Date: Mon, 4 Jul 2022 13:53:45 +0200 Subject: [PATCH 1/6] version bump to 320 --- CHANGELOG.md | 20 ++++++++++++++++++++ CHANGELOG_de-DE.md | 21 +++++++++++++++++++++ composer.json | 2 +- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf1867e1..6f274f275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -201,3 +201,23 @@ Maintenance Tested with: Shopware 6.4.10.0 + +#3.2.0 + +New Features + +* New payment method: Bancontact +* Added bankgrouptypes for iDEAL +* Add scheduled task to clean up redirect table +* Add due date for invoice on standard invoice + +Bugfixes + +* added shipping costs to line items +* fixed removal of secure invoice + +Maintenance + +* Changed renaming of payment methods +* Changed PAYONE Logo +* tested with 6.4.12 diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md index 5e30b0844..9cace562b 100644 --- a/CHANGELOG_de-DE.md +++ b/CHANGELOG_de-DE.md @@ -192,8 +192,29 @@ Fehlerbehebungen * Data Protection Check wird immer aktiviert Wartung + * Artikel ohne Steuern werden beim Capture berücksichtigt * Versandinformationen wurden bei Unzer hinzugefügt Getestet mit: Shopware 6.4.10.0 + +#3.2.0 + +Neue Funktionen + +* Neue Zahlungsart: Bancontact +* Bankgruppen Typen für iDEAL hinzugefügt +* Regelmäßiges automatisiertes reinigen der redirect Tabelle +* Zahlungsziel auf den Standardrechnungen für den Rechnungskauf hinzugefügt + +Fehlerbehebung + +* Versandkosten zu einzelnen Artikeln hinzugefügt +* Fehler in Regel zur Entfernung des gesicherten Rechnungskaufs behoben + +Wartung + +* Umbenennung der Zahlungsarten +* PAYONE Logo ausgetauscht +* Getestet mit 6.4.12 diff --git a/composer.json b/composer.json index 6cf075716..5773ac1b0 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "payone-gmbh/shopware-6", "type": "shopware-platform-plugin", "description": "PAYONE Payment Plugin", - "version": "3.1.0", + "version": "3.2.0", "license": "MIT", "authors": [ { From a5d95a45f555f03775a9da6cbaa5eb4f8ea09604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20M=C3=BCller?= Date: Mon, 4 Jul 2022 15:18:51 +0200 Subject: [PATCH 2/6] [PAYOSWXP-35] Fix shopware installation --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 553b92cb2..08a11d77f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,6 +104,8 @@ jobs: rm -rf /tmp/shopware/platform git clone --depth 1 --single-branch -b ${{ matrix.shopware-versions }} https://github.com/shopware/platform /tmp/shopware/platform cd /tmp/shopware + composer config --no-plugins allow-plugins.bamarni/composer-bin-plugin true + composer config --no-plugins allow-plugins.phpstan/extension-installer true php psh.phar init cd /tmp/shopware/vendor/shopware/platform wget https://github.com/shopware/platform/commit/0e6cbc24383f0123c01f59bd9aae0a49ce739cca.patch From cdf4c54a916b8c6f445c1278fe4647c22b6cf895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20M=C3=BCller?= Date: Mon, 4 Jul 2022 15:23:04 +0200 Subject: [PATCH 3/6] [PAYOSWXP-35] Add another try to fix shopware installation --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08a11d77f..54803c65d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,9 +103,10 @@ jobs: printf "const:\n APP_ENV: \"dev\"\n APP_URL: \"http://localhost\"\n DB_HOST: \"127.0.0.1\"\n DB_PORT: \"3306\"\n DB_NAME: \"shopware\"\n DB_USER: \"root\"\n DB_PASSWORD: \"root\"" > /tmp/shopware/.psh.yaml.override rm -rf /tmp/shopware/platform git clone --depth 1 --single-branch -b ${{ matrix.shopware-versions }} https://github.com/shopware/platform /tmp/shopware/platform - cd /tmp/shopware + cd /tmp/shopware/dev-ops/analyze composer config --no-plugins allow-plugins.bamarni/composer-bin-plugin true composer config --no-plugins allow-plugins.phpstan/extension-installer true + cd /tmp/shopware php psh.phar init cd /tmp/shopware/vendor/shopware/platform wget https://github.com/shopware/platform/commit/0e6cbc24383f0123c01f59bd9aae0a49ce739cca.patch From 7f774e2855f77e9878a3c8647f9f602727de0b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20M=C3=BCller?= Date: Mon, 4 Jul 2022 15:42:02 +0200 Subject: [PATCH 4/6] [PAYOSWXP-35] Add another fix for shopware installation --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54803c65d..d36ff03bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -106,6 +106,9 @@ jobs: cd /tmp/shopware/dev-ops/analyze composer config --no-plugins allow-plugins.bamarni/composer-bin-plugin true composer config --no-plugins allow-plugins.phpstan/extension-installer true + cd /tmp/shopware/platform + composer config --no-plugins allow-plugins.bamarni/composer-bin-plugin true + composer config --no-plugins allow-plugins.phpstan/extension-installer true cd /tmp/shopware php psh.phar init cd /tmp/shopware/vendor/shopware/platform From ad0efa75e57f23ae46d4d228694c9c35828d8253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20M=C3=BCller?= Date: Mon, 4 Jul 2022 15:50:49 +0200 Subject: [PATCH 5/6] [PAYOSWXP-35] Add simpler fix for shopware installation by downgrading the composer version --- .github/workflows/main.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d36ff03bc..7f850b1f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -85,7 +85,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} extensions: mbstring, xdebug, curl, dom, fileinfo, gd, iconv, intl, json, xml, mbstring, pdo, phar, zip, sodium - tools: composer:v2 + tools: composer:2.3.7 - name: Check PHP Version run: php -v - name: Check Composer Version @@ -103,12 +103,6 @@ jobs: printf "const:\n APP_ENV: \"dev\"\n APP_URL: \"http://localhost\"\n DB_HOST: \"127.0.0.1\"\n DB_PORT: \"3306\"\n DB_NAME: \"shopware\"\n DB_USER: \"root\"\n DB_PASSWORD: \"root\"" > /tmp/shopware/.psh.yaml.override rm -rf /tmp/shopware/platform git clone --depth 1 --single-branch -b ${{ matrix.shopware-versions }} https://github.com/shopware/platform /tmp/shopware/platform - cd /tmp/shopware/dev-ops/analyze - composer config --no-plugins allow-plugins.bamarni/composer-bin-plugin true - composer config --no-plugins allow-plugins.phpstan/extension-installer true - cd /tmp/shopware/platform - composer config --no-plugins allow-plugins.bamarni/composer-bin-plugin true - composer config --no-plugins allow-plugins.phpstan/extension-installer true cd /tmp/shopware php psh.phar init cd /tmp/shopware/vendor/shopware/platform From d682610d7ce749cd0c362877dd0f9168dea1dc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20M=C3=BCller?= Date: Mon, 4 Jul 2022 16:56:19 +0200 Subject: [PATCH 6/6] [PAYOSWXP-35] Change composer version to 2.1.5 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f850b1f0..a6cf7ccb3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -85,7 +85,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} extensions: mbstring, xdebug, curl, dom, fileinfo, gd, iconv, intl, json, xml, mbstring, pdo, phar, zip, sodium - tools: composer:2.3.7 + tools: composer:2.1.5 - name: Check PHP Version run: php -v - name: Check Composer Version