From a631d057f14d4309e00fefcb2cb9e4e266a45889 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:38:35 +0100
Subject: [PATCH] Update payment methods form

---
 app/controllers/split_checkout_controller.rb | 3 ++-
 app/views/split_checkout/_payment.html.haml  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb
index 6a7435c8aa..47b8728a76 100644
--- a/app/controllers/split_checkout_controller.rb
+++ b/app/controllers/split_checkout_controller.rb
@@ -81,7 +81,8 @@ class SplitCheckoutController < ::BaseController
     params.require(:order).permit(
       :email, :shipping_method_id, :special_instructions,
       bill_address_attributes: PermittedAttributes::Address.attributes,
-      ship_address_attributes: PermittedAttributes::Address.attributes
+      ship_address_attributes: PermittedAttributes::Address.attributes,
+      payments_attributes: [:payment_method_id]
     )
   end
 
diff --git a/app/views/split_checkout/_payment.html.haml b/app/views/split_checkout/_payment.html.haml
index fbf8df3e0c..d9c6b9d8a6 100644
--- a/app/views/split_checkout/_payment.html.haml
+++ b/app/views/split_checkout/_payment.html.haml
@@ -1,11 +1,14 @@
-%div.checkout-substep{"data": {"controller": "paymentmethod"}}
+%div.checkout-substep{"data-controller": "paymentmethod"}
   %div.checkout-title
     = t("split_checkout.step2.payment_method.title")
+  - selected_payment_method = @order.payments&.with_state(:checkout)&.first&.payment_method_id
   - available_payment_methods.each do |payment_method| 
     %div.checkout-input
       = f.radio_button :payment_method_id, payment_method.id,
         name: "order[payments_attributes][][payment_method_id]",
         id: "payment_method_#{payment_method.id}",
+        name: "order[payments_attributes][][payment_method_id]",
+        checked: (payment_method.id == selected_payment_method),
         "data-action": "paymentmethod#selectPaymentMethod",
         "data-paymentmethod-description": "#{payment_method.description}"
       = f.label payment_method.id, "#{payment_method.name} (#{payment_method_price(payment_method, @order)})", {for: "payment_method_" + payment_method.id.to_s }