diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 70e9163..35193b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,8 +20,11 @@ jobs: echo "::set-output name=filepath::$(ls dist/* | head -1)" echo "::set-output name=filename::$(basename `ls dist/* | head -1`)" - CHANGELOG=$(cat docs/source/changelog.rst | php -r 'preg_match_all("#([v\d\.]+)\n[-]+\n(.+?)\n\n#s", file_get_contents("php://stdin"), $matches); echo trim($matches[2][0]);') - echo "::set-output name=changelog::$CHANGELOG" + t=$(cat docs/source/changelog.rst | php -r 'preg_match_all("#([v\d\.]+)\n[-]+\n(.+?)\n\n#s", file_get_contents("php://stdin"), $matches); echo trim($matches[2][0]);') + t="${t//'%'/'%25'}" + t="${t//$'\n'/'%0A'}" + t="${t//$'\r'/'%0D'}" + echo "::set-output name=changelog::$t" shell: bash - name: Create Release id: create-release diff --git a/docs/source/_static/config-open.png b/docs/source/_static/config-open.png index ac3d448..a281046 100644 Binary files a/docs/source/_static/config-open.png and b/docs/source/_static/config-open.png differ diff --git a/docs/source/_static/config-payment-active.png b/docs/source/_static/config-payment-active.png index c9d65f7..27d1dd0 100644 Binary files a/docs/source/_static/config-payment-active.png and b/docs/source/_static/config-payment-active.png differ diff --git a/docs/source/_static/config-payment-country.png b/docs/source/_static/config-payment-country.png index 7519a8d..79a3ab8 100644 Binary files a/docs/source/_static/config-payment-country.png and b/docs/source/_static/config-payment-country.png differ diff --git a/docs/source/_static/custom.css b/docs/source/_static/custom.css new file mode 100644 index 0000000..ce42de4 --- /dev/null +++ b/docs/source/_static/custom.css @@ -0,0 +1,11 @@ +ul.simple { + padding-left:40px; +} + +ul.simple li { + list-style: disc; +} + +ul.simple li p { + margin-bottom: 10px; +} diff --git a/docs/source/_static/installation-community_store.png b/docs/source/_static/installation-community_store.png index 16ac5c3..c9704cb 100644 Binary files a/docs/source/_static/installation-community_store.png and b/docs/source/_static/installation-community_store.png differ diff --git a/docs/source/_static/merchant-tx-manager.png b/docs/source/_static/merchant-tx-manager.png index 74c8502..dcabbc1 100644 Binary files a/docs/source/_static/merchant-tx-manager.png and b/docs/source/_static/merchant-tx-manager.png differ diff --git a/docs/source/_static/usage-customer-payment-methods.png b/docs/source/_static/usage-customer-payment-methods.png index b29e855..cfd7cd0 100644 Binary files a/docs/source/_static/usage-customer-payment-methods.png and b/docs/source/_static/usage-customer-payment-methods.png differ diff --git a/docs/source/_static/usage-customer-review.png b/docs/source/_static/usage-customer-review.png index 0d8573c..c2c981a 100644 Binary files a/docs/source/_static/usage-customer-review.png and b/docs/source/_static/usage-customer-review.png differ diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index e75a9b7..9564e82 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,14 @@ Changelog ========= +v2.0.3 +------ + +* eine Bestellung kann nur abgeschlossen werden, wenn der Transaktionstatus PREAUTHORIZED ist, andernfalls erhält der Kunde eine Fehlermeldung +* eine Bestellung wird nur als bezahlt markiert, wenn der Transaktionsstatus bei Aufruf des AuthorizationCallback AUTHORIZED ist +* in der Transaktionsübersicht werden keine abgebrochenen Bestellungen mehr angezeigt +* das Ratenrechner-Widget wird in bestimmten Fällen nicht mehr doppelt angezeigt + v2.0.2 ------ diff --git a/docs/source/requirements.rst b/docs/source/requirements.rst index 2a7d87d..6d11ba9 100644 --- a/docs/source/requirements.rst +++ b/docs/source/requirements.rst @@ -13,8 +13,8 @@ Versionskompatibilität Das Plugin hat neben Shopware 5.x keine weiteren Abhängigkeiten. Es wurde für die folgenden Versionen mit dem Responsive Template getestet: -* 5.0.x -* 5.1.x +* 5.0.x (<= v1.8.7) +* 5.1.x (<= v1.8.7) * 5.2.x * 5.3.x * 5.4.x