Merge pull request #52 from subscribepro/7-billing-address-is-not-saved

Support saving billing address attached directly to subscription
subscribepro · Dec 5, 2023 · 86f5bed · 86f5bed
2 parents cfb5509 + 83e6dfe
commit 86f5bed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/SubscribePro/Service/Subscription/Subscription.php b/src/SubscribePro/Service/Subscription/Subscription.php
@@ -133,6 +133,10 @@ public function getFormData()
             $formData[self::SHIPPING_ADDRESS] = $this->getShippingAddress()->getAsChildFormData($this->isNew());
         }
 
+        if ($this->getBillingAddress() instanceof AddressInterface) {
+            $formData[self::BILLING_ADDRESS] = $this->getBillingAddress()->getAsChildFormData($this->isNew());
+        }
+
         if (!empty($formData[self::SHIPPING_ADDRESS_ID])) {
             unset($formData[self::SHIPPING_ADDRESS]);
         } else {

diff --git a/src/SubscribePro/Service/Subscription/SubscriptionFactory.php b/src/SubscribePro/Service/Subscription/SubscriptionFactory.php
@@ -53,6 +53,9 @@ public function create(array $data = [])
         $addressData = $this->getFieldData($data, SubscriptionInterface::SHIPPING_ADDRESS);
         $data[SubscriptionInterface::SHIPPING_ADDRESS] = $this->addressFactory->create($addressData);
 
+        $addressData = $this->getFieldData($data, SubscriptionInterface::BILLING_ADDRESS);
+        $data[SubscriptionInterface::BILLING_ADDRESS] = $this->addressFactory->create($addressData);
+
         $paymentProfileData = $this->getFieldData($data, SubscriptionInterface::PAYMENT_PROFILE);
         $data[SubscriptionInterface::PAYMENT_PROFILE] = $this->paymentProfileFactory->create($paymentProfileData);