- 8.9Fehlerbehebung
+ 8.8Fehlerbehebung
@@ -790,7 +771,7 @@ tail -f var/log/whitelabelname_payment*.log
- 8.10FAQs
+ 8.9FAQs
@@ -983,24 +964,19 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.
8.6
Tokenisierung
-
-
- 8.7
- Wiederkehrende Zahlungen
-
- 8.8
+ 8.7
Hauptfunktionen
- 8.9
+ 8.8
Fehlerbehebung
- 8.10
+ 8.9
FAQs
diff --git a/docs/de/resource/api-key.png b/docs/de/resource/api-key.png
deleted file mode 100644
index c74fe13..0000000
Binary files a/docs/de/resource/api-key.png and /dev/null differ
diff --git a/docs/de/resource/application-users.png b/docs/de/resource/application-users.png
deleted file mode 100644
index 51a97b9..0000000
Binary files a/docs/de/resource/application-users.png and /dev/null differ
diff --git a/docs/de/resource/assign-role.png b/docs/de/resource/assign-role.png
deleted file mode 100644
index 616a1dd..0000000
Binary files a/docs/de/resource/assign-role.png and /dev/null differ
diff --git a/docs/de/resource/bogus-processor.png b/docs/de/resource/bogus-processor.png
deleted file mode 100644
index db79bb1..0000000
Binary files a/docs/de/resource/bogus-processor.png and /dev/null differ
diff --git a/docs/de/resource/capture-transaction.png b/docs/de/resource/capture-transaction.png
deleted file mode 100644
index 5fb2044..0000000
Binary files a/docs/de/resource/capture-transaction.png and /dev/null differ
diff --git a/docs/de/resource/cc-disable.png b/docs/de/resource/cc-disable.png
deleted file mode 100644
index 88048c8..0000000
Binary files a/docs/de/resource/cc-disable.png and /dev/null differ
diff --git a/docs/de/resource/cc-enable.png b/docs/de/resource/cc-enable.png
deleted file mode 100644
index 9b7e655..0000000
Binary files a/docs/de/resource/cc-enable.png and /dev/null differ
diff --git a/docs/de/resource/connectors.png b/docs/de/resource/connectors.png
deleted file mode 100644
index 056a892..0000000
Binary files a/docs/de/resource/connectors.png and /dev/null differ
diff --git a/docs/de/resource/loading-roles.png b/docs/de/resource/loading-roles.png
deleted file mode 100644
index 5d0d501..0000000
Binary files a/docs/de/resource/loading-roles.png and /dev/null differ
diff --git a/docs/de/resource/name-processor.png b/docs/de/resource/name-processor.png
deleted file mode 100644
index d028107..0000000
Binary files a/docs/de/resource/name-processor.png and /dev/null differ
diff --git a/docs/de/resource/order-confirmation-email.png b/docs/de/resource/order-confirmation-email.png
deleted file mode 100644
index b7e8d57..0000000
Binary files a/docs/de/resource/order-confirmation-email.png and /dev/null differ
diff --git a/docs/de/resource/payment-method-configuration.png b/docs/de/resource/payment-method-configuration.png
deleted file mode 100644
index c84e6c0..0000000
Binary files a/docs/de/resource/payment-method-configuration.png and /dev/null differ
diff --git a/docs/de/resource/payment-methods.png b/docs/de/resource/payment-methods.png
deleted file mode 100644
index 4bbea90..0000000
Binary files a/docs/de/resource/payment-methods.png and /dev/null differ
diff --git a/docs/de/resource/payment-settings.png b/docs/de/resource/payment-settings.png
deleted file mode 100644
index bd758a5..0000000
Binary files a/docs/de/resource/payment-settings.png and /dev/null differ
diff --git a/docs/de/resource/plugin-configuration.png b/docs/de/resource/plugin-configuration.png
deleted file mode 100644
index 1fa6bd4..0000000
Binary files a/docs/de/resource/plugin-configuration.png and /dev/null differ
diff --git a/docs/de/resource/plugin-installation.png b/docs/de/resource/plugin-installation.png
deleted file mode 100644
index 5b32274..0000000
Binary files a/docs/de/resource/plugin-installation.png and /dev/null differ
diff --git a/docs/de/resource/refund-transaction.png b/docs/de/resource/refund-transaction.png
deleted file mode 100644
index a03d38c..0000000
Binary files a/docs/de/resource/refund-transaction.png and /dev/null differ
diff --git a/docs/de/resource/roles.png b/docs/de/resource/roles.png
deleted file mode 100644
index 6dd3548..0000000
Binary files a/docs/de/resource/roles.png and /dev/null differ
diff --git a/docs/de/resource/save-role.png b/docs/de/resource/save-role.png
deleted file mode 100644
index b5d30cb..0000000
Binary files a/docs/de/resource/save-role.png and /dev/null differ
diff --git a/docs/de/resource/shopware_6_stage_graph_delivery.svg b/docs/de/resource/shopware_6_stage_graph_delivery.svg
deleted file mode 100644
index 03e5a1d..0000000
--- a/docs/de/resource/shopware_6_stage_graph_delivery.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/de/resource/shopware_6_stage_graph_order.svg b/docs/de/resource/shopware_6_stage_graph_order.svg
deleted file mode 100644
index 89a9ea7..0000000
--- a/docs/de/resource/shopware_6_stage_graph_order.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/de/resource/state_graph_order.svg b/docs/de/resource/state_graph_order.svg
deleted file mode 100644
index 46dbc35..0000000
--- a/docs/de/resource/state_graph_order.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/docs/de/resource/state_graph_payment_state.svg b/docs/de/resource/state_graph_payment_state.svg
deleted file mode 100644
index d09a614..0000000
--- a/docs/de/resource/state_graph_payment_state.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/de/resource/token.png b/docs/de/resource/token.png
deleted file mode 100644
index 15be72e..0000000
Binary files a/docs/de/resource/token.png and /dev/null differ
diff --git a/docs/de/resource/user.png b/docs/de/resource/user.png
deleted file mode 100644
index 5673a04..0000000
Binary files a/docs/de/resource/user.png and /dev/null differ
diff --git a/docs/de/resource/void-transaction.png b/docs/de/resource/void-transaction.png
deleted file mode 100644
index 8037d28..0000000
Binary files a/docs/de/resource/void-transaction.png and /dev/null differ
diff --git a/docs/de/resource/webhook-listeners.png b/docs/de/resource/webhook-listeners.png
deleted file mode 100644
index 7b7f2b4..0000000
Binary files a/docs/de/resource/webhook-listeners.png and /dev/null differ
diff --git a/docs/de/resource/webhooks.png b/docs/de/resource/webhooks.png
deleted file mode 100644
index 27a58e1..0000000
Binary files a/docs/de/resource/webhooks.png and /dev/null differ
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index 01a0e55..90a3080 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -23,7 +23,7 @@
-
+
Source
@@ -50,13 +50,11 @@
-
Shopware Version: 6.5.x, 6.6.x or 6.7.x (see compatibility table).
+Shopware Version: 6.5.x or 6.6.x (see compatibility table).
PHP: Minimum version as required by your Shopware installation (e.g., 7.4+).
VR Payment Account: Obtain Space ID, User ID, and API Key from VR Payment Portal (see Portal Start-up Guide).
-
-
For using recurring payments, you also need Showpare Commercial package, which is a paid product.
@@ -79,16 +77,10 @@
-
-
Support Until
6.7.x
7.x.x
PHP 8.2 and 8.3
Ongoing
6.6.x
6.x.x
PHP 8.2 and 8.3
December 2025
Ongoing
6.5.x - Deprecated
-
-
- - 8.7Recurring payments
-
-
-
Shopware provides the package "Shopware Commercial" with additional features, among others, subscriptions. This plugin supports making payments that are suitable for subscriptions. As long as the payment method’s conector supports -tokenization, it can be used for subscriptions. The recurring payment is fully managed by Shopware Commercial plugin. Please refer to their documentation for more information.
-- 8.8Key Features
+ 8.7Key Features
@@ -765,15 +747,12 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
-
-
Automatic Updates: Payment methods sync dynamically via the VR Payment API.
Recurring payments: Make recurring payments with Subscriptions (Shopware Commercial) and VRPayment.
-- 8.9Troubleshooting
+ 8.8Troubleshooting
@@ -804,7 +783,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
- 8.10FAQs
+ 8.9FAQs
@@ -1000,24 +979,19 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
8.6
Tokenization
-
-
- 8.7
- Recurring payments
-
- 8.8
+ 8.7
Key Features
- 8.9
+ 8.8
Troubleshooting
- 8.10
+ 8.9
FAQs
diff --git a/docs/en/resource/api-key.png b/docs/en/resource/api-key.png
deleted file mode 100644
index c74fe13..0000000
Binary files a/docs/en/resource/api-key.png and /dev/null differ
diff --git a/docs/en/resource/application-users.png b/docs/en/resource/application-users.png
deleted file mode 100644
index 51a97b9..0000000
Binary files a/docs/en/resource/application-users.png and /dev/null differ
diff --git a/docs/en/resource/assign-role.png b/docs/en/resource/assign-role.png
deleted file mode 100644
index 616a1dd..0000000
Binary files a/docs/en/resource/assign-role.png and /dev/null differ
diff --git a/docs/en/resource/bogus-processor.png b/docs/en/resource/bogus-processor.png
deleted file mode 100644
index db79bb1..0000000
Binary files a/docs/en/resource/bogus-processor.png and /dev/null differ
diff --git a/docs/en/resource/capture-transaction.png b/docs/en/resource/capture-transaction.png
deleted file mode 100644
index 5fb2044..0000000
Binary files a/docs/en/resource/capture-transaction.png and /dev/null differ
diff --git a/docs/en/resource/cc-disable.png b/docs/en/resource/cc-disable.png
deleted file mode 100644
index 88048c8..0000000
Binary files a/docs/en/resource/cc-disable.png and /dev/null differ
diff --git a/docs/en/resource/cc-enable.png b/docs/en/resource/cc-enable.png
deleted file mode 100644
index 9b7e655..0000000
Binary files a/docs/en/resource/cc-enable.png and /dev/null differ
diff --git a/docs/en/resource/connectors.png b/docs/en/resource/connectors.png
deleted file mode 100644
index 056a892..0000000
Binary files a/docs/en/resource/connectors.png and /dev/null differ
diff --git a/docs/en/resource/loading-roles.png b/docs/en/resource/loading-roles.png
deleted file mode 100644
index 5d0d501..0000000
Binary files a/docs/en/resource/loading-roles.png and /dev/null differ
diff --git a/docs/en/resource/name-processor.png b/docs/en/resource/name-processor.png
deleted file mode 100644
index d028107..0000000
Binary files a/docs/en/resource/name-processor.png and /dev/null differ
diff --git a/docs/en/resource/order-confirmation-email.png b/docs/en/resource/order-confirmation-email.png
deleted file mode 100644
index b7e8d57..0000000
Binary files a/docs/en/resource/order-confirmation-email.png and /dev/null differ
diff --git a/docs/en/resource/payment-method-configuration.png b/docs/en/resource/payment-method-configuration.png
deleted file mode 100644
index c84e6c0..0000000
Binary files a/docs/en/resource/payment-method-configuration.png and /dev/null differ
diff --git a/docs/en/resource/payment-methods.png b/docs/en/resource/payment-methods.png
deleted file mode 100644
index 4bbea90..0000000
Binary files a/docs/en/resource/payment-methods.png and /dev/null differ
diff --git a/docs/en/resource/payment-settings.png b/docs/en/resource/payment-settings.png
deleted file mode 100644
index bd758a5..0000000
Binary files a/docs/en/resource/payment-settings.png and /dev/null differ
diff --git a/docs/en/resource/plugin-configuration.png b/docs/en/resource/plugin-configuration.png
deleted file mode 100644
index 1fa6bd4..0000000
Binary files a/docs/en/resource/plugin-configuration.png and /dev/null differ
diff --git a/docs/en/resource/plugin-installation.png b/docs/en/resource/plugin-installation.png
deleted file mode 100644
index 5b32274..0000000
Binary files a/docs/en/resource/plugin-installation.png and /dev/null differ
diff --git a/docs/en/resource/refund-transaction.png b/docs/en/resource/refund-transaction.png
deleted file mode 100644
index a03d38c..0000000
Binary files a/docs/en/resource/refund-transaction.png and /dev/null differ
diff --git a/docs/en/resource/roles.png b/docs/en/resource/roles.png
deleted file mode 100644
index 6dd3548..0000000
Binary files a/docs/en/resource/roles.png and /dev/null differ
diff --git a/docs/en/resource/save-role.png b/docs/en/resource/save-role.png
deleted file mode 100644
index b5d30cb..0000000
Binary files a/docs/en/resource/save-role.png and /dev/null differ
diff --git a/docs/en/resource/shopware_6_stage_graph_delivery.svg b/docs/en/resource/shopware_6_stage_graph_delivery.svg
deleted file mode 100644
index 03e5a1d..0000000
--- a/docs/en/resource/shopware_6_stage_graph_delivery.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/en/resource/shopware_6_stage_graph_order.svg b/docs/en/resource/shopware_6_stage_graph_order.svg
deleted file mode 100644
index 89a9ea7..0000000
--- a/docs/en/resource/shopware_6_stage_graph_order.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/en/resource/state_graph_order.svg b/docs/en/resource/state_graph_order.svg
deleted file mode 100644
index 46dbc35..0000000
--- a/docs/en/resource/state_graph_order.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/docs/en/resource/state_graph_payment_state.svg b/docs/en/resource/state_graph_payment_state.svg
deleted file mode 100644
index d09a614..0000000
--- a/docs/en/resource/state_graph_payment_state.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/en/resource/token.png b/docs/en/resource/token.png
deleted file mode 100644
index 15be72e..0000000
Binary files a/docs/en/resource/token.png and /dev/null differ
diff --git a/docs/en/resource/user.png b/docs/en/resource/user.png
deleted file mode 100644
index 5673a04..0000000
Binary files a/docs/en/resource/user.png and /dev/null differ
diff --git a/docs/en/resource/void-transaction.png b/docs/en/resource/void-transaction.png
deleted file mode 100644
index 8037d28..0000000
Binary files a/docs/en/resource/void-transaction.png and /dev/null differ
diff --git a/docs/en/resource/webhook-listeners.png b/docs/en/resource/webhook-listeners.png
deleted file mode 100644
index 7b7f2b4..0000000
Binary files a/docs/en/resource/webhook-listeners.png and /dev/null differ
diff --git a/docs/en/resource/webhooks.png b/docs/en/resource/webhooks.png
deleted file mode 100644
index 27a58e1..0000000
Binary files a/docs/en/resource/webhooks.png and /dev/null differ
diff --git a/docs/fr/documentation.html b/docs/fr/documentation.html
index ead0cae..1d72dcc 100644
--- a/docs/fr/documentation.html
+++ b/docs/fr/documentation.html
@@ -23,7 +23,7 @@
-
+
Source
@@ -50,7 +50,7 @@
-
Shopware Version: 6.5.x, 6.6.x or 6.7.x (voir tableau de compatibilité).
+Shopware Version: 6.5.x or 6.6.x (voir tableau de compatibilité).
PHP: Version minimale requise pour votre installation Shopware (e.g., 7.4+).
@@ -71,28 +71,22 @@
-
-
-
-
@@ -711,19 +705,10 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
Version Shopware
Version du Plugin
Version PHP
Support jusqu’à
6.7.x
7.x.x
PHP 8.2 et 8.3
En cours
Shopware Version
Plugin Version
PHP Version
Support Until
6.6.x
6.x.x
PHP 8.2 et 8.3
Décembre 2025
PHP 8.2 and 8.3
En cours
6.5.x – Obsolète
6.5.x - Deprecated
5.x.x
PHP 8.2 et 8.3
Octobre 2024
PHP 8.2 and 8.3
October 2024
-
-
- - 8.7Paiements récurrents
-
-
-
Shopware fournit le package "Shopware Commercial" avec des fonctionnalités supplémentaires, entre autres, les abonnements. Ce plugin prend en charge les paiements adaptés aux abonnements. Tant que le connecteur de la méthode de paiement prend en charge la tokenisation, il peut être utilisé pour les abonnements. Le paiement récurrent est entièrement géré par le plugin Shopware Commercial. Veuillez vous référer à leur documentation pour plus d’informations.
-- 8.8Caractéristiques Pricinpales
+ 8.7Caractéristiques Pricinpales
@@ -740,15 +725,12 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
-
-
Mises à jour automatiques: Les méthodes de paiement se synchronisent dynamiquement via l’API Wallee.
Paiements récurrents: Effectuez des paiements récurrents avec les abonnements (Shopware Commercial) et VRPayment.
-- 8.9Troubleshooting
+ 8.8Troubleshooting
@@ -779,7 +761,7 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
- 8.10FAQs
+ 8.9FAQs
@@ -971,24 +953,19 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.
8.6
Tokenisation
-
-
- 8.7
- Paiements récurrents
-
- 8.8
+ 8.7
Caractéristiques Pricinpales
- 8.9
+ 8.8
Troubleshooting
- 8.10
+ 8.9
FAQs
diff --git a/docs/fr/resource/api-key.png b/docs/fr/resource/api-key.png
deleted file mode 100644
index c74fe13..0000000
Binary files a/docs/fr/resource/api-key.png and /dev/null differ
diff --git a/docs/fr/resource/application-users.png b/docs/fr/resource/application-users.png
deleted file mode 100644
index 51a97b9..0000000
Binary files a/docs/fr/resource/application-users.png and /dev/null differ
diff --git a/docs/fr/resource/assign-role.png b/docs/fr/resource/assign-role.png
deleted file mode 100644
index 616a1dd..0000000
Binary files a/docs/fr/resource/assign-role.png and /dev/null differ
diff --git a/docs/fr/resource/bogus-processor.png b/docs/fr/resource/bogus-processor.png
deleted file mode 100644
index db79bb1..0000000
Binary files a/docs/fr/resource/bogus-processor.png and /dev/null differ
diff --git a/docs/fr/resource/capture-transaction.png b/docs/fr/resource/capture-transaction.png
deleted file mode 100644
index 5fb2044..0000000
Binary files a/docs/fr/resource/capture-transaction.png and /dev/null differ
diff --git a/docs/fr/resource/cc-disable.png b/docs/fr/resource/cc-disable.png
deleted file mode 100644
index 88048c8..0000000
Binary files a/docs/fr/resource/cc-disable.png and /dev/null differ
diff --git a/docs/fr/resource/cc-enable.png b/docs/fr/resource/cc-enable.png
deleted file mode 100644
index 9b7e655..0000000
Binary files a/docs/fr/resource/cc-enable.png and /dev/null differ
diff --git a/docs/fr/resource/connectors.png b/docs/fr/resource/connectors.png
deleted file mode 100644
index 056a892..0000000
Binary files a/docs/fr/resource/connectors.png and /dev/null differ
diff --git a/docs/fr/resource/loading-roles.png b/docs/fr/resource/loading-roles.png
deleted file mode 100644
index 5d0d501..0000000
Binary files a/docs/fr/resource/loading-roles.png and /dev/null differ
diff --git a/docs/fr/resource/name-processor.png b/docs/fr/resource/name-processor.png
deleted file mode 100644
index d028107..0000000
Binary files a/docs/fr/resource/name-processor.png and /dev/null differ
diff --git a/docs/fr/resource/order-confirmation-email.png b/docs/fr/resource/order-confirmation-email.png
deleted file mode 100644
index b7e8d57..0000000
Binary files a/docs/fr/resource/order-confirmation-email.png and /dev/null differ
diff --git a/docs/fr/resource/payment-method-configuration.png b/docs/fr/resource/payment-method-configuration.png
deleted file mode 100644
index c84e6c0..0000000
Binary files a/docs/fr/resource/payment-method-configuration.png and /dev/null differ
diff --git a/docs/fr/resource/payment-methods.png b/docs/fr/resource/payment-methods.png
deleted file mode 100644
index 4bbea90..0000000
Binary files a/docs/fr/resource/payment-methods.png and /dev/null differ
diff --git a/docs/fr/resource/payment-settings.png b/docs/fr/resource/payment-settings.png
deleted file mode 100644
index bd758a5..0000000
Binary files a/docs/fr/resource/payment-settings.png and /dev/null differ
diff --git a/docs/fr/resource/plugin-configuration.png b/docs/fr/resource/plugin-configuration.png
deleted file mode 100644
index 1fa6bd4..0000000
Binary files a/docs/fr/resource/plugin-configuration.png and /dev/null differ
diff --git a/docs/fr/resource/plugin-installation.png b/docs/fr/resource/plugin-installation.png
deleted file mode 100644
index 5b32274..0000000
Binary files a/docs/fr/resource/plugin-installation.png and /dev/null differ
diff --git a/docs/fr/resource/refund-transaction.png b/docs/fr/resource/refund-transaction.png
deleted file mode 100644
index a03d38c..0000000
Binary files a/docs/fr/resource/refund-transaction.png and /dev/null differ
diff --git a/docs/fr/resource/roles.png b/docs/fr/resource/roles.png
deleted file mode 100644
index 6dd3548..0000000
Binary files a/docs/fr/resource/roles.png and /dev/null differ
diff --git a/docs/fr/resource/save-role.png b/docs/fr/resource/save-role.png
deleted file mode 100644
index b5d30cb..0000000
Binary files a/docs/fr/resource/save-role.png and /dev/null differ
diff --git a/docs/fr/resource/shopware_6_stage_graph_delivery.svg b/docs/fr/resource/shopware_6_stage_graph_delivery.svg
deleted file mode 100644
index 03e5a1d..0000000
--- a/docs/fr/resource/shopware_6_stage_graph_delivery.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/fr/resource/shopware_6_stage_graph_order.svg b/docs/fr/resource/shopware_6_stage_graph_order.svg
deleted file mode 100644
index 89a9ea7..0000000
--- a/docs/fr/resource/shopware_6_stage_graph_order.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/fr/resource/state_graph_order.svg b/docs/fr/resource/state_graph_order.svg
deleted file mode 100644
index 46dbc35..0000000
--- a/docs/fr/resource/state_graph_order.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/docs/fr/resource/state_graph_payment_state.svg b/docs/fr/resource/state_graph_payment_state.svg
deleted file mode 100644
index d09a614..0000000
--- a/docs/fr/resource/state_graph_payment_state.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/fr/resource/token.png b/docs/fr/resource/token.png
deleted file mode 100644
index 15be72e..0000000
Binary files a/docs/fr/resource/token.png and /dev/null differ
diff --git a/docs/fr/resource/user.png b/docs/fr/resource/user.png
deleted file mode 100644
index 5673a04..0000000
Binary files a/docs/fr/resource/user.png and /dev/null differ
diff --git a/docs/fr/resource/void-transaction.png b/docs/fr/resource/void-transaction.png
deleted file mode 100644
index 8037d28..0000000
Binary files a/docs/fr/resource/void-transaction.png and /dev/null differ
diff --git a/docs/fr/resource/webhook-listeners.png b/docs/fr/resource/webhook-listeners.png
deleted file mode 100644
index 7b7f2b4..0000000
Binary files a/docs/fr/resource/webhook-listeners.png and /dev/null differ
diff --git a/docs/fr/resource/webhooks.png b/docs/fr/resource/webhooks.png
deleted file mode 100644
index 27a58e1..0000000
Binary files a/docs/fr/resource/webhooks.png and /dev/null differ
diff --git a/docs/it/documentation.html b/docs/it/documentation.html
index 59bb277..e9d8543 100644
--- a/docs/it/documentation.html
+++ b/docs/it/documentation.html
@@ -23,7 +23,7 @@
-
+
Source
@@ -50,7 +50,7 @@
-
Versione di Shopware: 6.5.x, 6.6.x o 6.7.x (vedere la tabella di compatibilità).
+Versione di Shopware: 6.5.x o 6.6.x (vedere la tabella di compatibilità).
PHP: Versione minima richiesta dalla vostra installazione di Shopware (ad es. 7.4+).
@@ -71,28 +71,22 @@
-
-
-
-
@@ -718,19 +712,10 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
Versione Shopware
Versione Plugin
Versione PHP
Supporto fino a
6.7.x
7.x.x
PHP 8.2 e 8.3
In corso
Shopware Version
Plugin Version
PHP Version
Support Until
6.6.x
6.x.x
PHP 8.2 e 8.3
Dicembre 2025
PHP 8.2 and 8.3
Ongoing
6.5.x – Deprecato
6.5.x - Deprecated
5.x.x
PHP 8.2 e 8.3
Ottobre 2024
PHP 8.2 and 8.3
October 2024
-
-
- - 8.7Pagamenti ricorrenti
-
-
-
Shopware fornisce il pacchetto "Shopware Commercial" con funzionalità aggiuntive, tra cui gli abbonamenti. Questo plugin supporta l’esecuzione di pagamenti adatti per gli abbonamenti. Finché il connettore del metodo di pagamento supporta la tokenizzazione, può essere utilizzato per gli abbonamenti. Il pagamento ricorrente è completamente gestito dal plugin Shopware Commercial. Si prega di fare riferimento alla loro documentazione per maggiori informazioni.
-- 8.8Key Features
+ 8.7Key Features
@@ -747,15 +732,12 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
-
-
Automatic Updates: I metodi di pagamento si sincronizzano dinamicamente tramite l’API VR Payment.
Pagamenti ricorrenti: Effettua pagamenti ricorrenti con Abbonamenti (Shopware Commercial) e VRPayment.
-- 8.9Risoluzione dei Problemi
+ 8.8Risoluzione dei Problemi
@@ -786,7 +768,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
- 8.10FAQs
+ 8.9FAQs
@@ -982,24 +964,19 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
8.6
Tokenization
-
-
- 8.7
- Pagamenti ricorrenti
-
- 8.8
+ 8.7
Key Features
- 8.9
+ 8.8
Risoluzione dei Problemi
- 8.10
+ 8.9
FAQs
diff --git a/docs/it/resource/api-key.png b/docs/it/resource/api-key.png
deleted file mode 100644
index c74fe13..0000000
Binary files a/docs/it/resource/api-key.png and /dev/null differ
diff --git a/docs/it/resource/application-users.png b/docs/it/resource/application-users.png
deleted file mode 100644
index 51a97b9..0000000
Binary files a/docs/it/resource/application-users.png and /dev/null differ
diff --git a/docs/it/resource/assign-role.png b/docs/it/resource/assign-role.png
deleted file mode 100644
index 616a1dd..0000000
Binary files a/docs/it/resource/assign-role.png and /dev/null differ
diff --git a/docs/it/resource/bogus-processor.png b/docs/it/resource/bogus-processor.png
deleted file mode 100644
index db79bb1..0000000
Binary files a/docs/it/resource/bogus-processor.png and /dev/null differ
diff --git a/docs/it/resource/capture-transaction.png b/docs/it/resource/capture-transaction.png
deleted file mode 100644
index 5fb2044..0000000
Binary files a/docs/it/resource/capture-transaction.png and /dev/null differ
diff --git a/docs/it/resource/cc-disable.png b/docs/it/resource/cc-disable.png
deleted file mode 100644
index 88048c8..0000000
Binary files a/docs/it/resource/cc-disable.png and /dev/null differ
diff --git a/docs/it/resource/cc-enable.png b/docs/it/resource/cc-enable.png
deleted file mode 100644
index 9b7e655..0000000
Binary files a/docs/it/resource/cc-enable.png and /dev/null differ
diff --git a/docs/it/resource/connectors.png b/docs/it/resource/connectors.png
deleted file mode 100644
index 056a892..0000000
Binary files a/docs/it/resource/connectors.png and /dev/null differ
diff --git a/docs/it/resource/loading-roles.png b/docs/it/resource/loading-roles.png
deleted file mode 100644
index 5d0d501..0000000
Binary files a/docs/it/resource/loading-roles.png and /dev/null differ
diff --git a/docs/it/resource/name-processor.png b/docs/it/resource/name-processor.png
deleted file mode 100644
index d028107..0000000
Binary files a/docs/it/resource/name-processor.png and /dev/null differ
diff --git a/docs/it/resource/order-confirmation-email.png b/docs/it/resource/order-confirmation-email.png
deleted file mode 100644
index b7e8d57..0000000
Binary files a/docs/it/resource/order-confirmation-email.png and /dev/null differ
diff --git a/docs/it/resource/payment-method-configuration.png b/docs/it/resource/payment-method-configuration.png
deleted file mode 100644
index c84e6c0..0000000
Binary files a/docs/it/resource/payment-method-configuration.png and /dev/null differ
diff --git a/docs/it/resource/payment-methods.png b/docs/it/resource/payment-methods.png
deleted file mode 100644
index 4bbea90..0000000
Binary files a/docs/it/resource/payment-methods.png and /dev/null differ
diff --git a/docs/it/resource/payment-settings.png b/docs/it/resource/payment-settings.png
deleted file mode 100644
index bd758a5..0000000
Binary files a/docs/it/resource/payment-settings.png and /dev/null differ
diff --git a/docs/it/resource/plugin-configuration.png b/docs/it/resource/plugin-configuration.png
deleted file mode 100644
index 1fa6bd4..0000000
Binary files a/docs/it/resource/plugin-configuration.png and /dev/null differ
diff --git a/docs/it/resource/plugin-installation.png b/docs/it/resource/plugin-installation.png
deleted file mode 100644
index 5b32274..0000000
Binary files a/docs/it/resource/plugin-installation.png and /dev/null differ
diff --git a/docs/it/resource/refund-transaction.png b/docs/it/resource/refund-transaction.png
deleted file mode 100644
index a03d38c..0000000
Binary files a/docs/it/resource/refund-transaction.png and /dev/null differ
diff --git a/docs/it/resource/roles.png b/docs/it/resource/roles.png
deleted file mode 100644
index 6dd3548..0000000
Binary files a/docs/it/resource/roles.png and /dev/null differ
diff --git a/docs/it/resource/save-role.png b/docs/it/resource/save-role.png
deleted file mode 100644
index b5d30cb..0000000
Binary files a/docs/it/resource/save-role.png and /dev/null differ
diff --git a/docs/it/resource/shopware_6_stage_graph_delivery.svg b/docs/it/resource/shopware_6_stage_graph_delivery.svg
deleted file mode 100644
index 03e5a1d..0000000
--- a/docs/it/resource/shopware_6_stage_graph_delivery.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/it/resource/shopware_6_stage_graph_order.svg b/docs/it/resource/shopware_6_stage_graph_order.svg
deleted file mode 100644
index 89a9ea7..0000000
--- a/docs/it/resource/shopware_6_stage_graph_order.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/it/resource/state_graph_order.svg b/docs/it/resource/state_graph_order.svg
deleted file mode 100644
index 46dbc35..0000000
--- a/docs/it/resource/state_graph_order.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/docs/it/resource/state_graph_payment_state.svg b/docs/it/resource/state_graph_payment_state.svg
deleted file mode 100644
index d09a614..0000000
--- a/docs/it/resource/state_graph_payment_state.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/it/resource/token.png b/docs/it/resource/token.png
deleted file mode 100644
index 15be72e..0000000
Binary files a/docs/it/resource/token.png and /dev/null differ
diff --git a/docs/it/resource/user.png b/docs/it/resource/user.png
deleted file mode 100644
index 5673a04..0000000
Binary files a/docs/it/resource/user.png and /dev/null differ
diff --git a/docs/it/resource/void-transaction.png b/docs/it/resource/void-transaction.png
deleted file mode 100644
index 8037d28..0000000
Binary files a/docs/it/resource/void-transaction.png and /dev/null differ
diff --git a/docs/it/resource/webhook-listeners.png b/docs/it/resource/webhook-listeners.png
deleted file mode 100644
index 7b7f2b4..0000000
Binary files a/docs/it/resource/webhook-listeners.png and /dev/null differ
diff --git a/docs/it/resource/webhooks.png b/docs/it/resource/webhooks.png
deleted file mode 100644
index 27a58e1..0000000
Binary files a/docs/it/resource/webhooks.png and /dev/null differ
diff --git a/src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php b/src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php
index 60ec19b..508f807 100644
--- a/src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php
+++ b/src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php
@@ -499,7 +499,6 @@ class PaymentMethodConfigurationService {
'afterOrderEnabled' => true,
'active' => true,
'translations' => $this->getPaymentMethodConfigurationTranslation($paymentMethodConfiguration, $context),
- 'technicalName' => $paymentMethodConfiguration->getName(),
];
$data['mediaId'] = $this->upsertMedia($id, $paymentMethodConfiguration, $context);
diff --git a/src/Core/Api/Refund/Controller/RefundController.php b/src/Core/Api/Refund/Controller/RefundController.php
index b6b8661..0133c85 100644
--- a/src/Core/Api/Refund/Controller/RefundController.php
+++ b/src/Core/Api/Refund/Controller/RefundController.php
@@ -115,11 +115,7 @@ class RefundController extends AbstractController
$apiClient = $settings->getApiClient();
$transaction = $apiClient->getTransactionService()->read($settings->getSpaceId(), $transactionId);
- $refund = $this->refundService->createRefundByAmount($transaction, $refundableAmount, $context);
-
- if ($refund === null) {
- return new Response('refundExceedsAmount', Response::HTTP_BAD_REQUEST);
- }
+ $this->refundService->createRefundByAmount($transaction, $refundableAmount, $context);
return new Response(null, Response::HTTP_NO_CONTENT);
}
diff --git a/src/Core/Api/Transaction/Service/TransactionService.php b/src/Core/Api/Transaction/Service/TransactionService.php
index f8ea0dd..64f4754 100644
--- a/src/Core/Api/Transaction/Service/TransactionService.php
+++ b/src/Core/Api/Transaction/Service/TransactionService.php
@@ -8,7 +8,7 @@ use Shopware\Core\{
Checkout\Cart\CartException,
Checkout\Cart\LineItem\LineItem,
Checkout\Order\OrderEntity,
- Checkout\Payment\Cart\PaymentTransactionStruct,
+ Checkout\Payment\Cart\AsyncPaymentTransactionStruct,
Framework\Context,
Framework\DataAbstractionLayer\Search\Criteria,
Framework\DataAbstractionLayer\Search\Filter\EqualsFilter,
@@ -16,23 +16,22 @@ use Shopware\Core\{
};
use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use VRPayment\Sdk\Model\{
- AddressCreate,
- ChargeAttempt,
- CreationEntityState,
- CriteriaOperator,
- EntityQuery,
- EntityQueryFilter,
- EntityQueryFilterType,
- Gender,
- LineItemAttributeCreate,
- LineItemCreate,
- LineItemType,
- TokenizationMode,
- Transaction,
- TransactionCreate,
- TransactionPending,
- TransactionState,
+use VRPayment\Sdk\{
+ Model\AddressCreate,
+ Model\ChargeAttempt,
+ Model\CreationEntityState,
+ Model\CriteriaOperator,
+ Model\EntityQuery,
+ Model\EntityQueryFilter,
+ Model\EntityQueryFilterType,
+ Model\Gender,
+ Model\LineItemAttributeCreate,
+ Model\LineItemCreate,
+ Model\LineItemType,
+ Model\Transaction,
+ Model\TransactionCreate,
+ Model\TransactionPending,
+ Model\TransactionState,
};
use VRPaymentPayment\Core\{
Api\OrderDeliveryState\Handler\OrderDeliveryStateHandler,
@@ -116,7 +115,7 @@ class TransactionService
*
* A redirect to the url will be performed
*
- * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
+ * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
*
* @return string
@@ -125,14 +124,10 @@ class TransactionService
* @throws \VRPayment\Sdk\VersioningException
*/
public function create(
- PaymentTransactionStruct $transaction,
- SalesChannelContext $salesChannelContext
+ AsyncPaymentTransactionStruct $transaction,
+ SalesChannelContext $salesChannelContext
): string
{
- $criteria = new Criteria([$transaction->getOrderTransactionId()]);
- $criteria->addAssociation('order');
- $orderTransaction = $this->container->get('order_transaction.repository')->search($criteria, $salesChannelContext->getContext())->first();
-
$salesChannelId = $salesChannelContext->getSalesChannel()->getId();
$settings = $this->settingsService->getSettings($salesChannelId);
$apiClient = $settings->getApiClient();
@@ -170,7 +165,7 @@ class TransactionService
$redirectUrl = $this->container->get('router')->generate(
'frontend.vrpayment.checkout.pay',
- ['orderId' => $orderTransaction->getOrder()->getId(),],
+ ['orderId' => $transaction->getOrder()->getId(),],
UrlGeneratorInterface::ABSOLUTE_URL
);
@@ -182,8 +177,8 @@ class TransactionService
$this->upsert(
$createdTransaction,
$salesChannelContext->getContext(),
- $orderTransaction->getPaymentMethodId(),
- $orderTransaction->getOrder()->getSalesChannelId()
+ $transaction->getOrderTransaction()->getPaymentMethodId(),
+ $transaction->getOrder()->getSalesChannelId()
);
$_SESSION['transactionId'] = null;
$_SESSION['arrayOfPossibleMethods'] = null;
@@ -191,45 +186,26 @@ class TransactionService
$_SESSION['currencyCheck'] = null;
- $this->holdDelivery($orderTransaction->getOrder()->getId(), $salesChannelContext->getContext());
+ $this->holdDelivery($transaction->getOrder()->getId(), $salesChannelContext->getContext());
return $redirectUrl;
}
/**
- * Creates the transaction in the portal using the SDK.
- *
- * @return void
- */
- public function createRecurringTransaction(TransactionCreate $sdkTransactionCreate, string $spaceId = ""): Transaction {
- $settings = $this->settingsService->getSettings();
- if (empty($spaceId)) {
- $spaceId = $settings->getSpaceId();
- }
-
- $sdkTransaction = $settings->getApiClient()->getTransactionService()->create($spaceId, $sdkTransactionCreate);
- if ($sdkTransaction->valid()) {
- return $settings->getApiClient()->getTransactionService()->processWithoutUserInteraction($spaceId, $sdkTransaction->getId());
- }
-
- throw new \Exception("The transacion is not valid and could not be created.");
- }
-
- /**
- * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
+ * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
* @param \Shopware\Core\Framework\Context $context
* @param int $vrpaymentTransactionId
* @param int $spaceId
*/
protected function addVRPaymentTransactionId(
- PaymentTransactionStruct $transaction,
+ AsyncPaymentTransactionStruct $transaction,
Context $context,
int $vrpaymentTransactionId,
int $spaceId
): void
{
$data = [
- 'id' => $transaction->getOrderTransactionId(),
+ 'id' => $transaction->getOrderTransaction()->getId(),
'customFields' => [
TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TRANSACTION_ID => $vrpaymentTransactionId,
TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_SPACE_ID => $spaceId,
@@ -367,7 +343,7 @@ class TransactionService
*
* @return \Shopware\Core\Checkout\Order\OrderEntity
*/
- protected function getOrderEntity(string $orderId, Context $context): OrderEntity
+ private function getOrderEntity(string $orderId, Context $context): OrderEntity
{
try {
$criteria = (new Criteria([$orderId]))->addAssociations(['deliveries']);
@@ -411,7 +387,7 @@ class TransactionService
* @throws \VRPayment\Sdk\Http\ConnectionException
* @throws \VRPayment\Sdk\VersioningException
*/
- public function read(int $transactionId, string $salesChannelId = ""): Transaction
+ public function read(int $transactionId, string $salesChannelId): Transaction
{
$settings = $this->settingsService->getSettings($salesChannelId);
return $settings->getApiClient()->getTransactionService()->read($settings->getSpaceId(), $transactionId);
@@ -618,8 +594,7 @@ class TransactionService
->setCustomerEmailAddress($customer->getEmail())
->setCustomerId($customerId)
->setSuccessUrl($homeUrl . '?success')
- ->setFailedUrl($homeUrl . '?fail')
- ->setTokenizationMode(TokenizationMode::FORCE_CREATION);
+ ->setFailedUrl($homeUrl . '?fail');
$transactionService = $settings->getApiClient()->getTransactionService();
$transaction = $transactionService->create($settings->getSpaceId(), $transactionPayload);
diff --git a/src/Core/Api/WebHooks/Strategy/WebHookTransactionStrategy.php b/src/Core/Api/WebHooks/Strategy/WebHookTransactionStrategy.php
index f0b75f7..a100f45 100644
--- a/src/Core/Api/WebHooks/Strategy/WebHookTransactionStrategy.php
+++ b/src/Core/Api/WebHooks/Strategy/WebHookTransactionStrategy.php
@@ -9,13 +9,12 @@ use Shopware\Core\{
Checkout\Cart\CartException,
Framework\Context,
System\StateMachine\Exception\IllegalTransitionException};
-use VRPayment\Sdk\Model\{
- RefundState,
- Transaction,
- TransactionInvoiceState,
- TransactionState,
- TransactionInvoice,
- Token};
+use VRPayment\Sdk\{
+ Model\RefundState,
+ Model\Transaction,
+ Model\TransactionInvoiceState,
+ Model\TransactionState,
+ Model\TransactionInvoice,};
use VRPaymentPayment\Core\{
Api\WebHooks\Service\WebHooksService,
Api\WebHooks\Struct\WebHookRequest,
@@ -52,7 +51,7 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
* @throws \VRPayment\Sdk\Http\ConnectionException ConnectionException.
* @throws \VRPayment\Sdk\VersioningException VersioningException.
*/
- public function getTransaction(WebHookRequest $request): Transaction {
+ public function getTransaction(WebHookRequest $request) {
return $this->settings->getApiClient()
->getTransactionService()
->read($request->getSpaceId(), $request->getEntityId());
@@ -61,7 +60,7 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
/**
* @inheritDoc
*/
- public function getOrderIdByTransaction(Transaction $transaction): string
+ public function getOrderIdByTransaction($transaction): string
{
/** @var \VRPayment\Sdk\Model\Transaction $transaction */
return $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
@@ -97,7 +96,7 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
*/
public function process(WebHookRequest $request): Response
{
- return $this->processTransaction($request, $this->getContext());
+ return $this->updateTransaction($request, $this->getContext());
}
/**
@@ -108,17 +107,16 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
* @param Context $context The operational context providing settings and environment for transaction processing.
* @return Response Returns a JSON response indicating the result of the transaction update operation.
*/
- private function processTransaction(WebHookRequest $request, Context $context): Response
+ private function updateTransaction(WebHookRequest $request, Context $context): Response
{
$status = Response::HTTP_UNPROCESSABLE_ENTITY;
try {
/** @var \Shopware\Core\Checkout\Order\OrderEntity $order */
$transaction = $this->getTransaction($request);
- $token = $transaction->getToken();
- $orderId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
- if (!empty($orderId) && !$transaction->getParent()) {
- $this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context, $request, $token) {
+ $orderId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
+ if(!empty($orderId) && !$transaction->getParent()) {
+ $this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context, $request) {
$this->transactionService->upsert($transaction, $context);
$orderTransactionId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
$orderTransaction = $this->getOrderTransaction($orderId, $context);
@@ -145,16 +143,6 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
$this->unholdDelivery($orderId, $context);
break;
case TransactionState::AUTHORIZED:
- if ($token instanceof Token) {
- // Update orderTransaction with the authorized token:
- $data = [
- 'id' => $orderTransactionId,
- 'customFields' => [
- TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TOKEN => $token->getId(),
- ],
- ];
- $this->container->get('order_transaction.repository')->update([$data], $context);
- }
$this->orderTransactionStateHandler->process($orderTransactionId, $context);
$this->sendEmail($transaction, $context, $orderId);
break;
diff --git a/src/Core/Api/WebHooks/Strategy/WebhookStrategyActionsInterface.php b/src/Core/Api/WebHooks/Strategy/WebhookStrategyActionsInterface.php
index 250db67..a2e25de 100644
--- a/src/Core/Api/WebHooks/Strategy/WebhookStrategyActionsInterface.php
+++ b/src/Core/Api/WebHooks/Strategy/WebhookStrategyActionsInterface.php
@@ -57,5 +57,5 @@ interface WebhookStrategyActionsInterface {
* @param Transaction|TransactionInvoiceState|Refund|mixed $transaction The transaction object from which the order ID should be extracted.
* @return string The order ID as a string.
*/
- public function getOrderIdByTransaction(Transaction $transaction): string;
+ public function getOrderIdByTransaction($transaction): string;
}
diff --git a/src/Core/Checkout/Cart/CustomCartPersister.php b/src/Core/Checkout/Cart/CustomCartPersister.php
deleted file mode 100644
index 584dd1e..0000000
--- a/src/Core/Checkout/Cart/CustomCartPersister.php
+++ /dev/null
@@ -1,59 +0,0 @@
-inner = $inner;
- }
-
- public function delete(string $token, SalesChannelContext $context): void
- {
- if (!$context->getContext()->hasState('do-cart-delete') && $this->isWhiteLabelPayment($context)) {
- return;
- }
-
- $this->inner->delete($token, $context);
- }
-
- public function load(string $token, SalesChannelContext $context): Cart
- {
- return $this->inner->load($token, $context);
- }
-
- public function save(Cart $cart, SalesChannelContext $context): void
- {
- $this->inner->save($cart, $context);
- }
-
- public function replace(string $oldToken, string $newToken, SalesChannelContext $context): void
- {
- $this->inner->replace($oldToken, $newToken, $context);
- }
-
- public function getDecorated(): AbstractCartPersister
- {
- return $this->inner;
- }
-
- private function isWhiteLabelPayment(SalesChannelContext $context): bool
- {
- $paymentMethod = $context->getPaymentMethod();
-
- if (!$paymentMethod instanceof PaymentMethodEntity) {
- return false;
- }
-
- return $paymentMethod->getHandlerIdentifier() === VRPaymentPaymentHandler::class;
- }
-}
diff --git a/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php b/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php
index fd8c9bb..669ad23 100644
--- a/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php
+++ b/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php
@@ -4,42 +4,22 @@ namespace VRPaymentPayment\Core\Checkout\PaymentHandler;
use Psr\Log\LoggerInterface;
use Shopware\Core\{
- Checkout\Order\OrderEntity,
- Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity,
Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler,
- Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStates,
- Checkout\Payment\Cart\PaymentTransactionStruct,
- Checkout\Payment\Cart\PaymentHandler\AbstractPaymentHandler,
- Checkout\Payment\Cart\PaymentHandler\PaymentHandlerType,
+ Checkout\Payment\Cart\AsyncPaymentTransactionStruct,
+ Checkout\Payment\Cart\PaymentHandler\AsynchronousPaymentHandlerInterface,
+ Checkout\Payment\Exception\AsyncPaymentFinalizeException,
+ Checkout\Payment\Exception\AsyncPaymentProcessException,
Checkout\Payment\PaymentException,
Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException,
- Framework\App\AppException,
- Framework\Api\Context\SalesChannelApiSource,
- Framework\Context,
- Framework\DataAbstractionLayer\EntityRepository,
- Framework\DataAbstractionLayer\Search\Criteria,
- Framework\DataAbstractionLayer\Search\Filter\EqualsFilter,
- Framework\DataAbstractionLayer\Search\Sorting\FieldSorting,
- Framework\Struct\Struct,
Framework\Validation\DataBag\RequestDataBag,
- System\StateMachine\Aggregation\StateMachineState\StateMachineStateEntity,
- System\SalesChannel\Context\SalesChannelContextService,
- System\SalesChannel\Context\SalesChannelContextServiceParameters
+ System\SalesChannel\SalesChannelContext
};
-use Shopware\Core\Framework\Util\Random;
-use VRPaymentPayment\Core\Checkout\Cart\CustomCartPersister;
-use Shopware\Core\Checkout\Cart\Cart;
-use Shopware\Core\Checkout\Cart\CartPersister;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-
use Symfony\Component\{
HttpFoundation\RedirectResponse,
HttpFoundation\Request
};
use VRPayment\Sdk\Model\TransactionState;
-use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService as PluginTransactionService;
-use VRPaymentPayment\Core\Util\Payload\TransactionPayload;
-
+use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
/**
@@ -47,18 +27,13 @@ use VRPaymentPayment\Core\Util\Payload\TransactionPayload;
*
* @package VRPaymentPayment\Core\Checkout\PaymentHandler
*/
-class VRPaymentPaymentHandler extends AbstractPaymentHandler
+class VRPaymentPaymentHandler implements AsynchronousPaymentHandlerInterface
{
/**
- * @var CustomCartPersister
+ * @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
*/
- private CustomCartPersister $cartPersister;
-
- /**
- * @var \VRPaymentPayment\Core\Api\Transaction\Service\PluginTransactionService
- */
- protected $pluginTransactionService;
+ protected $transactionService;
/**
* @var \Psr\Log\LoggerInterface
@@ -69,32 +44,22 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
*/
private $orderTransactionStateHandler;
- protected SalesChannelContextService $salesChannelContextService;
-
- protected EntityRepository $orderTransactionRepository;
-
- protected ?EntityRepository $subscriptionRepository;
-
/**
* VRPaymentPaymentHandler constructor.
+ *
+ * @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
+ * @param \Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler $orderTransactionStateHandler
*/
- public function __construct(
- CustomCartPersister $cartPersister,
- PluginTransactionService $pluginTransactionService,
- OrderTransactionStateHandler $orderTransactionStateHandler,
- SalesChannelContextService $salesChannelContextService,
- EntityRepository $orderTransactionRepository,
- ?EntityRepository $subscriptionRepository,
- ) {
- $this->cartPersister = $cartPersister;
- $this->pluginTransactionService = $pluginTransactionService;
+ public function __construct(TransactionService $transactionService, OrderTransactionStateHandler $orderTransactionStateHandler)
+ {
+ $this->transactionService = $transactionService;
$this->orderTransactionStateHandler = $orderTransactionStateHandler;
- $this->salesChannelContextService = $salesChannelContextService;
- $this->orderTransactionRepository = $orderTransactionRepository;
- $this->subscriptionRepository = $subscriptionRepository;
}
+
/**
* @param \Psr\Log\LoggerInterface $logger
+ * @internal
+ * @required
*
*/
public function setLogger(LoggerInterface $logger): void
@@ -108,352 +73,78 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
*
* A redirect to the url will be performed
*
- * @param \Symfony\Component\HttpFoundation\Request
- * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
- * @param \Shopware\Core\Framework\Context $context
- * @param \Shopware\Core\Framework\Struct\Struct $validateStruct
+ * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
+ * @param \Shopware\Core\Framework\Validation\DataBag\RequestDataBag $dataBag
+ * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function pay(
- Request $request,
- PaymentTransactionStruct $transaction,
- Context $context,
- ?Struct $validateStruct
+ AsyncPaymentTransactionStruct $transaction,
+ RequestDataBag $dataBag,
+ SalesChannelContext $salesChannelContext
): RedirectResponse
{
try {
- $orderTransactionId = $transaction->getOrderTransactionId();
- $orderTransaction = $this->orderTransactionRepository->search(
- (new Criteria([$orderTransactionId]))
- ->addAssociation('order'), $context
- )->getEntities()->first();
-
- $contextSource = $context->getSource();
- if ($contextSource instanceof SalesChannelApiSource) {
- $salesChannelContextId = $contextSource->getSalesChannelId();
- }
-
- $parameters = new SalesChannelContextServiceParameters($salesChannelContextId, $request->getSession()->get("sw-context-token", Random::getAlphanumericString(32)), originalContext: $context);
- $salesChannelContext = $this->salesChannelContextService->get($parameters);
$redirectUrl = $transaction->getReturnUrl();
-
- if ($orderTransaction->getOrder()->getAmountTotal() > 0) {
- $transactionId = $request->getSession()->get('transactionId');
+ if ($transaction->getOrder()->getAmountTotal() > 0) {
+ $transactionId = $_SESSION['transactionId'] ?? null;
if ($transactionId === null) {
- $this->pluginTransactionService->createPendingTransaction($salesChannelContext);
+ $this->transactionService->createPendingTransaction($salesChannelContext);
}
- $redirectUrl = $this->pluginTransactionService->create($transaction, $salesChannelContext);
+ $redirectUrl = $this->transactionService->create($transaction, $salesChannelContext);
}
return new RedirectResponse($redirectUrl);
- } catch (\Throwable $e) {
- $request->getSession()->remove('transactionId');
+
+ } catch (\Exception $e) {
+ unset($_SESSION['transactionId']);
$errorMessage = 'An error occurred during the communication with external payment gateway : ' . $e->getMessage();
$this->logger->critical($errorMessage);
- throw PaymentException::customerCanceled($transaction->getOrderTransaction()->getId(), $errorMessage);
+ throw new \Exception($transaction->getOrderTransaction()->getId() . ': ' . $errorMessage);
}
}
/**
* The finalize function will be called when the user is redirected back to shop from the payment gateway.
*
+ * Throw a @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
* @param \Symfony\Component\HttpFoundation\Request $request
- * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
- * @param \Shopware\Core\Framework\Context $context
+ * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
* @throws \VRPayment\Sdk\ApiException
* @throws \VRPayment\Sdk\Http\ConnectionException
* @throws \VRPayment\Sdk\VersioningException
- * @throws \Exception when the payment was canceled by the customer
+ * @see AsyncPaymentFinalizeException exception if an error ocurres while calling an external payment API
+ * Throw a @see CustomerCanceledAsyncPaymentException exception if the customer canceled the payment process on
+ * payment provider page
+ *
*/
public function finalize(
- Request $request,
- PaymentTransactionStruct $transaction,
- Context $context
+ AsyncPaymentTransactionStruct $transaction,
+ Request $request,
+ SalesChannelContext $salesChannelContext
): void
{
- $orderTransactionId = $transaction->getOrderTransactionId();
- $orderTransaction = $this->orderTransactionRepository->search(
- (new Criteria([$orderTransactionId]))
- ->addAssociation('order'), $context
- )->getEntities()->first();
-
- if ($orderTransaction->getOrder()->getAmountTotal() > 0) {
- $transactionEntity = $this->pluginTransactionService->getByOrderId(
- $orderTransaction->getOrder()->getId(),
- $context
+ if ($transaction->getOrder()->getAmountTotal() > 0) {
+ $transactionEntity = $this->transactionService->getByOrderId(
+ $transaction->getOrder()->getId(),
+ $salesChannelContext->getContext()
);
- $vRPaymentTransaction = $this->pluginTransactionService->read(
+ $vRPaymentTransaction = $this->transactionService->read(
$transactionEntity->getTransactionId(),
- $transactionEntity->getSalesChannelId()
+ $salesChannelContext->getSalesChannel()->getId()
);
if (in_array($vRPaymentTransaction->getState(), [TransactionState::FAILED])) {
$errorMessage = strtr('Customer canceled payment for :orderId on SalesChannel :salesChannelName', [
- ':orderId' => $orderTransaction->getOrder()->getId(),
- ':salesChannelName' => $transactionEntity->getSalesChannelId(),
+ ':orderId' => $transaction->getOrder()->getId(),
+ ':salesChannelName' => $salesChannelContext->getSalesChannel()->getName(),
]);
- $request->getSession()->remove('transactionId');
+ unset($_SESSION['transactionId']);
$this->logger->info($errorMessage);
throw PaymentException::customerCanceled($transaction->getOrderTransaction()->getId(), $errorMessage);
}
} else {
- $this->orderTransactionStateHandler->paid($orderTransaction->getId(), $context);
+ $this->orderTransactionStateHandler->paid($transaction->getOrderTransaction()->getId(), $salesChannelContext->getContext());
}
-
- $token = $request->getSession()->get('sw-context-token');
- if ($token) {
- $salesChannelId = $transactionEntity->getSalesChannelId();
- $parameters = new SalesChannelContextServiceParameters($salesChannelId, $token, originalContext: $context);
- $salesChannelContext = $this->salesChannelContextService->get($parameters);
-
- $salesChannelContext->getContext()->addState('do-cart-delete');
- $this->logger->info('Clearing cart with token: ' . $token);
- $this->cartPersister->delete($salesChannelContext->getToken(), $salesChannelContext);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public function supports(
- PaymentHandlerType $type,
- string $paymentMethodId,
- Context $context
- ): bool {
- // Both PaymentHandlerType::RECURRING and PaymentHandlerType::REFUND are supported
- //TODO: check that the payment method really supports recurring.
- // In order to do that, we need to get this information in when synching the payment methods.
- // The payment methods in the portal are managed by their Connectors. The Connectors need
- // to support the recurrin and the refunding. These values are 1453357059666L and 1453351315899L for
- // tokenization and refunding respectively.
- return true;
- }
-
- public function recurring(
- PaymentTransactionStruct $transaction,
- Context $context
- ): void {
- if ($this->subscriptionRepository === null || !class_exists(\Shopware\Commercial\Subscription\Entity\Subscription\SubscriptionEntity::class)) {
- throw PaymentException::paymentTypeUnsupported(
- $transaction->getOrderTransactionId(),
- 'Shopware Commercial plugin with Subscription feature is not installed or active. Recurring payments cannot be processed.'
- );
- }
-
- if ($transaction->isRecurring() === false) {
- //TODO: Provide payment-method-id instead of order-transaction-id
- throw PaymentException::paymentTypeUnsupported($transaction->getOrderTransaction()->getId(), PaymentHandlerType::RECURRING);
- }
-
- $recurringData = $transaction->getRecurring();
- $newTransactionId = $transaction->getOrderTransactionId();
-
- if ($recurringData === null) {
- throw PaymentException::recurringInterrupted($newTransactionId, 'Recurring payment data is missing from the transaction struct.');
- }
-
- try {
- // Get information about the subscription
- $subscriptionId = $recurringData->getSubscriptionId();
- $criteria = new Criteria([$subscriptionId]);
- $criteria->addAssociation('orders.transactions.stateMachineState');
-
- /** @var SubscriptionEntity|null $subscription */
- $subscription = $this->subscriptionRepository->search($criteria, $context)->get($subscriptionId);
-
- if ($subscription === null) {
- throw PaymentException::recurringInterrupted($newTransactionId, sprintf('Subscription with ID "%s" could not be found.', $subscriptionId));
- }
-
- // Find the original order and transaction
- $orders = $subscription->getOrders();
- if ($orders === null || $orders->count() === 0) {
- throw PaymentException::recurringInterrupted($newTransactionId, 'No orders found associated with the subscription.');
- }
-
- $orders->sort(fn (OrderEntity $a, OrderEntity $b) => $a->getCreatedAt() <=> $b->getCreatedAt());
- /** @var OrderEntity|null $originalOrder */
- $originalOrder = $orders->first();
-
- $originalTransactions = $originalOrder->getTransactions();
-
- if ($originalTransactions === null) {
- throw PaymentException::recurringInterrupted($newTransactionId, 'No transactions found on the original order.');
- }
-
- /** @var OrderTransactionEntity|null $originalTransaction */
- $originalTransaction = $originalTransactions->filter(
- fn (OrderTransactionEntity $t) => $t->getStateMachineState()?->getTechnicalName() === OrderTransactionStates::STATE_PAID
- )->first();
-
- if ($originalTransaction === null) {
- throw PaymentException::recurringInterrupted($newTransactionId, 'A successful, paid transaction could not be found on the original order to retrieve payment details.');
- }
-
- $newOrderTransaction = $this->orderTransactionRepository->search(
- (new Criteria([$newTransactionId]))
- ->addAssociation('order'), $context
- )->getEntities()->first();
- $orderNumber = $newOrderTransaction->getOrder()->getOrderNumber();
-
- // Access the custom fields for getting the original transaction details
- $customFields = $originalTransaction->getCustomFields();
- // The tokenReference is not really needed because it's also stored in the original transaction
- $tokenReference = $customFields[TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TOKEN] ?? null;
- $spaceId = (string) $customFields[TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_SPACE_ID] ?? null;
- $sdkTransactionId = $customFields[TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TRANSACTION_ID] ?? null;
-
- if ($sdkTransactionId === null || $spaceId === null) {
- throw PaymentException::recurringInterrupted($newTransactionId, 'Required original transaction ID and spaceId is missing from order transaction custom fields.');
- }
-
- /** @var \VRPayment\Sdk\Model\Transaction $originalSdkTransaction */
- $originalSdkTransaction = $this->pluginTransactionService->read($sdkTransactionId, "");
-
- //TODO: Consider moving this logic to its own function for improved readability
- $sdkTransactionCreate = new \VRPayment\Sdk\Model\TransactionCreate;
-
- // Build the new transaction based on the original transaction
- $sdkTransactionCreate->setCurrency($originalSdkTransaction->getCurrency());
- $sdkTransactionCreate->setBillingAddress($this->addressCreateFromSdk($originalSdkTransaction->getBillingAddress()));
- $sdkTransactionCreate->setShippingAddress($this->addressCreateFromSdk($originalSdkTransaction->getShippingAddress()));
- $sdkTransactionCreate->setShippingMethod($originalSdkTransaction->getShippingMethod());
- $sdkTransactionCreate->setCustomerEmailAddress($originalSdkTransaction->getCustomerEmailAddress());
- $sdkTransactionCreate->setCustomerId($originalSdkTransaction->getCustomerId());
- $sdkTransactionCreate->setLanguage($originalSdkTransaction->getLanguage());
- // Get the merchant reference from the new Order, not the original one
- $sdkTransactionCreate->setMerchantReference($orderNumber);
- $sdkTransactionCreate->setInvoiceMerchantReference($originalSdkTransaction->getInvoiceMerchantReference());
-
- $lineItems = $originalSdkTransaction->getLineItems();
- $lineItemsCreate = [];
- foreach ($lineItems as $lineItem) {
- $lineItemsCreate[] = $this->lineItemCreateFromSdk($lineItem);
- }
- if (count($lineItemsCreate) > 0) {
- $sdkTransactionCreate->setLineItems($lineItemsCreate);
- }
-
- $sdkTransactionCreate->setSuccessUrl($originalSdkTransaction->getSuccessUrl());
- $sdkTransactionCreate->setToken($originalSdkTransaction->getToken());
- $sdkTransactionCreate->setTokenizationMode($originalSdkTransaction->getTokenizationMode());
- $sdkTransactionCreate->setMetaData($originalSdkTransaction->getMetaData());
-
- // Create the new recurring transaction
- $newSdkTransaction = $this->pluginTransactionService->createRecurringTransaction($sdkTransactionCreate, $spaceId);
-
- // Set the new state for the new order transaction
- if (in_array($newSdkTransaction->getState(), [TransactionState::AUTHORIZED, TransactionState::COMPLETED, TransactionState::CONFIRMED, TransactionState::FULFILL])) {
- $this->orderTransactionStateHandler->paid($newTransactionId, $context);
- } elseif (in_array($newSdkTransaction->getState(), [TransactionState::DECLINE, TransactionState::FAILED, TransactionState::VOIDED])) {
- $this->orderTransactionStateHandler->fail($newTransactionId, $context);
- } elseif (in_array($newSdkTransaction->getState(), [TransactionState::PENDING, TransactionState::PROCESSING])) {
- $this->orderTransactionStateHandler->process($newTransactionId, $context);
- } else {
- $this->orderTransactionStateHandler->reopen($newTransactionId, $context);
- }
-
- $data = [
- 'id' => $newTransactionId,
- 'customFields' => [
- TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TRANSACTION_ID => $newSdkTransaction->getId(),
- TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_SPACE_ID => $spaceId,
- TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TOKEN => $tokenReference,
- ],
- ];
-
- // Update the new order transaction with the new transaction details
- $this->orderTransactionRepository->update([$data], $context);
- $this->pluginTransactionService->upsert($newSdkTransaction, $context);
- }
- catch (\Throwable $e) {
- $errorMessage = 'An error occurred during the communication with external payment gateway : ' . $e->getMessage();
- $this->logger->critical($errorMessage);
- throw PaymentException::recurringInterrupted($transaction->getOrderTransactionId(), $errorMessage);
- }
- }
-
- /**
- * Creates a new AddressCreate instance from the given SDK Address model.
- *
- * @param \VRPayment\Sdk\Model\Address $address The address model from the SDK.
- * @return \VRPayment\Sdk\Model\AddressCreate The newly created AddressCreate instance.
- */
- private function addressCreateFromSdk(\VRPayment\Sdk\Model\Address $address): \VRPayment\Sdk\Model\AddressCreate {
- $addressCreate = new \VRPayment\Sdk\Model\AddressCreate;
-
- $addressCreate->setCity($address->getCity());
- $addressCreate->setCommercialRegisterNumber($address->getCommercialRegisterNumber());
- $addressCreate->setCountry($address->getCountry());
- $addressCreate->setDateOfBirth($address->getDateOfBirth());
- $addressCreate->setDependentLocality($address->getDependentLocality());
- $addressCreate->setEmailAddress($address->getEmailAddress());
- $addressCreate->setFamilyName($address->getFamilyName());
- $addressCreate->setGender($address->getGender());
- $addressCreate->setGivenName($address->getGivenName());
- $addressCreate->setMobilePhoneNumber($address->getMobilePhoneNumber());
- $addressCreate->setOrganizationName($address->getOrganizationName());
- $addressCreate->setPhoneNumber($address->getPhoneNumber());
- $addressCreate->setPostalState($address->getPostalState());
- $addressCreate->setPostcode($address->getPostcode());
- $addressCreate->setSalesTaxNumber($address->getSalesTaxNumber());
- $addressCreate->setSalutation($address->getSalutation());
- $addressCreate->setSocialSecurityNumber($address->getSocialSecurityNumber());
- $addressCreate->setSortingCode($address->getSortingCode());
- $addressCreate->setStreet($address->getStreet());
-
- return $addressCreate;
- }
-
- /**
- * Creates a LineItemCreate object from a given SDK LineItem.
- *
- * This method takes a \VRPayment\Sdk\Model\LineItem instance and transforms it into a
- * \VRPayment\Sdk\Model\LineItemCreate object, which can be used for further processing
- * or integration with the VRPayment payment SDK.
- *
- * @param \VRPayment\Sdk\Model\LineItem $lineItem The line item from the SDK to convert.
- * @return \VRPayment\Sdk\Model\LineItemCreate The created LineItemCreate object.
- */
- private function lineItemCreateFromSdk(\VRPayment\Sdk\Model\LineItem $lineItem): \VRPayment\Sdk\Model\LineItemCreate
- {
- $lineItemCreate = new \VRPayment\Sdk\Model\LineItemCreate();
-
- $lineItemCreate->setAmountIncludingTax($lineItem->getAmountIncludingTax());
-
- $attributes = $lineItem->getAttributes();
- $attributesCreate = [];
- foreach ($attributes as $id => $attribute) {
- $attributeCreate = new \VRPayment\Sdk\Model\LineItemAttributeCreate();
- $attributeCreate->setLabel($attribute->getLabel());
- $attributeCreate->setValue($attribute->getValue());
- $attributesCreate[$id] = $attributeCreate;
- }
- if (count($attributesCreate) > 0) {
- $lineItemCreate->setAttributes($attributesCreate);
- }
-
- $lineItemCreate->setDiscountIncludingTax($lineItem->getDiscountIncludingTax());
- $lineItemCreate->setName($lineItem->getName());
- $lineItemCreate->setQuantity($lineItem->getQuantity());
- $lineItemCreate->setShippingRequired($lineItem->getShippingRequired());
- $lineItemCreate->setSku($lineItem->getSku());
-
- $taxes = $lineItem->getTaxes();
- $taxesCreate = [];
- foreach ($taxes as $tax) {
- $taxCreate = new \VRPayment\Sdk\Model\TaxCreate();
- $taxCreate->setRate($tax->getRate());
- $taxCreate->setTitle($tax->getTitle());
- $taxesCreate[] = $taxCreate;
- }
- if (count($taxesCreate) > 0) {
- $lineItemCreate->setTaxes($taxesCreate);
- }
-
- $lineItemCreate->setType($lineItem->getType());
- $lineItemCreate->setUniqueId($lineItem->getUniqueId());
-
- return $lineItemCreate;
}
}
diff --git a/src/Core/Checkout/Subscription/Command/GenerateSubscriptionOrderCommand.php b/src/Core/Checkout/Subscription/Command/GenerateSubscriptionOrderCommand.php
deleted file mode 100644
index 8719a5b..0000000
--- a/src/Core/Checkout/Subscription/Command/GenerateSubscriptionOrderCommand.php
+++ /dev/null
@@ -1,116 +0,0 @@
-addArgument('subscriptionIdentifier', InputArgument::REQUIRED, 'The ID or Number of the subscription to process.');
- }
-
- protected function execute(InputInterface $input, OutputInterface $output): int
- {
- $io = new ShopwareStyle($input, $output);
-
- if ($this->subscriptionRepository === null || !class_exists(\Shopware\Commercial\Subscription\Entity\Subscription\SubscriptionEntity::class)) {
- $io->error('Subscription functionality is not available in this Shopware instance. Please ensure the Subscription plugin is installed and enabled.');
- return self::FAILURE;
- }
-
- $identifier = $input->getArgument('subscriptionIdentifier');
-
- if (!is_string($identifier)) {
- $io->error('Invalid Subscription ID provided.');
- return self::FAILURE;
- }
- $subscriptionId = $this->findSubscriptionId($identifier, $io);
-
- if ($subscriptionId === null) {
- // Error message is already printed in findSubscriptionId
- return self::FAILURE;
- }
-
- $io->text(sprintf('Forcing next schedule for subscription ID: %s', $subscriptionId));
- $this->forceNextSchedule($subscriptionId);
-
- $io->title('Subscription Order Generation');
- $io->text(sprintf('Dispatching GenerateSubscriptionOrder message for subscription ID: %s', $subscriptionId));
-
- $this->bus->dispatch(new GenerateSubscriptionOrder($subscriptionId));
-
- $io->success('Message dispatched successfully!');
- $io->note('Ensure a message consumer is running to process the queue: "bin/console messenger:consume async"');
-
- return self::SUCCESS;
- }
-
- /**
- * Set the next schedule date to the current time, so it will be processed immediately.
- *
- * @param string $subscriptionId
- * @return void
- */
- private function forceNextSchedule(string $subscriptionId): void
- {
- $context = Context::createDefaultContext();
- $this->subscriptionRepository->update([
- [
- 'id' => $subscriptionId,
- 'nextSchedule' => (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT),
- ]
- ], $context);
- }
-
- private function findSubscriptionId(string $identifier, ShopwareStyle $io): ?string
- {
- $context = Context::createDefaultContext();
- if (Uuid::isValid($identifier)) {
- // Check if a subscription with this ID actually exists
- $result = $this->subscriptionRepository->searchIds(new Criteria([$identifier]), $context);
- if ($result->firstId()) {
- return $identifier;
- }
- $io->error(sprintf('No subscription found with ID "%s".', $identifier));
- return null;
- }
-
- // If not a UUID, assume it's a subscription number
- $criteria = new Criteria();
- $criteria->addFilter(new EqualsFilter('subscriptionNumber', $identifier));
- $result = $this->subscriptionRepository->searchIds($criteria, $context);
-
- if ($result->firstId() === null) {
- $io->error(sprintf('No subscription found with number "%s".', $identifier));
- return null;
- }
-
- return $result->firstId();
- }
-}
diff --git a/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php b/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php
index 9109457..9baf214 100644
--- a/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php
+++ b/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php
@@ -100,7 +100,6 @@ class CheckoutSubscriber implements EventSubscriberInterface
{
return [
CheckoutConfirmPageLoadedEvent::class => ['onConfirmPageLoaded', 1],
- "subscription." . CheckoutConfirmPageLoadedEvent::class => ['onConfirmPageLoaded', 1],
MailBeforeValidateEvent::class => ['onMailBeforeValidate', 1],
];
}
diff --git a/src/Core/Util/Analytics/Analytics.php b/src/Core/Util/Analytics/Analytics.php
index 2a02274..cf2fd15 100644
--- a/src/Core/Util/Analytics/Analytics.php
+++ b/src/Core/Util/Analytics/Analytics.php
@@ -25,7 +25,7 @@ class Analytics {
self::SHOP_SYSTEM => 'shopware',
self::SHOP_SYSTEM_VERSION => '6',
self::SHOP_SYSTEM_AND_VERSION => 'shopware-6',
- self::PLUGIN_SYSTEM_VERSION => '7.1.0',
+ self::PLUGIN_SYSTEM_VERSION => '6.1.15',
];
}
diff --git a/src/Core/Util/Payload/TransactionPayload.php b/src/Core/Util/Payload/TransactionPayload.php
index 30368e8..8f9bc59 100644
--- a/src/Core/Util/Payload/TransactionPayload.php
+++ b/src/Core/Util/Payload/TransactionPayload.php
@@ -8,14 +8,10 @@ use Shopware\Core\{Checkout\Cart\Tax\Struct\CalculatedTaxCollection,
Checkout\Customer\Aggregate\CustomerAddress\CustomerAddressEntity,
Checkout\Customer\CustomerEntity,
Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity,
- Checkout\Order\OrderEntity,
- Checkout\Payment\Cart\PaymentTransactionStruct,
+ Checkout\Payment\Cart\AsyncPaymentTransactionStruct,
Framework\DataAbstractionLayer\Search\Criteria,
System\SalesChannel\SalesChannelContext
};
-use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
-
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use VRPayment\Sdk\{Model\AddressCreate,
@@ -40,10 +36,6 @@ use VRPaymentPayment\Core\{Api\PaymentMethodConfiguration\Entity\PaymentMethodCo
Util\Payload\CustomProducts\CustomProductsLineItemTypes
};
-use Shopware\Core\System\SystemConfig\SystemConfigService;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\System\Tax\TaxEntity;
-
/**
* Class TransactionPayload
*
@@ -56,7 +48,6 @@ class TransactionPayload extends AbstractPayload
public const ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_SPACE_ID = 'vrpayment_space_id';
public const ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TRANSACTION_ID = 'vrpayment_transaction_id';
- public const ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TOKEN = 'vrpayment_token';
public const VRPAYMENT_METADATA_SALES_CHANNEL_ID = 'salesChannelId';
public const VRPAYMENT_METADATA_ORDER_ID = 'orderId';
@@ -70,7 +61,7 @@ class TransactionPayload extends AbstractPayload
protected $salesChannelContext;
/**
- * @var \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct
+ * @var \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct
*/
protected $transaction;
@@ -94,10 +85,6 @@ class TransactionPayload extends AbstractPayload
*/
protected $translator;
- protected EntityRepository $orderTransactionRepository;
-
- protected OrderEntity $order;
-
/**
* TransactionPayload constructor.
*
@@ -105,14 +92,14 @@ class TransactionPayload extends AbstractPayload
* @param \VRPaymentPayment\Core\Util\LocaleCodeProvider $localeCodeProvider
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
* @param \VRPaymentPayment\Core\Settings\Struct\Settings $settings
- * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
+ * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
*/
public function __construct(
ContainerInterface $container,
LocaleCodeProvider $localeCodeProvider,
SalesChannelContext $salesChannelContext,
Settings $settings,
- PaymentTransactionStruct $transaction
+ AsyncPaymentTransactionStruct $transaction
)
{
$this->localeCodeProvider = $localeCodeProvider;
@@ -121,23 +108,6 @@ class TransactionPayload extends AbstractPayload
$this->transaction = $transaction;
$this->container = $container;
$this->translator = $this->container->get('translator');
- $this->orderTransactionRepository = $this->container->get('order_transaction.repository');
-
- $criteria = (new Criteria());
- $criteria->addFilter(new EqualsFilter('id', $this->transaction->getOrderTransactionId()));
-
- $orders = $this->orderTransactionRepository->search($criteria, $this->salesChannelContext->getContext())->getEntities();
- $orderId = $orders->first()->getOrderId();
-
- $criteria = new Criteria([$orderId]);
- $criteria
- ->addAssociation('lineItems')
- ->addAssociation('orderCustomer')
- ->addAssociation('transactions')
- ->addAssociation('currency')
- ;
-
- $this->order = $this->container->get('order.repository')->search($criteria, $this->salesChannelContext->getContext())->getEntities()->first();
}
/**
@@ -148,21 +118,13 @@ class TransactionPayload extends AbstractPayload
*/
public function get(int $version): TransactionPending
{
- $customerId = $this->order->getOrderCustomer()->getCustomerId();
- $criteria = new Criteria([$customerId]);
- $criteria->addAssociation('activeBillingAddress')
- ->addAssociation('activeShippingAddress')
- ->addAssociation('activeShippingAddress')
- ->addAssociation('defaultBillingAddress')
- ->addAssociation('defaultShippingAddress')
- ->addAssociation('salutation');
- $customer = $this->container->get('customer.repository')->search($criteria, $this->salesChannelContext->getContext())->getEntities()->first();
+ $customer = $this->salesChannelContext->getCustomer();
$lineItems = $this->getLineItems();
-
$billingAddress = $this->getAddressPayload($customer, $customer->getActiveBillingAddress());
$shippingAddress = $this->getAddressPayload($customer, $customer->getActiveShippingAddress(), false);
+
$customerId = null;
$customerName = null;
if ($customer->getGuest() === false) {
@@ -175,14 +137,14 @@ class TransactionPayload extends AbstractPayload
}
$transactionData = [
- 'currency' => $this->order->getCurrency()->getIsoCode(),
- 'customer_email_address' => $customer->getEmail(),
+ 'currency' => $this->salesChannelContext->getCurrency()->getIsoCode(),
+ 'customer_email_address' => $billingAddress->getEmailAddress(),
'customer_id' => $customerId,
'language' => $this->localeCodeProvider->getLocaleCodeFromContext($this->salesChannelContext->getContext()) ?? null,
- 'merchant_reference' => $this->fixLength($this->order->getOrderNumber(), 100),
+ 'merchant_reference' => $this->fixLength($this->transaction->getOrder()->getOrderNumber(), 100),
'meta_data' => [
- self::VRPAYMENT_METADATA_ORDER_ID => $this->order->getId(),
- self::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID => $this->order->getTransactions()->first()->getId(),
+ self::VRPAYMENT_METADATA_ORDER_ID => $this->transaction->getOrder()->getId(),
+ self::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID => $this->transaction->getOrderTransaction()->getId(),
self::VRPAYMENT_METADATA_SALES_CHANNEL_ID => $this->salesChannelContext->getSalesChannel()->getId(),
self::VRPAYMENT_METADATA_CUSTOMER_NAME => $customerName,
],
@@ -199,8 +161,8 @@ class TransactionPayload extends AbstractPayload
$transactionData['meta_data']['additionalAddress2'] = $additionalAddress2;
}
- if (!empty($this->order->getCustomerComment())) {
- $transactionData['meta_data']['customer_comment'] = $this->order->getCustomerComment();
+ if (!empty($this->transaction->getOrder()->getCustomerComment())) {
+ $transactionData['meta_data']['customer_comment'] = $this->transaction->getOrder()->getCustomerComment();
}
$vatIds = $customer->getVatIds();
@@ -236,7 +198,7 @@ class TransactionPayload extends AbstractPayload
$transactionPayload->setAllowedPaymentMethodConfigurations([$paymentConfiguration->getPaymentMethodConfigurationId()]);
$successUrl = $this->transaction->getReturnUrl() . '&status=paid';
- $failedUrl = $this->getFailUrl($this->order->getId()) . '&status=fail';
+ $failedUrl = $this->getFailUrl($this->transaction->getOrder()->getId()) . '&status=fail';
$transactionPayload->setSuccessUrl($successUrl)
->setFailedUrl($failedUrl);
@@ -257,7 +219,7 @@ class TransactionPayload extends AbstractPayload
protected function getLineItems(): array
{
$lineItems = [];
- $items = $this->order->getLineItems() ?? [];
+ $items = $this->transaction->getOrder()->getLineItems();
foreach ($items as $shopLineItem) {
if ($this->shouldSkipLineItem($shopLineItem)) {
@@ -345,90 +307,27 @@ class TransactionPayload extends AbstractPayload
protected function addDiscountLineItem($discount, array &$lineItems): void
{
$calculatedPrice = $discount->getPrice();
- $discountName = $discount->getLabel() ?? 'Unnamed';
- $definition = $discount->getPriceDefinition();
+ $calculatedTaxesCollection = $calculatedPrice->getCalculatedTaxes();
- if ($this->order->getTaxStatus() === 'net' || $definition instanceof \Shopware\Core\Checkout\Cart\Price\Struct\AbsolutePriceDefinition) {
- $calculatedTaxesCollection = $calculatedPrice->getCalculatedTaxes();
- foreach ($calculatedTaxesCollection as $calculatedTax) {
- $rate = $calculatedTax->getTaxRate();
- $amount = $this->calculateDiscountAmount($calculatedTax);
+ foreach ($calculatedTaxesCollection as $calculatedTax) {
+ $rate = $calculatedTax->getTaxRate();
+ $lineItem = new LineItemCreate();
+ $amount = $this->calculateDiscountAmount($calculatedTax);
- $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
- }
- } else {
- $taxRules = $calculatedPrice->getTaxRules();
+ $discountName = $discount->getLabel();
+ $lineItem->setAmountIncludingTax($amount)
+ ->setName(sprintf('DISCOUNT: %s (%s%% tax)', $discount->getLabel(), $rate))
+ ->setQuantity(1)
+ ->setShippingRequired(false)
+ ->setSku('sku-discount-' . $rate . '-' . $discountName, 200)
+ ->setType(LineItemType::DISCOUNT)
+ ->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate . '-' . $discountName);
- if ($taxRules && $taxRules->count() > 0) {
- foreach ($taxRules as $taxRule) {
- $rate = $taxRule->getTaxRate();
- $amount = $calculatedPrice->getTotalPrice();
- $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
- }
- } else {
- $rate = $this->getDefaultTaxRate();
- $amount = $calculatedPrice->getTotalPrice();
- $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
- }
- }
- }
-
- /**
- * @param string $discountName
- * @param float $amount
- * @param float $rate
- * @return LineItemCreate
- */
- private function createDiscountLineItem(string $discountName, float $amount, float $rate): LineItemCreate
- {
- $lineItem = new LineItemCreate();
-
- $discountSkuName = 'sku-discount-' . $rate . '-' . $discountName;
- $discountTitle = sprintf('DISCOUNT: %s (%s%% tax)', $discountName, $rate);
- if ($this->order->getTaxStatus() === 'tax-free') {
- $discountSkuName = 'sku-discount-' . $discountName;
- $discountTitle = sprintf('DISCOUNT: %s', $discountName);
- }
-
- $lineItem->setAmountIncludingTax($amount)
- ->setName($discountTitle)
- ->setQuantity(1)
- ->setShippingRequired(false)
- ->setSku($discountSkuName, 200)
- ->setType(LineItemType::DISCOUNT)
- ->setUniqueId('coupon-' . $discountSkuName);
-
- $taxRate = new TaxCreate([
- 'title' => 'Discount Tax: ' . $rate,
- 'rate' => $rate,
- ]);
-
- if ($this->order->getTaxStatus() !== 'tax-free') {
+ $taxRate = new TaxCreate(['title' => 'Discount Tax: ' . $rate, 'rate' => $rate]);
$lineItem->setTaxes([$taxRate]);
+
+ $lineItems[] = $lineItem;
}
-
- return $lineItem;
- }
-
- /**
- * @return float
- */
- private function getDefaultTaxRate(): float
- {
- /** @var SystemConfigService $systemConfigService */
- $systemConfigService = $this->container->get(SystemConfigService::class);
- $taxId = $systemConfigService->get('core.tax.defaultTaxRate');
-
- if (!$taxId || !is_string($taxId)) {
- return 21.0;
- }
-
- $criteria = new Criteria([$taxId]);
- /** @var TaxRepository $taxRepository */
- $taxRepository = $this->container->get('tax.repository');
- $tax = $taxRepository->search($criteria, Context::createDefaultContext())->get($taxId);
-
- return $tax instanceof TaxEntity ? $tax->getTaxRate() : 21.0;
}
/**
@@ -437,7 +336,7 @@ class TransactionPayload extends AbstractPayload
protected function calculateDiscountAmount($calculatedTax): float
{
$amount = self::round($calculatedTax->getPrice());
- if ($this->order->getTaxStatus() === 'net') {
+ if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
$amount = self::round($amount + $calculatedTax->getTax());
}
return $amount;
@@ -458,7 +357,9 @@ class TransactionPayload extends AbstractPayload
*/
protected function addOptionalLineItems(array &$lineItems): void
{
- if ($this->order->getShippingCosts() && $this->order->getShippingTotal() > 0) {
+ $shippingCosts = $this->transaction->getOrder()->getShippingCosts();
+
+ if ($shippingCosts && $this->transaction->getOrder()->getShippingTotal() > 0) {
if ($shippingLineItem = $this->getShippingLineItem()) {
$lineItems[] = $shippingLineItem;
}
@@ -480,7 +381,7 @@ class TransactionPayload extends AbstractPayload
protected function getCustomProductOptionLabel(string $lineItemParentId): string
{
$label = '';
- foreach ($this->order->getLineItems() as $shopLineItem) {
+ foreach ($this->transaction->getOrder()->getLineItems() as $shopLineItem) {
if ($shopLineItem->getParentId() === $lineItemParentId && $shopLineItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT) {
$label = $shopLineItem->getLabel();
break;
@@ -505,11 +406,10 @@ class TransactionPayload extends AbstractPayload
$sku = $payLoad['productNumber'];
}
$sku = $this->fixLength($sku, 200);
-
$amount = $shopLineItem->getTotalPrice() ? self::round($shopLineItem->getTotalPrice()) : 0;
//include Tax Excluded for Net Tax display customer group
- if ($this->order->getTaxStatus() === 'net') {
+ if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
$amount = self::round($amount + $shopLineItem->getPrice()->getCalculatedTaxes()->getAmount());
}
@@ -545,9 +445,7 @@ class TransactionPayload extends AbstractPayload
}
if (!empty($taxes)) {
- if ($this->order->getTaxStatus() !== 'tax-free') {
- $lineItem->setTaxes($taxes);
- }
+ $lineItem->setTaxes($taxes);
}
if ($shopLineItem->getTotalPrice() >= 0) {
@@ -623,34 +521,31 @@ class TransactionPayload extends AbstractPayload
{
try {
- $amount = $this->order->getShippingTotal();
+ $amount = $this->transaction->getOrder()->getShippingTotal();
$amount = self::round($amount);
if ($amount > 0) {
$shippingName = $this->salesChannelContext->getShippingMethod()->getName() ?? $this->translator->trans('vrpayment.payload.shipping.name');
$taxes = $this->getTaxes(
- $this->order->getShippingCosts()->getCalculatedTaxes(),
+ $this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes(),
$shippingName
);
- if ($this->order->getTaxStatus() === 'net') {
- $amount = self::round($amount + $this->order->getShippingCosts()->getCalculatedTaxes()->getAmount());
+ if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
+ $amount = self::round($amount + $this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes()->getAmount());
}
$lineItem = (new LineItemCreate())
->setAmountIncludingTax($amount)
->setName($this->fixLength($shippingName . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
- ->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
+ ->setQuantity($this->transaction->getOrder()->getShippingCosts()->getQuantity() ?? 1)
+ ->setTaxes($taxes)
->setSku($this->fixLength($shippingName . '-Shipping', 200))
/** @noinspection PhpParamsInspection */
->setType(LineItemType::SHIPPING)
->setUniqueId($this->fixLength($shippingName . '-Shipping', 200));
- if ($this->order->getTaxStatus() !== 'tax-free') {
- $lineItem->setTaxes($taxes);
- }
-
if (!$lineItem->valid()) {
$this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());
throw new InvalidPayloadException('Shipping LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));
@@ -671,15 +566,15 @@ class TransactionPayload extends AbstractPayload
protected function getMultipleShippingLineItems(): array
{
try {
- if ($this->order->getShippingTotal() > 0) {
+ if ($this->transaction->getOrder()->getShippingTotal() > 0) {
$lineItems = [];
$shippingName = $this->salesChannelContext->getShippingMethod()->getName() ?? $this->translator->trans('vrpayment.payload.shipping.name');
$isFirst = true;
- foreach ($this->order->getShippingCosts()->getCalculatedTaxes() as $taxItem) {
+ foreach ($this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes() as $taxItem) {
$amount = self::round($taxItem->getPrice());
- if ($this->order->getTaxStatus() === 'net') {
+ if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
$amount = self::round($amount + $taxItem->getTax());
}
$taxRate = $taxItem->getTaxRate();
@@ -691,15 +586,12 @@ class TransactionPayload extends AbstractPayload
$lineItem = (new LineItemCreate())
->setAmountIncludingTax($amount)
->setName($this->fixLength($name . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
- ->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
+ ->setQuantity($this->transaction->getOrder()->getShippingCosts()->getQuantity() ?? 1)
+ ->setTaxes([$tax])
->setSku($this->fixLength($name . '-Shipping', 200))
->setType($isFirst ? LineItemType::SHIPPING : LineItemType::FEE) // First item as SHIPPING, rest as FEE
->setUniqueId($this->fixLength($name . '-Shipping', 200));
- if ($this->order->getTaxStatus() !== 'tax-free') {
- $lineItem->setTaxes([$tax]);
- }
-
if (!$lineItem->valid()) {
$this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());
throw new InvalidPayloadException('Shipping LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));
@@ -733,8 +625,9 @@ class TransactionPayload extends AbstractPayload
$lineItemPriceTotal = array_sum(array_map(static fn(LineItemCreate $li) => $li->getAmountIncludingTax(), $lineItems));
$this->logger->debug("LineItem price total before adjustment: $lineItemPriceTotal");
+
// Get shipping total including taxes from the order
- $shippingCosts = $this->order->getShippingCosts();
+ $shippingCosts = $this->transaction->getOrder()->getShippingCosts();
$shippingTotal = $shippingCosts ? self::round($shippingCosts->getTotalPrice()) : 0.0;
// Add shipping to the line items total if it's not already included
@@ -743,13 +636,13 @@ class TransactionPayload extends AbstractPayload
$lineItemPriceTotal += $shippingTotal;
}
- $adjustmentPrice = self::round($this->order->getAmountTotal() - $lineItemPriceTotal);
+ $adjustmentPrice = self::round($this->transaction->getOrder()->getAmountTotal() - $lineItemPriceTotal);
if (abs($adjustmentPrice) != 0) {
if ($this->settings->isLineItemConsistencyEnabled()) {
$error = strtr('LineItems total :lineItemTotal does not add up to order total :orderTotal', [
':lineItemTotal' => $lineItemPriceTotal,
- ':orderTotal' => $this->order->getAmountTotal(),
+ ':orderTotal' => $this->transaction->getOrder()->getAmountTotal(),
]);
$this->logger->critical($error);
throw new \Exception($error);
diff --git a/src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-completion/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-completion/index.html.twig
index ec0cc3b..506861f 100644
--- a/src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-completion/index.html.twig
+++ b/src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-completion/index.html.twig
@@ -4,21 +4,21 @@
@modal-close="$emit('modal-close')">
{% block vrpayment_order_action_completion_amount %}
-
-
+ v-model:value="isCompletion">
+
{% endblock %}
{% block vrpayment_order_action_completion_confirm_button %}
-
{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-
+
{% endblock %}
-
-
+
{% endblock %}
{% block vrpayment_order_action_refund_confirm_button_by_amount %}
-
+
{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-
+
{% endblock %}
-
-
+
{{ $tc('vrpayment-order.refundAction.maxAvailableAmountToRefund') }}:
@@ -20,12 +20,12 @@
{% block vrpayment_order_action_refund_confirm_button_partial %}
-
+
{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-
+
{% endblock %}
-
+
{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-
+
{% endblock %}
-
-
+
-
{{ $tc('vrpayment-settings.settingForm.credentials.button.label') }}
-
+
- {% endverbatim %}
{% endblock %}
-
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-options/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-options/index.html.twig
index 252b010..0760ce1 100644
--- a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-options/index.html.twig
+++ b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-options/index.html.twig
@@ -1,5 +1,5 @@
{% block vrpayment_settings_content_card_channel_config_options %}
-
{% block vrpayment_settings_content_card_channel_config_credentials_card_container %}
@@ -14,15 +14,15 @@
:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_SPACE_VIEW_ID]"
:customInheritationCheckFunction="checkNumberFieldInheritance">
-
-
+ :value="props.currentValue"
+ @update:value="props.updateCurrentValue">
+
{% endblock %}
@@ -55,16 +55,16 @@
:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_LINE_ITEM_CONSISTENCY_ENABLED]"
:customInheritationCheckFunction="checkBoolFieldInheritance">
-
-
+ :value="props.currentValue"
+ @update:value="props.updateCurrentValue">
+
{% endblock %}
@@ -75,16 +75,16 @@
:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_EMAIL_ENABLED]"
:customInheritationCheckFunction="checkBoolFieldInheritance">
-
-
+ :value="props.currentValue"
+ @update:value="props.updateCurrentValue">
+
{% endblock %}
@@ -92,6 +92,6 @@
{% endblock %}
{% endblock %}
-
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-settings-icon/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-settings-icon/index.html.twig
index 3fad643..ad1f95e 100644
--- a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-settings-icon/index.html.twig
+++ b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-settings-icon/index.html.twig
@@ -1,5 +1,5 @@
{% block vrpayment_settings_icon %}
-
{% endblock %}
+{% block base_footer %}
+ {% sw_include '@Storefront/storefront/layout/footer/footer-minimal.html.twig' %}
+{% endblock %}
+
{% block base_body_script %}
{{ parent() }}
{% if page.extensions.vRPaymentData %}
diff --git a/src/Resources/views/storefront/page/checkout/order/vrpayment_header.html.twig b/src/Resources/views/storefront/page/checkout/order/vrpayment_header.html.twig
new file mode 100644
index 0000000..4d958c1
--- /dev/null
+++ b/src/Resources/views/storefront/page/checkout/order/vrpayment_header.html.twig
@@ -0,0 +1,53 @@
+{% sw_extends '@Storefront/storefront/layout/header/header-minimal.html.twig' %}
+
+{% block layout_header_minimal_logo %}
+
{{ $tc('vrpayment-order.refundAction.maxAvailableItemsToRefund') }}:
@@ -20,12 +20,12 @@
{% block vrpayment_order_action_refund_confirm_button %}
-
+
{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-
+
{% endblock %}
-
-
+ v-model:value="isVoid">
+
{% endblock %}
{% block vrpayment_order_action_void_confirm_button %}
-
{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-
+
{% endblock %}
-
diff --git a/src/Resources/app/administration/src/module/vrpayment-order/extension/sw-order/sw-order.scss b/src/Resources/app/administration/src/module/vrpayment-order/extension/sw-order/sw-order.scss
index f7ab85e..ff18ca8 100644
--- a/src/Resources/app/administration/src/module/vrpayment-order/extension/sw-order/sw-order.scss
+++ b/src/Resources/app/administration/src/module/vrpayment-order/extension/sw-order/sw-order.scss
@@ -3,7 +3,7 @@
margin-top: 40px;
}
- .sw-order-detail-base .mt-card-view__content {
+ .sw-order-detail-base .sw-card-view__content {
overflow-x: visible;
overflow-y: visible;
}
diff --git a/src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.html.twig
index 30d37cc..5d68090 100644
--- a/src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.html.twig
+++ b/src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.html.twig
@@ -1,61 +1,61 @@
{% block vrpayment_order_detail %}
-
+
diff --git a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig
index 117ac2d..90f9b5e 100644
--- a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig
+++ b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig
@@ -1,6 +1,6 @@
{% block vrpayment_settings_content_card_channel_config_credentials %}
-
@@ -17,17 +17,17 @@
:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_SPACE_ID]"
:customInheritationCheckFunction="checkNumberFieldInheritance">
-
-
+ @update:value="props.updateCurrentValue">
+
{% endblock %}
@@ -38,17 +38,17 @@
:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_USER_ID]"
:customInheritationCheckFunction="checkNumberFieldInheritance">
-
-
+ @update:value="props.updateCurrentValue">
+
{% endblock %}
@@ -59,7 +59,7 @@
:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_APPLICATION_KEY]"
:customInheritationCheckFunction="checkTextFieldInheritance">
-
-
+ @update:value="props.updateCurrentValue">
+
{% endblock %}
{% endblock %}
- {% verbatim %}
-
+
{% block vrpayment_order_actions_section %}
-
+
{% block vrpayment_order_transaction_refunds_action_button %}
-
{{ $tc('vrpayment-order.buttons.label.refund') }}
-
+
{% endblock %}
{% block vrpayment_order_transaction_completion_action_button %}
-
{{ $tc('vrpayment-order.buttons.label.completion') }}
-
+
{% endblock %}
{% block vrpayment_order_transaction_void_action_button %}
-
{{ $tc('vrpayment-order.buttons.label.void') }}
-
+
{% endblock %}
{% block vrpayment_order_transaction_download_invoice_action_button %}
-
{{ $tc('vrpayment-order.buttons.label.download-invoice') }}
-
+
{% endblock %}
{% block vrpayment_order_transaction_download_packing_slip_action_button %}
-
{{ $tc('vrpayment-order.buttons.label.download-packing-slip') }}
-
+
{% endblock %}
-
+
{% endblock %}
-
+
{% block vrpayment_order_transaction_history_card %}
-
+
{% block vrpayment_order_transaction_history_grid %}
@@ -78,10 +78,10 @@
{% endblock %}
-
+
{% endblock %}
{% block vrpayment_order_transaction_line_items_card %}
-
+
{% block vrpayment_order_transaction_line_items_grid %}
@@ -131,10 +131,10 @@
{% endblock %}
-
+
{% endblock %}
{% block vrpayment_order_transaction_refunds_card %}
-
+
{% block vrpayment_order_transaction_refunds_grid %}
@@ -147,7 +147,7 @@
{% endblock %}
-
+
{% endblock %}
{% block vrpayment_order_actions_modal_refund_partial %}
{% endblock %}
-
+ {% block layout_header_logo_inner %}
+
+ {% endblock %}
+
+{% endblock %}
+
+{% block layout_header_minimal_button %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/VRPaymentPayment.php b/src/VRPaymentPayment.php
index a6650cb..e305188 100644
--- a/src/VRPaymentPayment.php
+++ b/src/VRPaymentPayment.php
@@ -3,7 +3,6 @@
namespace VRPaymentPayment;
use Shopware\Core\{
- Framework\Feature,
Framework\Plugin,
Framework\Plugin\Context\ActivateContext,
Framework\Plugin\Context\DeactivateContext,
@@ -22,7 +21,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
// expect the vendor folder on Shopware store releases
if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
@@ -84,21 +82,19 @@ class VRPaymentPayment extends Plugin {
{
parent::build($container);
- $confDir = \rtrim($this->getPath(), '/') . '/Resources/config';
- $locator = new FileLocator($confDir);
+ $locator = new FileLocator('Resources/config');
$resolver = new LoaderResolver([
- new YamlFileLoader($container, $locator),
- new XmlFileLoader($container, $locator),
- new GlobFileLoader($container, $locator),
- new DirectoryLoader($container, $locator),
+ new YamlFileLoader($container, $locator),
+ new GlobFileLoader($container, $locator),
+ new DirectoryLoader($container, $locator),
]);
$configLoader = new DelegatingLoader($resolver);
- $configLoader->load($confDir . '/{packages}/*.yaml', 'glob');
+ $confDir = \rtrim($this->getPath(), '/') . '/Resources/config';
- $configLoader->load('services/core/checkout.xml');
+ $configLoader->load($confDir . '/{packages}/*.yaml', 'glob');
}
public function enrichPrivileges(): array