From 8c9c28eb484ad6c560fa4ed2bde0cbabd7690220 Mon Sep 17 00:00:00 2001
From: Peter Ukena <peter.ukena@brille24.de>
Date: Mon, 26 Nov 2018 17:23:50 +0100
Subject: [PATCH 1/3] Smaller style and code fixes

---
 .../preselecting_refund_payment_method_based_on_order.feature | 2 +-
 src/Resources/config/doctrine/CreditMemo.orm.xml              | 4 ++--
 src/Resources/config/doctrine/CreditMemoSequence.orm.xml      | 4 ++--
 src/Resources/config/doctrine/Refund.orm.xml                  | 2 +-
 src/Resources/config/doctrine/RefundPayment.orm.xml           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/preselecting_refund_payment_method_based_on_order.feature b/features/preselecting_refund_payment_method_based_on_order.feature
index 43a8ac3c..60d65506 100644
--- a/features/preselecting_refund_payment_method_based_on_order.feature
+++ b/features/preselecting_refund_payment_method_based_on_order.feature
@@ -18,4 +18,4 @@ Feature: Preselecting refund payment method based on order's payment
     @ui
     Scenario: When refunding, the selected payment should be the first one of the corresponding order
         When I want to refund some units of order "#00000022"
-        Then the selected refund payment method should be "Space money"
\ No newline at end of file
+        Then the selected refund payment method should be "Space money"
diff --git a/src/Resources/config/doctrine/CreditMemo.orm.xml b/src/Resources/config/doctrine/CreditMemo.orm.xml
index 7fe862ff..1cc0be3c 100644
--- a/src/Resources/config/doctrine/CreditMemo.orm.xml
+++ b/src/Resources/config/doctrine/CreditMemo.orm.xml
@@ -7,7 +7,7 @@
                             http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
 >
 
-    <entity name="Sylius\RefundPlugin\Entity\CreditMemo" table="sylius_refund_credit_memo">
+    <mapped-superclass name="Sylius\RefundPlugin\Entity\CreditMemo" table="sylius_refund_credit_memo">
         <id name="id" column="id" type="string" />
 
         <field name="number" />
@@ -26,5 +26,5 @@
         <indexes>
             <index columns="orderNumber" />
         </indexes>
-    </entity>
+    </mapped-superclass>
 </doctrine-mapping>
diff --git a/src/Resources/config/doctrine/CreditMemoSequence.orm.xml b/src/Resources/config/doctrine/CreditMemoSequence.orm.xml
index cafe8f5b..1ebf4892 100644
--- a/src/Resources/config/doctrine/CreditMemoSequence.orm.xml
+++ b/src/Resources/config/doctrine/CreditMemoSequence.orm.xml
@@ -5,12 +5,12 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                                       http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Sylius\RefundPlugin\Entity\CreditMemoSequence" table="sylius_refund_credit_memo_sequence">
+    <mapped-superclass name="Sylius\RefundPlugin\Entity\CreditMemoSequence" table="sylius_refund_credit_memo_sequence">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
         <field name="index" column="idx" type="integer" />
         <field name="version" type="integer" version="true" />
-    </entity>
+    </mapped-superclass>
 
 </doctrine-mapping>
diff --git a/src/Resources/config/doctrine/Refund.orm.xml b/src/Resources/config/doctrine/Refund.orm.xml
index bcf195f4..151507a8 100644
--- a/src/Resources/config/doctrine/Refund.orm.xml
+++ b/src/Resources/config/doctrine/Refund.orm.xml
@@ -7,7 +7,7 @@
                             http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
 >
 
-    <entity name="Sylius\RefundPlugin\Entity\Refund" table="sylius_refund_refund">
+    <mapped-superclass name="Sylius\RefundPlugin\Entity\Refund" table="sylius_refund_refund">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/src/Resources/config/doctrine/RefundPayment.orm.xml b/src/Resources/config/doctrine/RefundPayment.orm.xml
index c5c80836..f040fcd8 100644
--- a/src/Resources/config/doctrine/RefundPayment.orm.xml
+++ b/src/Resources/config/doctrine/RefundPayment.orm.xml
@@ -7,7 +7,7 @@
                             http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
 >
 
-    <entity name="Sylius\RefundPlugin\Entity\RefundPayment" table="sylius_refund_payment">
+    <mapped-superclass name="Sylius\RefundPlugin\Entity\RefundPayment" table="sylius_refund_payment">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
@@ -20,6 +20,6 @@
         <many-to-one field="paymentMethod" target-entity="Sylius\Component\Payment\Model\PaymentMethodInterface">
             <join-column name="payment_method_id" referenced-column-name="id" nullable="true" />
         </many-to-one>
-    </entity>
+    </mapped-superclass>
 
 </doctrine-mapping>

From c081e0ffe033f287a662182f37dd7297e3804924 Mon Sep 17 00:00:00 2001
From: Kamil Kokot <kamil@kokot.me>
Date: Fri, 7 Jun 2019 20:09:06 +0800
Subject: [PATCH 2/3] Update the PR and use ResourceBundle ^1.6.0-RC.2

---
 composer.json                                | 1 +
 src/Resources/config/doctrine/Refund.orm.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bfc50a7d..3254ae98 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "php": "^7.2",
         "knplabs/knp-snappy-bundle": "^1.5",
         "myclabs/php-enum": "^1.7",
+        "sylius/resource-bundle": "^1.6.0-RC.2",
         "sylius/sylius": "^1.4",
         "symfony/messenger": "~4.3.0"
     },
diff --git a/src/Resources/config/doctrine/Refund.orm.xml b/src/Resources/config/doctrine/Refund.orm.xml
index 151507a8..24ad4bef 100644
--- a/src/Resources/config/doctrine/Refund.orm.xml
+++ b/src/Resources/config/doctrine/Refund.orm.xml
@@ -16,6 +16,6 @@
         <field name="amount" type="integer" />
         <field name="refundedUnitId" type="integer" nullable="true" column="refunded_unit_id"/>
         <field name="type" type="sylius_refund_refund_type" />
-    </entity>
+    </mapped-superclass>
 
 </doctrine-mapping>

From d8da4df722fd8f0f98256eec4e40a0f2c16a2593 Mon Sep 17 00:00:00 2001
From: Mateusz Zalewski <zaleslaw@gmail.com>
Date: Mon, 10 Jun 2019 09:31:38 +0200
Subject: [PATCH 3/3] Make CreditMemoSequence entity again

---
 src/Resources/config/doctrine/CreditMemoSequence.orm.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/config/doctrine/CreditMemoSequence.orm.xml b/src/Resources/config/doctrine/CreditMemoSequence.orm.xml
index 1ebf4892..cafe8f5b 100644
--- a/src/Resources/config/doctrine/CreditMemoSequence.orm.xml
+++ b/src/Resources/config/doctrine/CreditMemoSequence.orm.xml
@@ -5,12 +5,12 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                                       http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <mapped-superclass name="Sylius\RefundPlugin\Entity\CreditMemoSequence" table="sylius_refund_credit_memo_sequence">
+    <entity name="Sylius\RefundPlugin\Entity\CreditMemoSequence" table="sylius_refund_credit_memo_sequence">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
         <field name="index" column="idx" type="integer" />
         <field name="version" type="integer" version="true" />
-    </mapped-superclass>
+    </entity>
 
 </doctrine-mapping>