mirror of
https://github.com/vr-payment/shopware-6.git
synced 2026-06-05 11:36:37 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 andrewrowanwallee
|
3f3bf866dd | ||
|
andrewrowanwallee
|
4fbae35058 | ||
|
andrewrowanwallee
|
922f66e784 | ||
|
andrewrowanwallee
|
089555e77f | ||
|
andrewrowanwallee
|
55bdb5c640 |
@@ -1,3 +1,31 @@
|
||||
# 7.3.1
|
||||
- Shopware 6.7.7.0 compatibility
|
||||
- Fix for missing payment icons
|
||||
- Fixed issue with 'Entire Set' coupons returning error due to totals mismatch
|
||||
- Fixed issue with orphaned order_transactions causing an admin UI failure
|
||||
- Fixed error thrown when customers who aren't logged in attempt to download an invoice
|
||||
|
||||
# 7.3.0
|
||||
- Headless storefront support
|
||||
|
||||
# 7.2.0
|
||||
- Renamed database table to avoid a naming conflict with legacy plugins
|
||||
- Fixed issue with refunds failing for payments using Invoice
|
||||
- Fix to respect sort order of payment methods
|
||||
|
||||
# 7.1.6
|
||||
- Improved rounding handling to force 2 decimal places
|
||||
- Removed references to unused classes
|
||||
- Fixed some type errors
|
||||
- Further improved 0 amount transaction; state transitions
|
||||
|
||||
# 7.1.5
|
||||
- Improved analytics
|
||||
- Improved error handling for refunding amount 0 and too many items
|
||||
|
||||
# 7.1.4
|
||||
- Updated SDK to 4.8.1
|
||||
|
||||
# 7.1.3
|
||||
- Fixed issue with radio button/switch settings not saving
|
||||
- Fixed issue with error screen sporadically happening after failed payments
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
# 7.3.1
|
||||
- Kompatibilität mit Shopware 6.7.7.0
|
||||
- Fehlende Zahlungssymbole behoben
|
||||
- Problem mit „Gesamtes Set“-Gutscheinen aufgrund von Summenabweichungen behoben
|
||||
- Problem mit verwaisten Bestelltransaktionen behoben, die zu einem Fehler in der Admin-Oberfläche führten
|
||||
- Ein Fehler wurde behoben, der auftrat, wenn nicht angemeldete Kunden versuchten, eine Rechnung herunterzuladen.
|
||||
|
||||
# 7.3.0
|
||||
- Headless Storefront unterstützung
|
||||
|
||||
# 7.2.0
|
||||
- Datenbanktabelle umbenannt, um Namenskonflikte mit älteren Plugins zu vermeiden.
|
||||
- Problem mit fehlgeschlagenen Rückerstattungen bei Zahlungen mit Rechnungen behoben.
|
||||
|
||||
# 7.1.6
|
||||
- Verbesserte Rundungsbehandlung für zwei Dezimalstellen
|
||||
- Entfernte Verweise auf ungenutzte Klassen
|
||||
- Behebung einiger Typfehler
|
||||
- Weitere Verbesserung von Transaktionen mit dem Betrag 0 und Zustandsübergängen
|
||||
|
||||
# 7.1.5
|
||||
- Verbesserte Analysefunktionen
|
||||
- Verbesserte Fehlerbehandlung bei Rückerstattungen von 0 Beträgen und zu vielen Artikeln
|
||||
|
||||
# 7.1.4
|
||||
- Aktualisiertes SDK - 4.8.1
|
||||
|
||||
# 7.1.3
|
||||
– Problem behoben, bei dem die Einstellungen von Optionsfeldern/Schaltern nicht gespeichert wurden.
|
||||
– Problem behoben, bei dem nach fehlgeschlagenen Zahlungen sporadisch ein Fehlerbildschirm angezeigt wurde.
|
||||
|
||||
+1
-1
@@ -186,7 +186,7 @@
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright 2025 VR Payment GmbH
|
||||
Copyright 2026 VR Payment GmbH
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -13,10 +13,10 @@ Please note that this plugin is for versions 6.5, 6.6 or 6.7. For the 6.4 plugin
|
||||
|
||||
## Documentation
|
||||
|
||||
- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.4/docs/en/documentation.html)
|
||||
- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.4/docs/de/documentation.html)
|
||||
- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.4/docs/fr/documentation.html)
|
||||
- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.4/docs/it/documentation.html)
|
||||
- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.1/docs/en/documentation.html)
|
||||
- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.1/docs/de/documentation.html)
|
||||
- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.1/docs/fr/documentation.html)
|
||||
- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.1/docs/it/documentation.html)
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -42,6 +42,22 @@ bin/console plugin:refresh
|
||||
bin/console plugin:install --activate --clearCache VRPayment
|
||||
```
|
||||
|
||||
## Update
|
||||
|
||||
### Via Administration
|
||||
1. Go to Shopware Admin > Extensions > My extensions.
|
||||
2. Find VRPaymentPayment.
|
||||
3. Click Update.
|
||||
|
||||
### Via CLI
|
||||
1. Deploy the new plugin files (replace the folder in custom/plugins/VRPaymentPayment or upload/install a new ZIP).
|
||||
2. Run:
|
||||
```bash
|
||||
bin/console plugin:refresh
|
||||
bin/console plugin:update --clearCache VRPaymentPayment
|
||||
bin/console cache:clear
|
||||
```
|
||||
|
||||
## Configuration
|
||||
### API Credentials
|
||||
|
||||
@@ -78,7 +94,7 @@ ________________________________________________________________________________
|
||||
| Shopware 6 version | Plugin major version | Supported until |
|
||||
|-------------------------------|------------------------|------------------------|
|
||||
| Shopware 6.7.x | 7.x | Further notice |
|
||||
| Shopware 6.6.x | 6.x | December 2025 |
|
||||
| Shopware 6.6.x | 6.x | March 2026 |
|
||||
| Shopware 6.5.x | 5.x | October 2024 |
|
||||
-----------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+1
-1
@@ -59,5 +59,5 @@
|
||||
"vrpayment/sdk": "^4.0.0"
|
||||
},
|
||||
"type": "shopware-platform-plugin",
|
||||
"version": "7.1.4"
|
||||
"version": "7.3.1"
|
||||
}
|
||||
|
||||
+115
-49
@@ -23,7 +23,7 @@
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.4/">
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.1/">
|
||||
Source
|
||||
</a>
|
||||
</li>
|
||||
@@ -197,10 +197,59 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
|
||||
</div>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="_update">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Update </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="section" id="_via_administration">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Via Administration </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Gehe zu Shopware Admin > Erweiterungen > Meine Erweiterungen.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Suche nach VRPaymentPayment.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Klicke auf Aktualisieren.</p>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> <div class="section" id="_via_cli">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Via CLI </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Stelle die neuen Plugin-Dateien bereit (ersetze den Ordner <code>custom/plugins/VRPaymentPayment</code> oder lade ein neues ZIP hoch/installiere es).</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Führe aus:</p>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlight"><code class="language-bash" data-lang="bash">bin/console plugin:refresh
|
||||
bin/console plugin:update --clearCache VRPaymentPayment
|
||||
bin/console cache:clear</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="portal-startup-guide">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Portal-Startanleitung </h1>
|
||||
<span class="title-number">6</span>Portal-Startanleitung </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -219,7 +268,7 @@ Wählen Sie das passende Abo aus – es sollte E-Commerce-Transaktionen unterst
|
||||
</div> <div class="section" id="_erstellen_sie_den_api_schlüssel">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Erstellen Sie den API-Schlüssel: </h2>
|
||||
<span class="title-number">6.1</span>Erstellen Sie den API-Schlüssel: </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
@@ -305,7 +354,7 @@ Bitte beachten Sie, dass das Laden der Rollen einige Sekunden dauern kann.
|
||||
</div> <div class="section" id="_zahlungsmethoden_einrichten">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Zahlungsmethoden einrichten </h2>
|
||||
<span class="title-number">6.2</span>Zahlungsmethoden einrichten </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -367,7 +416,7 @@ Bitte beachten Sie, dass die Konnektoren doppelt erscheinen, da einer für Zahlu
|
||||
</div> <div class="chapter" id="_shop_startanleitung">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">6</span>Shop-Startanleitung </h1>
|
||||
<span class="title-number">7</span>Shop-Startanleitung </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="olist arabic">
|
||||
@@ -506,7 +555,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="chapter" id="_transaktionszustandsdiagramm">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">7</span>Transaktionszustandsdiagramm </h1>
|
||||
<span class="title-number">8</span>Transaktionszustandsdiagramm </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -516,7 +565,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="section" id="_zustandsabbildung_von_shopware_bestellungen">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.1</span>Zustandsabbildung von Shopware-Bestellungen </h2>
|
||||
<span class="title-number">8.1</span>Zustandsabbildung von Shopware-Bestellungen </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -524,7 +573,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="section" id="_allgemeine_anmerkungen_zu_bestellstatus">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.1.1</span>Allgemeine Anmerkungen zu Bestellstatus </h3>
|
||||
<span class="title-number">8.1.1</span>Allgemeine Anmerkungen zu Bestellstatus </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -534,7 +583,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="section" id="_zustandsabbildung_des_shopware_zahlungsstatus">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.2</span>Zustandsabbildung des Shopware-Zahlungsstatus </h2>
|
||||
<span class="title-number">8.2</span>Zustandsabbildung des Shopware-Zahlungsstatus </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -561,7 +610,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="section" id="_allgemeine_anmerkungen_zu_zahlungsstatus">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.2.1</span>Allgemeine Anmerkungen zu Zahlungsstatus </h3>
|
||||
<span class="title-number">8.2.1</span>Allgemeine Anmerkungen zu Zahlungsstatus </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -571,7 +620,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="section" id="_zustandsabbildung_des_shopware_lieferstatus">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.3</span>Zustandsabbildung des Shopware-Lieferstatus </h2>
|
||||
<span class="title-number">8.3</span>Zustandsabbildung des Shopware-Lieferstatus </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -597,7 +646,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="chapter" id="_transaktionsverwaltung">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">8</span>Transaktionsverwaltung </h1>
|
||||
<span class="title-number">9</span>Transaktionsverwaltung </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -605,7 +654,7 @@ Bitte beachten Sie, dass diese Option leer bleiben sollte, wenn Sie die Space Vi
|
||||
</div> <div class="section" id="_bestellung_abschließen_erfassen">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.1</span>Bestellung abschließen (erfassen) </h2>
|
||||
<span class="title-number">9.1</span>Bestellung abschließen (erfassen) </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -633,7 +682,7 @@ Wenn der Abschluss in VR Payment ausstehend ist, bleibt die Bestellung im Status
|
||||
</div> <div class="section" id="_transaktion_stornieren">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.2</span>Transaktion stornieren </h2>
|
||||
<span class="title-number">9.2</span>Transaktion stornieren </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -657,7 +706,7 @@ Sie können nur Transaktionen stornieren, die noch nicht abgeschlossen sind.
|
||||
</div> <div class="section" id="_rückerstattung_einer_transaktion">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.3</span>Rückerstattung einer Transaktion </h2>
|
||||
<span class="title-number">9.3</span>Rückerstattung einer Transaktion </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -683,7 +732,7 @@ Es kann einige Zeit dauern, bis Sie die Rückerstattung in Shopware sehen. Rück
|
||||
</div> <div class="section" id="_bestellungen_auf_on_hold">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.4</span>Bestellungen auf On Hold </h2>
|
||||
<span class="title-number">9.4</span>Bestellungen auf On Hold </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -705,7 +754,7 @@ Es kann einige Zeit dauern, bis Sie die Rückerstattung in Shopware sehen. Rück
|
||||
</div> <div class="section" id="_einschränkungen_der_synchronisierung_zwischen_whitelabelname_und_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.5</span>Einschränkungen der Synchronisierung zwischen VR Payment und Shopware </h2>
|
||||
<span class="title-number">9.5</span>Einschränkungen der Synchronisierung zwischen VR Payment und Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -716,7 +765,7 @@ Es kann einige Zeit dauern, bis Sie die Rückerstattung in Shopware sehen. Rück
|
||||
</div> <div class="section" id="_tokenisierung">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.6</span>Tokenisierung </h2>
|
||||
<span class="title-number">9.6</span>Tokenisierung </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -736,7 +785,7 @@ Die Tokenisierung ist für Gast-Checkouts nicht verfügbar
|
||||
</div> <div class="section" id="_wiederkehrende_zahlungen">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.7</span>Wiederkehrende Zahlungen </h2>
|
||||
<span class="title-number">9.7</span>Wiederkehrende Zahlungen </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -746,7 +795,7 @@ Tokenisierung unterstützt, kann er für Abonnements verwendet werden. Die wiede
|
||||
</div> <div class="section" id="_hauptfunktionen">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.8</span>Hauptfunktionen </h2>
|
||||
<span class="title-number">9.8</span>Hauptfunktionen </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -771,7 +820,7 @@ Tokenisierung unterstützt, kann er für Abonnements verwendet werden. Die wiede
|
||||
</div> <div class="section" id="_fehlerbehebung">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.9</span>Fehlerbehebung </h2>
|
||||
<span class="title-number">9.9</span>Fehlerbehebung </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -803,7 +852,7 @@ tail -f var/log/whitelabelname*.log</code></pre>
|
||||
</div> <div class="section" id="_faqs">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.10</span>FAQs </h2>
|
||||
<span class="title-number">9.10</span>FAQs </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -832,7 +881,7 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.</p>
|
||||
</div> <div class="chapter" id="_änderungsprotokoll">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">9</span>Änderungsprotokoll </h1>
|
||||
<span class="title-number">10</span>Änderungsprotokoll </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -841,7 +890,7 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.</p>
|
||||
</div> <div class="chapter" id="_mitwirken">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">10</span>Mitwirken </h1>
|
||||
<span class="title-number">11</span>Mitwirken </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -852,7 +901,7 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.</p>
|
||||
</div> <div class="chapter" id="_support">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">11</span>Support </h1>
|
||||
<span class="title-number">12</span>Support </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -908,133 +957,150 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.</p>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<a href="#_update">
|
||||
<span class="item-number">5</span>
|
||||
<span class="item-title">Update</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_via_administration">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-title">Via Administration</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_via_cli">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-title">Via CLI</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-title">Portal-Startanleitung</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_erstellen_sie_den_api_schlüssel">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-number">6.1</span>
|
||||
<span class="item-title">Erstellen Sie den API-Schlüssel:</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_zahlungsmethoden_einrichten">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-number">6.2</span>
|
||||
<span class="item-title">Zahlungsmethoden einrichten</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_shop_startanleitung">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-title">Shop-Startanleitung</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_transaktionszustandsdiagramm">
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-title">Transaktionszustandsdiagramm</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_zustandsabbildung_von_shopware_bestellungen">
|
||||
<span class="item-number">7.1</span>
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-title">Zustandsabbildung von Shopware-Bestellungen</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_allgemeine_anmerkungen_zu_bestellstatus">
|
||||
<span class="item-number">7.1.1</span>
|
||||
<span class="item-number">8.1.1</span>
|
||||
<span class="item-title">Allgemeine Anmerkungen zu Bestellstatus</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_zustandsabbildung_des_shopware_zahlungsstatus">
|
||||
<span class="item-number">7.2</span>
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-title">Zustandsabbildung des Shopware-Zahlungsstatus</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_allgemeine_anmerkungen_zu_zahlungsstatus">
|
||||
<span class="item-number">7.2.1</span>
|
||||
<span class="item-number">8.2.1</span>
|
||||
<span class="item-title">Allgemeine Anmerkungen zu Zahlungsstatus</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_zustandsabbildung_des_shopware_lieferstatus">
|
||||
<span class="item-number">7.3</span>
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-title">Zustandsabbildung des Shopware-Lieferstatus</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_transaktionsverwaltung">
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-title">Transaktionsverwaltung</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_bestellung_abschließen_erfassen">
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-number">9.1</span>
|
||||
<span class="item-title">Bestellung abschließen (erfassen)</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_transaktion_stornieren">
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-number">9.2</span>
|
||||
<span class="item-title">Transaktion stornieren</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_rückerstattung_einer_transaktion">
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-number">9.3</span>
|
||||
<span class="item-title">Rückerstattung einer Transaktion</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_bestellungen_auf_on_hold">
|
||||
<span class="item-number">8.4</span>
|
||||
<span class="item-number">9.4</span>
|
||||
<span class="item-title">Bestellungen auf On Hold</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_einschränkungen_der_synchronisierung_zwischen_whitelabelname_und_shopware">
|
||||
<span class="item-number">8.5</span>
|
||||
<span class="item-number">9.5</span>
|
||||
<span class="item-title">Einschränkungen der Synchronisierung zwischen VR Payment und Shopware</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_tokenisierung">
|
||||
<span class="item-number">8.6</span>
|
||||
<span class="item-number">9.6</span>
|
||||
<span class="item-title">Tokenisierung</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_wiederkehrende_zahlungen">
|
||||
<span class="item-number">8.7</span>
|
||||
<span class="item-number">9.7</span>
|
||||
<span class="item-title">Wiederkehrende Zahlungen</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_hauptfunktionen">
|
||||
<span class="item-number">8.8</span>
|
||||
<span class="item-number">9.8</span>
|
||||
<span class="item-title">Hauptfunktionen</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_fehlerbehebung">
|
||||
<span class="item-number">8.9</span>
|
||||
<span class="item-number">9.9</span>
|
||||
<span class="item-title">Fehlerbehebung</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_faqs">
|
||||
<span class="item-number">8.10</span>
|
||||
<span class="item-number">9.10</span>
|
||||
<span class="item-title">FAQs</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_änderungsprotokoll">
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-title">Änderungsprotokoll</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_mitwirken">
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-title">Mitwirken</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_support">
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-number">12</span>
|
||||
<span class="item-title">Support</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
|
||||
+115
-49
@@ -23,7 +23,7 @@
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.4/">
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.1/">
|
||||
Source
|
||||
</a>
|
||||
</li>
|
||||
@@ -193,10 +193,59 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
|
||||
</div>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="_update">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Update </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="section" id="_via_administration">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Via Administration </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Go to Shopware Admin > Extensions > My extensions.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Find VRPaymentPayment.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Click Update.</p>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> <div class="section" id="_via_cli">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Via CLI </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Deploy the new plugin files (replace the folder in <code>custom/plugins/VRPaymentPayment</code> or upload/install a new ZIP).</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Run:</p>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlight"><code class="language-bash" data-lang="bash">bin/console plugin:refresh
|
||||
bin/console plugin:update --clearCache VRPaymentPayment
|
||||
bin/console cache:clear</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="portal-startup-guide">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Portal Startup Guide </h1>
|
||||
<span class="title-number">6</span>Portal Startup Guide </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -215,7 +264,7 @@ Please select the proper subscription plan - it should support ecommerce transac
|
||||
</div> <div class="section" id="_create_the_api_key">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Create the API key: </h2>
|
||||
<span class="title-number">6.1</span>Create the API key: </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
@@ -301,7 +350,7 @@ Please note that Roles might be loading for few seconds
|
||||
</div> <div class="section" id="_setup_payment_methods">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Setup Payment Methods </h2>
|
||||
<span class="title-number">6.2</span>Setup Payment Methods </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -363,7 +412,7 @@ Please note that the connectors seems duplicated but it because one is for Physi
|
||||
</div> <div class="chapter" id="_shop_startup_guide">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">6</span>Shop Startup Guide </h1>
|
||||
<span class="title-number">7</span>Shop Startup Guide </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="olist arabic">
|
||||
@@ -502,7 +551,7 @@ Please note that if you do not use the Space View Id; this option should stay em
|
||||
</div> <div class="chapter" id="_transaction_state_graph">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">7</span>Transaction State graph </h1>
|
||||
<span class="title-number">8</span>Transaction State graph </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -514,7 +563,7 @@ can be found in the <a href="https://gateway.vr-payment.de/en-us/doc/payment/tra
|
||||
</div> <div class="section" id="_state_mapping_of_shopware_orders">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.1</span>State mapping of Shopware orders </h2>
|
||||
<span class="title-number">8.1</span>State mapping of Shopware orders </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -522,7 +571,7 @@ can be found in the <a href="https://gateway.vr-payment.de/en-us/doc/payment/tra
|
||||
</div> <div class="section" id="_general_remarks_regarding_order_statuses">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.1.1</span>General remarks regarding order statuses </h3>
|
||||
<span class="title-number">8.1.1</span>General remarks regarding order statuses </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -532,7 +581,7 @@ can be found in the <a href="https://gateway.vr-payment.de/en-us/doc/payment/tra
|
||||
</div> <div class="section" id="_state_mapping_of_shopware_payment_status">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.2</span>State mapping of Shopware payment status </h2>
|
||||
<span class="title-number">8.2</span>State mapping of Shopware payment status </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -559,7 +608,7 @@ can be found in the <a href="https://gateway.vr-payment.de/en-us/doc/payment/tra
|
||||
</div> <div class="section" id="_general_remarks_regarding_payment_statuses">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.2.1</span>General remarks regarding payment statuses </h3>
|
||||
<span class="title-number">8.2.1</span>General remarks regarding payment statuses </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -569,7 +618,7 @@ can be found in the <a href="https://gateway.vr-payment.de/en-us/doc/payment/tra
|
||||
</div> <div class="section" id="_state_mapping_of_shopware_delivery_status">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.3</span>State mapping of Shopware delivery status </h2>
|
||||
<span class="title-number">8.3</span>State mapping of Shopware delivery status </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -595,7 +644,7 @@ can be found in the <a href="https://gateway.vr-payment.de/en-us/doc/payment/tra
|
||||
</div> <div class="chapter" id="_transaction_management">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">8</span>Transaction management </h1>
|
||||
<span class="title-number">9</span>Transaction management </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -605,7 +654,7 @@ Shopware. However, there are some limitations (see below).</p>
|
||||
</div> <div class="section" id="_complete_capture_an_order">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.1</span>Complete (capture) an order </h2>
|
||||
<span class="title-number">9.1</span>Complete (capture) an order </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -639,7 +688,7 @@ the fulfill state is reached. Initially the transaction will be in the <code>Aut
|
||||
</div> <div class="section" id="_void_a_transaction">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.2</span>Void a transaction </h2>
|
||||
<span class="title-number">9.2</span>Void a transaction </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -663,7 +712,7 @@ You can only void transactions that are not yet completed.
|
||||
</div> <div class="section" id="_refund_of_a_transaction">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.3</span>Refund of a transaction </h2>
|
||||
<span class="title-number">9.3</span>Refund of a transaction </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -690,7 +739,7 @@ It can take some time until you see the refund in Shopware. Refunds will only be
|
||||
</div> <div class="section" id="_on_hold_orders">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.4</span>On hold orders </h2>
|
||||
<span class="title-number">9.4</span>On hold orders </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -714,7 +763,7 @@ within the defined time frame, VR Payment will generate a manual task which you
|
||||
</div> <div class="section" id="_limitations_of_the_synchronization_between_whitelabelname_and_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.5</span>Limitations of the synchronization between VR Payment and Shopware </h2>
|
||||
<span class="title-number">9.5</span>Limitations of the synchronization between VR Payment and Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -730,7 +779,7 @@ your Shopware backend.</p>
|
||||
</div> <div class="section" id="_tokenization">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.6</span>Tokenization </h2>
|
||||
<span class="title-number">9.6</span>Tokenization </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -751,7 +800,7 @@ Tokenization is not available for guest checkouts.
|
||||
</div> <div class="section" id="_recurring_payments">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.7</span>Recurring payments </h2>
|
||||
<span class="title-number">9.7</span>Recurring payments </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -761,7 +810,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</div> <div class="section" id="_key_features">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.8</span>Key Features </h2>
|
||||
<span class="title-number">9.8</span>Key Features </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -786,7 +835,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</div> <div class="section" id="_troubleshooting">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.9</span>Troubleshooting </h2>
|
||||
<span class="title-number">9.9</span>Troubleshooting </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -817,7 +866,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</div> <div class="section" id="_faqs">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.10</span>FAQs </h2>
|
||||
<span class="title-number">9.10</span>FAQs </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -849,7 +898,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</div> <div class="chapter" id="_changelog">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">9</span>Changelog </h1>
|
||||
<span class="title-number">10</span>Changelog </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -858,7 +907,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</div> <div class="chapter" id="_contributing">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">10</span>Contributing </h1>
|
||||
<span class="title-number">11</span>Contributing </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -869,7 +918,7 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</div> <div class="chapter" id="_support">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">11</span>Support </h1>
|
||||
<span class="title-number">12</span>Support </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -925,133 +974,150 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<a href="#_update">
|
||||
<span class="item-number">5</span>
|
||||
<span class="item-title">Update</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_via_administration">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-title">Via Administration</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_via_cli">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-title">Via CLI</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-title">Portal Startup Guide</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_create_the_api_key">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-number">6.1</span>
|
||||
<span class="item-title">Create the API key:</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_setup_payment_methods">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-number">6.2</span>
|
||||
<span class="item-title">Setup Payment Methods</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_shop_startup_guide">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-title">Shop Startup Guide</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_transaction_state_graph">
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-title">Transaction State graph</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_state_mapping_of_shopware_orders">
|
||||
<span class="item-number">7.1</span>
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-title">State mapping of Shopware orders</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_general_remarks_regarding_order_statuses">
|
||||
<span class="item-number">7.1.1</span>
|
||||
<span class="item-number">8.1.1</span>
|
||||
<span class="item-title">General remarks regarding order statuses</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_state_mapping_of_shopware_payment_status">
|
||||
<span class="item-number">7.2</span>
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-title">State mapping of Shopware payment status</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_general_remarks_regarding_payment_statuses">
|
||||
<span class="item-number">7.2.1</span>
|
||||
<span class="item-number">8.2.1</span>
|
||||
<span class="item-title">General remarks regarding payment statuses</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_state_mapping_of_shopware_delivery_status">
|
||||
<span class="item-number">7.3</span>
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-title">State mapping of Shopware delivery status</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_transaction_management">
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-title">Transaction management</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_complete_capture_an_order">
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-number">9.1</span>
|
||||
<span class="item-title">Complete (capture) an order</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_void_a_transaction">
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-number">9.2</span>
|
||||
<span class="item-title">Void a transaction</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_refund_of_a_transaction">
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-number">9.3</span>
|
||||
<span class="item-title">Refund of a transaction</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_on_hold_orders">
|
||||
<span class="item-number">8.4</span>
|
||||
<span class="item-number">9.4</span>
|
||||
<span class="item-title">On hold orders</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_limitations_of_the_synchronization_between_whitelabelname_and_shopware">
|
||||
<span class="item-number">8.5</span>
|
||||
<span class="item-number">9.5</span>
|
||||
<span class="item-title">Limitations of the synchronization between VR Payment and Shopware</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_tokenization">
|
||||
<span class="item-number">8.6</span>
|
||||
<span class="item-number">9.6</span>
|
||||
<span class="item-title">Tokenization</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_recurring_payments">
|
||||
<span class="item-number">8.7</span>
|
||||
<span class="item-number">9.7</span>
|
||||
<span class="item-title">Recurring payments</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_key_features">
|
||||
<span class="item-number">8.8</span>
|
||||
<span class="item-number">9.8</span>
|
||||
<span class="item-title">Key Features</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_troubleshooting">
|
||||
<span class="item-number">8.9</span>
|
||||
<span class="item-number">9.9</span>
|
||||
<span class="item-title">Troubleshooting</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_faqs">
|
||||
<span class="item-number">8.10</span>
|
||||
<span class="item-number">9.10</span>
|
||||
<span class="item-title">FAQs</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_changelog">
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-title">Changelog</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_contributing">
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-title">Contributing</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_support">
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-number">12</span>
|
||||
<span class="item-title">Support</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
|
||||
+115
-49
@@ -23,7 +23,7 @@
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.4/">
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.1/">
|
||||
Source
|
||||
</a>
|
||||
</li>
|
||||
@@ -184,10 +184,59 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
|
||||
</div>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="_mise_à_jour">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Mise à jour </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="section" id="_via_l_administration">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Via l’administration </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Allez dans Shopware Admin > Extensions > Mes extensions.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Recherchez VRPaymentPayment.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Cliquez sur Mettre à jour.</p>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> <div class="section" id="_via_la_cli">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Via la CLI </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Déployez les nouveaux fichiers du plugin (remplacez le dossier <code>custom/plugins/VRPaymentPayment</code> ou téléversez/installez un nouveau ZIP).</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Exécutez :</p>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlight"><code class="language-bash" data-lang="bash">bin/console plugin:refresh
|
||||
bin/console plugin:update --clearCache VRPaymentPayment
|
||||
bin/console cache:clear</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="portal-startup-guide">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Guide de démarrage pour le Portail </h1>
|
||||
<span class="title-number">6</span>Guide de démarrage pour le Portail </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -206,7 +255,7 @@ Veuillez sélectionner le plan d’abonnement approprié - il doit prendre e
|
||||
</div> <div class="section" id="_créez_la_clé_api">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Créez la clé API: </h2>
|
||||
<span class="title-number">6.1</span>Créez la clé API: </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
@@ -292,7 +341,7 @@ Veuillez noter que le chargement des rôles peut durer quelques secondes.
|
||||
</div> <div class="section" id="_configurer_les_modes_de_paiement">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Configurer les modes de paiement </h2>
|
||||
<span class="title-number">6.2</span>Configurer les modes de paiement </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -354,7 +403,7 @@ Veuillez noter que les connecteurs semblent faire double emploi, mais c’es
|
||||
</div> <div class="chapter" id="_guide_de_démarrage_pour_shopware">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">6</span>Guide de démarrage pour Shopware </h1>
|
||||
<span class="title-number">7</span>Guide de démarrage pour Shopware </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="olist arabic">
|
||||
@@ -493,7 +542,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="chapter" id="_différents_etats_pour_une_transaction">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">7</span>Différents Etats pour une Transaction </h1>
|
||||
<span class="title-number">8</span>Différents Etats pour une Transaction </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -503,7 +552,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="section" id="_cartographie_des_différents_états_d_une_commande_de_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.1</span>Cartographie des différents états d’une commande de Shopware </h2>
|
||||
<span class="title-number">8.1</span>Cartographie des différents états d’une commande de Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -511,7 +560,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="section" id="_remarque_générales_concernant_les_status_des_commandes">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.1.1</span>Remarque générales concernant les status des commandes </h3>
|
||||
<span class="title-number">8.1.1</span>Remarque générales concernant les status des commandes </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -521,7 +570,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="section" id="_cartographie_des_différents_états_du_paiement_de_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.2</span>Cartographie des différents états du paiement de Shopware </h2>
|
||||
<span class="title-number">8.2</span>Cartographie des différents états du paiement de Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -548,7 +597,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="section" id="_remarques_générales_concernant_les_différents_status_pour_les_paiements">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.2.1</span>Remarques générales concernant les différents status pour les paiements </h3>
|
||||
<span class="title-number">8.2.1</span>Remarques générales concernant les différents status pour les paiements </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -558,7 +607,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="section" id="_carthographie_des_différents_états_de_livraison_chez_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.3</span>Carthographie des différents états de livraison chez Shopware </h2>
|
||||
<span class="title-number">8.3</span>Carthographie des différents états de livraison chez Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -584,7 +633,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="chapter" id="_gestion_des_transactions">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">8</span>Gestion des Transactions </h1>
|
||||
<span class="title-number">9</span>Gestion des Transactions </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -592,7 +641,7 @@ Veuillez noter que si vous n’utilisez pas Space View Id, cette option doit
|
||||
</div> <div class="section" id="_complete_capture_an_order">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.1</span>Complete (capture) an order </h2>
|
||||
<span class="title-number">9.1</span>Complete (capture) an order </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -624,7 +673,7 @@ Lorsque le paiement est en attente dans VR Payment, la commande reste en attente
|
||||
</div> <div class="section" id="_annuler_une_transaction">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.2</span>Annuler une transaction </h2>
|
||||
<span class="title-number">9.2</span>Annuler une transaction </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -648,7 +697,7 @@ Vous ne pouvez annuler que les transactions qui ne sont pas encore complétée..
|
||||
</div> <div class="section" id="_remboursement_d_une_transaction">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.3</span>Remboursement d’une transaction </h2>
|
||||
<span class="title-number">9.3</span>Remboursement d’une transaction </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -674,7 +723,7 @@ Il peut s’écouler un certain temps avant que vous ne voyiez le remboursem
|
||||
</div> <div class="section" id="_commandes_en_attente">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.4</span>Commandes en attente </h2>
|
||||
<span class="title-number">9.4</span>Commandes en attente </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -696,7 +745,7 @@ Il peut s’écouler un certain temps avant que vous ne voyiez le remboursem
|
||||
</div> <div class="section" id="_limites_de_la_synchronisation_entre_whitelabelname_et_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.5</span>Limites de la synchronisation entre VR Payment et Shopware </h2>
|
||||
<span class="title-number">9.5</span>Limites de la synchronisation entre VR Payment et Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -707,7 +756,7 @@ Il peut s’écouler un certain temps avant que vous ne voyiez le remboursem
|
||||
</div> <div class="section" id="_tokenisation">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.6</span>Tokenisation </h2>
|
||||
<span class="title-number">9.6</span>Tokenisation </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -727,7 +776,7 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
|
||||
</div> <div class="section" id="_paiements_récurrents">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.7</span>Paiements récurrents </h2>
|
||||
<span class="title-number">9.7</span>Paiements récurrents </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -736,7 +785,7 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
|
||||
</div> <div class="section" id="_caractéristiques_pricinpales">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.8</span>Caractéristiques Pricinpales </h2>
|
||||
<span class="title-number">9.8</span>Caractéristiques Pricinpales </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -761,7 +810,7 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
|
||||
</div> <div class="section" id="_troubleshooting">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.9</span>Troubleshooting </h2>
|
||||
<span class="title-number">9.9</span>Troubleshooting </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -792,7 +841,7 @@ La tokenisation n’est pas disponible pour les paiements par les invités.
|
||||
</div> <div class="section" id="_faqs">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.10</span>FAQs </h2>
|
||||
<span class="title-number">9.10</span>FAQs </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -820,7 +869,7 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.</p>
|
||||
</div> <div class="chapter" id="_changelog">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">9</span>Changelog </h1>
|
||||
<span class="title-number">10</span>Changelog </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -829,7 +878,7 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.</p>
|
||||
</div> <div class="chapter" id="_contribuer">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">10</span>Contribuer </h1>
|
||||
<span class="title-number">11</span>Contribuer </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -840,7 +889,7 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.</p>
|
||||
</div> <div class="chapter" id="_support">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">11</span>Support </h1>
|
||||
<span class="title-number">12</span>Support </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -896,133 +945,150 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.</p>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<a href="#_mise_à_jour">
|
||||
<span class="item-number">5</span>
|
||||
<span class="item-title">Mise à jour</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_via_l_administration">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-title">Via l’administration</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_via_la_cli">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-title">Via la CLI</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-title">Guide de démarrage pour le Portail</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_créez_la_clé_api">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-number">6.1</span>
|
||||
<span class="item-title">Créez la clé API:</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_configurer_les_modes_de_paiement">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-number">6.2</span>
|
||||
<span class="item-title">Configurer les modes de paiement</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_guide_de_démarrage_pour_shopware">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-title">Guide de démarrage pour Shopware</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_différents_etats_pour_une_transaction">
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-title">Différents Etats pour une Transaction</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_cartographie_des_différents_états_d_une_commande_de_shopware">
|
||||
<span class="item-number">7.1</span>
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-title">Cartographie des différents états d’une commande de Shopware</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_remarque_générales_concernant_les_status_des_commandes">
|
||||
<span class="item-number">7.1.1</span>
|
||||
<span class="item-number">8.1.1</span>
|
||||
<span class="item-title">Remarque générales concernant les status des commandes</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_cartographie_des_différents_états_du_paiement_de_shopware">
|
||||
<span class="item-number">7.2</span>
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-title">Cartographie des différents états du paiement de Shopware</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_remarques_générales_concernant_les_différents_status_pour_les_paiements">
|
||||
<span class="item-number">7.2.1</span>
|
||||
<span class="item-number">8.2.1</span>
|
||||
<span class="item-title">Remarques générales concernant les différents status pour les paiements</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_carthographie_des_différents_états_de_livraison_chez_shopware">
|
||||
<span class="item-number">7.3</span>
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-title">Carthographie des différents états de livraison chez Shopware</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_gestion_des_transactions">
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-title">Gestion des Transactions</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_complete_capture_an_order">
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-number">9.1</span>
|
||||
<span class="item-title">Complete (capture) an order</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_annuler_une_transaction">
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-number">9.2</span>
|
||||
<span class="item-title">Annuler une transaction</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_remboursement_d_une_transaction">
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-number">9.3</span>
|
||||
<span class="item-title">Remboursement d&#8217;une transaction</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_commandes_en_attente">
|
||||
<span class="item-number">8.4</span>
|
||||
<span class="item-number">9.4</span>
|
||||
<span class="item-title">Commandes en attente</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_limites_de_la_synchronisation_entre_whitelabelname_et_shopware">
|
||||
<span class="item-number">8.5</span>
|
||||
<span class="item-number">9.5</span>
|
||||
<span class="item-title">Limites de la synchronisation entre VR Payment et Shopware</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_tokenisation">
|
||||
<span class="item-number">8.6</span>
|
||||
<span class="item-number">9.6</span>
|
||||
<span class="item-title">Tokenisation</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_paiements_récurrents">
|
||||
<span class="item-number">8.7</span>
|
||||
<span class="item-number">9.7</span>
|
||||
<span class="item-title">Paiements récurrents</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_caractéristiques_pricinpales">
|
||||
<span class="item-number">8.8</span>
|
||||
<span class="item-number">9.8</span>
|
||||
<span class="item-title">Caractéristiques Pricinpales</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_troubleshooting">
|
||||
<span class="item-number">8.9</span>
|
||||
<span class="item-number">9.9</span>
|
||||
<span class="item-title">Troubleshooting</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_faqs">
|
||||
<span class="item-number">8.10</span>
|
||||
<span class="item-number">9.10</span>
|
||||
<span class="item-title">FAQs</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_changelog">
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-title">Changelog</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_contribuer">
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-title">Contribuer</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_support">
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-number">12</span>
|
||||
<span class="item-title">Support</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
|
||||
+115
-49
@@ -23,7 +23,7 @@
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.4/">
|
||||
<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.1/">
|
||||
Source
|
||||
</a>
|
||||
</li>
|
||||
@@ -191,10 +191,59 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
|
||||
</div>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="_aggiornamento">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Aggiornamento </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="section" id="_tramite_amministrazione">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Tramite Amministrazione </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Vai su Shopware Admin > Estensioni > Le mie estensioni.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Trova VRPaymentPayment.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Clicca su Aggiorna.</p>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> <div class="section" id="_tramite_cli">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Tramite CLI </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
<ol class="arabic">
|
||||
<li>
|
||||
<p>Distribuisci i nuovi file del plugin (sostituisci la cartella <code>custom/plugins/VRPaymentPayment</code> oppure carica/installa un nuovo ZIP).</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>Esegui:</p>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlight"><code class="language-bash" data-lang="bash">bin/console plugin:refresh
|
||||
bin/console plugin:update --clearCache VRPaymentPayment
|
||||
bin/console cache:clear</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</div> </div>
|
||||
</div> </div>
|
||||
</div> <div class="chapter" id="portal-startup-guide">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">5</span>Guida Rapida al Portale </h1>
|
||||
<span class="title-number">6</span>Guida Rapida al Portale </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -213,7 +262,7 @@ Selezionate il piano di abbonamento appropriato: dovrebbe supportare le transazi
|
||||
</div> <div class="section" id="_create_la_chiave_api">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.1</span>Create la chiave API: </h2>
|
||||
<span class="title-number">6.1</span>Create la chiave API: </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="olist arabic">
|
||||
@@ -299,7 +348,7 @@ Si prega di notare che il caricamento dei ruoli potrebbe richiedere alcuni secon
|
||||
</div> <div class="section" id="_configurate_i_metodi_di_pagamento">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">5.2</span>Configurate i Metodi di Pagamento </h2>
|
||||
<span class="title-number">6.2</span>Configurate i Metodi di Pagamento </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -361,7 +410,7 @@ Si prega di notare che i connettori sembrano duplicati, ma è perché uno è per
|
||||
</div> <div class="chapter" id="_guida_rapida_al_shop">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">6</span>Guida Rapida al Shop </h1>
|
||||
<span class="title-number">7</span>Guida Rapida al Shop </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="olist arabic">
|
||||
@@ -500,7 +549,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="chapter" id="_grafico_dello_stato_della_transazione">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">7</span>Grafico dello Stato della Transazione </h1>
|
||||
<span class="title-number">8</span>Grafico dello Stato della Transazione </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -510,7 +559,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="section" id="_mappatura_degli_stati_degli_ordini_di_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.1</span>Mappatura degli Stati degli Ordini di Shopware </h2>
|
||||
<span class="title-number">8.1</span>Mappatura degli Stati degli Ordini di Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -518,7 +567,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="section" id="_osservazioni_generali_riguardo_agli_stati_degli_ordini">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.1.1</span>Osservazioni Generali Riguardo agli Stati degli Ordini </h3>
|
||||
<span class="title-number">8.1.1</span>Osservazioni Generali Riguardo agli Stati degli Ordini </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -528,7 +577,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="section" id="_mappatura_dello_stato_di_pagamento_di_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.2</span>Mappatura dello Stato di Pagamento di Shopware </h2>
|
||||
<span class="title-number">8.2</span>Mappatura dello Stato di Pagamento di Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -555,7 +604,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="section" id="_osservazioni_generali_riguardo_agli_stati_di_pagamento">
|
||||
<div class="section-title">
|
||||
<h3>
|
||||
<span class="title-number">7.2.1</span>Osservazioni Generali Riguardo agli Stati di Pagamento </h3>
|
||||
<span class="title-number">8.2.1</span>Osservazioni Generali Riguardo agli Stati di Pagamento </h3>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -565,7 +614,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="section" id="_mappatura_dello_stato_di_spedizione_di_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">7.3</span>Mappatura dello Stato di Spedizione di Shopware </h2>
|
||||
<span class="title-number">8.3</span>Mappatura dello Stato di Spedizione di Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -591,7 +640,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="chapter" id="_gestione_delle_transazioni">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">8</span>Gestione delle Transazioni </h1>
|
||||
<span class="title-number">9</span>Gestione delle Transazioni </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -599,7 +648,7 @@ Si prega di notare che se non utilizzate lo Space View Id, questa opzione dovreb
|
||||
</div> <div class="section" id="_completare_acquisire_un_ordine">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.1</span>Completare (Acquisire) un Ordine </h2>
|
||||
<span class="title-number">9.1</span>Completare (Acquisire) un Ordine </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -631,7 +680,7 @@ Quando il completamento è in sospeso in VR Payment, l’ordine rimarrà nel
|
||||
</div> <div class="section" id="_annullare_una_transazione">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.2</span>Annullare una transazione </h2>
|
||||
<span class="title-number">9.2</span>Annullare una transazione </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -655,7 +704,7 @@ Puoi annullare solo le transazioni che non sono ancora state completate
|
||||
</div> <div class="section" id="_rimborso_di_una_transazione">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.3</span>Rimborso di una Transazione </h2>
|
||||
<span class="title-number">9.3</span>Rimborso di una Transazione </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -681,7 +730,7 @@ Potrebbe volerci un po' di tempo prima che vediate il rimborso in Shopware. I ri
|
||||
</div> <div class="section" id="_ordini_in_attesa">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.4</span>Ordini in Attesa </h2>
|
||||
<span class="title-number">9.4</span>Ordini in Attesa </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -703,7 +752,7 @@ Potrebbe volerci un po' di tempo prima che vediate il rimborso in Shopware. I ri
|
||||
</div> <div class="section" id="_limitazioni_della_sincronizzazione_tra_whitelabelname_e_shopware">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.5</span>Limitazioni della Sincronizzazione tra VR Payment e Shopware </h2>
|
||||
<span class="title-number">9.5</span>Limitazioni della Sincronizzazione tra VR Payment e Shopware </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -714,7 +763,7 @@ Potrebbe volerci un po' di tempo prima che vediate il rimborso in Shopware. I ri
|
||||
</div> <div class="section" id="_tokenization">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.6</span>Tokenization </h2>
|
||||
<span class="title-number">9.6</span>Tokenization </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -734,7 +783,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="section" id="_pagamenti_ricorrenti">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.7</span>Pagamenti ricorrenti </h2>
|
||||
<span class="title-number">9.7</span>Pagamenti ricorrenti </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -743,7 +792,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="section" id="_key_features">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.8</span>Key Features </h2>
|
||||
<span class="title-number">9.8</span>Key Features </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -768,7 +817,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="section" id="_risoluzione_dei_problemi">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.9</span>Risoluzione dei Problemi </h2>
|
||||
<span class="title-number">9.9</span>Risoluzione dei Problemi </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="ulist">
|
||||
@@ -799,7 +848,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="section" id="_faqs">
|
||||
<div class="section-title">
|
||||
<h2>
|
||||
<span class="title-number">8.10</span>FAQs </h2>
|
||||
<span class="title-number">9.10</span>FAQs </h2>
|
||||
</div>
|
||||
<div class="section-body">
|
||||
<div class="paragraph">
|
||||
@@ -831,7 +880,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="chapter" id="_changelog">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">9</span>Changelog </h1>
|
||||
<span class="title-number">10</span>Changelog </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -840,7 +889,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="chapter" id="_contribuzione">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">10</span>Contribuzione </h1>
|
||||
<span class="title-number">11</span>Contribuzione </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -851,7 +900,7 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</div> <div class="chapter" id="_support">
|
||||
<div class="chapter-title">
|
||||
<h1>
|
||||
<span class="title-number">11</span>Support </h1>
|
||||
<span class="title-number">12</span>Support </h1>
|
||||
</div>
|
||||
<div class="chapter-body">
|
||||
<div class="paragraph">
|
||||
@@ -907,133 +956,150 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<a href="#_aggiornamento">
|
||||
<span class="item-number">5</span>
|
||||
<span class="item-title">Aggiornamento</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_tramite_amministrazione">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-title">Tramite Amministrazione</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_tramite_cli">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-title">Tramite CLI</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#portal-startup-guide">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-title">Guida Rapida al Portale</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_create_la_chiave_api">
|
||||
<span class="item-number">5.1</span>
|
||||
<span class="item-number">6.1</span>
|
||||
<span class="item-title">Create la chiave API:</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_configurate_i_metodi_di_pagamento">
|
||||
<span class="item-number">5.2</span>
|
||||
<span class="item-number">6.2</span>
|
||||
<span class="item-title">Configurate i Metodi di Pagamento</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_guida_rapida_al_shop">
|
||||
<span class="item-number">6</span>
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-title">Guida Rapida al Shop</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_grafico_dello_stato_della_transazione">
|
||||
<span class="item-number">7</span>
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-title">Grafico dello Stato della Transazione</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_mappatura_degli_stati_degli_ordini_di_shopware">
|
||||
<span class="item-number">7.1</span>
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-title">Mappatura degli Stati degli Ordini di Shopware</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_osservazioni_generali_riguardo_agli_stati_degli_ordini">
|
||||
<span class="item-number">7.1.1</span>
|
||||
<span class="item-number">8.1.1</span>
|
||||
<span class="item-title">Osservazioni Generali Riguardo agli Stati degli Ordini</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_mappatura_dello_stato_di_pagamento_di_shopware">
|
||||
<span class="item-number">7.2</span>
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-title">Mappatura dello Stato di Pagamento di Shopware</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-3">
|
||||
<a href="#_osservazioni_generali_riguardo_agli_stati_di_pagamento">
|
||||
<span class="item-number">7.2.1</span>
|
||||
<span class="item-number">8.2.1</span>
|
||||
<span class="item-title">Osservazioni Generali Riguardo agli Stati di Pagamento</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_mappatura_dello_stato_di_spedizione_di_shopware">
|
||||
<span class="item-number">7.3</span>
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-title">Mappatura dello Stato di Spedizione di Shopware</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_gestione_delle_transazioni">
|
||||
<span class="item-number">8</span>
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-title">Gestione delle Transazioni</span>
|
||||
</a>
|
||||
<ul class="nav">
|
||||
<li class="nav-level-2">
|
||||
<a href="#_completare_acquisire_un_ordine">
|
||||
<span class="item-number">8.1</span>
|
||||
<span class="item-number">9.1</span>
|
||||
<span class="item-title">Completare (Acquisire) un Ordine</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_annullare_una_transazione">
|
||||
<span class="item-number">8.2</span>
|
||||
<span class="item-number">9.2</span>
|
||||
<span class="item-title">Annullare una transazione</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_rimborso_di_una_transazione">
|
||||
<span class="item-number">8.3</span>
|
||||
<span class="item-number">9.3</span>
|
||||
<span class="item-title">Rimborso di una Transazione</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_ordini_in_attesa">
|
||||
<span class="item-number">8.4</span>
|
||||
<span class="item-number">9.4</span>
|
||||
<span class="item-title">Ordini in Attesa</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_limitazioni_della_sincronizzazione_tra_whitelabelname_e_shopware">
|
||||
<span class="item-number">8.5</span>
|
||||
<span class="item-number">9.5</span>
|
||||
<span class="item-title">Limitazioni della Sincronizzazione tra VR Payment e Shopware</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_tokenization">
|
||||
<span class="item-number">8.6</span>
|
||||
<span class="item-number">9.6</span>
|
||||
<span class="item-title">Tokenization</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_pagamenti_ricorrenti">
|
||||
<span class="item-number">8.7</span>
|
||||
<span class="item-number">9.7</span>
|
||||
<span class="item-title">Pagamenti ricorrenti</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_key_features">
|
||||
<span class="item-number">8.8</span>
|
||||
<span class="item-number">9.8</span>
|
||||
<span class="item-title">Key Features</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_risoluzione_dei_problemi">
|
||||
<span class="item-number">8.9</span>
|
||||
<span class="item-number">9.9</span>
|
||||
<span class="item-title">Risoluzione dei Problemi</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-2">
|
||||
<a href="#_faqs">
|
||||
<span class="item-number">8.10</span>
|
||||
<span class="item-number">9.10</span>
|
||||
<span class="item-title">FAQs</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_changelog">
|
||||
<span class="item-number">9</span>
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-title">Changelog</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_contribuzione">
|
||||
<span class="item-number">10</span>
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-title">Contribuzione</span>
|
||||
</a>
|
||||
</li> <li class="nav-level-1">
|
||||
<a href="#_support">
|
||||
<span class="item-number">11</span>
|
||||
<span class="item-number">12</span>
|
||||
<span class="item-title">Support</span>
|
||||
</a>
|
||||
</li> </ul>
|
||||
|
||||
@@ -661,6 +661,13 @@ class PaymentMethodConfigurationService {
|
||||
], $context);
|
||||
|
||||
// Media insert/update
|
||||
|
||||
// detect if collision, return existing id
|
||||
$existingId = $this->checkMediaAlreadyExists($paymentMethodConfiguration->getResolvedImageUrl(), $context);
|
||||
if ($existingId) {
|
||||
return $existingId;
|
||||
}
|
||||
|
||||
$mediaDefinition = $this->container->get(MediaDefinition::class);
|
||||
$this->mediaSerializer->setRegistry($this->serializerRegistry);
|
||||
|
||||
@@ -681,6 +688,22 @@ class PaymentMethodConfigurationService {
|
||||
}
|
||||
}
|
||||
|
||||
private function checkMediaAlreadyExists($paymentMethodUrl, $context) {
|
||||
// detect if collision, return existing id
|
||||
if (preg_match('#/([^/]+)\.[^/.]+$#', $paymentMethodUrl, $matches)) {
|
||||
$filename = $matches[1];
|
||||
}
|
||||
$criteria = new Criteria();
|
||||
$criteria->addFilter(new EqualsFilter('fileName', $filename));
|
||||
|
||||
$existing = $this->mediaRepository->search($criteria, $context)->first();
|
||||
|
||||
if ($existing) {
|
||||
return $existing->getId();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves media default folder for a given payment method configuration.
|
||||
*
|
||||
|
||||
@@ -13,6 +13,7 @@ use Symfony\Component\{
|
||||
};
|
||||
use VRPaymentPayment\Core\{
|
||||
Api\Refund\Service\RefundService,
|
||||
Api\Transaction\Service\TransactionService,
|
||||
Settings\Service\SettingsService
|
||||
};
|
||||
|
||||
@@ -41,16 +42,23 @@ class RefundController extends AbstractController
|
||||
*/
|
||||
protected $logger;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
|
||||
*/
|
||||
protected $transactionService;
|
||||
|
||||
/**
|
||||
* RefundController constructor.
|
||||
*
|
||||
* @param \VRPaymentPayment\Core\Api\Refund\Service\RefundService $refundService
|
||||
* @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
|
||||
* @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
|
||||
*/
|
||||
public function __construct(RefundService $refundService, SettingsService $settingsService)
|
||||
public function __construct(RefundService $refundService, SettingsService $settingsService, TransactionService $transactionService)
|
||||
{
|
||||
$this->settingsService = $settingsService;
|
||||
$this->refundService = $refundService;
|
||||
$this->transactionService = $transactionService;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -82,11 +90,23 @@ class RefundController extends AbstractController
|
||||
$quantity = (int)$request->request->get('quantity');
|
||||
$lineItemId = $request->request->get('lineItemId');
|
||||
|
||||
if ($quantity === null || $quantity <= 0) {
|
||||
return new Response('refundQuantityZero', Response::HTTP_BAD_REQUEST);
|
||||
}
|
||||
|
||||
$settings = $this->settingsService->getSettings($salesChannelId);
|
||||
$apiClient = $settings->getApiClient();
|
||||
|
||||
$transaction = $apiClient->getTransactionService()->read($settings->getSpaceId(), $transactionId);
|
||||
|
||||
$maxQuantity = $this->refundService->getMaxRefundableQuantity($transaction, $context, $lineItemId);
|
||||
|
||||
if ($quantity > $maxQuantity) {
|
||||
return new Response('refundExceedsQuantity', Response::HTTP_BAD_REQUEST);
|
||||
}
|
||||
|
||||
$refund = $this->refundService->create($transaction, $context, $lineItemId, $quantity);
|
||||
|
||||
if ($refund === null) {
|
||||
return new Response('Refund was not created. Please check the refund amound or if the item was not refunded before', Response::HTTP_BAD_REQUEST);
|
||||
}
|
||||
@@ -111,10 +131,23 @@ class RefundController extends AbstractController
|
||||
$transactionId = $request->request->get('transactionId');
|
||||
$refundableAmount = $request->request->get('refundableAmount');
|
||||
|
||||
if ($refundableAmount === null || $refundableAmount <= 0.0) {
|
||||
return new Response('refundAmountZero', Response::HTTP_BAD_REQUEST);
|
||||
}
|
||||
|
||||
$settings = $this->settingsService->getSettings($salesChannelId);
|
||||
$apiClient = $settings->getApiClient();
|
||||
|
||||
$transaction = $apiClient->getTransactionService()->read($settings->getSpaceId(), $transactionId);
|
||||
|
||||
$completed = (float) $transaction->getCompletedAmount();
|
||||
$refunded = (float) $transaction->getRefundedAmount();
|
||||
$maxRefund = round($completed - $refunded, 2);
|
||||
|
||||
if ($refundableAmount > $maxRefund) {
|
||||
return new Response('refundExceedsAmount', Response::HTTP_BAD_REQUEST);
|
||||
}
|
||||
|
||||
$refund = $this->refundService->createRefundByAmount($transaction, $refundableAmount, $context);
|
||||
|
||||
if ($refund === null) {
|
||||
|
||||
@@ -12,7 +12,11 @@ use Shopware\Core\{
|
||||
};
|
||||
use VRPayment\Sdk\{
|
||||
Model\Refund,
|
||||
Model\Transaction
|
||||
Model\Transaction,
|
||||
Model\CriteriaOperator,
|
||||
Model\EntityQueryFilter,
|
||||
Model\EntityQueryFilterType,
|
||||
Model\EntityQuery,
|
||||
};
|
||||
use VRPaymentPayment\Core\{
|
||||
Api\Refund\Entity\RefundEntity,
|
||||
@@ -241,4 +245,67 @@ class RefundService
|
||||
->first();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get total refunded quantity for transaction's line item by lineItemId.
|
||||
*
|
||||
* @param \VRPayment\Sdk\Model\Transaction $transaction
|
||||
* @param \Shopware\Core\Framework\Context $context
|
||||
* @param string $lineItemId
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getRefundedQuantity(Transaction $transaction, Context $context, string $lineItemId): int {
|
||||
$transactionEntity = $this->getTransactionEntityByTransactionId($transaction->getId(), $context);
|
||||
$settings = $this->settingsService->getSettings($transactionEntity->getSalesChannel()->getId());
|
||||
$apiClient = $settings->getApiClient();
|
||||
|
||||
$entityQueryFilter = (new EntityQueryFilter())
|
||||
->setType(EntityQueryFilterType::LEAF)
|
||||
->setOperator(CriteriaOperator::EQUALS)
|
||||
->setFieldName('transaction.id')
|
||||
->setValue($transaction->getId());
|
||||
|
||||
$query = (new EntityQuery())->setFilter($entityQueryFilter);
|
||||
|
||||
$refunds = $apiClient->getRefundService()->search($settings->getSpaceId(), $query);
|
||||
|
||||
$refundedQuantity = 0;
|
||||
|
||||
foreach ($refunds as $refund) {
|
||||
foreach ($refund->getReductions() as $reduction) {
|
||||
if ($reduction->getLineItemUniqueId() === $lineItemId) {
|
||||
$refundedQuantity += (int) $reduction->getQuantityReduction();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $refundedQuantity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get maximum quantity of available items to refund for line item.
|
||||
*
|
||||
* @param \VRPayment\Sdk\Model\Transaction $transaction
|
||||
* @param \Shopware\Core\Framework\Context $context
|
||||
* @param string $lineItemId
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getMaxRefundableQuantity(Transaction $transaction, Context $context, string $lineItemId): int {
|
||||
|
||||
$originalQuantity = 0;
|
||||
|
||||
foreach ($transaction->getLineItems() as $lineItem) {
|
||||
if ($lineItem->getUniqueId() === $lineItemId) {
|
||||
$originalQuantity = (int) $lineItem->getQuantity();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$refundedQuantity = $this->getRefundedQuantity($transaction, $context, $lineItemId);
|
||||
|
||||
$maxQuantity = $originalQuantity - $refundedQuantity;
|
||||
|
||||
return $maxQuantity;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ use VRPaymentPayment\Core\Api\Refund\Entity\RefundEntityDefinition;
|
||||
*/
|
||||
class TransactionEntityDefinition extends EntityDefinition {
|
||||
|
||||
public const ENTITY_NAME = 'vrpayment_transaction';
|
||||
public const ENTITY_NAME = 'vrpayment_transaction_data';
|
||||
|
||||
/**
|
||||
* @return string
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Api\Transaction\Service;
|
||||
|
||||
use Psr\Cache\CacheItemPoolInterface;
|
||||
use Psr\Container\ContainerInterface;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Shopware\Core\{
|
||||
@@ -45,7 +48,8 @@ use VRPaymentPayment\Core\{
|
||||
Settings\Service\SettingsService,
|
||||
Util\LocaleCodeProvider,
|
||||
Util\Payload\CustomProducts\CustomProductsLineItemTypes,
|
||||
Util\Payload\TransactionPayload
|
||||
Util\Payload\TransactionPayload,
|
||||
Util\Analytics\Analytics
|
||||
};
|
||||
use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity;
|
||||
use Shopware\Core\Framework\Struct\ArrayEntity;
|
||||
@@ -78,6 +82,12 @@ class TransactionService
|
||||
*/
|
||||
private $settingsService;
|
||||
|
||||
/**
|
||||
* Cache for storing pending transaction IDs across headless requests.
|
||||
* @var CacheItemPoolInterface
|
||||
*/
|
||||
private CacheItemPoolInterface $cache;
|
||||
|
||||
const CARD_HOLDER_KEY = '1456765000789';
|
||||
const PSEUDO_CODE_KEY = '1485172176673';
|
||||
const CARD_VALIDITY_KEY = '1456765711187';
|
||||
@@ -90,16 +100,18 @@ class TransactionService
|
||||
* @param \Psr\Container\ContainerInterface $container
|
||||
* @param \VRPaymentPayment\Core\Util\LocaleCodeProvider $localeCodeProvider
|
||||
* @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
|
||||
* @param CacheItemPoolInterface $cache Cache for headless transaction persistence
|
||||
*/
|
||||
public function __construct(
|
||||
ContainerInterface $container,
|
||||
LocaleCodeProvider $localeCodeProvider,
|
||||
SettingsService $settingsService
|
||||
)
|
||||
{
|
||||
SettingsService $settingsService,
|
||||
CacheItemPoolInterface $cache
|
||||
) {
|
||||
$this->container = $container;
|
||||
$this->localeCodeProvider = $localeCodeProvider;
|
||||
$this->settingsService = $settingsService;
|
||||
$this->cache = $cache;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -131,8 +143,7 @@ class TransactionService
|
||||
public function create(
|
||||
PaymentTransactionStruct $transaction,
|
||||
SalesChannelContext $salesChannelContext
|
||||
): string
|
||||
{
|
||||
): string {
|
||||
$criteria = new Criteria([$transaction->getOrderTransactionId()]);
|
||||
$criteria->addAssociation('order');
|
||||
$orderTransaction = $this->container->get('order_transaction.repository')->search($criteria, $salesChannelContext->getContext())->first();
|
||||
@@ -141,13 +152,28 @@ class TransactionService
|
||||
$settings = $this->settingsService->getSettings($salesChannelId);
|
||||
$apiClient = $settings->getApiClient();
|
||||
|
||||
$transactionId = $_SESSION['transactionId'] ?? null;
|
||||
// Get transaction ID from cache (headless) or session (storefront).
|
||||
$transactionId = $this->getTransactionIdFromContext($salesChannelContext);
|
||||
$pendingTransaction = null;
|
||||
|
||||
// Try to read the pending transaction if we have an ID stored.
|
||||
if ($transactionId !== null) {
|
||||
$pendingTransaction = $this->read($_SESSION['transactionId'], $salesChannelId);
|
||||
try {
|
||||
$pendingTransaction = $this->read($transactionId, $salesChannelId);
|
||||
// Verify it's still in PENDING state - otherwise we can't reuse it.
|
||||
if ($pendingTransaction != null && $pendingTransaction->getState() !== TransactionState::PENDING) {
|
||||
$pendingTransaction = null;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
// Transaction may have been deleted, expired, or is invalid - we'll create a new one.
|
||||
$this->logger?->debug('Could not read pending transaction, will create new one: ' . $e->getMessage());
|
||||
$pendingTransaction = null;
|
||||
}
|
||||
}
|
||||
|
||||
if ($transactionId === null || $pendingTransaction === null || $pendingTransaction->getState() !== TransactionState::PENDING) {
|
||||
unset($_SESSION['transactionId']);
|
||||
// Create a new transaction if we don't have a valid pending one.
|
||||
if ($pendingTransaction === null) {
|
||||
$this->clearTransactionIdFromContext($salesChannelContext);
|
||||
$pendingTransactionId = $this->createPendingTransaction($salesChannelContext);
|
||||
$pendingTransaction = $this->read($pendingTransactionId, $salesChannelId);
|
||||
}
|
||||
@@ -160,6 +186,7 @@ class TransactionService
|
||||
$transaction
|
||||
));
|
||||
$transactionPayloadClass->setLogger($this->logger);
|
||||
$transactionPayloadClass->setTransactionId($pendingTransaction->getId());
|
||||
$transactionPayload = $transactionPayloadClass->get($pendingTransaction->getVersion());
|
||||
|
||||
$createdTransaction = $apiClient->getTransactionService()
|
||||
@@ -169,7 +196,8 @@ class TransactionService
|
||||
$transaction,
|
||||
$salesChannelContext->getContext(),
|
||||
$createdTransaction->getId(),
|
||||
$settings->getSpaceId()
|
||||
$settings->getSpaceId(),
|
||||
$salesChannelContext->getToken()
|
||||
);
|
||||
|
||||
$redirectUrl = $this->container->get('router')->generate(
|
||||
@@ -178,6 +206,16 @@ class TransactionService
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
|
||||
// If the request comes from the Store API (headless), we should not redirect to a Storefront Twig page.
|
||||
// Instead, we return the returnUrl so the headless client can handle the next steps (e.g. rendering the iframe).
|
||||
$request = $this->container->get('request_stack')->getCurrentRequest();
|
||||
if ($request) {
|
||||
$routeScope = $request->attributes->get('_route_scope', []);
|
||||
if (in_array('store-api', $routeScope, true)) {
|
||||
$redirectUrl = $transaction->getReturnUrl();
|
||||
}
|
||||
}
|
||||
|
||||
if ($settings->getIntegration() == Integration::PAYMENT_PAGE) {
|
||||
$redirectUrl = $apiClient->getTransactionPaymentPageService()
|
||||
->paymentPageUrl($settings->getSpaceId(), $createdTransaction->getId());
|
||||
@@ -215,15 +253,21 @@ class TransactionService
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function createRecurringTransaction(TransactionCreate $sdkTransactionCreate, string $spaceId = ""): Transaction {
|
||||
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);
|
||||
$apiClient = $settings->getApiClient();
|
||||
Analytics::addHeaders($apiClient, [
|
||||
Analytics::SUBSCRIPTION_TRANSACTION => true
|
||||
]);
|
||||
|
||||
$sdkTransaction = $apiClient->getTransactionService()->create($spaceId, $sdkTransactionCreate);
|
||||
if ($sdkTransaction->valid()) {
|
||||
return $settings->getApiClient()->getTransactionService()->processWithoutUserInteraction($spaceId, $sdkTransaction->getId());
|
||||
return $apiClient->getTransactionService()->processWithoutUserInteraction($spaceId, $sdkTransaction->getId());
|
||||
}
|
||||
|
||||
throw new \Exception("The transacion is not valid and could not be created.");
|
||||
@@ -239,15 +283,21 @@ class TransactionService
|
||||
PaymentTransactionStruct $transaction,
|
||||
Context $context,
|
||||
int $vrpaymentTransactionId,
|
||||
int $spaceId
|
||||
): void
|
||||
{
|
||||
$data = [
|
||||
'id' => $transaction->getOrderTransactionId(),
|
||||
'customFields' => [
|
||||
int $spaceId,
|
||||
?string $token = null
|
||||
): void {
|
||||
$customFields = [
|
||||
TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TRANSACTION_ID => $vrpaymentTransactionId,
|
||||
TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_SPACE_ID => $spaceId,
|
||||
],
|
||||
];
|
||||
|
||||
if ($token) {
|
||||
$customFields[TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TOKEN] = $token;
|
||||
}
|
||||
|
||||
$data = [
|
||||
'id' => $transaction->getOrderTransactionId(),
|
||||
'customFields' => $customFields,
|
||||
];
|
||||
$this->container->get('order_transaction.repository')->update([$data], $context);
|
||||
}
|
||||
@@ -265,8 +315,7 @@ class TransactionService
|
||||
Context $context,
|
||||
string $paymentMethodId = null,
|
||||
string $salesChannelId = null
|
||||
): void
|
||||
{
|
||||
): void {
|
||||
try {
|
||||
|
||||
$transactionId = $transaction->getId();
|
||||
@@ -345,7 +394,6 @@ class TransactionService
|
||||
|
||||
$data = array_filter($data);
|
||||
$this->container->get(TransactionEntityDefinition::ENTITY_NAME . '.repository')->upsert([$data], $context);
|
||||
|
||||
} catch (\Exception $exception) {
|
||||
$this->logger->critical(__CLASS__ . ' : ' . __FUNCTION__ . ' : ' . $exception->getMessage());
|
||||
}
|
||||
@@ -381,7 +429,7 @@ class TransactionService
|
||||
*
|
||||
* @return \Shopware\Core\Checkout\Order\OrderEntity
|
||||
*/
|
||||
protected function getOrderEntity(string $orderId, Context $context): OrderEntity
|
||||
public function getOrderEntity(string $orderId, Context $context): OrderEntity
|
||||
{
|
||||
try {
|
||||
$criteria = (new Criteria([$orderId]))->addAssociations(['deliveries']);
|
||||
@@ -396,7 +444,6 @@ class TransactionService
|
||||
} catch (\Exception $e) {
|
||||
throw CartException::orderNotFound($orderId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -444,7 +491,8 @@ class TransactionService
|
||||
return $this->container->get(TransactionEntityDefinition::ENTITY_NAME . '.repository')
|
||||
->search(
|
||||
(new Criteria())->addFilter(new EqualsFilter('transactionId', $transactionId))
|
||||
->addAssociations(['refunds']), $context
|
||||
->addAssociations(['refunds']),
|
||||
$context
|
||||
)
|
||||
->first();
|
||||
}
|
||||
@@ -462,7 +510,8 @@ class TransactionService
|
||||
return $this->container->get(TransactionEntityDefinition::ENTITY_NAME . '.repository')
|
||||
->search(
|
||||
(new Criteria())->addFilter(new EqualsFilter('orderTransactionId', $orderTransactionId))
|
||||
->addAssociations(['refunds']), $context
|
||||
->addAssociations(['refunds']),
|
||||
$context
|
||||
)
|
||||
->first();
|
||||
}
|
||||
@@ -479,7 +528,8 @@ class TransactionService
|
||||
{
|
||||
return $this->container->get(RefundEntityDefinition::ENTITY_NAME . '.repository')
|
||||
->search(
|
||||
(new Criteria())->addFilter(new EqualsFilter('transactionId', $transactionId)), $context
|
||||
(new Criteria())->addFilter(new EqualsFilter('transactionId', $transactionId)),
|
||||
$context
|
||||
)
|
||||
->getEntities();
|
||||
}
|
||||
@@ -522,41 +572,34 @@ class TransactionService
|
||||
public function createPendingTransaction(SalesChannelContext $salesChannelContext, $event = null): int
|
||||
{
|
||||
$expiredTransaction = true;
|
||||
$transactionId = $_SESSION['transactionId'] ?? null;
|
||||
// Get transaction ID from cache (headless) or session (storefront).
|
||||
$transactionId = $this->getTransactionIdFromContext($salesChannelContext);
|
||||
$settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
if (!$settings) {
|
||||
throw new \Exception('Space settings not configured');
|
||||
}
|
||||
|
||||
if ($transactionId) {
|
||||
try {
|
||||
$transactionService = $settings->getApiClient()->getTransactionService();
|
||||
$pendingTransaction = $transactionService->read($settings->getSpaceId(), $transactionId);
|
||||
if ($pendingTransaction->getState() === TransactionState::PENDING) {
|
||||
$expiredTransaction = false;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
// Transaction may have been deleted, expired, or is invalid - treat as expired.
|
||||
$expiredTransaction = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$transactionId || $expiredTransaction) {
|
||||
$settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
$lineItems = [];
|
||||
if ($event) {
|
||||
if ($event instanceof CheckoutConfirmPageLoadedEvent) {
|
||||
$cartLineItems = $event->getPage()->getCart()->getLineItems()->getElements();
|
||||
foreach ($cartLineItems as $cartLineItem) {
|
||||
if ($cartLineItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
continue;
|
||||
}
|
||||
$lineItems[] = $this->createTempLineItem($cartLineItem);
|
||||
}
|
||||
} elseif ($event instanceof AccountEditOrderPageLoadedEvent) {
|
||||
$order = $event->getPage()->getOrder();
|
||||
foreach ($order->getLineItems() as $orderLineItem) {
|
||||
$lineItems[] = $this->createTempLineItem($orderLineItem);
|
||||
}
|
||||
}
|
||||
if ($customer === null) {
|
||||
throw new \Exception('Customer is required to create a transaction');
|
||||
}
|
||||
$lineItems = $this->extractLineItems($event);
|
||||
|
||||
$customerId = "";
|
||||
if ($customer->getGuest() === false) {
|
||||
@@ -594,7 +637,9 @@ class TransactionService
|
||||
$transactionService = $settings->getApiClient()->getTransactionService();
|
||||
$transaction = $transactionService->create($settings->getSpaceId(), $transactionPayload);
|
||||
$transactionId = $transaction->getId();
|
||||
$_SESSION['transactionId'] = $transactionId;
|
||||
|
||||
// Store in cache and session for transaction reuse.
|
||||
$this->storeTransactionIdInContext($salesChannelContext, $transactionId);
|
||||
}
|
||||
|
||||
return $transactionId;
|
||||
@@ -605,7 +650,7 @@ class TransactionService
|
||||
* @param int $transactionId
|
||||
* @return void
|
||||
*/
|
||||
public function updateTempTransaction(SalesChannelContext $salesChannelContext, int $transactionId): void
|
||||
public function updateTempTransaction(SalesChannelContext $salesChannelContext, int $transactionId, array $lineItems = []): void
|
||||
{
|
||||
$pendingTransaction = new TransactionPending();
|
||||
$pendingTransaction->setId($transactionId);
|
||||
@@ -623,10 +668,50 @@ class TransactionService
|
||||
$pendingTransaction->setBillingAddress($billingAddress);
|
||||
$pendingTransaction->setShippingAddress($shippingAddress);
|
||||
|
||||
if (!empty($lineItems)) {
|
||||
$pendingTransaction->setLineItems($lineItems);
|
||||
}
|
||||
|
||||
$settings->getApiClient()->getTransactionService()
|
||||
->update($settings->getSpaceId(), $pendingTransaction);
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts line items from the given source (Event or Cart).
|
||||
*
|
||||
* @param mixed $source
|
||||
* @return array
|
||||
*/
|
||||
public function extractLineItems($source): array
|
||||
{
|
||||
$lineItems = [];
|
||||
if ($source) {
|
||||
if ($source instanceof CheckoutConfirmPageLoadedEvent) {
|
||||
$cartLineItems = $source->getPage()->getCart()->getLineItems()->getElements();
|
||||
foreach ($cartLineItems as $cartLineItem) {
|
||||
if ($cartLineItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
continue;
|
||||
}
|
||||
$lineItems[] = $this->createTempLineItem($cartLineItem);
|
||||
}
|
||||
} elseif ($source instanceof AccountEditOrderPageLoadedEvent) {
|
||||
$order = $source->getPage()->getOrder();
|
||||
foreach ($order->getLineItems() as $orderLineItem) {
|
||||
$lineItems[] = $this->createTempLineItem($orderLineItem);
|
||||
}
|
||||
} elseif ($source instanceof \Shopware\Core\Checkout\Cart\Cart) {
|
||||
$cartLineItems = $source->getLineItems()->getElements();
|
||||
foreach ($cartLineItems as $cartLineItem) {
|
||||
if ($cartLineItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
continue;
|
||||
}
|
||||
$lineItems[] = $this->createTempLineItem($cartLineItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $lineItems;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param ChargeAttempt|null $chargeAttempt
|
||||
* @param string $descriptorKey
|
||||
@@ -715,18 +800,20 @@ class TransactionService
|
||||
{
|
||||
$lineItem = new LineItemCreate();
|
||||
|
||||
$roundedPrice = $this->round($productData->getPrice()->getUnitPrice());
|
||||
|
||||
if ($productData instanceof LineItem) {
|
||||
$lineItem->setName($productData->getLabel());
|
||||
$lineItem->setUniqueId($productData->getId());
|
||||
$lineItem->setSku($productData->getReferencedId() ?? $productData->getId());
|
||||
$lineItem->setQuantity($productData->getQuantity());
|
||||
$lineItem->setAmountIncludingTax($productData->getPrice()->getUnitPrice());
|
||||
$lineItem->setAmountIncludingTax($roundedPrice);
|
||||
} elseif ($productData instanceof OrderLineItemEntity) {
|
||||
$lineItem->setName($productData->getLabel());
|
||||
$lineItem->setUniqueId($productData->getId());
|
||||
$lineItem->setSku($productData->getProductId() ?? $productData->getIdentifier() ?? $productData->getId());
|
||||
$lineItem->setQuantity($productData->getQuantity());
|
||||
$lineItem->setAmountIncludingTax($productData->getUnitPrice());
|
||||
$lineItem->setAmountIncludingTax($roundedPrice);
|
||||
} else {
|
||||
throw new \InvalidArgumentException('Unsupported line item type: ' . get_class($productData));
|
||||
}
|
||||
@@ -790,7 +877,8 @@ class TransactionService
|
||||
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
|
||||
* @return bool
|
||||
*/
|
||||
private function isSubscription(SalesChannelContext $salesChannelContext): bool {
|
||||
private function isSubscription(SalesChannelContext $salesChannelContext): bool
|
||||
{
|
||||
$extensionName = 'subscription';
|
||||
if (class_exists(\Shopware\Commercial\Subscription\Framework\Struct\SubscriptionContextStruct::class)) {
|
||||
$extensionName = SubscriptionContextStruct::SUBSCRIPTION_EXTENSION;
|
||||
@@ -800,4 +888,100 @@ class TransactionService
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $amount
|
||||
* @param int $precision
|
||||
*
|
||||
* @return float
|
||||
*/
|
||||
private function round($value, $precision = 2): float
|
||||
{
|
||||
return \round($value, $precision);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a cache key for the pending transaction ID.
|
||||
* Uses customer ID for authenticated users, which works for both headless and storefront.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext
|
||||
* @return string|null
|
||||
*/
|
||||
private function getPendingTransactionCacheKey(SalesChannelContext $salesChannelContext): ?string
|
||||
{
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
if ($customer) {
|
||||
return 'vrpn_pending_transaction_id_customer_' . $customer->getId();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the stored pending transaction ID from cache or session.
|
||||
* Uses customer ID as cache key for headless (stateless) support.
|
||||
* Falls back to session for Storefront (stateful) compatibility.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext
|
||||
* @return int|null The transaction ID if found, otherwise null.
|
||||
*/
|
||||
private function getTransactionIdFromContext(SalesChannelContext $salesChannelContext): ?int
|
||||
{
|
||||
// Try cache first (for headless/API where session might not persist or be shared).
|
||||
$cacheKey = $this->getPendingTransactionCacheKey($salesChannelContext);
|
||||
if ($cacheKey) {
|
||||
$item = $this->cache->getItem($cacheKey);
|
||||
if ($item->isHit()) {
|
||||
return (int) $item->get();
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback to PHP session for traditional Storefront compatibility.
|
||||
if (isset($_SESSION['transactionId'])) {
|
||||
return (int) $_SESSION['transactionId'];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears the pending transaction ID from cache and session.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext
|
||||
*/
|
||||
private function clearTransactionIdFromContext(SalesChannelContext $salesChannelContext): void
|
||||
{
|
||||
// Clear from cache key.
|
||||
$cacheKey = $this->getPendingTransactionCacheKey($salesChannelContext);
|
||||
if ($cacheKey) {
|
||||
$this->cache->deleteItem($cacheKey);
|
||||
}
|
||||
|
||||
// Clear from session.
|
||||
if (isset($_SESSION['transactionId'])) {
|
||||
unset($_SESSION['transactionId']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores the pending transaction ID in cache and session.
|
||||
* This persists in the database (via cache) and works across all request types (Storefront & headless).
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext
|
||||
* @param int $transactionId
|
||||
*/
|
||||
private function storeTransactionIdInContext(SalesChannelContext $salesChannelContext, int $transactionId): void
|
||||
{
|
||||
// Store in cache for headless.
|
||||
$cacheKey = $this->getPendingTransactionCacheKey($salesChannelContext);
|
||||
if ($cacheKey) {
|
||||
$item = $this->cache->getItem($cacheKey);
|
||||
$item->set($transactionId);
|
||||
// Expire after 2 hours to avoid stale data (matching typical cart lifetime).
|
||||
$item->expiresAfter(7200);
|
||||
$this->cache->save($item);
|
||||
}
|
||||
|
||||
// Store in session for Storefront.
|
||||
$_SESSION['transactionId'] = $transactionId;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +119,9 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
|
||||
$orderId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
|
||||
if (!empty($orderId) && !$transaction->getParent()) {
|
||||
$this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context, $request, $token) {
|
||||
if ($this->allowUpsert($transaction, $orderId, $context)) {
|
||||
$this->transactionService->upsert($transaction, $context);
|
||||
}
|
||||
$orderTransactionId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
|
||||
$orderTransaction = $this->getOrderTransaction($orderId, $context);
|
||||
$this->logger->info("OrderId: {orderId} Current state: {state}", [
|
||||
@@ -178,4 +180,26 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
|
||||
|
||||
return new JsonResponse(['data' => $request->jsonSerialize()], $status);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks the incoming transaction ID against the current transaction ID of the order.
|
||||
* If they don’t match, the saved transaction in the database remains unchanged.
|
||||
*
|
||||
* @param Transaction $transaction The transaction data retrieved from the portal.
|
||||
* @param string $orderId The order ID of the current transaction.
|
||||
* @param Context $context The operational context providing settings and environment for transaction processing.
|
||||
* @return bool Returns a value that determines whether to upsert the transaction into the database.
|
||||
*/
|
||||
private function allowUpsert(Transaction $transaction, string $orderId, Context $context): bool
|
||||
{
|
||||
try {
|
||||
$transactionEntity = $this->transactionService->getByOrderId($orderId, $context);
|
||||
if ($transactionEntity->getTransactionId() !== $transaction->getId()) {
|
||||
return false;
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\PaymentHandler;
|
||||
|
||||
@@ -119,13 +121,14 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
PaymentTransactionStruct $transaction,
|
||||
Context $context,
|
||||
?Struct $validateStruct
|
||||
): RedirectResponse
|
||||
{
|
||||
): RedirectResponse {
|
||||
try {
|
||||
$orderTransactionId = $transaction->getOrderTransactionId();
|
||||
$orderTransaction = $this->orderTransactionRepository->search(
|
||||
(new Criteria([$orderTransactionId]))
|
||||
->addAssociation('order'), $context
|
||||
->addAssociation('order')
|
||||
->addAssociation('stateMachineState'),
|
||||
$context
|
||||
)->getEntities()->first();
|
||||
|
||||
$contextSource = $context->getSource();
|
||||
@@ -133,20 +136,9 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
$salesChannelContextId = $contextSource->getSalesChannelId();
|
||||
}
|
||||
|
||||
$orderCustomer = $orderTransaction->getOrder()?->getOrderCustomer();
|
||||
$contextToken = $this->getContextToken($request);
|
||||
$parameters = new SalesChannelContextServiceParameters($salesChannelContextId, $contextToken, originalContext: $context);
|
||||
|
||||
if ($orderCustomer) {
|
||||
$customerId = $orderCustomer->getCustomerId();
|
||||
} else {
|
||||
$customerId = null;
|
||||
}
|
||||
|
||||
$parameters = new SalesChannelContextServiceParameters(
|
||||
$salesChannelContextId,
|
||||
$request->getSession()->get("sw-context-token", Random::getAlphanumericString(32)),
|
||||
originalContext: $context,
|
||||
customerId: $customerId
|
||||
);
|
||||
$salesChannelContext = $this->salesChannelContextService->get($parameters);
|
||||
$redirectUrl = $transaction->getReturnUrl();
|
||||
|
||||
@@ -162,7 +154,10 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
$request->getSession()->remove('transactionId');
|
||||
$errorMessage = 'An error occurred during the communication with external payment gateway : ' . $e->getMessage();
|
||||
$this->logger->critical($errorMessage);
|
||||
throw PaymentException::customerCanceled($orderTransactionId, $errorMessage);
|
||||
if ($orderTransaction->getState()?->getTechnicalName() === OrderTransactionStates::STATE_CANCELLED) {
|
||||
throw PaymentException::asyncFinalizeInterrupted($orderTransaction->getOrder()->getId(), $errorMessage);
|
||||
}
|
||||
throw PaymentException::customerCanceled($transaction->getOrderTransactionId(), $errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,12 +176,13 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
Request $request,
|
||||
PaymentTransactionStruct $transaction,
|
||||
Context $context
|
||||
): void
|
||||
{
|
||||
): void {
|
||||
$orderTransactionId = $transaction->getOrderTransactionId();
|
||||
$orderTransaction = $this->orderTransactionRepository->search(
|
||||
(new Criteria([$orderTransactionId]))
|
||||
->addAssociation('order'), $context
|
||||
->addAssociation('order')
|
||||
->addAssociation('stateMachineState'),
|
||||
$context
|
||||
)->getEntities()->first();
|
||||
|
||||
if ($orderTransaction->getOrder()->getAmountTotal() > 0) {
|
||||
@@ -213,15 +209,37 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
$this->orderTransactionStateHandler->paid($orderTransaction->getId(), $context);
|
||||
}
|
||||
|
||||
$token = $request->getSession()->get('sw-context-token');
|
||||
$token = $this->getContextToken($request);
|
||||
if ($token) {
|
||||
$salesChannelId = $transactionEntity->getSalesChannelId();
|
||||
$orderEntity = $this->pluginTransactionService->getOrderEntity(
|
||||
$orderTransaction->getOrder()->getId(),
|
||||
$context
|
||||
);
|
||||
$salesChannelId = $orderEntity->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);
|
||||
} else {
|
||||
// Fallback: Try to get token from transaction custom fields (for Headless redirects)
|
||||
$customFields = $orderTransaction->getCustomFields() ?? [];
|
||||
$storedToken = $customFields[TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TOKEN] ?? null;
|
||||
|
||||
if ($storedToken) {
|
||||
$this->logger->info('Clearing cart with stored token: ' . $storedToken);
|
||||
$orderEntity = $this->pluginTransactionService->getOrderEntity(
|
||||
$orderTransaction->getOrder()->getId(),
|
||||
$context
|
||||
);
|
||||
$salesChannelId = $orderEntity->getSalesChannelId();
|
||||
$parameters = new SalesChannelContextServiceParameters($salesChannelId, $storedToken, originalContext: $context);
|
||||
$salesChannelContext = $this->salesChannelContextService->get($parameters);
|
||||
|
||||
$salesChannelContext->getContext()->addState('do-cart-delete');
|
||||
$this->cartPersister->delete($salesChannelContext->getToken(), $salesChannelContext);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -305,7 +323,8 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
|
||||
$newOrderTransaction = $this->orderTransactionRepository->search(
|
||||
(new Criteria([$newTransactionId]))
|
||||
->addAssociation('order'), $context
|
||||
->addAssociation('order'),
|
||||
$context
|
||||
)->getEntities()->first();
|
||||
$orderNumber = $newOrderTransaction->getOrder()->getOrderNumber();
|
||||
|
||||
@@ -378,8 +397,7 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
// Update the new order transaction with the new transaction details
|
||||
$this->orderTransactionRepository->update([$data], $context);
|
||||
$this->pluginTransactionService->upsert($newSdkTransaction, $context);
|
||||
}
|
||||
catch (\Throwable $e) {
|
||||
} 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);
|
||||
@@ -392,7 +410,8 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
* @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 {
|
||||
private function addressCreateFromSdk(\VRPayment\Sdk\Model\Address $address): \VRPayment\Sdk\Model\AddressCreate
|
||||
{
|
||||
$addressCreate = new \VRPayment\Sdk\Model\AddressCreate;
|
||||
|
||||
$addressCreate->setCity($address->getCity());
|
||||
@@ -432,7 +451,9 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
{
|
||||
$lineItemCreate = new \VRPayment\Sdk\Model\LineItemCreate();
|
||||
|
||||
$lineItemCreate->setAmountIncludingTax($lineItem->getAmountIncludingTax());
|
||||
$roundedPrice = $this->round($lineItem->getAmountIncludingTax());
|
||||
|
||||
$lineItemCreate->setAmountIncludingTax($roundedPrice);
|
||||
|
||||
$attributes = $lineItem->getAttributes();
|
||||
$attributesCreate = [];
|
||||
@@ -469,4 +490,30 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
|
||||
|
||||
return $lineItemCreate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $amount
|
||||
* @param int $precision
|
||||
*
|
||||
* @return float
|
||||
*/
|
||||
private function round($value, $precision = 2): float
|
||||
{
|
||||
return \round($value, $precision);
|
||||
}
|
||||
|
||||
private function getContextToken(Request $request): ?string
|
||||
{
|
||||
$headerContextToken = $request->headers->get('sw-context-token');
|
||||
if ($headerContextToken) {
|
||||
return $headerContextToken;
|
||||
}
|
||||
|
||||
$sessionContextToken = $request->getSession()->get("sw-context-token");
|
||||
if ($sessionContextToken) {
|
||||
return $sessionContextToken;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\PaymentMethod\SalesChannel;
|
||||
|
||||
use Shopware\Core\Checkout\Payment\PaymentMethodDefinition;
|
||||
use Shopware\Core\Checkout\Payment\SalesChannel\AbstractPaymentMethodRoute;
|
||||
use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult;
|
||||
use Shopware\Core\Framework\Log\Package;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use VRPaymentPayment\Core\Checkout\Service\PaymentMethodFilterService;
|
||||
|
||||
#[Package('checkout')]
|
||||
/**
|
||||
* This decorator intercepts the Store API payment method route to apply WhitelabelMachineName-specific filtering.
|
||||
* It ensures that only payment methods valid for the current transaction (given currency, amount, etc.) are shown.
|
||||
*/
|
||||
class PaymentMethodRouteDecorator extends AbstractPaymentMethodRoute
|
||||
{
|
||||
/**
|
||||
* @var AbstractPaymentMethodRoute
|
||||
* The original route being decorated.
|
||||
*/
|
||||
private AbstractPaymentMethodRoute $decorated;
|
||||
|
||||
/**
|
||||
* @var PaymentMethodFilterService
|
||||
* Service used to filter the payment methods based on WhitelabelMachineName API availability.
|
||||
*/
|
||||
private PaymentMethodFilterService $paymentMethodFilterService;
|
||||
|
||||
/**
|
||||
* @param AbstractPaymentMethodRoute $decorated
|
||||
* @param PaymentMethodFilterService $paymentMethodFilterService
|
||||
*/
|
||||
public function __construct(
|
||||
AbstractPaymentMethodRoute $decorated,
|
||||
PaymentMethodFilterService $paymentMethodFilterService
|
||||
) {
|
||||
$this->decorated = $decorated;
|
||||
$this->paymentMethodFilterService = $paymentMethodFilterService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the decorated service.
|
||||
*
|
||||
* @return AbstractPaymentMethodRoute
|
||||
*/
|
||||
public function getDecorated(): AbstractPaymentMethodRoute
|
||||
{
|
||||
return $this->decorated;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the payment methods and applies the WhitelabelMachineName filter to the result.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param SalesChannelContext $context
|
||||
* @param Criteria $criteria
|
||||
* @return PaymentMethodRouteResponse
|
||||
*/
|
||||
#[Route(
|
||||
path: '/store-api/payment-method',
|
||||
name: 'store-api.payment.method',
|
||||
methods: ['GET', 'POST'],
|
||||
defaults: ['_entity' => 'payment_method']
|
||||
)]
|
||||
public function load(Request $request, SalesChannelContext $context, Criteria $criteria): PaymentMethodRouteResponse
|
||||
{
|
||||
// Fetch the initial list of payment methods from the decorated service.
|
||||
$response = $this->decorated->load($request, $context, $criteria);
|
||||
|
||||
$currentRoute = $request->attributes->get('_route');
|
||||
if ($currentRoute === 'frontend.checkout.finish.page' || !$this->allowFilterPaymentMethods($request)) {
|
||||
return $response;
|
||||
}
|
||||
|
||||
$paymentMethods = $response->getPaymentMethods();
|
||||
|
||||
// Apply WhitelabelMachineName-specific filtering logic via the dedicated service.
|
||||
$filteredCollection = $this->paymentMethodFilterService->filterPaymentMethods(
|
||||
$paymentMethods,
|
||||
$context
|
||||
);
|
||||
|
||||
// Return the filtered results as a new response.
|
||||
return new PaymentMethodRouteResponse(
|
||||
new EntitySearchResult(
|
||||
'payment_method',
|
||||
(int)$filteredCollection->count(),
|
||||
$filteredCollection,
|
||||
null,
|
||||
$criteria,
|
||||
$context->getContext()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* We prevent filtering methods unless onlyAvailable is true.
|
||||
* This is because the filterPaymentMethods() function creates unnecessary pending transactions in the
|
||||
* portal when logged-in users navigate between pages.
|
||||
* The onlyAvailable flag applies rule-based filtering of payment methods and is usually true on checkout pages,
|
||||
* so we apply filterPaymentMethods() only when relevant.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return bool
|
||||
*/
|
||||
private function allowFilterPaymentMethods(Request $request): bool
|
||||
{
|
||||
if ($request->query->getBoolean('onlyAvailable') || $request->request->getBoolean('onlyAvailable')) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,298 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\Service;
|
||||
|
||||
use Shopware\Core\Checkout\Cart\Cart;
|
||||
use Shopware\Core\Checkout\Cart\LineItemFactoryRegistry;
|
||||
use Shopware\Core\Checkout\Cart\SalesChannel\CartService;
|
||||
use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemCollection;
|
||||
use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity;
|
||||
use Shopware\Core\Checkout\Order\OrderEntity;
|
||||
use Shopware\Core\Framework\Context;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
|
||||
use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use VRPaymentPayment\Core\Util\Payload\CustomProducts\CustomProductsLineItemTypes;
|
||||
|
||||
/**
|
||||
* This service handles the reconstruction of a Shopware cart from an existing order.
|
||||
* It ensures that line items, including those from complex plugins like 'Customized Products',
|
||||
* are correctly re-added to a fresh cart.
|
||||
*/
|
||||
class CartRecoveryService
|
||||
{
|
||||
/**
|
||||
* @var CartService
|
||||
* Shopware service for cart-related operations.
|
||||
*/
|
||||
private CartService $cartService;
|
||||
|
||||
/**
|
||||
* @var LineItemFactoryRegistry
|
||||
* Registry to create Shopware LineItems from raw data.
|
||||
*/
|
||||
private LineItemFactoryRegistry $lineItemFactoryRegistry;
|
||||
|
||||
/**
|
||||
* @var EntityRepository
|
||||
* Repository for accessing order data.
|
||||
*/
|
||||
private EntityRepository $orderRepository;
|
||||
|
||||
/**
|
||||
* @var object|null
|
||||
* Optional route service for adding customized products to the cart.
|
||||
*/
|
||||
private ?object $addCustomizedProductsRoute;
|
||||
|
||||
/**
|
||||
* @param CartService $cartService
|
||||
* @param LineItemFactoryRegistry $lineItemFactoryRegistry
|
||||
* @param EntityRepository $orderRepository
|
||||
* @param object|null $addCustomizedProductsRoute
|
||||
*/
|
||||
public function __construct(
|
||||
CartService $cartService,
|
||||
LineItemFactoryRegistry $lineItemFactoryRegistry,
|
||||
EntityRepository $orderRepository,
|
||||
?object $addCustomizedProductsRoute = null
|
||||
) {
|
||||
$this->cartService = $cartService;
|
||||
$this->lineItemFactoryRegistry = $lineItemFactoryRegistry;
|
||||
$this->orderRepository = $orderRepository;
|
||||
$this->addCustomizedProductsRoute = $addCustomizedProductsRoute;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recreates a cart based on the items in an existing order.
|
||||
*
|
||||
* @param OrderEntity $order The source order.
|
||||
* @param SalesChannelContext $salesChannelContext The current sales channel context.
|
||||
* @return Cart The newly created and populated cart.
|
||||
*/
|
||||
public function recreateCartFromOrder(OrderEntity $order, SalesChannelContext $salesChannelContext): Cart
|
||||
{
|
||||
// Start with a clean slate by deleting any existing cart for the current session.
|
||||
$this->cartService->deleteCart($salesChannelContext);
|
||||
$cart = $this->cartService->createNew($salesChannelContext->getToken());
|
||||
|
||||
$orderItems = $order->getLineItems();
|
||||
|
||||
if ($orderItems === null) {
|
||||
return $cart;
|
||||
}
|
||||
|
||||
// Special handling for Customized Products if the plugin logic is available.
|
||||
if ($this->hasCustomProducts($orderItems) && $this->addCustomizedProductsRoute) {
|
||||
$cart = $this->addCustomProducts($orderItems, $salesChannelContext, $cart);
|
||||
}
|
||||
|
||||
/** @var OrderLineItemEntity $orderLineItemEntity */
|
||||
foreach ($orderItems as $orderLineItemEntity) {
|
||||
$type = (string)$orderLineItemEntity->getType();
|
||||
|
||||
// Skip child items and complex types that should have been handled by specialized logic.
|
||||
if ($type !== CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT || $orderLineItemEntity->getParentId() !== null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Create a standard product line item.
|
||||
$lineItem = $this->lineItemFactoryRegistry->create([
|
||||
'id' => $orderLineItemEntity->getId(),
|
||||
'quantity' => (int)$orderLineItemEntity->getQuantity(),
|
||||
'referencedId' => (string)$orderLineItemEntity->getReferencedId(),
|
||||
'type' => $type,
|
||||
], $salesChannelContext);
|
||||
|
||||
// Preserve payload data to ensure product options and other metadata are carried over.
|
||||
$lineItemPayload = $orderLineItemEntity->getPayload();
|
||||
if (!empty($lineItemPayload)) {
|
||||
$lineItem->setPayload($lineItemPayload);
|
||||
}
|
||||
|
||||
// Add the item to the cart.
|
||||
$cart = $this->cartService->add($cart, $lineItem, $salesChannelContext);
|
||||
}
|
||||
|
||||
return $cart;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the order contains any line items belonging to the Customized Products plugin.
|
||||
*
|
||||
* @param OrderLineItemCollection $orderItems The items in the order.
|
||||
* @return bool True if customized products are present.
|
||||
*/
|
||||
private function hasCustomProducts(OrderLineItemCollection $orderItems): bool
|
||||
{
|
||||
/** @var OrderLineItemEntity $orderItem */
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Specialized logic to re-add customized products to the cart via the plugin's own route.
|
||||
*
|
||||
* @param OrderLineItemCollection $orderItems All order items.
|
||||
* @param SalesChannelContext $salesChannelContext Context.
|
||||
* @param Cart $cart Current cart.
|
||||
* @return Cart Updated cart.
|
||||
*/
|
||||
private function addCustomProducts(OrderLineItemCollection $orderItems, SalesChannelContext $salesChannelContext, Cart $cart): Cart
|
||||
{
|
||||
if (!$this->addCustomizedProductsRoute) {
|
||||
return $cart;
|
||||
}
|
||||
|
||||
/** @var OrderLineItemEntity $orderItem */
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() !== CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Find the main product associated with this customized product container.
|
||||
$product = $this->getCustomProduct($orderItems, (string)$orderItem->getId());
|
||||
if (!$product) continue;
|
||||
|
||||
// Gather the chosen options and their values.
|
||||
$productOptions = $this->getCustomProductOptions($orderItems, (string)$orderItem->getId());
|
||||
$optionValues = $this->getOptionValues($productOptions);
|
||||
|
||||
// Prepare the data bag for the specialized add-to-cart route.
|
||||
$params = new RequestDataBag([
|
||||
'customized-products-template' => new RequestDataBag([
|
||||
'id' => (string)$orderItem->getReferencedId(),
|
||||
'options' => new RequestDataBag($optionValues),
|
||||
]),
|
||||
]);
|
||||
|
||||
$request = new Request([], [
|
||||
'lineItems' => [
|
||||
(string)$product->getReferencedId() => [
|
||||
'quantity' => (int)$orderItem->getQuantity(),
|
||||
'id' => (string)$product->getReferencedId(),
|
||||
'type' => CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT,
|
||||
'referencedId' => (string)$product->getReferencedId(),
|
||||
'stackable' => (bool)$orderItem->getStackable(),
|
||||
'removable' => (bool)$orderItem->getRemovable(),
|
||||
]
|
||||
]
|
||||
]);
|
||||
|
||||
// Call the Customized Products plugin's internal logic to add the item with its complex configuration.
|
||||
$this->addCustomizedProductsRoute->add($params, $request, $salesChannelContext, $cart);
|
||||
|
||||
// Re-fetch the cart to reflect changes made by the plugin route.
|
||||
$cart = $this->cartService->getCart($salesChannelContext->getToken(), $salesChannelContext);
|
||||
}
|
||||
|
||||
return $cart;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds the main product item within a customized product structure.
|
||||
*
|
||||
* @param OrderLineItemCollection $orderItems All order items.
|
||||
* @param string $parentId The ID of the customized product container.
|
||||
* @return OrderLineItemEntity|null The product line item entity.
|
||||
*/
|
||||
private function getCustomProduct(OrderLineItemCollection $orderItems, string $parentId): ?OrderLineItemEntity
|
||||
{
|
||||
/** @var OrderLineItemEntity $orderItem */
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT && $orderItem->getParentId() === $parentId) {
|
||||
return $orderItem;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gathers all option items for a customized product.
|
||||
*
|
||||
* @param OrderLineItemCollection $orderItems All items.
|
||||
* @param string $parentId The ID of the customized product container.
|
||||
* @return OrderLineItemEntity[] List of option entities.
|
||||
*/
|
||||
private function getCustomProductOptions(OrderLineItemCollection $orderItems, string $parentId): array
|
||||
{
|
||||
$options = [];
|
||||
/** @var OrderLineItemEntity $orderItem */
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS_OPTION && $orderItem->getParentId() === $parentId) {
|
||||
$options[] = $orderItem;
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of options into a data structure suitable for the Customized Products logic.
|
||||
*
|
||||
* @param OrderLineItemEntity[] $productOptions List of option entities.
|
||||
* @return array Formatted option values.
|
||||
*/
|
||||
private function getOptionValues(array $productOptions): array
|
||||
{
|
||||
$optionValues = [];
|
||||
foreach ($productOptions as $productOption) {
|
||||
$payload = (array)$productOption->getPayload();
|
||||
$optionType = (string)($payload['type'] ?? '');
|
||||
|
||||
switch ($optionType) {
|
||||
case CustomProductsLineItemTypes::PRODUCT_OPTION_TYPE_IMAGE_UPLOAD:
|
||||
case CustomProductsLineItemTypes::PRODUCT_OPTION_TYPE_FILE_UPLOAD:
|
||||
$media = (array)($payload['media'] ?? []);
|
||||
foreach ($media as $mediaItem) {
|
||||
$optionValues[(string)$productOption->getReferencedId()] = new RequestDataBag([
|
||||
'media' => new RequestDataBag([
|
||||
(string)$mediaItem['filename'] => new RequestDataBag([
|
||||
'id' => (string)$mediaItem['mediaId'],
|
||||
'filename' => (string)$mediaItem['filename'],
|
||||
]),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
$optionValues[(string)$productOption->getReferencedId()] = new RequestDataBag([
|
||||
'value' => (string)($payload['value'] ?? ''),
|
||||
]);
|
||||
}
|
||||
}
|
||||
return $optionValues;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches a full order entity with necessary associations for recovery or display.
|
||||
*
|
||||
* @param string $orderId The ID of the order.
|
||||
* @param Context $context The current system context.
|
||||
* @return OrderEntity The order entity.
|
||||
* @throws \Exception If the order is not found.
|
||||
*/
|
||||
public function getOrderEntity(string $orderId, Context $context): OrderEntity
|
||||
{
|
||||
$criteria = (new Criteria([$orderId]))
|
||||
->addAssociation('lineItems.cover')
|
||||
->addAssociation('transactions.paymentMethod')
|
||||
->addAssociation('deliveries.shippingMethod');
|
||||
|
||||
/** @var OrderEntity|null $order */
|
||||
$order = $this->orderRepository->search($criteria, $context)->get($orderId);
|
||||
|
||||
if (!$order) {
|
||||
throw new \Exception('Order not found');
|
||||
}
|
||||
|
||||
return $order;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\Service;
|
||||
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
|
||||
use VRPaymentPayment\Core\Settings\Service\SettingsService;
|
||||
|
||||
|
||||
/**
|
||||
* This service provides methods for retrieving invoice documents associated with WhitelabelMachineName transactions.
|
||||
* It abstracts the API calls needed to fetch invoice data from the WhitelabelMachineName platform.
|
||||
*/
|
||||
class InvoiceService
|
||||
{
|
||||
/**
|
||||
* @var SettingsService
|
||||
* The service used to access sales channel specific settings.
|
||||
*/
|
||||
protected SettingsService $settingsService;
|
||||
|
||||
/**
|
||||
* @var TransactionService
|
||||
* The service used to handle transaction-specific operations.
|
||||
*/
|
||||
protected TransactionService $transactionService;
|
||||
|
||||
/**
|
||||
* @param SettingsService $settingsService
|
||||
* @param TransactionService $transactionService
|
||||
*/
|
||||
public function __construct(
|
||||
SettingsService $settingsService,
|
||||
TransactionService $transactionService
|
||||
) {
|
||||
$this->settingsService = $settingsService;
|
||||
$this->transactionService = $transactionService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the invoice document metadata for a given order.
|
||||
*
|
||||
* @param string $orderId The Shopware order ID.
|
||||
* @param SalesChannelContext $salesChannelContext The current context.
|
||||
*
|
||||
* @return object The invoice document metadata (instance of \VRPayment\Sdk\Model\RenderedDocument).
|
||||
*/
|
||||
public function getInvoiceDocument(string $orderId, SalesChannelContext $salesChannelContext): object
|
||||
{
|
||||
// Retrieve valid settings for the current sales channel.
|
||||
$settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
// Fetch the local transaction entity associated with the order.
|
||||
$transactionEntity = $this->transactionService->getByOrderId($orderId, $salesChannelContext->getContext());
|
||||
|
||||
// Perform the API call to WhitelabelMachineName to get the invoice document metadata.
|
||||
return $settings->getApiClient()->getTransactionService()->getInvoiceDocument(
|
||||
(int)$settings->getSpaceId(),
|
||||
(int)$transactionEntity->getTransactionId()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,192 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\Service;
|
||||
|
||||
use Shopware\Core\Framework\Uuid\Uuid;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Component\Routing\RouterInterface;
|
||||
use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
|
||||
use VRPaymentPayment\Core\Settings\Options\Integration;
|
||||
use VRPaymentPayment\Core\Settings\Service\SettingsService;
|
||||
use VRPaymentPayment\Core\Checkout\Struct\PaymentConfigStruct;
|
||||
use VRPayment\Sdk\Model\TransactionState;
|
||||
|
||||
/**
|
||||
* This service provides the consolidated payment configuration needed for the frontend.
|
||||
* it handles the generation of JS URLs and provides integration parameters for both Storefront and headless clients.
|
||||
*/
|
||||
class PaymentIntegrationService
|
||||
{
|
||||
/**
|
||||
* @var TransactionService
|
||||
* Service to handle transaction-specific API calls.
|
||||
*/
|
||||
private TransactionService $transactionService;
|
||||
|
||||
/**
|
||||
* @var SettingsService
|
||||
* Service to retrieve sales channel specific settings.
|
||||
*/
|
||||
private SettingsService $settingsService;
|
||||
|
||||
/**
|
||||
* @var TransactionManagementService
|
||||
* Service to manage transaction state.
|
||||
*/
|
||||
private TransactionManagementService $transactionManagementService;
|
||||
|
||||
/**
|
||||
* @var RouterInterface
|
||||
* Shopware router for generating callback and redirect URLs.
|
||||
*/
|
||||
private RouterInterface $router;
|
||||
|
||||
/**
|
||||
* @param TransactionService $transactionService
|
||||
* @param SettingsService $settingsService
|
||||
* @param TransactionManagementService $transactionManagementService
|
||||
* @param RouterInterface $router
|
||||
*/
|
||||
public function __construct(
|
||||
TransactionService $transactionService,
|
||||
SettingsService $settingsService,
|
||||
TransactionManagementService $transactionManagementService,
|
||||
RouterInterface $router
|
||||
) {
|
||||
$this->transactionService = $transactionService;
|
||||
$this->settingsService = $settingsService;
|
||||
$this->transactionManagementService = $transactionManagementService;
|
||||
$this->router = $router;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the payment configuration for a given transaction ID.
|
||||
* This is used on the checkout confirm page before the order is created.
|
||||
*
|
||||
* @param int $transactionId The WhitelabelMachineName transaction ID.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return PaymentConfigStruct The consolidated integration data.
|
||||
*/
|
||||
public function getConfigForTransaction(
|
||||
int $transactionId,
|
||||
SalesChannelContext $salesChannelContext
|
||||
): PaymentConfigStruct {
|
||||
$settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
// Fetch the transaction details from WhitelabelMachineName API.
|
||||
$vrpaymentTransaction = $settings->getApiClient()->getTransactionService()->read(
|
||||
$settings->getSpaceId(),
|
||||
$transactionId
|
||||
);
|
||||
|
||||
$javascriptUrl = $this->getTransactionJavaScriptUrl($settings, $transactionId);
|
||||
|
||||
$possiblePaymentMethods = $settings->getApiClient()
|
||||
->getTransactionService()
|
||||
->fetchPaymentMethods(
|
||||
$settings->getSpaceId(),
|
||||
$transactionId,
|
||||
$settings->getIntegration()
|
||||
);
|
||||
|
||||
$cartRecreateUrl = $this->router->generate(
|
||||
'frontend.checkout.cart.page',
|
||||
[],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
|
||||
$checkoutUrl = $this->router->generate(
|
||||
'frontend.checkout.confirm.page',
|
||||
[],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
|
||||
return (new PaymentConfigStruct())
|
||||
->setIntegration((string)$settings->getIntegration())
|
||||
->setJavascriptUrl($javascriptUrl)
|
||||
->setDeviceJavascriptUrl($this->getDeviceJavascriptUrl((int)$settings->getSpaceId()))
|
||||
->setTransactionPossiblePaymentMethods($possiblePaymentMethods)
|
||||
->setTransactionId($transactionId)
|
||||
->setSpaceId((int)$settings->getSpaceId())
|
||||
->setCartRecreateUrl($cartRecreateUrl)
|
||||
->setCheckoutUrl($checkoutUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the payment configuration for a given order.
|
||||
*
|
||||
* @param string $orderId The Shopware order ID.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @param string|null $cartRecreateUrl Optional override for the cart recreation URL.
|
||||
* @param string|null $checkoutUrl Optional override for the checkout confirmation URL.
|
||||
* @return PaymentConfigStruct The consolidated integration data.
|
||||
*/
|
||||
public function getPaymentConfig(
|
||||
string $orderId,
|
||||
SalesChannelContext $salesChannelContext,
|
||||
?string $cartRecreateUrl = null,
|
||||
?string $checkoutUrl = null
|
||||
): PaymentConfigStruct {
|
||||
// Retrieve settings and the transaction entity for the order.
|
||||
$settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
$transactionEntity = $this->transactionService->getByOrderId($orderId, $salesChannelContext->getContext());
|
||||
|
||||
// Default to storefront URLs if no overrides are provided.
|
||||
if ($cartRecreateUrl === null) {
|
||||
$cartRecreateUrl = $this->router->generate(
|
||||
'frontend.vrpayment.checkout.recreate-cart',
|
||||
['orderId' => $orderId],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
}
|
||||
|
||||
if ($checkoutUrl === null) {
|
||||
$checkoutUrl = $this->router->generate(
|
||||
'frontend.checkout.confirm.page',
|
||||
[],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
}
|
||||
|
||||
return $this->getConfigForTransaction((int)$transactionEntity->getTransactionId(), $salesChannelContext)
|
||||
->setCartRecreateUrl($cartRecreateUrl)
|
||||
->setCheckoutUrl($checkoutUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines the JavaScript URL for the WhitelabelMachineName integration.
|
||||
*
|
||||
* @param mixed $settings The plugin settings.
|
||||
* @param int $transactionId The transaction ID.
|
||||
* @return string The absolute URL to the JavaScript component.
|
||||
*/
|
||||
private function getTransactionJavaScriptUrl($settings, int $transactionId): string
|
||||
{
|
||||
$javascriptUrl = '';
|
||||
switch ($settings->getIntegration()) {
|
||||
case Integration::IFRAME:
|
||||
$javascriptUrl = $settings->getApiClient()->getTransactionIframeService()
|
||||
->javascriptUrl($settings->getSpaceId(), $transactionId);
|
||||
break;
|
||||
case Integration::LIGHTBOX:
|
||||
$javascriptUrl = $settings->getApiClient()->getTransactionLightboxService()
|
||||
->javascriptUrl($settings->getSpaceId(), $transactionId);
|
||||
break;
|
||||
}
|
||||
return $javascriptUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the device tracking JavaScript URL.
|
||||
*
|
||||
* @param int $spaceId The WhitelabelMachineName space ID.
|
||||
* @return string The tracking URL.
|
||||
*/
|
||||
private function getDeviceJavascriptUrl(int $spaceId): string
|
||||
{
|
||||
return 'https://gateway.vr-payment.de/s/' . $spaceId . '/payment/device.js?session=' . Uuid::randomHex();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,285 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\Service;
|
||||
|
||||
use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Shopware\Core\Checkout\Cart\SalesChannel\CartService;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
|
||||
use VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService;
|
||||
use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
|
||||
use VRPaymentPayment\Core\Checkout\PaymentHandler\VRPaymentPaymentHandler;
|
||||
use VRPaymentPayment\Core\Settings\Service\SettingsService;
|
||||
use VRPaymentPayment\Core\Util\PaymentMethodUtil;
|
||||
use Shopware\Core\Framework\Struct\ArrayEntity;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* This service centralizes the logic for filtering WhitelabelMachineName payment methods.
|
||||
* It ensures that only valid and available payment methods are displayed to the customer,
|
||||
* based on the current transaction state and configured settings.
|
||||
*/
|
||||
class PaymentMethodFilterService
|
||||
{
|
||||
/**
|
||||
* @var PaymentMethodConfigurationService
|
||||
* Service to handle WhitelabelMachineName payment method configurations.
|
||||
*/
|
||||
private PaymentMethodConfigurationService $paymentMethodConfigurationService;
|
||||
|
||||
/**
|
||||
* @var TransactionService
|
||||
* Service to manage WhitelabelMachineName transactions via API.
|
||||
*/
|
||||
private TransactionService $transactionService;
|
||||
|
||||
/**
|
||||
* @var SettingsService
|
||||
* Service to retrieve plugin settings.
|
||||
*/
|
||||
private SettingsService $settingsService;
|
||||
|
||||
/**
|
||||
* @var PaymentMethodUtil
|
||||
* Utility for payment method operations.
|
||||
*/
|
||||
private PaymentMethodUtil $paymentMethodUtil;
|
||||
|
||||
/**
|
||||
* @var EntityRepository
|
||||
* Repository for Shopware payment methods.
|
||||
*/
|
||||
private EntityRepository $paymentMethodRepository;
|
||||
|
||||
/**
|
||||
* @var LoggerInterface
|
||||
*/
|
||||
private LoggerInterface $logger;
|
||||
|
||||
/**
|
||||
* @var TransactionManagementService
|
||||
* Service to manage transaction state consistency.
|
||||
*/
|
||||
private TransactionManagementService $transactionManagementService;
|
||||
|
||||
/**
|
||||
* @var CartService
|
||||
*/
|
||||
private CartService $cartService;
|
||||
|
||||
/**
|
||||
* @param SettingsService $settingsService
|
||||
* @param TransactionService $transactionService
|
||||
* @param PaymentMethodConfigurationService $paymentMethodConfigurationService
|
||||
* @param PaymentMethodUtil $paymentMethodUtil
|
||||
* @param EntityRepository $paymentMethodRepository
|
||||
* @param TransactionManagementService $transactionManagementService
|
||||
*/
|
||||
public function __construct(
|
||||
SettingsService $settingsService,
|
||||
TransactionService $transactionService,
|
||||
PaymentMethodConfigurationService $paymentMethodConfigurationService,
|
||||
PaymentMethodUtil $paymentMethodUtil,
|
||||
EntityRepository $paymentMethodRepository,
|
||||
TransactionManagementService $transactionManagementService,
|
||||
CartService $cartService
|
||||
) {
|
||||
$this->settingsService = $settingsService;
|
||||
$this->transactionService = $transactionService;
|
||||
$this->paymentMethodConfigurationService = $paymentMethodConfigurationService;
|
||||
$this->paymentMethodUtil = $paymentMethodUtil;
|
||||
$this->paymentMethodRepository = $paymentMethodRepository;
|
||||
$this->transactionManagementService = $transactionManagementService;
|
||||
$this->cartService = $cartService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param LoggerInterface $logger
|
||||
*/
|
||||
public function setLogger(LoggerInterface $logger): void
|
||||
{
|
||||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
/**
|
||||
* Filters the given collection of payment methods based on WhitelabelMachineName's availability logic.
|
||||
*
|
||||
* @param PaymentMethodCollection $paymentMethodCollection The initial collection of payment methods.
|
||||
* @param SalesChannelContext $salesChannelContext The current sales channel context.
|
||||
* @param mixed $event Optional event that triggered the filtering.
|
||||
* @return PaymentMethodCollection The filtered collection of payment methods.
|
||||
*/
|
||||
public function filterPaymentMethods(
|
||||
PaymentMethodCollection $paymentMethodCollection,
|
||||
SalesChannelContext $salesChannelContext,
|
||||
$event = null
|
||||
): PaymentMethodCollection {
|
||||
// Fetch valid settings for the current sales channel.
|
||||
$settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
// If settings are missing, remove all WhitelabelMachineName payment methods to prevent incorrect behavior.
|
||||
if (is_null($settings)) {
|
||||
return $this->removeVRPaymentPaymentMethods($paymentMethodCollection, $salesChannelContext);
|
||||
}
|
||||
|
||||
// If there is no customer, we cannot create a transaction or perform API-based filtering.
|
||||
// This typically happens on non-checkout pages like the frontpage footer.
|
||||
if ($salesChannelContext->getCustomer() === null) {
|
||||
return $paymentMethodCollection;
|
||||
}
|
||||
|
||||
$source = $event;
|
||||
if ($source === null) {
|
||||
// In headless (Store API) flow, event is null. We explicitly fetch the cart to get line items.
|
||||
$source = $this->cartService->getCart($salesChannelContext->getToken(), $salesChannelContext);
|
||||
}
|
||||
|
||||
// Ensure a pending transaction exists in WhitelabelMachineName for correct filtering,
|
||||
// using the transaction management service for state consistency.
|
||||
$createdTransactionId = $this->transactionManagementService->getOrCreatePendingTransaction($salesChannelContext, $source);
|
||||
|
||||
// Update the temporary transaction if customer data has changed.
|
||||
$this->transactionManagementService->updateTempTransactionIfNeeded($salesChannelContext, $createdTransactionId, $source);
|
||||
|
||||
// Fetch available payment method IDs from WhitelabelMachineName API for this transaction.
|
||||
$allowedIds = $this->fetchAvailablePaymentMethodIds($settings, $createdTransactionId, $salesChannelContext);
|
||||
|
||||
// Return a new collection containing only allowed methods.
|
||||
return $this->buildFilteredCollection($paymentMethodCollection, $allowedIds, $settings->getSpaceId(), $salesChannelContext);
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes all WhitelabelMachineName-related payment methods from the collection.
|
||||
*
|
||||
* @param PaymentMethodCollection $paymentMethodCollection The collection to clean.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return PaymentMethodCollection The cleaned collection.
|
||||
*/
|
||||
private function removeVRPaymentPaymentMethods(
|
||||
PaymentMethodCollection $paymentMethodCollection,
|
||||
SalesChannelContext $salesChannelContext
|
||||
): PaymentMethodCollection {
|
||||
$paymentMethodIds = $this->paymentMethodUtil->getVRPaymentPaymentMethodIds($salesChannelContext->getContext());
|
||||
foreach ($paymentMethodIds as $paymentMethodId) {
|
||||
$paymentMethodCollection->remove($paymentMethodId);
|
||||
}
|
||||
return $paymentMethodCollection;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the list of allowed payment method IDs from the WhitelabelMachineName API.
|
||||
*
|
||||
* @param mixed $settings The plugin settings.
|
||||
* @param int $createdTransactionId The WhitelabelMachineName transaction ID.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return string[] Array of allowed payment method configuration IDs.
|
||||
*/
|
||||
private function fetchAvailablePaymentMethodIds(
|
||||
$settings,
|
||||
int $createdTransactionId,
|
||||
SalesChannelContext $salesChannelContext
|
||||
): array {
|
||||
$transactionService = $settings->getApiClient()->getTransactionService();
|
||||
$possiblePaymentMethods = $transactionService->fetchPaymentMethods(
|
||||
$settings->getSpaceId(),
|
||||
$createdTransactionId,
|
||||
$settings->getIntegration()
|
||||
);
|
||||
|
||||
$arrayOfPossibleMethods = [];
|
||||
foreach ($possiblePaymentMethods as $possiblePaymentMethod) {
|
||||
$arrayOfPossibleMethods[] = (string) $possiblePaymentMethod->getId();
|
||||
}
|
||||
|
||||
// Store the allowed IDs in context extension for later use.
|
||||
$salesChannelContext->getContext()->addExtension(
|
||||
'possibleMethods',
|
||||
new ArrayEntity(['ids' => $arrayOfPossibleMethods])
|
||||
);
|
||||
|
||||
return $arrayOfPossibleMethods;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a filtered PaymentMethodCollection based on allowed IDs.
|
||||
*
|
||||
* @param PaymentMethodCollection $paymentMethodCollection Original collection.
|
||||
* @param string[] $allowedIds List of allowed configuration IDs.
|
||||
* @param int $spaceId WhitelabelMachineName space ID.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return PaymentMethodCollection The final collection.
|
||||
*/
|
||||
private function buildFilteredCollection(
|
||||
PaymentMethodCollection $paymentMethodCollection,
|
||||
array $allowedIds,
|
||||
int $spaceId,
|
||||
SalesChannelContext $salesChannelContext
|
||||
): PaymentMethodCollection {
|
||||
$paymentIds = [];
|
||||
// Extract non-WhitelabelMachineName payment methods first.
|
||||
foreach ($paymentMethodCollection as $paymentMethodCollectionItem) {
|
||||
$isVRPaymentPM = VRPaymentPaymentHandler::class === $paymentMethodCollectionItem->getHandlerIdentifier();
|
||||
if (!$isVRPaymentPM) {
|
||||
$paymentIds[] = $paymentMethodCollectionItem->getId();
|
||||
}
|
||||
}
|
||||
|
||||
$allowedWLMethods = [];
|
||||
// Fetch all WhitelabelMachineName payment method configurations for the space.
|
||||
$paymentMethodConfigurations = $this->paymentMethodConfigurationService
|
||||
->getAllPaymentMethodConfigurations($spaceId, $salesChannelContext->getContext());
|
||||
|
||||
// Check each configuration against the list of allowed IDs from WhitelabelMachineName API.
|
||||
foreach ($paymentMethodConfigurations as $paymentMethodConfiguration) {
|
||||
if ($paymentMethodConfiguration->getPaymentMethod() === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$pmId = $paymentMethodConfiguration->getPaymentMethod()->getId();
|
||||
$pmConfigId = (string) $paymentMethodConfiguration->getPaymentMethodConfigurationId();
|
||||
|
||||
if (
|
||||
$paymentMethodConfiguration->getSpaceId() === $spaceId
|
||||
&& \in_array($pmConfigId, $allowedIds, true)
|
||||
) {
|
||||
$allowedWLMethods[] = $pmId;
|
||||
}
|
||||
}
|
||||
|
||||
// Combine non-WhitelabelMachineName and allowed WhitelabelMachineName payment methods.
|
||||
$allPaymentIds = array_unique(array_merge($paymentIds, $allowedWLMethods));
|
||||
$collection = new PaymentMethodCollection();
|
||||
|
||||
if (!empty($allPaymentIds)) {
|
||||
$criteria = new Criteria($allPaymentIds);
|
||||
$criteria->addFilter(new EqualsFilter('active', true));
|
||||
$criteria->addFilter(
|
||||
new EqualsFilter('salesChannels.id', $salesChannelContext->getSalesChannelId())
|
||||
);
|
||||
$criteria->addSorting(new FieldSorting('position', FieldSorting::ASCENDING));
|
||||
$criteria->addAssociation('media');
|
||||
// Re-fetch the entities to ensure we have valid objects with all associations.
|
||||
$result = $this->paymentMethodRepository->search($criteria, $salesChannelContext->getContext());
|
||||
/** @var \Shopware\Core\Checkout\Payment\PaymentMethodEntity $method */
|
||||
foreach ($result->getEntities() as $method) {
|
||||
if (!$collection->has((string)$method->getId())) {
|
||||
// Attach the configuration to the payment method as an extension for Twig access.
|
||||
foreach ($paymentMethodConfigurations as $paymentMethodConfiguration) {
|
||||
if ($paymentMethodConfiguration->getPaymentMethodId() === $method->getId()) {
|
||||
$method->addExtension('vrpayment_config', $paymentMethodConfiguration);
|
||||
break;
|
||||
}
|
||||
}
|
||||
$collection->add($method);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $collection;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,207 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\Service;
|
||||
|
||||
use Psr\Cache\CacheItemPoolInterface;
|
||||
use Shopware\Core\Framework\Struct\ArrayEntity;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
|
||||
use VRPaymentPayment\Core\Settings\Service\SettingsService;
|
||||
use VRPayment\Sdk\Model\TransactionState;
|
||||
|
||||
/**
|
||||
* This service manages the lifecycle of WhitelabelMachineName transactions and their state within the Shopware context.
|
||||
* It provides methods to retrieve, create, and update transactions while ensuring state consistency.
|
||||
*/
|
||||
class TransactionManagementService
|
||||
{
|
||||
/**
|
||||
* @var TransactionService
|
||||
* The service used to interact with the WhitelabelMachineName API for transaction operations.
|
||||
*/
|
||||
private TransactionService $transactionService;
|
||||
|
||||
/**
|
||||
* @var SettingsService
|
||||
* The service used to retrieve configuration settings for the current sales channel.
|
||||
*/
|
||||
private SettingsService $settingsService;
|
||||
|
||||
/**
|
||||
* @var CacheItemPoolInterface
|
||||
* Cache for headless transaction persistence
|
||||
*/
|
||||
private CacheItemPoolInterface $cache;
|
||||
|
||||
/**
|
||||
* @param TransactionService $transactionService
|
||||
* @param SettingsService $settingsService
|
||||
* @param CacheItemPoolInterface $cache
|
||||
*/
|
||||
public function __construct(
|
||||
TransactionService $transactionService,
|
||||
SettingsService $settingsService,
|
||||
CacheItemPoolInterface $cache
|
||||
) {
|
||||
$this->transactionService = $transactionService;
|
||||
$this->settingsService = $settingsService;
|
||||
$this->cache = $cache;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves an existing pending transaction ID from the context or creates a new one if necessary.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext The current sales channel context.
|
||||
* @param mixed $event Optional event context.
|
||||
* @return int The WhitelabelMachineName transaction ID.
|
||||
* @throws \Exception If settings are not configured.
|
||||
*/
|
||||
public function getOrCreatePendingTransaction(SalesChannelContext $salesChannelContext, $event = null): int
|
||||
{
|
||||
// Try to get the transaction ID from the current context state.
|
||||
$transactionId = $this->getTransactionIdFromContext($salesChannelContext);
|
||||
$settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
if (!$settings) {
|
||||
throw new \Exception('Space settings not configured');
|
||||
}
|
||||
|
||||
$expiredTransaction = true;
|
||||
if ($transactionId) {
|
||||
try {
|
||||
// Verify if the transaction still exists and is in a PENDING state.
|
||||
$pendingTransaction = $this->transactionService->read($transactionId, (string)$salesChannelContext->getSalesChannel()->getId());
|
||||
if ($pendingTransaction->getState() === TransactionState::PENDING) {
|
||||
$expiredTransaction = false;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
// If the transaction cannot be read, we treat it as expired or invalid.
|
||||
}
|
||||
}
|
||||
|
||||
// Create a new transaction if none exists or the existing one is no longer valid.
|
||||
if (!$transactionId || $expiredTransaction) {
|
||||
$transactionId = (int)$this->transactionService->createPendingTransaction($salesChannelContext, $event);
|
||||
$this->storeTransactionIdInContext($salesChannelContext, $transactionId);
|
||||
}
|
||||
|
||||
return $transactionId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the WhitelabelMachineName transaction if the customer context (address or currency) or line items have changed.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext The current context.
|
||||
* @param int $transactionId The WhitelabelMachineName transaction ID to update.
|
||||
* @param mixed $event The event that triggered this update (optional).
|
||||
*/
|
||||
public function updateTempTransactionIfNeeded(SalesChannelContext $salesChannelContext, int $transactionId, $event = null): void
|
||||
{
|
||||
$ctx = $salesChannelContext->getContext();
|
||||
|
||||
/** @var ArrayEntity|null $ext */
|
||||
$ext = $ctx->getExtension('checkoutState');
|
||||
|
||||
$oldAddressHash = $ext instanceof ArrayEntity ? (string)$ext->get('addressHash') : null;
|
||||
$oldCurrency = $ext instanceof ArrayEntity ? (string)$ext->get('currency') : null;
|
||||
$oldLineItemHash = $ext instanceof ArrayEntity ? (string)$ext->get('lineItemHash') : null;
|
||||
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
$addressHash = $customer ? md5(json_encode((array) $customer)) : null;
|
||||
$currency = (string)$salesChannelContext->getCurrency()->getIsoCode();
|
||||
|
||||
$lineItems = $this->transactionService->extractLineItems($event);
|
||||
$lineItemHash = !empty($lineItems) ? md5(json_encode($lineItems)) : $oldLineItemHash;
|
||||
|
||||
$needsUpdate = ($oldAddressHash !== $addressHash)
|
||||
|| ($oldCurrency !== $currency)
|
||||
|| ($oldLineItemHash !== $lineItemHash);
|
||||
|
||||
if ($needsUpdate) {
|
||||
// Update the transaction in WhitelabelMachineName to reflect current cart and customer data.
|
||||
if ($transactionId) {
|
||||
$this->transactionService->updateTempTransaction($salesChannelContext, $transactionId, $lineItems);
|
||||
}
|
||||
|
||||
// Clear payment method cache as options might have changed due to address/currency change.
|
||||
$ctx->addExtension('possibleMethods', new ArrayEntity(['ids' => []]));
|
||||
|
||||
// Persist the new state hash in the context.
|
||||
$ctx->addExtension(
|
||||
'checkoutState',
|
||||
new ArrayEntity([
|
||||
'transactionId' => $transactionId,
|
||||
'addressHash' => $addressHash,
|
||||
'currency' => $currency,
|
||||
'lineItemHash' => $lineItemHash,
|
||||
])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the stored WhitelabelMachineName transaction ID from the context, cache, or session.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return int|null The transaction ID if found, otherwise null.
|
||||
*/
|
||||
public function getTransactionIdFromContext(SalesChannelContext $salesChannelContext): ?int
|
||||
{
|
||||
/** @var ArrayEntity|null $ext */
|
||||
$ext = $salesChannelContext->getContext()->getExtension('checkoutState');
|
||||
if ($ext instanceof ArrayEntity && $ext->get('transactionId')) {
|
||||
return (int) $ext->get('transactionId');
|
||||
}
|
||||
|
||||
// Try to get from cache (headless support).
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
if ($customer) {
|
||||
$cacheKey = 'vrpn_pending_transaction_id_customer_' . $customer->getId();
|
||||
$item = $this->cache->getItem($cacheKey);
|
||||
if ($item->isHit()) {
|
||||
return (int) $item->get();
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback to PHP session for traditional Storefront compatibility.
|
||||
if (isset($_SESSION['transactionId'])) {
|
||||
return (int) $_SESSION['transactionId'];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Persists the transaction ID in the context state, cache, and session.
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @param int $transactionId The transaction ID to store.
|
||||
*/
|
||||
private function storeTransactionIdInContext(SalesChannelContext $salesChannelContext, int $transactionId): void
|
||||
{
|
||||
$ctx = $salesChannelContext->getContext();
|
||||
/** @var ArrayEntity|null $ext */
|
||||
$ext = $ctx->getExtension('checkoutState');
|
||||
|
||||
$data = $ext instanceof ArrayEntity ? $ext->all() : [];
|
||||
$data['transactionId'] = $transactionId;
|
||||
|
||||
// Store in context extension for stateless (headless) support within the request.
|
||||
$ctx->addExtension('checkoutState', new ArrayEntity($data));
|
||||
|
||||
// Store in cache for persistent headless support.
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
if ($customer) {
|
||||
$cacheKey = 'vrpn_pending_transaction_id_customer_' . $customer->getId();
|
||||
$item = $this->cache->getItem($cacheKey);
|
||||
$item->set($transactionId);
|
||||
$item->expiresAfter(7200);
|
||||
$this->cache->save($item);
|
||||
}
|
||||
|
||||
// Sync with PHP session for stateful Storefront support.
|
||||
$_SESSION['transactionId'] = $transactionId;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\StoreApi\Route;
|
||||
|
||||
use Shopware\Core\Framework\Log\Package;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use VRPaymentPayment\Core\Checkout\Service\CartRecoveryService;
|
||||
|
||||
#[Package('checkout')]
|
||||
#[Route(defaults: ['_routeScope' => ['store-api']])]
|
||||
/**
|
||||
* This Store API route allows headless clients to recreate a cart from an existing order.
|
||||
* This is particularly useful for 'Try Again' scenarios if a payment fails.
|
||||
*/
|
||||
class CartRecoveryRoute
|
||||
{
|
||||
/**
|
||||
* @var CartRecoveryService
|
||||
* Service to handle the logic of reconstructing a cart from order items.
|
||||
*/
|
||||
private CartRecoveryService $cartRecoveryService;
|
||||
|
||||
/**
|
||||
* @param CartRecoveryService $cartRecoveryService
|
||||
*/
|
||||
public function __construct(CartRecoveryService $cartRecoveryService)
|
||||
{
|
||||
$this->cartRecoveryService = $cartRecoveryService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recreates a cart based on the provided order ID.
|
||||
*
|
||||
* @param string $orderId The ID of the order to recover the cart from.
|
||||
* @param Request $request The incoming request.
|
||||
* @param SalesChannelContext $context The current sales channel context.
|
||||
* @return JsonResponse A JSON response containing either the new cart data or an error message.
|
||||
*/
|
||||
#[Route(
|
||||
path: '/store-api/vrpayment/checkout/recreate-cart/{orderId}',
|
||||
name: 'store-api.vrpayment.checkout.recreate-cart',
|
||||
methods: ['POST']
|
||||
)]
|
||||
public function recreate(string $orderId, Request $request, SalesChannelContext $context): JsonResponse
|
||||
{
|
||||
try {
|
||||
// Fetch the order entity.
|
||||
$order = $this->cartRecoveryService->getOrderEntity($orderId, $context->getContext());
|
||||
|
||||
// Security check: ensure the order belongs to the current sales channel.
|
||||
if ($order->getSalesChannelId() !== $context->getSalesChannelId()) {
|
||||
return new JsonResponse(['error' => 'Sales channel mismatch'], 403);
|
||||
}
|
||||
|
||||
// Perform the cart reconstruction.
|
||||
$cart = $this->cartRecoveryService->recreateCartFromOrder($order, $context);
|
||||
|
||||
// Return the reconstructed cart data.
|
||||
return new JsonResponse($cart);
|
||||
} catch (\Exception $e) {
|
||||
// Handle any exceptions during the process.
|
||||
return new JsonResponse(['error' => $e->getMessage()], 400);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\StoreApi\Route;
|
||||
|
||||
use Shopware\Core\Framework\Log\Package;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use VRPaymentPayment\Core\Checkout\Service\InvoiceService;
|
||||
|
||||
#[Package('checkout')]
|
||||
#[Route(defaults: ['_routeScope' => ['store-api']])]
|
||||
/**
|
||||
* This Store API route provides access to invoice documents for headless clients.
|
||||
*/
|
||||
class InvoiceRoute
|
||||
{
|
||||
/**
|
||||
* @var InvoiceService
|
||||
* Service to handle the retrieval of invoice documents from WhitelabelMachineName.
|
||||
*/
|
||||
private InvoiceService $invoiceService;
|
||||
|
||||
/**
|
||||
* @param InvoiceService $invoiceService
|
||||
*/
|
||||
public function __construct(InvoiceService $invoiceService)
|
||||
{
|
||||
$this->invoiceService = $invoiceService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the invoice document metadata and content for a given order.
|
||||
*
|
||||
* @param string $orderId The ID of the order.
|
||||
* @param Request $request The incoming request.
|
||||
* @param SalesChannelContext $context The current sales channel context.
|
||||
* @return JsonResponse A JSON response containing the invoice title, MIME type, and base64-encoded data.
|
||||
*/
|
||||
#[Route(
|
||||
path: '/store-api/vrpayment/account/order/invoice/{orderId}',
|
||||
name: 'store-api.vrpayment.account.order.invoice',
|
||||
methods: ['GET']
|
||||
)]
|
||||
public function load(string $orderId, Request $request, SalesChannelContext $context): JsonResponse
|
||||
{
|
||||
try {
|
||||
// Retrieve the invoice document via the dedicated service.
|
||||
$invoice = $this->invoiceService->getInvoiceDocument($orderId, $context);
|
||||
|
||||
// Structure the response for headless consumption.
|
||||
return new JsonResponse([
|
||||
'title' => (string)$invoice->getTitle(),
|
||||
'mimeType' => (string)$invoice->getMimeType(),
|
||||
'data' => (string)$invoice->getData(), // Base64 encoded
|
||||
]);
|
||||
} catch (\Exception $e) {
|
||||
// Handle errors (e.g., order not found or API failure).
|
||||
return new JsonResponse(['error' => $e->getMessage()], 400);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\StoreApi\Route;
|
||||
|
||||
use Shopware\Core\Framework\Log\Package;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use VRPaymentPayment\Core\Checkout\Service\PaymentIntegrationService;
|
||||
|
||||
/**
|
||||
* This route provides transaction-specific configuration for a given order.
|
||||
* It is primarily used by headless clients to initialize the WhitelabelMachineName payment iframe or lightbox.
|
||||
*/
|
||||
#[Package('checkout')]
|
||||
#[Route(defaults: ['_routeScope' => ['store-api']])]
|
||||
class WhitelabelMachineNameTransactionInfoRoute
|
||||
{
|
||||
/**
|
||||
* @var PaymentIntegrationService
|
||||
* The service responsible for generating the unified payment configuration.
|
||||
*/
|
||||
private PaymentIntegrationService $paymentIntegrationService;
|
||||
|
||||
/**
|
||||
* @param PaymentIntegrationService $paymentIntegrationService
|
||||
*/
|
||||
public function __construct(PaymentIntegrationService $paymentIntegrationService)
|
||||
{
|
||||
$this->paymentIntegrationService = $paymentIntegrationService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the payment configuration for a specific order.
|
||||
*
|
||||
* @param string $orderId The Shopware order ID.
|
||||
* @param Request $request The incoming request object.
|
||||
* @param SalesChannelContext $context The current sales channel context.
|
||||
* @return JsonResponse JSON response containing the PaymentConfigStruct data.
|
||||
*/
|
||||
#[Route(
|
||||
path: '/store-api/vrpayment/transaction/info/{orderId}',
|
||||
name: 'store-api.vrpayment.transaction.info',
|
||||
methods: ['GET']
|
||||
)]
|
||||
public function load(string $orderId, Request $request, SalesChannelContext $context): JsonResponse
|
||||
{
|
||||
try {
|
||||
// Retrieve the payment configuration using the common service.
|
||||
// This ensures logic parity between Storefront and Store API.
|
||||
$config = $this->paymentIntegrationService->getPaymentConfig($orderId, $context);
|
||||
|
||||
// Return the configuration as a JSON response for the headless client.
|
||||
return new JsonResponse($config);
|
||||
} catch (\Exception $e) {
|
||||
// In case of error, return a 400 response with the error message.
|
||||
return new JsonResponse(['error' => $e->getMessage()], 400);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,205 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Checkout\Struct;
|
||||
|
||||
use Shopware\Core\Framework\Struct\Struct;
|
||||
|
||||
/**
|
||||
* This struct encapsulates all the configuration data required to initialize a WhitelabelMachineName payment integration.
|
||||
*/
|
||||
class PaymentConfigStruct extends Struct
|
||||
{
|
||||
/**
|
||||
* @var string
|
||||
* The type of integration (e.g., 'iframe' or 'lightbox').
|
||||
*/
|
||||
protected string $integration;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* The absolute URL to the WhitelabelMachineName JavaScript component for transaction handling.
|
||||
*/
|
||||
protected string $javascriptUrl;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* The absolute URL to the WhitelabelMachineName JavaScript component for device tracking.
|
||||
*/
|
||||
protected string $deviceJavascriptUrl;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
* A list of possible payment methods for the current transaction.
|
||||
*/
|
||||
protected array $transactionPossiblePaymentMethods;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* The unique ID of the WhitelabelMachineName transaction.
|
||||
*/
|
||||
protected int $transactionId;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* The unique ID of the WhitelabelMachineName space.
|
||||
*/
|
||||
protected int $spaceId;
|
||||
|
||||
/**
|
||||
* @var string|null
|
||||
* The URL to redirect to if the cart needs to be recreated (e.g., after an error).
|
||||
*/
|
||||
protected ?string $cartRecreateUrl = null;
|
||||
|
||||
/**
|
||||
* @var string|null
|
||||
* The URL to the checkout confirmation page.
|
||||
*/
|
||||
protected ?string $checkoutUrl = null;
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getIntegration(): string
|
||||
{
|
||||
return $this->integration;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $integration
|
||||
* @return self
|
||||
*/
|
||||
public function setIntegration(string $integration): self
|
||||
{
|
||||
$this->integration = $integration;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getJavascriptUrl(): string
|
||||
{
|
||||
return $this->javascriptUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $javascriptUrl
|
||||
* @return self
|
||||
*/
|
||||
public function setJavascriptUrl(string $javascriptUrl): self
|
||||
{
|
||||
$this->javascriptUrl = $javascriptUrl;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getDeviceJavascriptUrl(): string
|
||||
{
|
||||
return $this->deviceJavascriptUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $deviceJavascriptUrl
|
||||
* @return self
|
||||
*/
|
||||
public function setDeviceJavascriptUrl(string $deviceJavascriptUrl): self
|
||||
{
|
||||
$this->deviceJavascriptUrl = $deviceJavascriptUrl;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getTransactionPossiblePaymentMethods(): array
|
||||
{
|
||||
return $this->transactionPossiblePaymentMethods;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $transactionPossiblePaymentMethods
|
||||
* @return self
|
||||
*/
|
||||
public function setTransactionPossiblePaymentMethods(array $transactionPossiblePaymentMethods): self
|
||||
{
|
||||
$this->transactionPossiblePaymentMethods = $transactionPossiblePaymentMethods;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
*/
|
||||
public function getTransactionId(): int
|
||||
{
|
||||
return $this->transactionId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $transactionId
|
||||
* @return self
|
||||
*/
|
||||
public function setTransactionId(int $transactionId): self
|
||||
{
|
||||
$this->transactionId = $transactionId;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
*/
|
||||
public function getSpaceId(): int
|
||||
{
|
||||
return $this->spaceId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $spaceId
|
||||
* @return self
|
||||
*/
|
||||
public function setSpaceId(int $spaceId): self
|
||||
{
|
||||
$this->spaceId = $spaceId;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string|null
|
||||
*/
|
||||
public function getCartRecreateUrl(): ?string
|
||||
{
|
||||
return $this->cartRecreateUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string|null $cartRecreateUrl
|
||||
* @return self
|
||||
*/
|
||||
public function setCartRecreateUrl(?string $cartRecreateUrl): self
|
||||
{
|
||||
$this->cartRecreateUrl = $cartRecreateUrl;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string|null
|
||||
*/
|
||||
public function getCheckoutUrl(): ?string
|
||||
{
|
||||
return $this->checkoutUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string|null $checkoutUrl
|
||||
* @return self
|
||||
*/
|
||||
public function setCheckoutUrl(?string $checkoutUrl): self
|
||||
{
|
||||
$this->checkoutUrl = $checkoutUrl;
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,12 @@
|
||||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Storefront\Account\Controller;
|
||||
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Shopware\Core\{
|
||||
Checkout\Cart\Exception\CustomerNotLoggedInException,
|
||||
Checkout\Cart\CartException,
|
||||
Checkout\Customer\CustomerEntity,
|
||||
PlatformRequest,
|
||||
System\SalesChannel\SalesChannelContext
|
||||
@@ -20,51 +22,57 @@ use Symfony\Component\{
|
||||
};
|
||||
use VRPaymentPayment\Core\{
|
||||
Api\Transaction\Service\TransactionService,
|
||||
Settings\Service\SettingsService
|
||||
Checkout\Service\InvoiceService
|
||||
};
|
||||
|
||||
#[Package('storefront')]
|
||||
#[Route(defaults: ['_routeScope' => ['storefront']])]
|
||||
/**
|
||||
* This controller handles account-related actions for orders, specifically
|
||||
* allowing customers to download their invoice documents.
|
||||
*/
|
||||
class AccountOrderController extends StorefrontController
|
||||
{
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Settings\Service\SettingsService
|
||||
* @var LoggerInterface
|
||||
*/
|
||||
protected $settingsService;
|
||||
protected LoggerInterface $logger;
|
||||
|
||||
/**
|
||||
* @var \Psr\Log\LoggerInterface
|
||||
* @var TransactionService
|
||||
* Local transaction service for order data retrieval.
|
||||
*/
|
||||
protected $logger;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
|
||||
*/
|
||||
protected $transactionService;
|
||||
protected TransactionService $transactionService;
|
||||
|
||||
/**
|
||||
* @var RequestStack
|
||||
* Symfony service to access the current request context.
|
||||
*/
|
||||
protected $requestStack;
|
||||
protected RequestStack $requestStack;
|
||||
|
||||
/**
|
||||
* AccountOrderController constructor.
|
||||
* @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
|
||||
* @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
|
||||
* @param RequestStack $requestStack
|
||||
* @var InvoiceService
|
||||
* Service to fetch invoice documents from WhitelabelMachineName.
|
||||
*/
|
||||
public function __construct(SettingsService $settingsService, TransactionService $transactionService, RequestStack $requestStack)
|
||||
{
|
||||
$this->settingsService = $settingsService;
|
||||
private InvoiceService $invoiceService;
|
||||
|
||||
/**
|
||||
* @param TransactionService $transactionService
|
||||
* @param RequestStack $requestStack
|
||||
* @param InvoiceService $invoiceService
|
||||
*/
|
||||
public function __construct(
|
||||
TransactionService $transactionService,
|
||||
RequestStack $requestStack,
|
||||
InvoiceService $invoiceService
|
||||
) {
|
||||
$this->transactionService = $transactionService;
|
||||
$this->requestStack = $requestStack;
|
||||
$this->invoiceService = $invoiceService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Psr\Log\LoggerInterface $logger
|
||||
* @internal
|
||||
* @required
|
||||
*
|
||||
* @param LoggerInterface $logger
|
||||
*/
|
||||
public function setLogger(LoggerInterface $logger): void
|
||||
{
|
||||
@@ -72,59 +80,76 @@ class AccountOrderController extends StorefrontController
|
||||
}
|
||||
|
||||
/**
|
||||
* Download invoice document
|
||||
* Downloads an invoice document for a specific order.
|
||||
*
|
||||
* @param string $orderId
|
||||
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*
|
||||
* @throws \VRPayment\Sdk\ApiException
|
||||
* @throws \VRPayment\Sdk\Http\ConnectionException
|
||||
* @throws \VRPayment\Sdk\VersioningException
|
||||
* @param string $orderId The ID of the order.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return Response The PDF document as a download response.
|
||||
*/
|
||||
#[Route("/vrpayment/account/order/download/invoice/document/{orderId}",
|
||||
#[Route(
|
||||
path: "/vrpayment/account/order/download/invoice/document/{orderId}",
|
||||
name: "frontend.vrpayment.account.order.download.invoice.document",
|
||||
methods: ['GET'])]
|
||||
methods: ['GET']
|
||||
)]
|
||||
public function downloadInvoiceDocument(string $orderId, SalesChannelContext $salesChannelContext): Response
|
||||
{
|
||||
try {
|
||||
// Ensure the user is logged in.
|
||||
$customer = $this->getLoggedInCustomer();
|
||||
$settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
// Fetch the transaction entity to verify ownership.
|
||||
$transactionEntity = $this->transactionService->getByOrderId($orderId, $salesChannelContext->getContext());
|
||||
if (strcasecmp($customer->getCustomerNumber(), $transactionEntity->getData()['customerId']) != 0) {
|
||||
|
||||
// Security check: ensure the document belongs to the logged-in customer.
|
||||
if (strcasecmp((string)$customer->getCustomerNumber(), (string)$transactionEntity->getData()['customerId']) != 0) {
|
||||
throw new AccessDeniedException();
|
||||
}
|
||||
$invoiceDocument = $settings->getApiClient()->getTransactionService()->getInvoiceDocument($settings->getSpaceId(), $transactionEntity->getTransactionId());
|
||||
$forceDownload = true;
|
||||
$filename = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '_', $invoiceDocument->getTitle()) . '.pdf';
|
||||
|
||||
// Retrieve the invoice document metadata and content.
|
||||
/** @var object $invoiceDocument */
|
||||
$invoiceDocument = $this->invoiceService->getInvoiceDocument($orderId, $salesChannelContext);
|
||||
|
||||
// Sanitize the filename for the download.
|
||||
$filename = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '_', (string)$invoiceDocument->getTitle()) . '.pdf';
|
||||
$disposition = HeaderUtils::makeDisposition(
|
||||
$forceDownload ? HeaderUtils::DISPOSITION_ATTACHMENT : HeaderUtils::DISPOSITION_INLINE,
|
||||
HeaderUtils::DISPOSITION_ATTACHMENT,
|
||||
$filename,
|
||||
$filename
|
||||
);
|
||||
$response = new Response(base64_decode($invoiceDocument->getData()));
|
||||
$response->headers->set('Content-Type', $invoiceDocument->getMimeType());
|
||||
|
||||
// Create the response with the PDF content (base64 decoded).
|
||||
$response = new Response(base64_decode((string)$invoiceDocument->getData()));
|
||||
$response->headers->set('Content-Type', (string)$invoiceDocument->getMimeType());
|
||||
$response->headers->set('Content-Disposition', $disposition);
|
||||
|
||||
return $response;
|
||||
} catch (\Exception $e) {
|
||||
$this->logger->error($e->getMessage());
|
||||
return $this->redirectToRoute('frontend.home.page');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper to retrieve the currently logged-in customer.
|
||||
*
|
||||
* @return CustomerEntity
|
||||
* @throws CartException
|
||||
*/
|
||||
protected function getLoggedInCustomer(): CustomerEntity
|
||||
{
|
||||
$request = $this->requestStack->getCurrentRequest();
|
||||
|
||||
if (!$request) {
|
||||
throw new CustomerNotLoggedInException();
|
||||
throw CartException::customerNotLoggedIn();
|
||||
}
|
||||
|
||||
/** @var SalesChannelContext|null $context */
|
||||
$context = $request->attributes->get(PlatformRequest::ATTRIBUTE_SALES_CHANNEL_CONTEXT_OBJECT);
|
||||
|
||||
if ($context && $context->getCustomer() && $context->getCustomer()->getGuest() === false) {
|
||||
return $context->getCustomer();
|
||||
}
|
||||
|
||||
throw new CustomerNotLoggedInException();
|
||||
throw CartException::customerNotLoggedIn();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,26 +1,18 @@
|
||||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Storefront\Checkout\Controller;
|
||||
|
||||
use VRPayment\Sdk\Model\TransactionState as SdkTransactionState;
|
||||
use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Shopware\Core\{
|
||||
Checkout\Cart\Cart,
|
||||
Checkout\Cart\CartException,
|
||||
Checkout\Cart\LineItemFactoryRegistry,
|
||||
Checkout\Cart\SalesChannel\CartService,
|
||||
Checkout\Order\Aggregate\OrderLineItem\OrderLineItemCollection,
|
||||
Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity,
|
||||
Checkout\Order\OrderEntity,
|
||||
Checkout\Order\SalesChannel\AbstractOrderRoute,
|
||||
Framework\Context,
|
||||
Framework\DataAbstractionLayer\Search\Criteria,
|
||||
Framework\DataAbstractionLayer\Search\Filter\EqualsFilter,
|
||||
Framework\DataAbstractionLayer\Search\Sorting\FieldSorting,
|
||||
Framework\Log\Package,
|
||||
Framework\Routing\Exception\MissingRequestParameterException,
|
||||
Framework\Uuid\Uuid,
|
||||
Framework\Uuid\Exception\InvalidUuidException,
|
||||
Framework\Validation\DataBag\RequestDataBag,
|
||||
Framework\Routing\RoutingException,
|
||||
Framework\DataAbstractionLayer\Search\Criteria,
|
||||
System\SalesChannel\SalesChannelContext
|
||||
};
|
||||
use Shopware\Storefront\{
|
||||
@@ -31,105 +23,90 @@ use Shopware\Storefront\{
|
||||
use Symfony\Component\{
|
||||
HttpFoundation\Request,
|
||||
HttpFoundation\Response,
|
||||
Routing\Attribute\Route,
|
||||
Routing\Generator\UrlGeneratorInterface
|
||||
};
|
||||
use VRPayment\Sdk\{
|
||||
Model\Transaction,
|
||||
Model\TransactionState
|
||||
Routing\Attribute\Route
|
||||
};
|
||||
use VRPaymentPayment\Core\{
|
||||
Api\Transaction\Service\TransactionService,
|
||||
Settings\Options\Integration,
|
||||
Settings\Service\SettingsService,
|
||||
Storefront\Checkout\Struct\CheckoutPageData,
|
||||
Util\Payload\CustomProducts\CustomProductsLineItemTypes
|
||||
Checkout\Service\CartRecoveryService,
|
||||
Checkout\Service\PaymentIntegrationService,
|
||||
Settings\Service\SettingsService
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Class CheckoutController
|
||||
*
|
||||
* @package VRPaymentPayment\Core\Storefront\Checkout\Controller
|
||||
*
|
||||
*/
|
||||
#[Package('checkout')]
|
||||
#[Route(defaults: ['_routeScope' => ['storefront']])]
|
||||
class CheckoutController extends StorefrontController {
|
||||
|
||||
/**
|
||||
* @var \Shopware\Storefront\Page\GenericPageLoader
|
||||
* This controller handles Storefront-specific actions for the WhitelabelMachineName integration,
|
||||
* such as rendering the payment page and recreating a cart from a failed order.
|
||||
*/
|
||||
protected $genericLoader;
|
||||
|
||||
class CheckoutController extends StorefrontController
|
||||
{
|
||||
/**
|
||||
* @var \Shopware\Core\Checkout\Cart\SalesChannel\CartService
|
||||
* @var GenericPageLoaderInterface
|
||||
* Loader for basic Shopware page data.
|
||||
*/
|
||||
protected $cartService;
|
||||
protected GenericPageLoaderInterface $genericLoader;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Settings\Service\SettingsService
|
||||
* @var SettingsService
|
||||
* Plugin settings service.
|
||||
*/
|
||||
protected $settingsService;
|
||||
protected SettingsService $settingsService;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Settings\Struct\Settings
|
||||
* @var LoggerInterface|null
|
||||
* Logger for recording errors and important information.
|
||||
*/
|
||||
protected $settings;
|
||||
private ?LoggerInterface $logger = null;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
|
||||
* @var AbstractOrderRoute
|
||||
* Shopware service for order retrieval.
|
||||
*/
|
||||
protected $transactionService;
|
||||
private AbstractOrderRoute $orderRoute;
|
||||
|
||||
/**
|
||||
* @var \Psr\Log\LoggerInterface
|
||||
* @var CartRecoveryService
|
||||
* Service to help customers recover their cart from a past order.
|
||||
*/
|
||||
private $logger;
|
||||
private CartRecoveryService $cartRecoveryService;
|
||||
|
||||
/**
|
||||
* @var \Shopware\Core\Checkout\Cart\LineItemFactoryRegistry
|
||||
* @var PaymentIntegrationService
|
||||
* Service to provide the integration parameters (JS URL, transaction ID, etc.).
|
||||
*/
|
||||
private $lineItemFactoryRegistry;
|
||||
private PaymentIntegrationService $paymentIntegrationService;
|
||||
|
||||
/**
|
||||
* @var \Shopware\Core\Checkout\Order\SalesChannel\AbstractOrderRoute
|
||||
* @var TransactionService
|
||||
* Service to check transaction details.
|
||||
*/
|
||||
private $orderRoute;
|
||||
private TransactionService $transactionService;
|
||||
|
||||
/**
|
||||
* PaymentController constructor.
|
||||
*
|
||||
* @param \Shopware\Core\Checkout\Cart\LineItemFactoryRegistry $lineItemFactoryRegistry
|
||||
* @param \Shopware\Core\Checkout\Cart\SalesChannel\CartService $cartService
|
||||
* @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
|
||||
* @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
|
||||
* @param \Shopware\Storefront\Page\GenericPageLoaderInterface $genericLoader
|
||||
* @param \Shopware\Core\Checkout\Order\SalesChannel\AbstractOrderRoute $orderRoute
|
||||
* @param SettingsService $settingsService
|
||||
* @param GenericPageLoaderInterface $genericLoader
|
||||
* @param AbstractOrderRoute $orderRoute
|
||||
* @param CartRecoveryService $cartRecoveryService
|
||||
* @param PaymentIntegrationService $paymentIntegrationService
|
||||
*/
|
||||
public function __construct(
|
||||
LineItemFactoryRegistry $lineItemFactoryRegistry,
|
||||
CartService $cartService,
|
||||
SettingsService $settingsService,
|
||||
TransactionService $transactionService,
|
||||
GenericPageLoaderInterface $genericLoader,
|
||||
AbstractOrderRoute $orderRoute
|
||||
)
|
||||
{
|
||||
$this->cartService = $cartService;
|
||||
AbstractOrderRoute $orderRoute,
|
||||
CartRecoveryService $cartRecoveryService,
|
||||
PaymentIntegrationService $paymentIntegrationService,
|
||||
TransactionService $transactionService
|
||||
) {
|
||||
$this->genericLoader = $genericLoader;
|
||||
$this->settingsService = $settingsService;
|
||||
$this->transactionService = $transactionService;
|
||||
$this->lineItemFactoryRegistry = $lineItemFactoryRegistry;
|
||||
$this->orderRoute = $orderRoute;
|
||||
$this->cartRecoveryService = $cartRecoveryService;
|
||||
$this->paymentIntegrationService = $paymentIntegrationService;
|
||||
$this->transactionService = $transactionService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Psr\Log\LoggerInterface $logger
|
||||
*
|
||||
* @internal
|
||||
* @required
|
||||
*
|
||||
* @param LoggerInterface $logger
|
||||
*/
|
||||
public function setLogger(LoggerInterface $logger): void
|
||||
{
|
||||
@@ -137,14 +114,11 @@ class CheckoutController extends StorefrontController {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
|
||||
* @param \Symfony\Component\HttpFoundation\Request $request
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
* @throws \VRPayment\Sdk\ApiException
|
||||
* @throws \VRPayment\Sdk\Http\ConnectionException
|
||||
* @throws \VRPayment\Sdk\VersioningException
|
||||
* Renders the WhitelabelMachineName payment page (usually contains the iframe or lightbox script).
|
||||
*
|
||||
* @param SalesChannelContext $salesChannelContext The current context.
|
||||
* @param Request $request The incoming request.
|
||||
* @return Response The rendered payment page.
|
||||
*/
|
||||
#[Route(
|
||||
path: "/vrpayment/checkout/pay",
|
||||
@@ -154,191 +128,57 @@ class CheckoutController extends StorefrontController {
|
||||
)]
|
||||
public function pay(SalesChannelContext $salesChannelContext, Request $request): Response
|
||||
{
|
||||
$orderId = $request->query->get('orderId');
|
||||
$orderId = (string)$request->query->get('orderId');
|
||||
|
||||
if (empty($orderId)) {
|
||||
throw new MissingRequestParameterException('orderId');
|
||||
throw RoutingException::missingRequestParameter('orderId');
|
||||
}
|
||||
|
||||
// Configuration
|
||||
$this->settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
try {
|
||||
// Load the order with necessary associations for the product table and addresses.
|
||||
$criteria = new Criteria([$orderId]);
|
||||
$criteria->addAssociation('lineItems.product')
|
||||
->addAssociation('deliveries.shippingOrderAddress.country')
|
||||
->addAssociation('orderCustomer.customer')
|
||||
->addAssociation('transactions.paymentMethod');
|
||||
|
||||
$transaction = $this->getTransaction($orderId, $salesChannelContext->getContext());
|
||||
$recreateCartUrl = $this->generateUrl(
|
||||
'frontend.vrpayment.checkout.recreate-cart',
|
||||
['orderId' => $orderId,],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
$order = $this->orderRoute->load(new Request(), $salesChannelContext, $criteria)->getOrders()->first();
|
||||
|
||||
if (in_array(
|
||||
$transaction->getState(),
|
||||
[
|
||||
TransactionState::AUTHORIZED,
|
||||
TransactionState::COMPLETED,
|
||||
TransactionState::FULFILL,
|
||||
]
|
||||
)) {
|
||||
return $this->redirect($transaction->getSuccessUrl(), Response::HTTP_MOVED_PERMANENTLY);
|
||||
} else {
|
||||
if (in_array(
|
||||
$transaction->getState(),
|
||||
[
|
||||
TransactionState::DECLINE,
|
||||
TransactionState::FAILED,
|
||||
TransactionState::VOIDED,
|
||||
]
|
||||
)) {
|
||||
return $this->redirect($transaction->getFailedUrl(), Response::HTTP_MOVED_PERMANENTLY);
|
||||
}
|
||||
if (!$order) {
|
||||
throw RoutingException::missingRequestParameter('orderId');
|
||||
}
|
||||
|
||||
$possiblePaymentMethods = $this->settings->getApiClient()
|
||||
->getTransactionService()
|
||||
->fetchPaymentMethods(
|
||||
$this->settings->getSpaceId(),
|
||||
$transaction->getId(),
|
||||
$this->settings->getIntegration()
|
||||
);
|
||||
// Fetch the configuration required for the frontend integration.
|
||||
$paymentConfig = $this->paymentIntegrationService->getPaymentConfig($orderId, $salesChannelContext);
|
||||
|
||||
if (empty($possiblePaymentMethods)) {
|
||||
$this->addFlash('danger', $this->trans('vrpayment.paymentMethod.notAvailable'));
|
||||
return $this->redirect($recreateCartUrl, Response::HTTP_MOVED_PERMANENTLY);
|
||||
}
|
||||
// Load a generic Shopware page to have layout headers/footers.
|
||||
$page = $this->genericLoader->load($request, $salesChannelContext);
|
||||
$page->addExtension('vRPaymentData', $paymentConfig);
|
||||
|
||||
$javascriptUrl = $this->getTransactionJavaScriptUrl($transaction->getId());
|
||||
|
||||
// Set Checkout Page Data
|
||||
$checkoutPageData = (new CheckoutPageData())
|
||||
->setIntegration($this->settings->getIntegration())
|
||||
->setJavascriptUrl($javascriptUrl)
|
||||
->setDeviceJavascriptUrl($this->settings->getSpaceId(), Uuid::randomHex())
|
||||
->setTransactionPossiblePaymentMethods($possiblePaymentMethods)
|
||||
->setCheckoutUrl($this->generateUrl(
|
||||
'frontend.vrpayment.checkout.pay',
|
||||
['orderId' => $orderId,],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
))
|
||||
->setCartRecreateUrl($recreateCartUrl);
|
||||
$page = $this->load($request, $salesChannelContext);
|
||||
$page->addExtension('vRPaymentData', $checkoutPageData);
|
||||
// Assign the order to the page so the templates can access page.order.
|
||||
$page->assign(['order' => $order]);
|
||||
|
||||
// Render the specialized Twig template for WhitelabelMachineName.
|
||||
return $this->renderStorefront(
|
||||
'@VRPaymentPayment/storefront/page/checkout/order/vrpayment.html.twig',
|
||||
['page' => $page]
|
||||
);
|
||||
} catch (\Exception $e) {
|
||||
if ($this->logger) {
|
||||
$this->logger->error($e->getMessage());
|
||||
}
|
||||
$this->addFlash('danger', $this->trans('vrpayment.paymentMethod.notAvailable'));
|
||||
return $this->redirectToRoute('frontend.home.page');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get transaction Javascript URL
|
||||
*
|
||||
* @param int $transactionId
|
||||
*
|
||||
* @return string
|
||||
* @throws \VRPayment\Sdk\ApiException
|
||||
* @throws \VRPayment\Sdk\Http\ConnectionException
|
||||
* @throws \VRPayment\Sdk\VersioningException
|
||||
*/
|
||||
private function getTransactionJavaScriptUrl(int $transactionId): string
|
||||
{
|
||||
$javascriptUrl = '';
|
||||
switch ($this->settings->getIntegration()) {
|
||||
case Integration::IFRAME:
|
||||
$javascriptUrl = $this->settings->getApiClient()->getTransactionIframeService()
|
||||
->javascriptUrl($this->settings->getSpaceId(), $transactionId);
|
||||
break;
|
||||
case Integration::LIGHTBOX:
|
||||
$javascriptUrl = $this->settings->getApiClient()->getTransactionLightboxService()
|
||||
->javascriptUrl($this->settings->getSpaceId(), $transactionId);
|
||||
break;
|
||||
default:
|
||||
$this->logger->critical(strtr('invalid integration : :integration', [':integration' => $this->settings->getIntegration()]));
|
||||
|
||||
}
|
||||
return $javascriptUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $orderId
|
||||
* @param \Shopware\Core\Framework\Context $context
|
||||
*
|
||||
* @return \VRPayment\Sdk\Model\Transaction
|
||||
* @throws \VRPayment\Sdk\ApiException
|
||||
* @throws \VRPayment\Sdk\Http\ConnectionException
|
||||
* @throws \VRPayment\Sdk\VersioningException
|
||||
*/
|
||||
private function getTransaction($orderId, Context $context): Transaction
|
||||
{
|
||||
$transactionEntity = $this->transactionService->getByOrderId($orderId, $context);
|
||||
return $this->settings->getApiClient()->getTransactionService()->read($this->settings->getSpaceId(), $transactionEntity->getTransactionId());
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Symfony\Component\HttpFoundation\Request $request
|
||||
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
|
||||
*
|
||||
* @return \Shopware\Storefront\Page\Checkout\Finish\CheckoutFinishPage
|
||||
*/
|
||||
protected function load(Request $request, SalesChannelContext $salesChannelContext): CheckoutFinishPage
|
||||
{
|
||||
$page = CheckoutFinishPage::createFrom($this->genericLoader->load($request, $salesChannelContext));
|
||||
$page->setOrder($this->getOrder($request, $salesChannelContext));
|
||||
|
||||
return $page;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param \Symfony\Component\HttpFoundation\Request $request
|
||||
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
|
||||
*
|
||||
* @return \Shopware\Core\Checkout\Order\OrderEntity
|
||||
*/
|
||||
private function getOrder(Request $request, SalesChannelContext $salesChannelContext): OrderEntity
|
||||
{
|
||||
|
||||
$orderId = $request->get('orderId');
|
||||
if (!$orderId) {
|
||||
throw new MissingRequestParameterException('orderId', '/orderId');
|
||||
}
|
||||
|
||||
$criteria = (new Criteria([$orderId]))
|
||||
->addAssociation('lineItems.cover')
|
||||
->addAssociation('transactions.paymentMethod')
|
||||
->addAssociation('deliveries.shippingMethod');
|
||||
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
if ($customer !== null) {
|
||||
$criteria = $criteria->addFilter(new EqualsFilter('order.orderCustomer.customerId', $customer->getId()));
|
||||
}
|
||||
|
||||
$criteria->getAssociation('transactions')->addSorting(new FieldSorting('createdAt'));
|
||||
|
||||
try {
|
||||
$searchResult = $this->orderRoute
|
||||
->load(new Request(), $salesChannelContext, $criteria)
|
||||
->getOrders();
|
||||
} catch (InvalidUuidException $e) {
|
||||
throw CartException::orderNotFound($orderId);
|
||||
}
|
||||
|
||||
/** @var OrderEntity|null $order */
|
||||
$order = $searchResult->get($orderId);
|
||||
|
||||
if (!$order) {
|
||||
throw CartException::orderNotFound($orderId);
|
||||
}
|
||||
|
||||
return $order;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recreate Cart
|
||||
*
|
||||
* @param \Symfony\Component\HttpFoundation\Request $request
|
||||
* @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
* Redirects the user to a route that recreates their cart from an existing order.
|
||||
* This is useful for allowing users to try payment again with different details.
|
||||
*
|
||||
* @param Request $request The incoming request.
|
||||
* @param SalesChannelContext $salesChannelContext The context.
|
||||
* @return Response Redirect to the checkout confirmation page.
|
||||
*/
|
||||
#[Route(
|
||||
path: "/vrpayment/checkout/recreate-cart",
|
||||
@@ -346,223 +186,49 @@ class CheckoutController extends StorefrontController {
|
||||
options: ["seo" => false],
|
||||
methods: ["GET"],
|
||||
)]
|
||||
public function recreateCart(Request $request, SalesChannelContext $salesChannelContext)
|
||||
public function recreateCart(Request $request, SalesChannelContext $salesChannelContext): Response
|
||||
{
|
||||
$orderId = $request->query->get('orderId');
|
||||
$orderId = (string)$request->query->get('orderId');
|
||||
|
||||
if (empty($orderId)) {
|
||||
throw new MissingRequestParameterException('orderId');
|
||||
throw RoutingException::missingRequestParameter('orderId');
|
||||
}
|
||||
|
||||
// Adoption for Headless Storefronts
|
||||
$orderRepo = $this->container->get('order.repository');
|
||||
$criteria = new Criteria([$orderId]);
|
||||
|
||||
$orderEntity = $orderRepo->search($criteria, $salesChannelContext->getContext())->first();
|
||||
|
||||
if($orderEntity->getSalesChannelId() !== $salesChannelContext->getSalesChannelId()) {
|
||||
$this->settings = $this->settingsService->getSettings($orderEntity->getSalesChannelId());
|
||||
$trans = $this->getTransaction($orderId, $salesChannelContext->getContext());
|
||||
return $this->redirect($trans->getSuccessUrl());
|
||||
}
|
||||
// End Adoption for Headless Storefronts
|
||||
|
||||
try {
|
||||
$this->cartService->deleteCart($salesChannelContext);
|
||||
$cart = $this->cartService->createNew($salesChannelContext->getToken());
|
||||
// Find the order that should be recovered.
|
||||
$order = $this->cartRecoveryService->getOrderEntity($orderId, $salesChannelContext->getContext());
|
||||
|
||||
// Configuration
|
||||
$this->settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
$orderEntity = $this->getOrder($request, $salesChannelContext);
|
||||
$lastTransaction = $orderEntity->getTransactions()->last();
|
||||
if ($lastTransaction && !$lastTransaction->getPaymentMethod()->getAfterOrderEnabled()) {
|
||||
// Security: Order must belong to the active sales channel.
|
||||
if ($order->getSalesChannelId() !== $salesChannelContext->getSalesChannelId()) {
|
||||
return $this->redirectToRoute('frontend.home.page');
|
||||
}
|
||||
|
||||
$transaction = $this->getTransaction($orderId, $salesChannelContext->getContext());
|
||||
if (!empty($transaction->getUserFailureMessage())) {
|
||||
// Perform the recovery process.
|
||||
$transactionEntity = $this->transactionService->getByOrderId($order->getId(), $salesChannelContext->getContext());
|
||||
if ($transactionEntity) {
|
||||
$transaction = $this->transactionService->read($transactionEntity->getTransactionId(), $salesChannelContext->getSalesChannelId());
|
||||
if (in_array($transaction->getState(), [
|
||||
SdkTransactionState::AUTHORIZED,
|
||||
SdkTransactionState::CONFIRMED,
|
||||
SdkTransactionState::FULFILL
|
||||
])) {
|
||||
return $this->redirectToRoute('frontend.checkout.finish.page', ['orderId' => $orderId]);
|
||||
}
|
||||
|
||||
if ($transaction->getUserFailureMessage()) {
|
||||
$this->addFlash('danger', $transaction->getUserFailureMessage());
|
||||
}
|
||||
|
||||
$orderItems = $orderEntity->getLineItems();
|
||||
$hasCustomProducts = $this->hasCustomProducts($orderItems);
|
||||
|
||||
if ($hasCustomProducts === true) {
|
||||
$cart = $this->addCustomProducts($orderItems, $request, $salesChannelContext);
|
||||
}
|
||||
|
||||
foreach ($orderItems as $orderLineItemEntity) {
|
||||
$type = $orderLineItemEntity->getType();
|
||||
|
||||
if ($type !== CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT || $orderLineItemEntity->getParentid() !== null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$lineItem = $this->lineItemFactoryRegistry->create([
|
||||
'id' => $orderLineItemEntity->getId(),
|
||||
'quantity' => $orderLineItemEntity->getQuantity(),
|
||||
'referencedId' => $orderLineItemEntity->getReferencedId(),
|
||||
'type' => $type,
|
||||
], $salesChannelContext);
|
||||
|
||||
$lineItemPayload = $orderLineItemEntity->getPayload();
|
||||
if (!empty($lineItemPayload)) {
|
||||
$lineItem->setPayload($lineItemPayload);
|
||||
}
|
||||
|
||||
$cart = $this->cartService->add($cart, $lineItem, $salesChannelContext);
|
||||
|
||||
}
|
||||
|
||||
$this->cartRecoveryService->recreateCartFromOrder($order, $salesChannelContext);
|
||||
} catch (\Exception $exception) {
|
||||
$this->addFlash('danger', $this->trans('error.addToCartError'));
|
||||
if ($this->logger) {
|
||||
$this->logger->critical($exception->getMessage());
|
||||
}
|
||||
return $this->redirectToRoute('frontend.home.page');
|
||||
}
|
||||
|
||||
// Send the user back to the checkout confirm page with their items restored.
|
||||
return $this->redirectToRoute('frontend.checkout.confirm.page');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param OrderLineItemCollection $orderItems
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
private function hasCustomProducts(OrderLineItemCollection $orderItems): bool
|
||||
{
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param OrderLineItemCollection $orderItems
|
||||
* @param string $parentId
|
||||
*
|
||||
* @return OrderLineItemEntity|null
|
||||
*/
|
||||
private function getCustomProduct(OrderLineItemCollection $orderItems, string $parentId): ?OrderLineItemEntity
|
||||
{
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT && $orderItem->getParentId() === $parentId) {
|
||||
return $orderItem;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param OrderLineItemCollection $orderItems
|
||||
* @param string $parentId
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function getCustomProductOptions(OrderLineItemCollection $orderItems, string $parentId): array
|
||||
{
|
||||
$options = [];
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS_OPTION && $orderItem->getParentId() === $parentId) {
|
||||
$options[] = $orderItem;
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $orderItems
|
||||
* @param $request
|
||||
* @param $salesChannelContext
|
||||
*
|
||||
* @return Cart
|
||||
*/
|
||||
private function addCustomProducts(OrderLineItemCollection $orderItems, Request $request, SalesChannelContext $salesChannelContext): Cart
|
||||
{
|
||||
|
||||
$cart = $this->cartService->getCart($salesChannelContext->getToken(), $salesChannelContext);
|
||||
if (!\class_exists('Swag\\CustomizedProducts\\Core\\Checkout\\Cart\\Route\\AddCustomizedProductsToCartRoute')) {
|
||||
return $cart;
|
||||
}
|
||||
|
||||
$customProductsService = $this->get('Swag\CustomizedProducts\Core\Checkout\Cart\Route\AddCustomizedProductsToCartRoute');
|
||||
|
||||
foreach ($orderItems as $orderItem) {
|
||||
if ($orderItem->getType() !== CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$product = $this->getCustomProduct($orderItems, $orderItem->getId());
|
||||
$productOptions = $this->getCustomProductOptions($orderItems, $orderItem->getId());
|
||||
$optionValues = $this->getOptionValues($productOptions);
|
||||
|
||||
$params = new RequestDataBag([
|
||||
'customized-products-template' => new RequestDataBag([
|
||||
'id' => $orderItem->getReferencedId(),
|
||||
'options' => new RequestDataBag($optionValues),
|
||||
]),
|
||||
]);
|
||||
|
||||
$request->request->add(
|
||||
[
|
||||
'lineItems' =>
|
||||
[
|
||||
$product->getProductId() =>
|
||||
[
|
||||
'quantity' => $orderItem->getQuantity(),
|
||||
'id' => $product->getProductId(),
|
||||
'type' => CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT,
|
||||
'referencedId' => $product->getReferencedId(),
|
||||
'stackable' => $orderItem->getStackable(),
|
||||
'removable' => $orderItem->getRemovable(),
|
||||
]
|
||||
]
|
||||
]
|
||||
);
|
||||
|
||||
$customProductsService->add($params, $request, $salesChannelContext, $cart);
|
||||
$cart = $this->cartService->getCart($salesChannelContext->getToken(), $salesChannelContext);
|
||||
}
|
||||
|
||||
return $cart;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $productOptions
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function getOptionValues(array $productOptions): array
|
||||
{
|
||||
$optionValues = [];
|
||||
foreach ($productOptions as $productOption) {
|
||||
$optionType = $productOption->getPayload()['type'] ?: '';
|
||||
|
||||
switch ($optionType) {
|
||||
case CustomProductsLineItemTypes::PRODUCT_OPTION_TYPE_IMAGE_UPLOAD:
|
||||
case CustomProductsLineItemTypes::PRODUCT_OPTION_TYPE_FILE_UPLOAD:
|
||||
$media = $productOption->getPayload()['media'] ?: [];
|
||||
foreach ($media as $mediaItem) {
|
||||
$optionValues[$productOption->getReferencedId()] = new RequestDataBag([
|
||||
'media' => new RequestDataBag([
|
||||
$mediaItem['filename'] => new RequestDataBag([
|
||||
'id' => $mediaItem['mediaId'],
|
||||
'filename' => $mediaItem['filename'],
|
||||
]),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
$optionValues[$productOption->getReferencedId()] = new RequestDataBag([
|
||||
'value' => $productOption->getPayload()['value'] ?: '',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
return $optionValues;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,105 +1,70 @@
|
||||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Storefront\Checkout\Subscriber;
|
||||
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Shopware\Core\{Checkout\Order\Aggregate\OrderTransaction\OrderTransactionCollection,
|
||||
use Shopware\Core\{
|
||||
Checkout\Order\Aggregate\OrderTransaction\OrderTransactionCollection,
|
||||
Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStates,
|
||||
Checkout\Order\OrderEntity,
|
||||
Content\MailTemplate\Service\Event\MailBeforeValidateEvent};
|
||||
Content\MailTemplate\Service\Event\MailBeforeValidateEvent
|
||||
};
|
||||
use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
|
||||
use Shopware\Core\System\SalesChannel\SalesChannelContext;
|
||||
use Shopware\Storefront\Page\Account\Order\AccountEditOrderPageLoadedEvent;
|
||||
use Shopware\Storefront\Page\Account\PaymentMethod\AccountPaymentMethodPageLoadedEvent;
|
||||
use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
|
||||
use Shopware\Storefront\Page\Checkout\Finish\CheckoutFinishPageLoadedEvent;
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
use VRPaymentPayment\Core\{Api\Transaction\Service\TransactionService,
|
||||
Checkout\PaymentHandler\VRPaymentPaymentHandler,
|
||||
Settings\Service\SettingsService,
|
||||
Settings\Struct\Settings,
|
||||
Util\PaymentMethodUtil};
|
||||
use VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService;
|
||||
use VRPaymentPayment\Sdk\{Model\AddressCreate,
|
||||
Model\ChargeAttempt,
|
||||
Model\CreationEntityState,
|
||||
Model\CriteriaOperator,
|
||||
Model\EntityQuery,
|
||||
Model\EntityQueryFilter,
|
||||
Model\EntityQueryFilterType,
|
||||
Model\LineItemAttributeCreate,
|
||||
Model\LineItemCreate,
|
||||
Model\LineItemType,
|
||||
Model\TaxCreate,
|
||||
Model\Transaction,
|
||||
Model\TransactionCreate,
|
||||
Model\TransactionPending};
|
||||
use Shopware\Core\Framework\Struct\ArrayEntity;
|
||||
use VRPaymentPayment\Core\Checkout\PaymentHandler\VRPaymentPaymentHandler;
|
||||
use VRPaymentPayment\Core\Settings\Service\SettingsService;
|
||||
use VRPaymentPayment\Core\Checkout\Service\PaymentMethodFilterService;
|
||||
use VRPaymentPayment\Core\Checkout\Service\PaymentIntegrationService;
|
||||
|
||||
/**
|
||||
* Class CheckoutSubscriber
|
||||
*
|
||||
* @package VRPaymentPayment\Storefront\Checkout\Subscriber
|
||||
* This subscriber listens to page load events in the Storefront to filter out
|
||||
* WhitelabelMachineName payment methods that are not applicable for the current cart or customer.
|
||||
*/
|
||||
class CheckoutSubscriber implements EventSubscriberInterface
|
||||
{
|
||||
/**
|
||||
* @var LoggerInterface
|
||||
*/
|
||||
protected LoggerInterface $logger;
|
||||
|
||||
/**
|
||||
* @var \Psr\Log\LoggerInterface
|
||||
* @var SettingsService
|
||||
*/
|
||||
protected $logger;
|
||||
private SettingsService $settingsService;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService
|
||||
* @var PaymentMethodFilterService
|
||||
*/
|
||||
private $paymentMethodConfigurationService;
|
||||
private PaymentMethodFilterService $paymentMethodFilterService;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
|
||||
* @var PaymentIntegrationService
|
||||
*/
|
||||
private $transactionService;
|
||||
private PaymentIntegrationService $paymentIntegrationService;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Settings\Service\SettingsService
|
||||
* @param SettingsService $settingsService
|
||||
* @param PaymentMethodFilterService $paymentMethodFilterService
|
||||
* @param PaymentIntegrationService $paymentIntegrationService
|
||||
*/
|
||||
private $settingsService;
|
||||
|
||||
/**
|
||||
* @var \VRPaymentPayment\Core\Util\PaymentMethodUtil
|
||||
*/
|
||||
private $paymentMethodUtil;
|
||||
|
||||
/** @var EntityRepository */
|
||||
private EntityRepository $paymentMethodRepository;
|
||||
|
||||
/**
|
||||
* CheckoutSubscriber constructor.
|
||||
*
|
||||
* @param \VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService $paymentMethodConfigurationService
|
||||
* @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
|
||||
* @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
|
||||
* @param \VRPaymentPayment\Core\Util\PaymentMethodUtil $paymentMethodUtil
|
||||
* @param EntityRepository $paymentMethodRepository
|
||||
*/
|
||||
public function __construct(PaymentMethodConfigurationService $paymentMethodConfigurationService, TransactionService $transactionService, SettingsService $settingsService, PaymentMethodUtil $paymentMethodUtil, EntityRepository $paymentMethodRepository)
|
||||
{
|
||||
$this->paymentMethodConfigurationService = $paymentMethodConfigurationService;
|
||||
$this->transactionService = $transactionService;
|
||||
public function __construct(
|
||||
SettingsService $settingsService,
|
||||
PaymentMethodFilterService $paymentMethodFilterService,
|
||||
PaymentIntegrationService $paymentIntegrationService
|
||||
) {
|
||||
$this->settingsService = $settingsService;
|
||||
$this->paymentMethodUtil = $paymentMethodUtil;
|
||||
$this->paymentMethodRepository = $paymentMethodRepository;
|
||||
$this->paymentMethodFilterService = $paymentMethodFilterService;
|
||||
$this->paymentIntegrationService = $paymentIntegrationService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Psr\Log\LoggerInterface $logger
|
||||
*
|
||||
* @internal
|
||||
* @required
|
||||
*
|
||||
* @param LoggerInterface $logger
|
||||
*/
|
||||
public function setLogger(LoggerInterface $logger): void
|
||||
{
|
||||
@@ -107,38 +72,75 @@ class CheckoutSubscriber implements EventSubscriberInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* Register events to listen to.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function getSubscribedEvents(): array
|
||||
{
|
||||
return [
|
||||
CheckoutConfirmPageLoadedEvent::class => 'onCheckoutConfirmLoaded',
|
||||
AccountEditOrderPageLoadedEvent::class => 'onAccountOrderEditLoaded',
|
||||
AccountPaymentMethodPageLoadedEvent::class => 'onAccountPaymentMethodLoaded',
|
||||
"subscription." . CheckoutConfirmPageLoadedEvent::class => ['onConfirmPageLoaded', 1],
|
||||
CheckoutConfirmPageLoadedEvent::class => 'onPageLoaded',
|
||||
AccountEditOrderPageLoadedEvent::class => 'onPageLoaded',
|
||||
AccountPaymentMethodPageLoadedEvent::class => 'onPageLoaded',
|
||||
"subscription." . CheckoutConfirmPageLoadedEvent::class => ['onPageLoaded', 1],
|
||||
MailBeforeValidateEvent::class => ['onMailBeforeValidate', 1],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop order emails being sent out
|
||||
* Handles filtering of payment methods when a relevant page is loaded.
|
||||
*
|
||||
* @param \Shopware\Core\Content\MailTemplate\Service\Event\MailBeforeValidateEvent $event
|
||||
* @param mixed $event The page loaded event.
|
||||
*/
|
||||
public function onPageLoaded($event): void
|
||||
{
|
||||
try {
|
||||
$salesChannelContext = $event->getSalesChannelContext();
|
||||
|
||||
// Access the payment methods available for the current page.
|
||||
$paymentMethodCollection = $event->getPage()->getPaymentMethods();
|
||||
|
||||
// Delegate filtering to the centralized service.
|
||||
$filteredCollection = $this->paymentMethodFilterService->filterPaymentMethods(
|
||||
$paymentMethodCollection,
|
||||
$salesChannelContext,
|
||||
$event
|
||||
);
|
||||
|
||||
// Update the page with the filtered list.
|
||||
$event->getPage()->setPaymentMethods($filteredCollection);
|
||||
|
||||
// If we are on a checkout or account page and have a pending transaction, provide integration data.
|
||||
$transactionId = $salesChannelContext->getContext()->getExtension('vrpayment_transaction_id');
|
||||
if ($transactionId) {
|
||||
$paymentConfig = $this->paymentIntegrationService->getConfigForTransaction(
|
||||
(int) $transactionId->getVars()['value'],
|
||||
$salesChannelContext
|
||||
);
|
||||
$event->getPage()->addExtension('vRPaymentData', $paymentConfig);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$this->logger->error($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles logic before a mail is validated/sent.
|
||||
*
|
||||
* @param MailBeforeValidateEvent $event
|
||||
*/
|
||||
public function onMailBeforeValidate(MailBeforeValidateEvent $event): void
|
||||
{
|
||||
$templateData = $event->getTemplateData();
|
||||
|
||||
/**
|
||||
* @var $order \Shopware\Core\Checkout\Order\OrderEntity
|
||||
*/
|
||||
/** @var OrderEntity|null $order */
|
||||
$order = !empty($templateData['order']) && $templateData['order'] instanceof OrderEntity ? $templateData['order'] : null;
|
||||
|
||||
if (!empty($order) && $order->getAmountTotal() > 0) {
|
||||
// Check if WhitelabelMachineName emails are enabled for this sales channel.
|
||||
$isVRPaymentEmailSettingEnabled = (bool)$this->settingsService->getSettings($order->getSalesChannelId())->isEmailEnabled();
|
||||
|
||||
$isVRPaymentEmailSettingEnabled = $this->settingsService->getSettings($order->getSalesChannelId())->isEmailEnabled();
|
||||
|
||||
if (!$isVRPaymentEmailSettingEnabled) { //setting is disabled
|
||||
if (!$isVRPaymentEmailSettingEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -146,253 +148,30 @@ class CheckoutSubscriber implements EventSubscriberInterface
|
||||
if (!($orderTransactions instanceof OrderTransactionCollection)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$orderTransactionLast = $orderTransactions->last();
|
||||
if (empty($orderTransactionLast) || empty($orderTransactionLast->getPaymentMethod())) { // no payment method available
|
||||
if (empty($orderTransactionLast) || empty($orderTransactionLast->getPaymentMethod())) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if the payment method used belongs to this plugin.
|
||||
$isVRPaymentPM = VRPaymentPaymentHandler::class == $orderTransactionLast->getPaymentMethod()->getHandlerIdentifier();
|
||||
if (!$isVRPaymentPM) { // not our payment method
|
||||
if (!$isVRPaymentPM) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Verify if the transaction is in a state where an email should be handled.
|
||||
$isOrderTransactionStateOpen = in_array(
|
||||
$orderTransactionLast->getStateMachineState()->getTechnicalName(), [
|
||||
$orderTransactionLast->getStateMachineState()->getTechnicalName(),
|
||||
[
|
||||
OrderTransactionStates::STATE_OPEN,
|
||||
OrderTransactionStates::STATE_IN_PROGRESS,
|
||||
]);
|
||||
]
|
||||
);
|
||||
|
||||
if (!$isOrderTransactionStateOpen) { // order payment status is open or in progress
|
||||
if (!$isOrderTransactionStateOpen) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param CheckoutConfirmPageLoadedEvent $event
|
||||
* @return void
|
||||
*/
|
||||
public function onCheckoutConfirmLoaded(CheckoutConfirmPageLoadedEvent $event): void
|
||||
{
|
||||
try {
|
||||
$salesChannelContext = $event->getSalesChannelContext();
|
||||
$settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
if (is_null($settings)) {
|
||||
$this->logger->notice('Removing payment methods because settings are invalid');
|
||||
$this->removeVRPaymentPaymentMethodFromConfirmPage($event);
|
||||
}
|
||||
|
||||
$createdTransactionId = $this->transactionService->createPendingTransaction($salesChannelContext, $event);
|
||||
$this->updateTempTransactionIfNeeded($salesChannelContext, $createdTransactionId);
|
||||
|
||||
$this->getAvailablePaymentMethods($settings, $createdTransactionId, $salesChannelContext);
|
||||
$this->setPossiblePaymentMethods($settings->getSpaceId(), $event);
|
||||
} catch (\Exception $e) {
|
||||
$this->logger->error($e->getMessage());
|
||||
$this->removeVRPaymentPaymentMethodFromConfirmPage($event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param AccountEditOrderPageLoadedEvent $event
|
||||
* @return void
|
||||
*/
|
||||
public function onAccountOrderEditLoaded(AccountEditOrderPageLoadedEvent $event): void
|
||||
{
|
||||
try {
|
||||
$this->handlePaymentMethodFiltering($event);
|
||||
} catch (\Throwable $e) {
|
||||
$this->logger->error($e->getMessage());
|
||||
$this->removeVRPaymentPaymentMethodFromConfirmPage($event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param AccountPaymentMethodPageLoadedEvent $event
|
||||
* @return void
|
||||
*/
|
||||
public function onAccountPaymentMethodLoaded(AccountPaymentMethodPageLoadedEvent $event): void
|
||||
{
|
||||
try {
|
||||
$this->handlePaymentMethodFiltering($event);
|
||||
} catch (\Throwable $e) {
|
||||
$this->logger->error($e->getMessage());
|
||||
$this->removeVRPaymentPaymentMethodFromConfirmPage($event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent $event
|
||||
*/
|
||||
public function onConfirmPageLoaded(CheckoutConfirmPageLoadedEvent $event): void
|
||||
{
|
||||
try {
|
||||
$this->handlePaymentMethodFiltering($event);
|
||||
} catch (\Throwable $e) {
|
||||
$this->logger->error($e->getMessage());
|
||||
$this->removeVRPaymentPaymentMethodFromConfirmPage($event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $event
|
||||
* @return void
|
||||
*/
|
||||
private function handlePaymentMethodFiltering($event): void
|
||||
{
|
||||
$salesChannelContext = $event->getSalesChannelContext();
|
||||
$settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
|
||||
|
||||
if (is_null($settings)) {
|
||||
$this->logger->notice('Removing payment methods because settings are invalid');
|
||||
$this->removeVRPaymentPaymentMethodFromConfirmPage($event);
|
||||
return;
|
||||
}
|
||||
|
||||
$createdTransactionId = $this->transactionService->createPendingTransaction($salesChannelContext, $event);
|
||||
$this->updateTempTransactionIfNeeded($salesChannelContext, $createdTransactionId);
|
||||
|
||||
$this->getAvailablePaymentMethods($settings, $createdTransactionId, $salesChannelContext);
|
||||
$this->setPossiblePaymentMethods($settings->getSpaceId(), $event);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $event
|
||||
* @return void
|
||||
*/
|
||||
private function removeVRPaymentPaymentMethodFromConfirmPage($event): void
|
||||
{
|
||||
$paymentMethodCollection = $event->getPage()->getPaymentMethods();
|
||||
$paymentMethodIds = $this->paymentMethodUtil->getVRPaymentPaymentMethodIds($event->getContext());
|
||||
foreach ($paymentMethodIds as $paymentMethodId) {
|
||||
$paymentMethodCollection->remove($paymentMethodId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Settings $settings
|
||||
* @param int $createdTransactionId
|
||||
* @return void
|
||||
*/
|
||||
private function getAvailablePaymentMethods(Settings $settings, int $createdTransactionId, SalesChannelContext $salesChannelContext): void
|
||||
{
|
||||
$transactionService = $settings->getApiClient()->getTransactionService();
|
||||
$possiblePaymentMethods = $transactionService->fetchPaymentMethods(
|
||||
$settings->getSpaceId(),
|
||||
$createdTransactionId,
|
||||
$settings->getIntegration()
|
||||
);
|
||||
$arrayOfPossibleMethods = [];
|
||||
foreach ($possiblePaymentMethods as $possiblePaymentMethod) {
|
||||
$arrayOfPossibleMethods[] = $possiblePaymentMethod->getId();
|
||||
}
|
||||
|
||||
$salesChannelContext->getContext()->addExtension(
|
||||
'possibleMethods',
|
||||
new ArrayEntity(['ids' => $arrayOfPossibleMethods])
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $spaceId
|
||||
* @param CheckoutConfirmPageLoadedEvent $event
|
||||
* @return void
|
||||
*/
|
||||
private function setPossiblePaymentMethods(int $spaceId, $event): void
|
||||
{
|
||||
$paymentIds = [];
|
||||
$paymentMethodCollection = $event->getPage()->getPaymentMethods();
|
||||
|
||||
foreach ($paymentMethodCollection as $paymentMethodCollectionItem) {
|
||||
$isVRPaymentPM = VRPaymentPaymentHandler::class === $paymentMethodCollectionItem->getHandlerIdentifier();
|
||||
if (!$isVRPaymentPM) {
|
||||
$paymentIds[] = $paymentMethodCollectionItem->getId();
|
||||
}
|
||||
}
|
||||
|
||||
$allowedWLMethods = [];
|
||||
$paymentMethodConfigurations = $this->paymentMethodConfigurationService
|
||||
->getAllPaymentMethodConfigurations($spaceId, $event->getSalesChannelContext()->getContext());
|
||||
|
||||
foreach ($paymentMethodConfigurations as $paymentMethodConfiguration) {
|
||||
if ($paymentMethodConfiguration->getPaymentMethod() === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$pmId = $paymentMethodConfiguration->getPaymentMethod()->getId();
|
||||
$pmConfigId = $paymentMethodConfiguration->getPaymentMethodConfigurationId();
|
||||
$allowedIds = $this->getAllowedPaymentMethodIds($event->getSalesChannelContext());
|
||||
|
||||
if ($paymentMethodConfiguration->getSpaceId() === $spaceId
|
||||
&& \in_array($pmConfigId, $allowedIds, true)) {
|
||||
$allowedWLMethods[] = $pmId;
|
||||
}
|
||||
}
|
||||
|
||||
$allPaymentIds = array_unique(array_merge($paymentIds, $allowedWLMethods));
|
||||
$collection = new PaymentMethodCollection();
|
||||
if (!empty($allPaymentIds)) {
|
||||
$criteria = new Criteria($allPaymentIds);
|
||||
$criteria->addFilter(new EqualsFilter('active', true));
|
||||
$criteria->addFilter(
|
||||
new EqualsFilter('salesChannels.id', $event->getSalesChannelContext()->getSalesChannelId())
|
||||
);
|
||||
|
||||
$result = $this->paymentMethodRepository->search($criteria, $event->getContext());
|
||||
foreach ($result->getEntities() as $method) {
|
||||
if (!$collection->has($method->getId())) {
|
||||
$collection->add($method);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$event->getPage()->setPaymentMethods($collection);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param SalesChannelContext $salesChannelContext
|
||||
* @param int $createdTransactionId
|
||||
* @return void
|
||||
*/
|
||||
private function updateTempTransactionIfNeeded(SalesChannelContext $salesChannelContext, int $createdTransactionId): void
|
||||
{
|
||||
$ctx = $salesChannelContext->getContext();
|
||||
|
||||
/** @var ArrayEntity|null $ext */
|
||||
$ext = $ctx->getExtension('checkoutState');
|
||||
|
||||
$oldAddressHash = $ext instanceof ArrayEntity ? $ext->get('addressHash') : null;
|
||||
$oldCurrency = $ext instanceof ArrayEntity ? $ext->get('currency') : null;
|
||||
|
||||
$customer = $salesChannelContext->getCustomer();
|
||||
$addressHash = md5(json_encode((array) $customer));
|
||||
$currency = $salesChannelContext->getCurrency()->getIsoCode();
|
||||
|
||||
$needsUpdate = ($oldAddressHash !== $addressHash) || ($oldCurrency !== $currency);
|
||||
|
||||
if ($needsUpdate) {
|
||||
if ($createdTransactionId) {
|
||||
$this->transactionService->updateTempTransaction($salesChannelContext, $createdTransactionId);
|
||||
}
|
||||
|
||||
$ctx->addExtension('possibleMethods', new ArrayEntity(['ids' => []]));
|
||||
$ctx->addExtension(
|
||||
'checkoutState',
|
||||
new ArrayEntity([
|
||||
'addressHash' => $addressHash,
|
||||
'currency' => $currency,
|
||||
])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param SalesChannelContext $salesChannelContext
|
||||
* @return array
|
||||
*/
|
||||
private function getAllowedPaymentMethodIds(SalesChannelContext $salesChannelContext): array
|
||||
{
|
||||
$ext = $salesChannelContext->getContext()->getExtension('possibleMethods');
|
||||
return $ext instanceof ArrayEntity ? ($ext->get('ids') ?? []) : [];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ class Analytics {
|
||||
public const SHOP_SYSTEM_VERSION = 'x-meta-shop-system-version';
|
||||
public const SHOP_SYSTEM_AND_VERSION = 'x-meta-shop-system-and-version';
|
||||
public const PLUGIN_SYSTEM_VERSION = 'x-meta-plugin-version';
|
||||
public const SUBSCRIPTION_TRANSACTION = 'x-meta-subscription-transaction';
|
||||
|
||||
/**
|
||||
* @return array
|
||||
@@ -25,16 +26,17 @@ class Analytics {
|
||||
self::SHOP_SYSTEM => 'shopware',
|
||||
self::SHOP_SYSTEM_VERSION => '6',
|
||||
self::SHOP_SYSTEM_AND_VERSION => 'shopware-6',
|
||||
self::PLUGIN_SYSTEM_VERSION => '7.1.4',
|
||||
self::PLUGIN_SYSTEM_VERSION => '7.3.1',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \VRPayment\Sdk\ApiClient $apiClient
|
||||
*/
|
||||
public static function addHeaders(ApiClient &$apiClient)
|
||||
public static function addHeaders(ApiClient &$apiClient, array $additionalHeaders = [])
|
||||
{
|
||||
$data = self::getDefaultData();
|
||||
$data = array_merge($data, $additionalHeaders);
|
||||
foreach ($data as $key => $value) {
|
||||
$apiClient->addDefaultHeader($key, $value);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Core\Util\Payload;
|
||||
|
||||
|
||||
use Psr\Container\ContainerInterface;
|
||||
use Shopware\Core\{Checkout\Cart\Tax\Struct\CalculatedTaxCollection,
|
||||
use Shopware\Core\{
|
||||
Checkout\Cart\Tax\Struct\CalculatedTaxCollection,
|
||||
Checkout\Customer\Aggregate\CustomerAddress\CustomerAddressEntity,
|
||||
Checkout\Customer\CustomerEntity,
|
||||
Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity,
|
||||
@@ -15,10 +18,12 @@ use Shopware\Core\{Checkout\Cart\Tax\Struct\CalculatedTaxCollection,
|
||||
};
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
|
||||
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
|
||||
use Shopware\Core\Framework\Api\Context\SalesChannelApiSource;
|
||||
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
use VRPayment\Sdk\{Model\AddressCreate,
|
||||
use VRPayment\Sdk\{
|
||||
Model\AddressCreate,
|
||||
Model\ChargeAttempt,
|
||||
Model\CreationEntityState,
|
||||
Model\CriteriaOperator,
|
||||
@@ -32,7 +37,8 @@ use VRPayment\Sdk\{Model\AddressCreate,
|
||||
Model\TransactionCreate,
|
||||
Model\TransactionPending
|
||||
};
|
||||
use VRPaymentPayment\Core\{Api\PaymentMethodConfiguration\Entity\PaymentMethodConfigurationEntity,
|
||||
use VRPaymentPayment\Core\{
|
||||
Api\PaymentMethodConfiguration\Entity\PaymentMethodConfigurationEntity,
|
||||
Settings\Struct\Settings,
|
||||
Util\Exception\InvalidPayloadException,
|
||||
Util\LocaleCodeProvider,
|
||||
@@ -98,6 +104,16 @@ class TransactionPayload extends AbstractPayload
|
||||
|
||||
protected OrderEntity $order;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $transactionId;
|
||||
|
||||
public function setTransactionId(int $transactionId): void
|
||||
{
|
||||
$this->transactionId = $transactionId;
|
||||
}
|
||||
|
||||
/**
|
||||
* TransactionPayload constructor.
|
||||
*
|
||||
@@ -113,8 +129,7 @@ class TransactionPayload extends AbstractPayload
|
||||
SalesChannelContext $salesChannelContext,
|
||||
Settings $settings,
|
||||
PaymentTransactionStruct $transaction
|
||||
)
|
||||
{
|
||||
) {
|
||||
$this->localeCodeProvider = $localeCodeProvider;
|
||||
$this->salesChannelContext = $salesChannelContext;
|
||||
$this->settings = $settings;
|
||||
@@ -182,7 +197,7 @@ class TransactionPayload extends AbstractPayload
|
||||
'merchant_reference' => $this->fixLength($this->order->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_TRANSACTION_ID => $this->transaction->getOrderTransactionId(),
|
||||
self::VRPAYMENT_METADATA_SALES_CHANNEL_ID => $this->salesChannelContext->getSalesChannel()->getId(),
|
||||
self::VRPAYMENT_METADATA_CUSTOMER_NAME => $customerName,
|
||||
],
|
||||
@@ -218,7 +233,7 @@ class TransactionPayload extends AbstractPayload
|
||||
}
|
||||
|
||||
$transactionPayload = (new TransactionPending())
|
||||
->setId($_SESSION['transactionId'])
|
||||
->setId($this->transactionId)
|
||||
->setVersion($version)
|
||||
->setBillingAddress($billingAddress)
|
||||
->setCurrency($transactionData['currency'])
|
||||
@@ -243,7 +258,9 @@ class TransactionPayload extends AbstractPayload
|
||||
}
|
||||
|
||||
$successUrl = $this->transaction->getReturnUrl() . '&status=paid';
|
||||
$failedUrl = $this->getFailUrl($this->order->getId()) . '&status=fail';
|
||||
// For headless clients, use the returnUrl for failure as well (they handle the status parameter).
|
||||
// For Storefront, use the recreate-cart route.
|
||||
$failedUrl = $this->getFailUrl($this->order->getId(), $this->transaction->getReturnUrl()) . '&status=fail';
|
||||
$transactionPayload->setSuccessUrl($successUrl)
|
||||
->setFailedUrl($failedUrl);
|
||||
|
||||
@@ -361,7 +378,7 @@ class TransactionPayload extends AbstractPayload
|
||||
$rate = $calculatedTax->getTaxRate();
|
||||
$amount = $this->calculateDiscountAmount($calculatedTax);
|
||||
|
||||
$lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
|
||||
$lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate, $discount->getId());
|
||||
}
|
||||
} else {
|
||||
$taxRules = $calculatedPrice->getTaxRules();
|
||||
@@ -370,12 +387,12 @@ class TransactionPayload extends AbstractPayload
|
||||
foreach ($taxRules as $taxRule) {
|
||||
$rate = $taxRule->getTaxRate();
|
||||
$amount = $calculatedPrice->getTotalPrice();
|
||||
$lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
|
||||
$lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate, $discount->getId());
|
||||
}
|
||||
} else {
|
||||
$rate = $this->getDefaultTaxRate();
|
||||
$amount = $calculatedPrice->getTotalPrice();
|
||||
$lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
|
||||
$lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate, $discount->getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -386,7 +403,7 @@ class TransactionPayload extends AbstractPayload
|
||||
* @param float $rate
|
||||
* @return LineItemCreate
|
||||
*/
|
||||
private function createDiscountLineItem(string $discountName, float $amount, float $rate): LineItemCreate
|
||||
private function createDiscountLineItem(string $discountName, float $amount, float $rate, string $discountId): LineItemCreate
|
||||
{
|
||||
$lineItem = new LineItemCreate();
|
||||
|
||||
@@ -397,13 +414,15 @@ class TransactionPayload extends AbstractPayload
|
||||
$discountTitle = sprintf('DISCOUNT: %s', $discountName);
|
||||
}
|
||||
|
||||
$lineItem->setAmountIncludingTax($amount)
|
||||
$roundedAmount = self::round($amount);
|
||||
|
||||
$lineItem->setAmountIncludingTax($roundedAmount)
|
||||
->setName($discountTitle)
|
||||
->setQuantity(1)
|
||||
->setShippingRequired(false)
|
||||
->setSku($discountSkuName, 200)
|
||||
->setType(LineItemType::DISCOUNT)
|
||||
->setUniqueId('coupon-' . $discountSkuName);
|
||||
->setUniqueId('coupon-' . $discountSkuName . '-' . $discountId);
|
||||
|
||||
$taxRate = new TaxCreate([
|
||||
'title' => 'Discount Tax: ' . $rate,
|
||||
@@ -520,12 +539,14 @@ class TransactionPayload extends AbstractPayload
|
||||
$amount = self::round($amount + $shopLineItem->getPrice()->getCalculatedTaxes()->getAmount());
|
||||
}
|
||||
|
||||
$roundedAmount = self::round($amount);
|
||||
|
||||
$lineItem = (new LineItemCreate())
|
||||
->setName($this->fixLength($shopLineItem->getLabel(), 150))
|
||||
->setUniqueId($uniqueId)
|
||||
->setSku($sku)
|
||||
->setQuantity($shopLineItem->getQuantity() ?? 1)
|
||||
->setAmountIncludingTax($amount);
|
||||
->setAmountIncludingTax($roundedAmount);
|
||||
|
||||
|
||||
if (!empty($shopLineItem->getType()) && $shopLineItem->getType() == CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
|
||||
@@ -536,7 +557,6 @@ class TransactionPayload extends AbstractPayload
|
||||
$this->translator->trans('vrpayment.payload.taxes'),
|
||||
$amount
|
||||
);
|
||||
|
||||
} else {
|
||||
$productAttributes = $this->getProductAttributes($shopLineItem);
|
||||
|
||||
@@ -644,9 +664,10 @@ class TransactionPayload extends AbstractPayload
|
||||
$amount = self::round($amount + $this->order->getShippingCosts()->getCalculatedTaxes()->getAmount());
|
||||
}
|
||||
|
||||
$roundedAmount = self::round($amount);
|
||||
|
||||
$lineItem = (new LineItemCreate())
|
||||
->setAmountIncludingTax($amount)
|
||||
->setAmountIncludingTax($roundedAmount)
|
||||
->setName($this->fixLength($shippingName . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
|
||||
->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
|
||||
->setSku($this->fixLength($shippingName . '-Shipping', 200))
|
||||
@@ -665,7 +686,6 @@ class TransactionPayload extends AbstractPayload
|
||||
|
||||
return $lineItem;
|
||||
}
|
||||
|
||||
} catch (\Exception $exception) {
|
||||
$this->logger->critical(__CLASS__ . ' : ' . __FUNCTION__ . ' : ' . $exception->getMessage());
|
||||
}
|
||||
@@ -694,9 +714,11 @@ class TransactionPayload extends AbstractPayload
|
||||
->setRate($taxRate)
|
||||
->setTitle('Tax rate: ' . $taxRate);
|
||||
|
||||
$roundedAmount = self::round($amount);
|
||||
|
||||
$name = $taxRate . '%-' . $shippingName;
|
||||
$lineItem = (new LineItemCreate())
|
||||
->setAmountIncludingTax($amount)
|
||||
->setAmountIncludingTax($roundedAmount)
|
||||
->setName($this->fixLength($name . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
|
||||
->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
|
||||
->setSku($this->fixLength($name . '-Shipping', 200))
|
||||
@@ -717,7 +739,6 @@ class TransactionPayload extends AbstractPayload
|
||||
}
|
||||
return $lineItems;
|
||||
}
|
||||
|
||||
} catch (\Exception $exception) {
|
||||
$this->logger->critical(__CLASS__ . ' : ' . __FUNCTION__ . ' : ' . $exception->getMessage());
|
||||
}
|
||||
@@ -760,7 +781,6 @@ class TransactionPayload extends AbstractPayload
|
||||
]);
|
||||
$this->logger->critical($error);
|
||||
throw new \Exception($error);
|
||||
|
||||
} else {
|
||||
$lineItem = (new LineItemCreate())
|
||||
->setName($this->translator->trans('vrpayment.payload.adjustmentLineItem'))
|
||||
@@ -768,7 +788,8 @@ class TransactionPayload extends AbstractPayload
|
||||
->setSku('Adjustment-Line-Item')
|
||||
->setQuantity(1);
|
||||
/** @noinspection PhpParamsInspection */
|
||||
$lineItem->setAmountIncludingTax($adjustmentPrice)
|
||||
$roundedAdjustmentPrice = self::round($adjustmentPrice);
|
||||
$lineItem->setAmountIncludingTax($roundedAdjustmentPrice)
|
||||
->setType(($adjustmentPrice > 0) ? LineItemType::FEE : LineItemType::DISCOUNT);
|
||||
|
||||
if (!$lineItem->valid()) {
|
||||
@@ -841,7 +862,6 @@ class TransactionPayload extends AbstractPayload
|
||||
} else {
|
||||
if (!empty($customer->getSalutation())) {
|
||||
$salutation = $customer->getSalutation()->getDisplayName();
|
||||
|
||||
}
|
||||
}
|
||||
$salutation = !empty($salutation) ? $this->fixLength($salutation, 20) : null;
|
||||
@@ -923,14 +943,48 @@ class TransactionPayload extends AbstractPayload
|
||||
}
|
||||
|
||||
/**
|
||||
* Get failure URL
|
||||
* Generates the failure URL for payment transactions.
|
||||
* For headless clients (Store API), returns the client's returnUrl.
|
||||
* For Storefront, returns the recreate-cart route.
|
||||
*
|
||||
* @param string $orderId
|
||||
*
|
||||
* @return string
|
||||
* @param string $orderId The order ID for the Storefront route.
|
||||
* @param string|null $returnUrl The client's return URL (used for headless).
|
||||
* @return string The failure URL.
|
||||
*/
|
||||
protected function getFailUrl(string $orderId): string
|
||||
protected function getFailUrl(string $orderId, ?string $returnUrl = null): string
|
||||
{
|
||||
// For headless clients (Store API) or custom integrations, we use the returnUrl so the client can handle the failure.
|
||||
// We detect "Standard Storefront" usage by checking if the returnUrl matches the standard Shopware 'finalize-transaction' route.
|
||||
// If it DOES match, we usually redirect to 'recreate-cart' for better error handling. (Storefront / Edit Order)
|
||||
// If it DOES NOT match (e.g. custom URL, headless URL), we return it as is.
|
||||
|
||||
$isStandardShopwareUrl = strpos($returnUrl ?? '', 'payment/finalize-transaction') !== false;
|
||||
|
||||
$request = $this->container->get('request_stack')->getCurrentRequest();
|
||||
$isJsonRequest = false;
|
||||
if ($request) {
|
||||
// Check for JSON preference
|
||||
$format = $request->getPreferredFormat();
|
||||
$contentTypes = $request->getAcceptableContentTypes();
|
||||
$isJsonRequest = $format === 'json' || in_array('application/json', $contentTypes);
|
||||
}
|
||||
|
||||
if ($returnUrl) {
|
||||
// Case 1: Custom URL (Headless detection part 1)
|
||||
// If the URL is custom (not standard Shopware), we always respect it.
|
||||
if (!$isStandardShopwareUrl) {
|
||||
return $returnUrl;
|
||||
}
|
||||
|
||||
// Case 2: Standard URL + JSON Request (Headless detection part 2)
|
||||
// If URL is standard BUT request prefers JSON, it's likely a headless app (Store API) being proxied.
|
||||
if ($isStandardShopwareUrl && $isJsonRequest) {
|
||||
return $returnUrl;
|
||||
}
|
||||
}
|
||||
|
||||
// Default: Storefront (SystemSource, SalesChannelSource, or AdminSalesChannelApiSource via Edit Order/HTML)
|
||||
// We generate the recreate-cart route to restore the cart and show the error.
|
||||
return $this->container->get('router')->generate(
|
||||
'frontend.vrpayment.checkout.recreate-cart',
|
||||
['orderId' => $orderId,],
|
||||
|
||||
@@ -31,7 +31,7 @@ class Migration1590156974TransactionEntity extends MigrationStep {
|
||||
public function update(Connection $connection): void
|
||||
{
|
||||
$connection->executeStatement('
|
||||
CREATE TABLE IF NOT EXISTS `vrpayment_transaction` (
|
||||
CREATE TABLE IF NOT EXISTS `vrpayment_transaction_tmp` (
|
||||
`id` BINARY(16) NOT NULL,
|
||||
`data` JSON NOT NULL,
|
||||
`payment_method_id` BINARY(16) NOT NULL,
|
||||
|
||||
@@ -42,7 +42,7 @@ class Migration1590646356RefundEntity extends MigrationStep {
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `refund_id_UNIQUE` (`refund_id`),
|
||||
KEY `fk.vrp_refund.transaction_id` (`transaction_id`),
|
||||
CONSTRAINT `fk.vrp_refund.transaction_id` FOREIGN KEY (`transaction_id`) REFERENCES `vrpayment_transaction` (`transaction_id`) ON DELETE CASCADE
|
||||
CONSTRAINT `fk.vrp_refund.transaction_id` FOREIGN KEY (`transaction_id`) REFERENCES `vrpayment_transaction_tmp` (`transaction_id`) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
');
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ class Migration1590646356TransactionEntity extends MigrationStep {
|
||||
public function update(Connection $connection): void
|
||||
{
|
||||
try {
|
||||
$connection->executeStatement('ALTER TABLE `vrpayment_transaction` ADD COLUMN `confirmation_email_sent` TINYINT(1) NOT NULL DEFAULT 0 AFTER `id`;');
|
||||
$connection->executeStatement('ALTER TABLE `vrpayment_transaction_tmp` ADD COLUMN `confirmation_email_sent` TINYINT(1) NOT NULL DEFAULT 0 AFTER `id`;');
|
||||
}catch (\Exception $exception){
|
||||
// column probably exists
|
||||
}
|
||||
|
||||
@@ -33,19 +33,19 @@ class Migration1605701048TransactionEntity extends MigrationStep
|
||||
|
||||
try {
|
||||
$connection->executeStatement('
|
||||
ALTER TABLE `vrpayment_transaction`
|
||||
ALTER TABLE `vrpayment_transaction_tmp`
|
||||
ADD `order_version_id` binary(16) NOT NULL AFTER `transaction_id`;
|
||||
');
|
||||
|
||||
$connection->executeStatement('
|
||||
UPDATE `vrpayment_transaction` t1
|
||||
UPDATE `vrpayment_transaction_tmp` t1
|
||||
INNER JOIN `order` t2
|
||||
ON t1.order_id = t2.id
|
||||
SET t1.order_version_id = t2.version_id;
|
||||
');
|
||||
|
||||
$connection->executeStatement('
|
||||
ALTER TABLE `vrpayment_transaction`
|
||||
ALTER TABLE `vrpayment_transaction_tmp`
|
||||
DROP FOREIGN KEY `fk.vrp_transaction.order_id`,
|
||||
DROP FOREIGN KEY `fk.vrp_transaction.order_transaction_id`,
|
||||
DROP FOREIGN KEY `fk.vrp_transaction.payment_method_id`,
|
||||
@@ -53,7 +53,7 @@ class Migration1605701048TransactionEntity extends MigrationStep
|
||||
');
|
||||
|
||||
$connection->executeStatement('
|
||||
ALTER TABLE `vrpayment_transaction`
|
||||
ALTER TABLE `vrpayment_transaction_tmp`
|
||||
ADD CONSTRAINT `fk.vrp_transaction_order_id` FOREIGN KEY (`order_id`, `order_version_id`)
|
||||
REFERENCES `order` (`id`, `version_id`) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||
ADD CONSTRAINT `fk.vrp_transaction_payment_method_id` FOREIGN KEY (`payment_method_id`)
|
||||
|
||||
@@ -30,7 +30,7 @@ class Migration1684240994TransactionEntity extends MigrationStep {
|
||||
public function update(Connection $connection): void
|
||||
{
|
||||
try {
|
||||
$connection->executeStatement('ALTER TABLE `vrpayment_transaction` ADD COLUMN `erp_merchant_id` VARCHAR(255) DEFAULT NULL AFTER `confirmation_email_sent`;');
|
||||
$connection->executeStatement('ALTER TABLE `vrpayment_transaction_tmp` ADD COLUMN `erp_merchant_id` VARCHAR(255) DEFAULT NULL AFTER `confirmation_email_sent`;');
|
||||
}catch (\Exception $exception){
|
||||
// column probably exists
|
||||
}
|
||||
|
||||
@@ -0,0 +1,323 @@
|
||||
<?php declare(strict_types=1);
|
||||
|
||||
namespace VRPaymentPayment\Migration;
|
||||
|
||||
use Doctrine\DBAL\Connection;
|
||||
use Shopware\Core\Framework\Migration\MigrationStep;
|
||||
use Monolog\Logger;
|
||||
use Monolog\Handler\StreamHandler;
|
||||
|
||||
/**
|
||||
* Class Migration1766067106TransactionEntity
|
||||
*
|
||||
* @package VRPaymentPayment\Migration
|
||||
*/
|
||||
class Migration1766067106TransactionEntity extends MigrationStep
|
||||
{
|
||||
|
||||
/**
|
||||
* get creation timestamp
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getCreationTimestamp(): int
|
||||
{
|
||||
return 1766067106;
|
||||
}
|
||||
|
||||
/**
|
||||
* update non-destructive changes
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
*/
|
||||
public function update(Connection $connection): void
|
||||
{
|
||||
$oldTableName = 'vrpayment_transaction';
|
||||
$tempTableName = 'vrpayment_transaction_tmp';
|
||||
$realTableName = 'vrpayment_transaction_data';
|
||||
$logger = new Logger('vrpayment_migration');
|
||||
$logger->pushHandler(new StreamHandler(dirname(__DIR__, 5) . '/var/log/vrpayment-migration.log'));
|
||||
$logger->info(
|
||||
'Migration start', [
|
||||
'old_table_exists' => $this->tableExists($connection, $oldTableName),
|
||||
'temp_table_exists' => $this->tableExists($connection, $tempTableName),
|
||||
'real_table_exists' => $this->tableExists($connection, $realTableName),
|
||||
]
|
||||
);
|
||||
if ($this->tableExists($connection, $tempTableName)) {
|
||||
// If _temp table exists, it means that this is a fresh installation.
|
||||
$logger->info('Fresh installation detected.');
|
||||
$connection->executeStatement(
|
||||
sprintf('RENAME TABLE `%s` TO `%s`', $tempTableName, $realTableName)
|
||||
);
|
||||
$logger->info('Fresh installation finished.');
|
||||
} else {
|
||||
// If _temp does not exist, it means that this could be a version upgrade.
|
||||
$logger->info('Possible plugin upgrade detected.');
|
||||
if ($this->tableExists($connection, $oldTableName) && !$this->isOldPluginTable($connection, $oldTableName)) {
|
||||
$logger->info('Old vrpayment_transaction table detected.');
|
||||
// If vrpayment_transaction already exists and does not belong to old plugin,
|
||||
// it means that this is indeed a version update.
|
||||
$this->syncTransactionTable($connection, $oldTableName);
|
||||
$logger->info('Old vrpayment_transaction table sync finished.');
|
||||
$this->syncRefundTable($connection, $oldTableName);
|
||||
$logger->info('Old vrpayment_refund table sync finished.');
|
||||
$connection->executeStatement(
|
||||
sprintf('RENAME TABLE `%s` TO `%s`', $oldTableName, $realTableName)
|
||||
);
|
||||
$logger->info('Old vrpayment_transaction table renaming completed.');
|
||||
}
|
||||
$logger->info('Possible plugin upgrade finished.');
|
||||
// If vrpayment_transaction exists and it does belong to old plugin,
|
||||
// it means we must run it in parallel.
|
||||
}
|
||||
$logger->info('Migration finished.');
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if table exists.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function tableExists(Connection $connection, string $table): bool {
|
||||
$result = $connection->fetchOne('SHOW TABLES LIKE :table', ['table' => $table]);
|
||||
return $result !== false && $result !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if table belongs to old plugin.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isOldPluginTable(Connection $connection, string $table): bool {
|
||||
$oldTableExclusiveColumns = [
|
||||
'finalized_at' => 'datetime',
|
||||
'refunded_at' => 'datetime',
|
||||
'initial_transaction_mode' => 'varchar',
|
||||
'manual_capture' => 'tinyint',
|
||||
'partial_refunded_at' => 'datetime',
|
||||
'refunded_amount' => 'double',
|
||||
'amount_to_refund' => 'double',
|
||||
];
|
||||
$resultColumns = $connection->fetchAllAssociative(
|
||||
'SELECT LOWER(COLUMN_NAME) AS column_name, LOWER(DATA_TYPE) AS data_type
|
||||
FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = :table',
|
||||
['table' => $table]
|
||||
);
|
||||
$dbColumns = [];
|
||||
foreach($resultColumns as $column) {
|
||||
$dbColumns[$column['column_name']] = $column['data_type'];
|
||||
}
|
||||
|
||||
$oldPluginTable = true;
|
||||
foreach($oldTableExclusiveColumns as $columnName => $columnType) {
|
||||
if(!isset($dbColumns[$columnName])) {
|
||||
$oldPluginTable = false;
|
||||
break;
|
||||
}
|
||||
if ($dbColumns[$columnName] !== $columnType) {
|
||||
$oldPluginTable = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return $oldPluginTable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronizes the transaction table with the current/latest version.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
*/
|
||||
private function syncTransactionTable(Connection $connection, string $table): void {
|
||||
$this->addColumnIfMissing($connection, $table, 'confirmation_email_sent', "TINYINT(1) NOT NULL DEFAULT 0 AFTER `id`");
|
||||
$this->addColumnIfMissing($connection, $table, 'erp_merchant_id', "VARCHAR(255) DEFAULT NULL AFTER `confirmation_email_sent`");
|
||||
$this->addColumnIfMissing($connection, $table, 'data', "LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`data`)) AFTER `erp_merchant_id`");
|
||||
$this->addColumnIfMissing($connection, $table, 'payment_method_id', "BINARY(16) NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'order_id', "BINARY(16) NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'order_transaction_id', "BINARY(16) NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'space_id', "INT(10) UNSIGNED NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'state', "VARCHAR(255) NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'sales_channel_id', "BINARY(16) NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'transaction_id', "INT(10) UNSIGNED NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'order_version_id', "BINARY(16) NOT NULL AFTER `transaction_id`");
|
||||
|
||||
$this->addColumnIfMissing($connection, $table, 'created_at', "DATETIME(3) NOT NULL");
|
||||
$this->addColumnIfMissing($connection, $table, 'updated_at', "DATETIME(3) DEFAULT NULL");
|
||||
|
||||
$this->ensureIndexBySql($connection, $table, 'fk.vrp_transaction.order_id', "KEY `fk.vrp_transaction.order_id` (`order_id`)");
|
||||
$this->ensureIndexBySql($connection, $table, 'fk.vrp_transaction.order_transaction_id', "KEY `fk.vrp_transaction.order_transaction_id` (`order_transaction_id`)");
|
||||
$this->ensureIndexBySql($connection, $table, 'fk.vrp_transaction.payment_method_id', "KEY `fk.vrp_transaction.payment_method_id` (`payment_method_id`)");
|
||||
$this->ensureIndexBySql($connection, $table, 'fk.vrp_transaction.sales_channel_id', "KEY `fk.vrp_transaction.sales_channel_id` (`sales_channel_id`)");
|
||||
$this->ensureIndexBySql($connection, $table, 'fk.vrp_transaction', "KEY `fk.vrp_transaction` (`order_id`,`order_version_id`)");
|
||||
|
||||
$this->ensureForeignKey(
|
||||
$connection,
|
||||
$table,
|
||||
'fk.vrp_transaction_order_id',
|
||||
['order_id', 'order_version_id'],
|
||||
'order',
|
||||
['id', 'version_id'],
|
||||
'CASCADE',
|
||||
'CASCADE'
|
||||
);
|
||||
$this->ensureForeignKey(
|
||||
$connection,
|
||||
$table,
|
||||
'fk.vrp_transaction_payment_method_id',
|
||||
['payment_method_id'],
|
||||
'payment_method',
|
||||
['id'],
|
||||
'RESTRICT',
|
||||
'CASCADE'
|
||||
);
|
||||
$this->ensureForeignKey(
|
||||
$connection,
|
||||
$table,
|
||||
'fk.vrp_transaction_sales_channel_id',
|
||||
['sales_channel_id'],
|
||||
'sales_channel',
|
||||
['id'],
|
||||
'RESTRICT',
|
||||
'CASCADE'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronizes the parts of the refund table related to transactions with the current/latest version.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
*/
|
||||
private function syncRefundTable(Connection $connection, string $table): void {
|
||||
$refundTable = 'vrpayment_refund';
|
||||
$this->ensureIndexBySql($connection, $refundTable, 'fk.vrp_refund.transaction_id', "KEY `fk.vrp_refund.transaction_id` (`transaction_id`)");
|
||||
$this->ensureForeignKey(
|
||||
$connection,
|
||||
$refundTable,
|
||||
'fk.vrp_refund.transaction_id',
|
||||
['transaction_id'],
|
||||
$table,
|
||||
['transaction_id'],
|
||||
'CASCADE',
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds column to the table if it's missing.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
* @param string $column
|
||||
* @param string $sqlFragment
|
||||
*/
|
||||
private function addColumnIfMissing(Connection $connection, string $table, string $column, string $sqlFragment): void {
|
||||
if ($this->columnExists($connection, $table, $column)) {
|
||||
return;
|
||||
}
|
||||
$connection->executeStatement(
|
||||
sprintf("ALTER TABLE `%s` ADD COLUMN `%s` %s", $table, $column, $sqlFragment)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds index to the table if it's missing.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
* @param string $indexName
|
||||
* @param string $sqlFragment
|
||||
*/
|
||||
private function ensureIndexBySql(Connection $connection, string $table, string $indexName, string $sqlFragment): void {
|
||||
if ($this->indexExists($connection, $table, $indexName)) {
|
||||
return;
|
||||
}
|
||||
$connection->executeStatement(
|
||||
sprintf("ALTER TABLE `%s` ADD %s", $table, $sqlFragment)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds foreign key constraint to the table if it's missing.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
* @param string $constraintName
|
||||
* @param string $columns
|
||||
* @param string $refTable
|
||||
* @param string $refColumns
|
||||
* @param string|null $onDelete
|
||||
* @param string|null $onUpdate
|
||||
*/
|
||||
private function ensureForeignKey(
|
||||
Connection $connection,
|
||||
string $table,
|
||||
string $constraintName,
|
||||
array $columns,
|
||||
string $refTable,
|
||||
array $refColumns,
|
||||
?string $onDelete,
|
||||
?string $onUpdate
|
||||
): void {
|
||||
if ($this->foreignKeyExists($connection, $table, $constraintName)) {
|
||||
return;
|
||||
}
|
||||
$columnsList = '`' . implode('`,`', $columns) . '`';
|
||||
$refColumnsList = '`' . implode('`,`', $refColumns) . '`';
|
||||
$connection->executeStatement(
|
||||
sprintf(
|
||||
"ALTER TABLE `%s`
|
||||
ADD CONSTRAINT `%s` FOREIGN KEY (%s)
|
||||
REFERENCES `%s` (%s)%s%s",
|
||||
$table,
|
||||
$constraintName,
|
||||
$columnsList,
|
||||
$refTable,
|
||||
$refColumnsList,
|
||||
$onDelete ? " ON DELETE {$onDelete}" : "",
|
||||
$onUpdate ? " ON UPDATE {$onUpdate}" : ""
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if foreign key constraint exists.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
* @param string $table
|
||||
* @param string $constraintName
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
private function foreignKeyExists(Connection $connection, string $table, $constraintName): bool {
|
||||
$result = $connection->fetchOne(
|
||||
"SELECT 1 FROM information_schema.referential_constraints
|
||||
WHERE constraint_schema = DATABASE()
|
||||
AND table_name = ?
|
||||
AND constraint_name = ?
|
||||
LIMIT 1",
|
||||
[$table,$constraintName]
|
||||
);
|
||||
return $result !== false && $result !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* update destructive changes
|
||||
*
|
||||
* @param \Doctrine\DBAL\Connection $connection
|
||||
*/
|
||||
public function updateDestructive(Connection $connection): void
|
||||
{
|
||||
// implement update destructive
|
||||
}
|
||||
}
|
||||
+9
-6
@@ -70,13 +70,16 @@ Component.register('vrpayment-order-action-refund-by-amount', {
|
||||
});
|
||||
}).catch((errorResponse) => {
|
||||
try {
|
||||
var errorTitle;
|
||||
var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
|
||||
var errorMessage;
|
||||
if (errorResponse.response.data == 'refundExceedsAmount') {
|
||||
errorTitle = this.$tc('vrpayment-order.refundAction.refundExceedsTotalError.title');
|
||||
errorMessage = this.$tc('vrpayment-order.refundAction.refundExceedsTotalError.messageRefundAmountExceedsAvailableBalance');
|
||||
} else {
|
||||
errorTitle = errorResponse.response.data.errors[0].title;
|
||||
switch(errorResponse.response.data) {
|
||||
case 'refundAmountZero':
|
||||
errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundAmountIsZero');
|
||||
break;
|
||||
case 'refundExceedsAmount':
|
||||
errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundAmountExceedsAvailableBalance');
|
||||
break;
|
||||
default:
|
||||
errorMessage = errorResponse.response.data.errors[0].detail;
|
||||
}
|
||||
this.createNotificationError({
|
||||
|
||||
+1
@@ -9,6 +9,7 @@
|
||||
:max="this.$parent.$parent.itemRefundableQuantity"
|
||||
:min="0"
|
||||
v-model="refundQuantity"
|
||||
number-type="int"
|
||||
:label="$tc('vrpayment-order.refund.refundQuantity.label')">
|
||||
</mt-number-field>
|
||||
|
||||
|
||||
+14
-2
@@ -68,9 +68,21 @@ Component.register('vrpayment-order-action-refund', {
|
||||
});
|
||||
}).catch((errorResponse) => {
|
||||
try {
|
||||
var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
|
||||
var errorMessage;
|
||||
switch(errorResponse.response.data) {
|
||||
case 'refundQuantityZero':
|
||||
errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundQuantityIsZero');
|
||||
break;
|
||||
case 'refundExceedsQuantity':
|
||||
errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundQuantityExceedsAvailableBalance');
|
||||
break;
|
||||
default:
|
||||
errorMessage = errorResponse.response.data.errors[0].detail;
|
||||
}
|
||||
this.createNotificationError({
|
||||
title: errorResponse.response.data.errors[0].title,
|
||||
message: errorResponse.response.data.errors[0].detail,
|
||||
title: errorTitle,
|
||||
message: errorMessage,
|
||||
autoClose: false
|
||||
});
|
||||
} catch (e) {
|
||||
|
||||
@@ -78,9 +78,12 @@
|
||||
"successTitle": "Erfolg",
|
||||
"maxAvailableItemsToRefund": "Maximal Verfügbare Artikel zum Erstatten",
|
||||
"maxAvailableAmountToRefund": "Maximal verfügbarer Erstattungsbetrag",
|
||||
"refundExceedsTotalError": {
|
||||
"title": "Fehler beim Erstellen der Rückerstattung.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "Der Rückerstattungsbetrag übersteigt das verfügbare Guthaben."
|
||||
"refundCreateError": {
|
||||
"errorTitle": "Fehler beim Erstellen der Rückerstattung.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "Der Rückerstattungsbetrag übersteigt das verfügbare Guthaben.",
|
||||
"messageRefundAmountIsZero": "Der Rückerstattungsbetrag muss größer als 0 sein.",
|
||||
"messageRefundQuantityExceedsAvailableBalance": "Rückerstattung nach Menge überschreitet die maximal verfügbare Anzahl an Artikeln zur Rückerstattung.",
|
||||
"messageRefundQuantityIsZero": "Rückerstattung nach Menge muss größer als 0 sein."
|
||||
}
|
||||
},
|
||||
"transactionHistory": {
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
"void": "Cancel authorization",
|
||||
"refund-whole-line-item": "Refund whole line item",
|
||||
"refund-line-item-by-quantity": "Refund by quantity",
|
||||
"refund-line-item-selected": "Rembourser sélectionnés",
|
||||
"refund-line-item-selected": "Refund selected",
|
||||
"refund-line-item-parial": "Partial refund"
|
||||
}
|
||||
@@ -79,9 +78,12 @@
|
||||
"successTitle": "Success",
|
||||
"maxAvailableItemsToRefund": "Maximum available items to refund",
|
||||
"maxAvailableAmountToRefund": "Maximum available amount to refund",
|
||||
"refundExceedsTotalError": {
|
||||
"title": "Error while creating the refund.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "Refund amount exceeds available balance."
|
||||
"refundCreateError": {
|
||||
"errorTitle": "Error while creating the refund.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "Refund amount exceeds available balance.",
|
||||
"messageRefundAmountIsZero": "Refund amount must be greater than 0.",
|
||||
"messageRefundQuantityExceedsAvailableBalance": "Refund by quantity exceeds maximum available items to refund.",
|
||||
"messageRefundQuantityIsZero": "Refund by quantity must be greater than 0."
|
||||
}
|
||||
},
|
||||
"transactionHistory": {
|
||||
|
||||
@@ -78,9 +78,12 @@
|
||||
"successTitle": "Succès",
|
||||
"maxAvailableItemsToRefund": "Nombre maximum d'articles disponibles pour le remboursement",
|
||||
"maxAvailableAmountToRefund": "Montant maximal disponible pour le remboursement",
|
||||
"refundExceedsTotalError": {
|
||||
"title": "Erreur lors de la création du remboursement.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "Le montant du remboursement dépasse le solde disponible."
|
||||
"refundCreateError": {
|
||||
"errorTitle": "Erreur lors de la création du remboursement.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "Le montant du remboursement dépasse le solde disponible.",
|
||||
"messageRefundAmountIsZero": "Le montant du remboursement doit être supérieur à 0.",
|
||||
"messageRefundQuantityExceedsAvailableBalance": "Le remboursement par quantité dépasse le nombre maximal d’articles remboursables.",
|
||||
"messageRefundQuantityIsZero": "Le remboursement par quantité doit être supérieur à 0."
|
||||
}
|
||||
},
|
||||
"transactionHistory": {
|
||||
|
||||
@@ -78,9 +78,12 @@
|
||||
"successTitle": "Successo",
|
||||
"maxAvailableItemsToRefund": "Numero massimo di articoli disponibili da rimborsare",
|
||||
"maxAvailableAmountToRefund": "Importo massimo disponibile per il rimborso",
|
||||
"refundExceedsTotalError": {
|
||||
"title": "Errore durante la creazione del rimborso.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "LL'importo del rimborso supera il saldo disponibile."
|
||||
"refundCreateError": {
|
||||
"errorTitle": "Errore durante la creazione del rimborso.",
|
||||
"messageRefundAmountExceedsAvailableBalance": "LL'importo del rimborso supera il saldo disponibile.",
|
||||
"messageRefundAmountIsZero": "L'importo del rimborso deve essere superiore a 0.",
|
||||
"messageRefundQuantityExceedsAvailableBalance": "Il rimborso per quantità supera il numero massimo di articoli rimborsabili.",
|
||||
"messageRefundQuantityIsZero": "Il rimborso per quantità deve essere maggiore di 0."
|
||||
}
|
||||
},
|
||||
"transactionHistory": {
|
||||
|
||||
+5
-1
@@ -10,6 +10,9 @@ export const CONFIG_USER_ID = CONFIG_DOMAIN + '.' + 'userId';
|
||||
export const CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED = CONFIG_DOMAIN + '.' + 'storefrontWebhooksUpdateEnabled';
|
||||
export const CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED = CONFIG_DOMAIN + '.' + 'storefrontPaymentsUpdateEnabled';
|
||||
|
||||
// References vendor/shopware/core/Defaults.php::SALES_CHANNEL_TYPE_STOREFRONT
|
||||
export const STOREFRONT_SALES_CHANNEL_TYPE_ID = '8a243080f92e4c719546314b577cf82b';
|
||||
|
||||
export default {
|
||||
CONFIG_DOMAIN,
|
||||
CONFIG_APPLICATION_KEY,
|
||||
@@ -21,5 +24,6 @@ export default {
|
||||
CONFIG_STOREFRONT_INVOICE_DOWNLOAD_ENABLED,
|
||||
CONFIG_USER_ID,
|
||||
CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED,
|
||||
CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED
|
||||
CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED,
|
||||
STOREFRONT_SALES_CHANNEL_TYPE_ID
|
||||
};
|
||||
+75
-2
@@ -11,7 +11,8 @@ Component.register('vrpayment-settings', {
|
||||
|
||||
inject: [
|
||||
'acl',
|
||||
'VRPaymentConfigurationService'
|
||||
'VRPaymentConfigurationService',
|
||||
'repositoryFactory'
|
||||
],
|
||||
|
||||
mixins: [
|
||||
@@ -168,14 +169,86 @@ Component.register('vrpayment-settings', {
|
||||
}
|
||||
},
|
||||
|
||||
onSave() {
|
||||
async onSave() {
|
||||
if (!(this.spaceIdFilled && this.userIdFilled && this.applicationKeyFilled)) {
|
||||
this.setErrorStates();
|
||||
return;
|
||||
}
|
||||
|
||||
this.isLoading = true;
|
||||
const validationError = await this.validateHeadlessIntegration();
|
||||
|
||||
if (validationError === 'HEADLESS') {
|
||||
this.createNotificationError({
|
||||
title: this.$tc('vrpayment-settings.settingForm.titleError'),
|
||||
message: this.$tc('vrpayment-settings.settingForm.messageHeadlessIntegrationError')
|
||||
});
|
||||
this.isLoading = false;
|
||||
return;
|
||||
} else if (validationError === 'GLOBAL') {
|
||||
this.createNotificationError({
|
||||
title: this.$tc('vrpayment-settings.settingForm.titleError'),
|
||||
message: this.$tc('vrpayment-settings.settingForm.messageGlobalIframeError')
|
||||
});
|
||||
this.isLoading = false;
|
||||
return;
|
||||
}
|
||||
|
||||
this.save();
|
||||
},
|
||||
|
||||
async validateHeadlessIntegration() {
|
||||
const salesChannelId = this.$refs.configComponent.selectedSalesChannelId;
|
||||
const currentIntegration = this.config[this.CONFIG_INTEGRATION];
|
||||
|
||||
// If integration is 'payment_page', it is always valid.
|
||||
if (currentIntegration === 'payment_page') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const salesChannelRepo = this.repositoryFactory.create('sales_channel');
|
||||
|
||||
try {
|
||||
if (salesChannelId) {
|
||||
// Specific Sales Channel Check
|
||||
const salesChannel = await salesChannelRepo.get(salesChannelId, Shopware.Context.api);
|
||||
|
||||
const currentTypeId = salesChannel.typeId.replace(/-/g, '');
|
||||
|
||||
// REST-2: Inverted Logic
|
||||
// We only allow 'iframe' integration if the Sales Channel is of type 'Storefront'.
|
||||
// Any other type (Headless, Product Export, Custom, etc.) does not support Iframe injection.
|
||||
const isStorefront = currentTypeId === constants.STOREFRONT_SALES_CHANNEL_TYPE_ID;
|
||||
if (!isStorefront) {
|
||||
return 'HEADLESS';
|
||||
}
|
||||
} else {
|
||||
// Global Scope ("All Sales Channels") Check
|
||||
// We must check if there is ANY Sales Channel that is NOT Storefront.
|
||||
// If so, we cannot allow "Iframe" globally, as it would break those channels.
|
||||
const criteria = new Shopware.Data.Criteria();
|
||||
criteria.addFilter(
|
||||
Shopware.Data.Criteria.not(
|
||||
'AND',
|
||||
[Shopware.Data.Criteria.equals('typeId', constants.STOREFRONT_SALES_CHANNEL_TYPE_ID)]
|
||||
)
|
||||
);
|
||||
criteria.setLimit(1); // We only need to know if at least one exists
|
||||
|
||||
const result = await salesChannelRepo.search(criteria, Shopware.Context.api);
|
||||
|
||||
if (result.total > 0) {
|
||||
return 'GLOBAL';
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
return null;
|
||||
}
|
||||
},
|
||||
|
||||
save() {
|
||||
this.isLoading = true;
|
||||
|
||||
|
||||
@@ -56,6 +56,8 @@
|
||||
"messagePaymentMethodConfigurationUpdated": "VRPayment PaymentMethodConfiguration has been registered.",
|
||||
"messageWebHookError": "VRPayment WebHook could not be saved. Please check your credentials.",
|
||||
"messageWebHookUpdated": "VRPayment WebHook has been updated.",
|
||||
"messageHeadlessIntegrationError": "Iframe integration is only supported for Storefront Sales Channels.",
|
||||
"messageGlobalIframeError": "Iframe integration cannot be set globally because you have non-Storefront Sales Channels.",
|
||||
"options": {
|
||||
"cardTitle": "Options",
|
||||
"emailEnabled": {
|
||||
|
||||
+8
File diff suppressed because one or more lines are too long
+154
-9
@@ -3,25 +3,170 @@
|
||||
// noinspection NpmUsedModulesInstalled
|
||||
import Plugin from 'src/plugin-system/plugin.class';
|
||||
import HttpClient from 'src/service/http-client.service';
|
||||
import DomAccess from 'src/helper/dom-access.helper';
|
||||
|
||||
|
||||
/**
|
||||
* VRPaymentCheckoutPlugin
|
||||
*
|
||||
* This plugin handles the initialization and lifecycle of the WhitelabelMachineName payment iframe
|
||||
* within the Shopware 6 checkout confirm page.
|
||||
*/
|
||||
class VRPaymentCheckoutPlugin extends Plugin {
|
||||
|
||||
static options = {
|
||||
payment_method_tabs: 'ul.vrpayment-payment-panel li',
|
||||
payment_method_iframe_prefix: 'iframe_payment_method_',
|
||||
payment_method_iframe_class: '.vrpayment-payment-iframe',
|
||||
payment_method_handler_name: 'vrpayment_payment_handler',
|
||||
payment_method_handler_prefix: 'vrpayment_handler_',
|
||||
payment_panel_id: 'vrpayment-payment-panel',
|
||||
payment_method_iframe_id: 'vrpayment-payment-iframe',
|
||||
payment_method_handler_status: 'input[name="vrpayment_payment_handler_validation_status"]',
|
||||
payment_form: 'confirmOrderForm',
|
||||
payment_form_id: 'confirmOrderForm',
|
||||
loader_id: 'vrpaymentLoader',
|
||||
checkout_url_id: 'checkoutUrl',
|
||||
cart_recreate_url_id: 'cartRecreateUrl',
|
||||
};
|
||||
|
||||
/**
|
||||
* Initializes the plugin, variables, and events.
|
||||
*/
|
||||
init() {
|
||||
// @TODO Move JS to Plugin
|
||||
this._client = new HttpClient(window.accessKey);
|
||||
try {
|
||||
this._initVariables();
|
||||
this._registerEvents();
|
||||
this._getIframe();
|
||||
} catch (e) {
|
||||
// Silently fail if elements are not found; this allows the plugin to be loaded on pages where it might be conditionally absent.
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds and stores references to relevant DOM elements.
|
||||
* @private
|
||||
*/
|
||||
_initVariables() {
|
||||
this.checkoutUrl = DomAccess.getElement(document, `#${this.options.checkout_url_id}`).value;
|
||||
this.cartRecreateUrl = DomAccess.getElement(document, `#${this.options.cart_recreate_url_id}`).value;
|
||||
this.paymentForm = DomAccess.getElement(document, `#${this.options.payment_form_id}`);
|
||||
this.paymentPanel = this.el;
|
||||
this.iframeContainer = DomAccess.getElement(this.paymentPanel, `#${this.options.payment_method_iframe_id}`);
|
||||
this.handler = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers event listeners for the payment form and browser history.
|
||||
* @private
|
||||
*/
|
||||
_registerEvents() {
|
||||
this.paymentForm.addEventListener('submit', this._submitPayment.bind(this), false);
|
||||
|
||||
// Handle back button/popstate to ensure cart consistency
|
||||
window.addEventListener('popstate', this._onPopstate.bind(this), false);
|
||||
window.history.pushState({}, document.title, this.cartRecreateUrl);
|
||||
window.history.pushState({}, document.title, this.checkoutUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles browser back button activity.
|
||||
* @private
|
||||
*/
|
||||
_onPopstate() {
|
||||
if (window.history.state == null) {
|
||||
return;
|
||||
}
|
||||
window.location.href = this.cartRecreateUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Intercepts the form submission to validate the iframe content first.
|
||||
* @param {Event} event
|
||||
* @private
|
||||
*/
|
||||
_submitPayment(event) {
|
||||
this._activateLoader(true);
|
||||
if (this.handler) {
|
||||
this.handler.validate();
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the WhitelabelMachineName Iframe handler and creates the iframe.
|
||||
* @private
|
||||
*/
|
||||
_getIframe() {
|
||||
const paymentMethodConfigurationId = this.paymentPanel.dataset.id;
|
||||
|
||||
if (!this.handler) {
|
||||
// IframeCheckoutHandler is expected to be global from the SDK script
|
||||
if (typeof window.IframeCheckoutHandler === 'function') {
|
||||
this.handler = window.IframeCheckoutHandler(paymentMethodConfigurationId);
|
||||
this.handler.setValidationCallback(this._validationCallBack.bind(this));
|
||||
this.handler.setInitializeCallback(this._hideLoader.bind(this));
|
||||
this.handler.setHeightChangeCallback((height) => {
|
||||
if (height < 1) {
|
||||
this.handler.submit();
|
||||
}
|
||||
});
|
||||
this.handler.create(this.iframeContainer);
|
||||
setTimeout(this._hideLoader.bind(this), 10000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback for iframe validation results.
|
||||
* @param {Object} validationResult
|
||||
* @private
|
||||
*/
|
||||
_validationCallBack(validationResult) {
|
||||
const statusInputs = document.querySelectorAll(this.options.payment_method_handler_status);
|
||||
if (validationResult.success) {
|
||||
statusInputs.forEach(input => {
|
||||
input.value = 'true';
|
||||
});
|
||||
this.handler.submit();
|
||||
} else {
|
||||
statusInputs.forEach(input => {
|
||||
input.value = 'false';
|
||||
});
|
||||
this._activateLoader(false);
|
||||
if (validationResult.errors) {
|
||||
this._showErrors(validationResult.errors);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Enables or disables buttons on the page to indicate loading.
|
||||
* @param {boolean} activate
|
||||
* @private
|
||||
*/
|
||||
_activateLoader(activate) {
|
||||
const buttons = document.querySelectorAll('button');
|
||||
buttons.forEach(button => {
|
||||
button.disabled = activate;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Hides the loader overlay once the iframe is ready.
|
||||
* @private
|
||||
*/
|
||||
_hideLoader() {
|
||||
const loader = document.getElementById(this.options.loader_id);
|
||||
if (loader && loader.parentNode) {
|
||||
loader.parentNode.removeChild(loader);
|
||||
}
|
||||
this._activateLoader(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays validation errors to the user.
|
||||
* @param {Array} errors
|
||||
* @private
|
||||
*/
|
||||
_showErrors(errors) {
|
||||
// Fallback to alert if no native Shopware mechanism is easily accessible here
|
||||
alert(errors.join('\n'));
|
||||
}
|
||||
}
|
||||
|
||||
export default VRPaymentCheckoutPlugin;
|
||||
@@ -13,7 +13,9 @@
|
||||
<import resource="./services/core/storefront/checkout.xml"/>
|
||||
|
||||
<import resource="./services/core/checkout.xml"/>
|
||||
<import resource="./services/core/checkout_services.xml"/>
|
||||
<import resource="./services/core/settings.xml"/>
|
||||
<import resource="./services/core/store_api.xml"/>
|
||||
<import resource="./services/core/util.xml"/>
|
||||
</imports>
|
||||
<services>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<service id="VRPaymentPayment\Core\Api\Refund\Controller\RefundController" public="true">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Refund\Service\RefundService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<call method="setLogger">
|
||||
<argument type="service" id="monolog.logger.vrpayment_payment"/>
|
||||
</call>
|
||||
|
||||
@@ -58,6 +58,8 @@
|
||||
<argument type="service" id="service_container"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Util\LocaleCodeProvider"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<!-- Cache for headless transaction persistence -->
|
||||
<argument type="service" id="cache.system"/>
|
||||
<call method="setLogger">
|
||||
<argument type="service" id="monolog.logger.vrpayment_payment"/>
|
||||
</call>
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
<?xml version="1.0" ?>
|
||||
|
||||
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://symfony.com/schema/dic/services"
|
||||
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
|
||||
|
||||
<services>
|
||||
<service id="VRPaymentPayment\Core\Checkout\Service\TransactionManagementService">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<!-- Cache for headless transaction persistence -->
|
||||
<argument type="service" id="cache.system"/>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\Service\PaymentMethodFilterService">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Util\PaymentMethodUtil"/>
|
||||
<argument type="service" id="payment_method.repository"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\TransactionManagementService"/>
|
||||
<argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
|
||||
<call method="setLogger">
|
||||
<argument type="service" id="monolog.logger.vrpayment_payment"/>
|
||||
</call>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\Service\PaymentIntegrationService">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\TransactionManagementService"/>
|
||||
<argument type="service" id="router"/>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\Service\CartRecoveryService">
|
||||
<argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
|
||||
<argument type="service" id="Shopware\Core\Checkout\Cart\LineItemFactoryRegistry"/>
|
||||
<argument type="service" id="order.repository"/>
|
||||
<argument type="service" id="Swag\CustomizedProducts\Core\Checkout\Cart\Route\AddCustomizedProductsToCartRoute" on-invalid="null"/>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\Service\InvoiceService">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
</service>
|
||||
</services>
|
||||
</container>
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" ?>
|
||||
|
||||
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://symfony.com/schema/dic/services"
|
||||
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
|
||||
|
||||
<services>
|
||||
<service id="VRPaymentPayment\Core\Checkout\PaymentMethod\SalesChannel\PaymentMethodRouteDecorator"
|
||||
decorates="Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRoute"
|
||||
decoration-inner-name="VRPaymentPayment\Core\Checkout\PaymentMethod\SalesChannel\PaymentMethodRouteDecorator.inner">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\PaymentMethod\SalesChannel\PaymentMethodRouteDecorator.inner"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\PaymentMethodFilterService"/>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\StoreApi\Route\WhitelabelMachineNameTransactionInfoRoute">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\PaymentIntegrationService"/>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\StoreApi\Route\CartRecoveryRoute">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\CartRecoveryService"/>
|
||||
</service>
|
||||
|
||||
<service id="VRPaymentPayment\Core\Checkout\StoreApi\Route\InvoiceRoute">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\InvoiceService"/>
|
||||
</service>
|
||||
</services>
|
||||
</container>
|
||||
@@ -7,9 +7,9 @@
|
||||
<services>
|
||||
<!-- Controllers -->
|
||||
<service id="VRPaymentPayment\Core\Storefront\Account\Controller\AccountOrderController" public="true">
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<argument type="service" id="Symfony\Component\HttpFoundation\RequestStack"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\InvoiceService"/>
|
||||
<call method="setLogger">
|
||||
<argument type="service" id="monolog.logger.vrpayment_payment"/>
|
||||
</call>
|
||||
|
||||
@@ -7,31 +7,25 @@
|
||||
<services>
|
||||
<!-- Controllers -->
|
||||
<service id="VRPaymentPayment\Core\Storefront\Checkout\Controller\CheckoutController" public="true">
|
||||
<argument type="service" id="Shopware\Core\Checkout\Cart\LineItemFactoryRegistry"/>
|
||||
<argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<argument type="service" id="Shopware\Storefront\Page\GenericPageLoader"/>
|
||||
<argument type="service" id="Shopware\Core\Checkout\Order\SalesChannel\OrderRoute"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\CartRecoveryService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Checkout\Service\PaymentIntegrationService"/>
|
||||
<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
|
||||
<call method="setLogger">
|
||||
<argument type="service" id="monolog.logger.vrpayment_payment"/>
|
||||
</call>
|
||||
<call method="setContainer">
|
||||
<argument type="service" id="service_container"/>
|
||||
</call>
|
||||
<!-- Removed in 6.7 -->
|
||||
<!-- <call method="setTwig">
|
||||
<argument type="service" id="twig"/>
|
||||
</call> -->
|
||||
</service>
|
||||
|
||||
<!-- Subscribers -->
|
||||
<service id="VRPaymentPayment\Core\Storefront\Checkout\Subscriber\CheckoutSubscriber">
|
||||
<argument id="VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService" type="service"/>
|
||||
<argument id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService" type="service"/>
|
||||
<argument id="VRPaymentPayment\Core\Settings\Service\SettingsService" type="service"/>
|
||||
<argument id="VRPaymentPayment\Core\Util\PaymentMethodUtil" type="service"/>
|
||||
<argument id="payment_method.repository" type="service"/>
|
||||
<argument id="VRPaymentPayment\Core\Checkout\Service\PaymentMethodFilterService" type="service"/>
|
||||
<argument id="VRPaymentPayment\Core\Checkout\Service\PaymentIntegrationService" type="service"/>
|
||||
<call method="setLogger">
|
||||
<argument type="service" id="monolog.logger.vrpayment_payment"/>
|
||||
</call>
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"base": "/bundles/vrpaymentpayment/administration/",
|
||||
"entryPoints": {
|
||||
"v-r-payment-payment": {
|
||||
"css": [
|
||||
"/bundles/vrpaymentpayment/administration/assets/v-r-payment-payment-D4AH6HY2.css"
|
||||
],
|
||||
"dynamic": [],
|
||||
"js": [
|
||||
"/bundles/vrpaymentpayment/administration/assets/v-r-payment-payment-BV391wJu.js"
|
||||
],
|
||||
"legacy": false,
|
||||
"preload": []
|
||||
}
|
||||
},
|
||||
"legacy": false,
|
||||
"metadatas": {},
|
||||
"version": [
|
||||
"7.1.0",
|
||||
7,
|
||||
1,
|
||||
0
|
||||
],
|
||||
"viteServer": null
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"main.js": {
|
||||
"file": "assets/v-r-payment-payment-BV391wJu.js",
|
||||
"name": "v-r-payment-payment",
|
||||
"src": "main.js",
|
||||
"isEntry": true,
|
||||
"css": [
|
||||
"assets/v-r-payment-payment-D4AH6HY2.css"
|
||||
]
|
||||
}
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.sw-order-detail .sw-tabs{margin-top:40px}.sw-order-detail .sw-order-detail-base .mt-card-view__content{overflow-x:visible;overflow-y:visible}.vrpayment-order-detail__data{display:grid}.vrpayment-order-detail__heading{padding-top:15px}
|
||||
@@ -0,0 +1,20 @@
|
||||
{% sw_extends '@Storefront/storefront/component/payment/payment-method.html.twig' %}
|
||||
|
||||
{% block component_payment_method_description %}
|
||||
{{ parent() }}
|
||||
|
||||
{# Check if the payment method handler belongs to WhitelabelMachineName #}
|
||||
{% if payment.handlerIdentifier == 'VRPaymentPayment\\Core\\Checkout\\PaymentHandler\\VRPaymentPaymentHandler' %}
|
||||
{# Retrieve the runtime-attached configuration from the extension #}
|
||||
{% set vrpConfig = payment.extensions.vrpayment_config %}
|
||||
|
||||
{% if vrpConfig %}
|
||||
{% set paymentMethodConfigurationId = vrpConfig.paymentMethodConfigurationId %}
|
||||
|
||||
{# Include the iframe container template #}
|
||||
{% sw_include '@VRPaymentPayment/storefront/component/payment/vrpayment_iframe.html.twig' with {
|
||||
'paymentMethodConfigurationId': paymentMethodConfigurationId
|
||||
} %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,10 @@
|
||||
<div id="vrpayment-payment-panel"
|
||||
class="vrpayment-payment-panel"
|
||||
data-vrpayment-checkout-plugin="true"
|
||||
data-id="{{ paymentMethodConfigurationId }}">
|
||||
<div id="vrpaymentLoader"><div></div></div>
|
||||
<input value="false" type="hidden" name="vrpayment_payment_handler_validation_status"
|
||||
form="confirmOrderForm">
|
||||
<div id="vrpayment-payment-iframe"
|
||||
class="vrpayment-payment-iframe"></div>
|
||||
</div>
|
||||
@@ -0,0 +1,26 @@
|
||||
{% sw_extends '@Storefront/storefront/page/checkout/confirm/index.html.twig' %}
|
||||
|
||||
{% block base_body_script %}
|
||||
{{ parent() }}
|
||||
|
||||
{# Provide WhitelabelMachineName integration data if available in page extensions #}
|
||||
{% if page.extensions.vRPaymentData %}
|
||||
{% set vrpData = page.extensions.vRPaymentData %}
|
||||
|
||||
{# Hidden inputs required by the JS components #}
|
||||
<input type="hidden" id="cartRecreateUrl" value="{{ vrpData.cartRecreateUrl }}" />
|
||||
<input type="hidden" id="checkoutUrl" value="{{ vrpData.checkoutUrl }}" />
|
||||
|
||||
{# Load WhitelabelMachineName SDK scripts #}
|
||||
{% if vrpData.deviceJavascriptUrl %}
|
||||
<script src="{{ vrpData.deviceJavascriptUrl }}" async="async"></script>
|
||||
{% endif %}
|
||||
{% if vrpData.javascriptUrl %}
|
||||
<script src="{{ vrpData.javascriptUrl }}"></script>
|
||||
{% endif %}
|
||||
|
||||
{# We don't need app.js if we use the modern plugin, but we might keep it for now if other pages depend on it.
|
||||
However, for the confirm page, the modern plugin registered in main.js will take over
|
||||
whenever it finds [data-vrpayment-checkout-plugin]. #}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user