From 5af304e9b0805a115f94ea641a0ca0b0547f260c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jib=C3=A9=20Barth?= <barth.jib@gmail.com>
Date: Fri, 5 May 2023 10:51:06 +0200
Subject: [PATCH 1/2] [UI] Remove default override of _payment to allow using
 ui event

---
 .../Order/Show/_payment.html.twig             | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig

diff --git a/templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig b/templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig
deleted file mode 100644
index 39165ed5f3..0000000000
--- a/templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig
+++ /dev/null
@@ -1,46 +0,0 @@
-{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %}
-{% import '@SyliusUi/Macro/labels.html.twig' as label %}
-
-<div class="item">
-    <div class="right floated content">
-        {% include '@SyliusAdmin/Common/Label/paymentState.html.twig' with {'data': payment.state} %}
-    </div>
-    <i class="large payment icon"></i>
-    <div class="content">
-        <div class="header">
-            {{ payment.method }}
-        </div>
-        <div class="description">
-            {{ money.format(payment.amount, payment.order.currencyCode) }}
-        </div>
-    </div>
-    {% if sm_can(payment, 'complete', 'sylius_payment') %}
-        <div class="ui segment">
-            <form action="{{ path('sylius_admin_order_payment_complete', {'orderId': order.id, 'id': payment.id}) }}" method="post" novalidate>
-                <input type="hidden" name="_csrf_token" value="{{ csrf_token(payment.id) }}" />
-                <input type="hidden" name="_method" value="PUT">
-                <button type="submit" class="ui icon labeled tiny blue fluid loadable button"><i class="check icon"></i> {{ 'sylius.ui.complete'|trans }}</button>
-            </form>
-        </div>
-    {% endif %}
-    {% if sm_can(payment, 'refund', 'sylius_payment') %}
-        <div class="ui segment">
-            <form action="{{ path('sylius_admin_order_payment_refund', {'orderId': order.id, 'id': payment.id}) }}" method="post" novalidate>
-                <input type="hidden" name="_csrf_token" value="{{ csrf_token(payment.id) }}" />
-                <input type="hidden" name="_method" value="PUT">
-                <button type="submit" class="ui icon labeled tiny yellow fluid loadable button"><i class="reply all icon"></i> {{ 'sylius.ui.refund'|trans }}</button>
-            </form>
-        </div>
-    {% endif %}
-    {% if
-        payment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and
-        payment.state == 'refunded'
-    %}
-        <div class="ui icon mini message">
-            <i class="paypal icon"></i>
-            <div class="content">
-                <p>{{ 'sylius.pay_pal.tender_type'|trans }}</p>
-            </div>
-        </div>
-    {% endif %}
-</div>

From 185eb482b41659d31e7190add84559d30db9f780 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Mon, 15 Apr 2024 13:58:27 +0200
Subject: [PATCH 2/2] Bump up PayPalPlugin to the newest patch

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2760a98b0d..1d1aaf64ef 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "sylius/paypal-plugin": "^1.5",
+        "sylius/paypal-plugin": "^1.5.2",
         "sylius/sylius": "^1.12.11",
         "symfony/dotenv": "^5.4 || ^6.4",
         "symfony/runtime": "^5.4 || ^6.4",