Fix SubscriptionOrderCloner in ORM 3

Author: GSadee

src/Cloner/SubscriptionOrderCloner.php

@@ -24,6 +24,7 @@
 use Sylius\MolliePlugin\Entity\OrderInterface;
 use Sylius\MolliePlugin\Model\AdjustmentInterface;
 use Webmozart\Assert\Assert;
+use Sylius\Component\Core\Model\AddressInterface;
 
 final class SubscriptionOrderCloner implements SubscriptionOrderClonerInterface
 {
@@ -67,10 +68,14 @@ public function clone(
         $clonedOrder->setPaymentState(OrderPaymentStates::STATE_AWAITING_PAYMENT);
         $clonedOrder->setPromotionCoupon($order->getPromotionCoupon());
 
-        Assert::notNull($order->getShippingAddress());
+        $shippingAddress = $order->getShippingAddress();
+        Assert::notNull($shippingAddress);
+        $clonedOrder->setShippingAddress($this->hydrateAndClone($shippingAddress));
+
+        $billingAddress = $order->getBillingAddress();
         Assert::notNull($order->getBillingAddress());
-        $clonedOrder->setShippingAddress(clone $order->getShippingAddress());
-        $clonedOrder->setBillingAddress(clone $order->getBillingAddress());
+        $clonedOrder->setBillingAddress($this->hydrateAndClone($billingAddress));
+
         $clonedOrder->setShippingState(OrderShippingStates::STATE_READY);
         $clonedOrder->setTokenValue($this->randomnessGenerator->generateUriSafeString(10));
 
@@ -113,4 +118,22 @@ public function clone(
 
         return $clonedOrder;
     }
+
+    /** Hydrates the proxy data of the address before cloning it */
+    private function hydrateAndClone(AddressInterface $address): AddressInterface
+    {
+        $address->getFirstName();
+        $address->getLastName();
+        $address->getCompany();
+        $address->getStreet();
+        $address->getCity();
+        $address->getPostcode();
+        $address->getCountryCode();
+        $address->getProvinceCode();
+        $address->getProvinceName();
+        $address->getPhoneNumber();
+        $address->getCustomer();
+
+        return clone $address;
+    }
 }

src/Subscription/Processor/SubscriptionProcessor.php

@@ -80,9 +80,7 @@ private function process(MollieSubscriptionInterface $subscription): PaymentInte
             $subscription->getSubscriptionConfiguration(),
             $clonedOrder,
         );
-        $payment->setDetails(
-            $details,
-        );
+        $payment->setDetails($details);
         $clonedOrder->addPayment($payment);
         $this->orderRepository->add($clonedOrder);