Store payment method and source on subscriptions

This allows each subscription to have its own payment method and
source. It also allows having subscriptions with payment methods
that aren't credit cards, which is useful if you want e.g. to allow
users to pay by check/wire transfer.

1 files changed, 10 insertions, 6 deletions

diff --git a/app/services/solidus_subscriptions/checkout.rb b/app/services/solidus_subscriptions/checkout.rb
index cd66406..3457435 100644
--- a/app/services/solidus_subscriptions/checkout.rb
+++ b/app/services/solidus_subscriptions/checkout.rb
@@ -116,22 +116,26 @@ module SolidusSubscriptions
     end
 
     def ship_address
-      subscription.shipping_address || user.ship_address
+      subscription.shipping_address_to_use
     end
 
     def bill_address
-      subscription.billing_address || user.bill_address
+      subscription.billing_address_to_use
     end
 
-    def active_card
-      user.wallet.default_wallet_payment_source.payment_source
+    def payment_source
+      subscription.payment_source_to_use
+    end
+
+    def payment_method
+      subscription.payment_method_to_use
     end
 
     def create_payment
       order.payments.create(
-        source: active_card,
+        source: payment_source,
         amount: order.total,
-        payment_method: active_card.payment_method,
+        payment_method: payment_method,
       )
     end