From 62ea634772ccdc69a7634a3cf981e46fb2b57eaa Mon Sep 17 00:00:00 2001 From: leandramasi Date: Thu, 11 Sep 2025 15:30:23 +0200 Subject: [PATCH 01/22] RATESWSX-332: set release version, update documentation --- README.md | 16 ++++++++-------- composer.json | 11 ++++++++--- .../app/administration/build/webpack.config.js | 11 ----------- 3 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 src/Resources/app/administration/build/webpack.config.js diff --git a/README.md b/README.md index ba44ba77..85fc7b04 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Ratepay GmbH - Shopware 6 Payment Module -| Module | Ratepay Payment Plugin for Shopware 6 | -|--------------------|----------------------------------------------------------------------------------------------------------------------------------------------| -| Author | Interlutions GmbH | -| Shop Version | `6.3.0.2 to 6.6.x.x` | -| Link | http://www.ratepay.com | -| Mail | integration@ratepay.com | -| Full Documentation | [click here](https://docs.ratepay.com/docs/developer/shop_modules/shopware/shopware_6/ratepay_payment_plugin_for_shopware_6/) | -| Legal Disclaimer | [click here](https://docs.ratepay.com/docs/developer/shop_modules/overview/) | +| Module | Ratepay Payment Plugin for Shopware 6 | +|--------------------|-------------------------------------------------------------------------------------------------------------------------------| +| Author | Interlutions GmbH | +| Shop Version | `6.3.0.2 to 6.7.x.x` | +| Link | http://www.ratepay.com | +| Mail | integration@ratepay.com | +| Full Documentation | [click here](https://docs.ratepay.com/docs/developer/shop_modules/shopware/shopware_6/ratepay_payment_plugin_for_shopware_6/) | +| Legal Disclaimer | [click here](https://docs.ratepay.com/docs/developer/shop_modules/overview/) | ## Installation via Shopware Store diff --git a/composer.json b/composer.json index 06469b3d..698f8796 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "ratepay/shopware6-module", "description": "Ratepay payment methods for Shopware 6", - "version": "7.2.0", + "version": "8.0.0", "license": "MIT", "authors": [ { @@ -41,9 +41,9 @@ } }, "require": { - "php": "^8.1", + "php": "^8.2", "ratepay/php-library": "^1.8", - "shopware/core": "~6.6.0", + "shopware/core": "~6.7.0", "ext-simplexml": "*", "ext-json": "*" }, @@ -73,5 +73,10 @@ "rector/rector": "^1.1", "symplify/easy-coding-standard": "^12.2", "phpunit/phpunit": "^9.6" + }, + "config": { + "allow-plugins": { + "symfony/runtime": false + } } } diff --git a/src/Resources/app/administration/build/webpack.config.js b/src/Resources/app/administration/build/webpack.config.js deleted file mode 100644 index 13fe06b2..00000000 --- a/src/Resources/app/administration/build/webpack.config.js +++ /dev/null @@ -1,11 +0,0 @@ -const { resolve } = require('path'); -module.exports = () => { - return { - resolve: { - alias: { - 'xml-formatter': resolve(__dirname, '..', 'node_modules', 'xml-formatter'), - 'highlight.js': resolve(__dirname, '..', 'node_modules', 'highlight.js'), - } - } - }; -} From 4775f27e68a287e24ab21efeee4c16091decff50 Mon Sep 17 00:00:00 2001 From: leandramasi Date: Thu, 11 Sep 2025 15:31:18 +0200 Subject: [PATCH 02/22] ignore node modules --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 95d6f4b1..a228c3cc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /var/cache/ composer.lock __COMPOSER_HOME__ -node_modules/ +src/Resources/app/administration/node_modules From 7ef57b57a2ae54ad9c1b0f03ae075dd7346312a3 Mon Sep 17 00:00:00 2001 From: leandramasi Date: Thu, 11 Sep 2025 15:32:57 +0200 Subject: [PATCH 03/22] github-actions: upgrade sw and php versions --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 90c43c35..860c608b 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -19,9 +19,9 @@ jobs: runs-on: 'ubuntu-latest' strategy: matrix: - php-version: [ '8.2', '8.3' ] + php-version: [ '8.2', '8.3', '8.4' ] mysql-version: [ '8.0' ] - shopware-version: [ 'v6.6.0.0', 'v6.6.1.0', 'v6.6.2.0', 'v6.6.3.0', 'v6.6.4.0' ] + shopware-version: [ 'v6.7.0.0', 'v6.7.1.0', 'v6.7.2.0' ] fail-fast: false max-parallel: 10 services: From 8c6f11c4be3930bfb0c61c4a48d992b99790411f Mon Sep 17 00:00:00 2001 From: leandramasi Date: Mon, 15 Sep 2025 15:39:50 +0200 Subject: [PATCH 04/22] RATWSWSX-332: add sw 6.7 compatibility to admin components --- .../ratepay-order-details.html.twig | 4 +- .../ratepay-order-history-log-grid.html.twig | 4 +- .../ratepay-order-management/index.js | 19 +- .../ratepay-order-management.html.twig | 201 +++++++++--------- .../ratepay-order-management.scss | 79 ++++--- .../sw-order/page/sw-order-detail/index.js | 36 +--- .../view/sw-order-detail-ratepay/index.js | 9 +- .../sw-order-detail-ratepay.html.twig | 2 +- .../js/rpay-payments/rpay-payments.js | 4 +- .../assets/rpay-payments-D9GnBg_p.js | 8 + .../assets/rpay-payments-D9GnBg_p.js.map | 1 + .../assets/rpay-payments-DQrD5tLS.css | 1 + .../administration/css/rpay-payments.css | 105 --------- 13 files changed, 186 insertions(+), 287 deletions(-) create mode 100644 src/Resources/public/administration/assets/rpay-payments-D9GnBg_p.js create mode 100644 src/Resources/public/administration/assets/rpay-payments-D9GnBg_p.js.map create mode 100644 src/Resources/public/administration/assets/rpay-payments-DQrD5tLS.css delete mode 100644 src/Resources/public/administration/css/rpay-payments.css diff --git a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-details/ratepay-order-details.html.twig b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-details/ratepay-order-details.html.twig index 5fc86e3b..972bd90d 100644 --- a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-details/ratepay-order-details.html.twig +++ b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-details/ratepay-order-details.html.twig @@ -5,7 +5,7 @@ ~ file that was distributed with this source code. #} - - + diff --git a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-history-log-grid/ratepay-order-history-log-grid.html.twig b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-history-log-grid/ratepay-order-history-log-grid.html.twig index 7baa71b6..10ddf798 100644 --- a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-history-log-grid/ratepay-order-history-log-grid.html.twig +++ b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-history-log-grid/ratepay-order-history-log-grid.html.twig @@ -5,7 +5,7 @@ ~ file that was distributed with this source code. #} - + - + diff --git a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/index.js b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/index.js index cdad100c..8f731155 100644 --- a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/index.js +++ b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/index.js @@ -126,6 +126,13 @@ Component.register('ratepay-order-management', { taxRepository() { return this.repositoryFactory.create('tax'); }, + taxOptions() { + return this.taxes.map(tax => ({ + id: tax.id, + value: tax.id, + label: this.getTaxLabel(tax), + })); + }, }, created() { @@ -166,14 +173,14 @@ Component.register('ratepay-order-management', { this.addDebit.data.tax = this.defaultTax; this.addDebit.data.taxId = this.defaultTax.id; }, - updateCreditTax() { - if (this.addCredit.data.taxId) { - this.addCredit.data.tax = this.taxes.get(this.addCredit.data.taxId); + updateCreditTax(newTaxId) { + if (newTaxId) { + this.addCredit.data.tax = this.taxes.get(newTaxId); } }, - updateDebitTax() { - if (this.addDebit.data.taxId) { - this.addDebit.data.tax = this.taxes.get(this.addDebit.data.taxId); + updateDebitTax(newTaxId) { + if (newTaxId) { + this.addDebit.data.tax = this.taxes.get(newTaxId); } }, onClickButtonDeliver() { diff --git a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/ratepay-order-management.html.twig b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/ratepay-order-management.html.twig index bdcad7d1..68e419f6 100644 --- a/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/ratepay-order-management.html.twig +++ b/src/Resources/app/administration/src/module/sw-order/component/ratepay-order-management/ratepay-order-management.html.twig @@ -1,11 +1,12 @@ {# - ~ Copyright (c) Ratepay GmbH - ~ - ~ For the full copyright and license information, please view the LICENSE - ~ file that was distributed with this source code. +~ Copyright (c) Ratepay GmbH +~ +~ For the full copyright and license information, please view the LICENSE +~ file that was distributed with this source code. #} - +