From a50be0a7774ec7b4dfbd5e84f86a53718938b37b Mon Sep 17 00:00:00 2001 From: leandramasi Date: Wed, 18 Jun 2025 11:08:52 +0200 Subject: [PATCH 1/5] RATEPAYSWSX-326: add mandatory star(*) for required fields --- .idea/.gitignore | 8 ++++++++ .idea/vcs.xml | 4 ++++ src/Resources/app/storefront/src/scss/base.scss | 1 + .../src/scss/ratepay/common/_bank-account.scss | 9 +++++++++ .../page/checkout/ratepay/common/bank-account.html.twig | 2 ++ 5 files changed, 24 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/vcs.xml create mode 100644 src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..d843f340 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Resources/app/storefront/src/scss/base.scss b/src/Resources/app/storefront/src/scss/base.scss index f2f1dc27..b4150a9d 100644 --- a/src/Resources/app/storefront/src/scss/base.scss +++ b/src/Resources/app/storefront/src/scss/base.scss @@ -2,6 +2,7 @@ // // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. +@import "ratepay/common/bank-account"; @import "ratepay/common/installment-calculator"; @import "ratepay/common/installment-plan"; @import "ratepay/installment-quick-info"; diff --git a/src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss b/src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss new file mode 100644 index 00000000..5ee15c9b --- /dev/null +++ b/src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss @@ -0,0 +1,9 @@ +// Copyright (c) Ratepay GmbH +// +// For the full copyright and license information, please view the LICENSE +// file that was distributed with this source code. + +.mandatory-star { + color: #000000; + margin-left: .1rem; +} \ No newline at end of file diff --git a/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig b/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig index 61a7a115..29f55b11 100644 --- a/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig +++ b/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig @@ -24,6 +24,7 @@ + * {% if ratepay.accountHolders|length == 1 %} {{ "ratepay.storefront.checkout.fields.iban"|trans|sw_sanitize }} + * Date: Mon, 23 Jun 2025 11:36:30 +0200 Subject: [PATCH 2/5] RATEPAYSWSX-326: apply sw default convention --- src/Resources/app/storefront/src/scss/base.scss | 1 - .../src/scss/ratepay/common/_bank-account.scss | 9 --------- .../page/checkout/ratepay/common/bank-account.html.twig | 6 ++---- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss diff --git a/src/Resources/app/storefront/src/scss/base.scss b/src/Resources/app/storefront/src/scss/base.scss index b4150a9d..f2f1dc27 100644 --- a/src/Resources/app/storefront/src/scss/base.scss +++ b/src/Resources/app/storefront/src/scss/base.scss @@ -2,7 +2,6 @@ // // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -@import "ratepay/common/bank-account"; @import "ratepay/common/installment-calculator"; @import "ratepay/common/installment-plan"; @import "ratepay/installment-quick-info"; diff --git a/src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss b/src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss deleted file mode 100644 index 5ee15c9b..00000000 --- a/src/Resources/app/storefront/src/scss/ratepay/common/_bank-account.scss +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Ratepay GmbH -// -// For the full copyright and license information, please view the LICENSE -// file that was distributed with this source code. - -.mandatory-star { - color: #000000; - margin-left: .1rem; -} \ No newline at end of file diff --git a/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig b/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig index 29f55b11..f4b9973d 100644 --- a/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig +++ b/src/Resources/views/storefront/page/checkout/ratepay/common/bank-account.html.twig @@ -22,9 +22,8 @@
- * {% if ratepay.accountHolders|length == 1 %}
- * Date: Mon, 23 Jun 2025 11:45:59 +0200 Subject: [PATCH 3/5] RATEPAYSWSX-326: remove .idea folder --- .idea/.gitignore | 8 -------- .idea/vcs.xml | 4 ---- 2 files changed, 12 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index d843f340..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From dde772fc731d4ba2ec94d07b2c46f0fd7164a84d Mon Sep 17 00:00:00 2001 From: leandramasi Date: Wed, 10 Sep 2025 10:28:57 +0200 Subject: [PATCH 4/5] rerun failed job From 1511e75ad3a57a2b681099543340d7b5794292a1 Mon Sep 17 00:00:00 2001 From: leandramasi Date: Wed, 10 Sep 2025 10:32:52 +0200 Subject: [PATCH 5/5] run lint --- src/Components/Checkout/Service/DataValidationService.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Components/Checkout/Service/DataValidationService.php b/src/Components/Checkout/Service/DataValidationService.php index e182a913..a0e1b4d0 100644 --- a/src/Components/Checkout/Service/DataValidationService.php +++ b/src/Components/Checkout/Service/DataValidationService.php @@ -20,7 +20,6 @@ use Shopware\Core\Framework\Validation\DataValidationDefinition; use Shopware\Core\Framework\Validation\DataValidator; use Shopware\Core\System\SalesChannel\SalesChannelContext; -use Symfony\Component\HttpFoundation\ParameterBag; class DataValidationService {