From ce7fb1b4dc84ba7f7e637b136283c348c6bd45e6 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 30 Nov 2021 13:35:39 +0000
Subject: [PATCH] Move select-options-formatting logic to helper

---
 app/helpers/checkout_helper.rb                         | 9 +++++++++
 app/views/split_checkout/payment/_stripe_sca.html.haml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/helpers/checkout_helper.rb b/app/helpers/checkout_helper.rb
index c5b22b4784..780c27c595 100644
--- a/app/helpers/checkout_helper.rb
+++ b/app/helpers/checkout_helper.rb
@@ -143,4 +143,13 @@ module CheckoutHelper
   def checkout_step?(step)
     checkout_step == step.to_s
   end
+
+  def stripe_card_options(cards)
+    cards.map do |cc|
+      [
+        "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:#{cc.month.to_s.rjust(2, '0')}/#{cc.year}",
+        cc.id
+      ]
+    end
+  end
 end
diff --git a/app/views/split_checkout/payment/_stripe_sca.html.haml b/app/views/split_checkout/payment/_stripe_sca.html.haml
index db56c50faa..6b1715d215 100644
--- a/app/views/split_checkout/payment/_stripe_sca.html.haml
+++ b/app/views/split_checkout/payment/_stripe_sca.html.haml
@@ -9,7 +9,7 @@
       %label
         = t('split_checkout.step2.form.stripe.use_saved_card')
       = select_tag :card,
-        options_for_select(@saved_credit_cards.map {|cc| [ "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:#{cc.month.to_s.rjust(2, '0')}/#{cc.year}", cc.id ] } + [[t('split_checkout.step2.form.stripe.create_new_card'), ""]], @selected_card),
+        options_for_select(stripe_card_options(@saved_credit_cards) + [[t('split_checkout.step2.form.stripe.create_new_card'), ""]], @selected_card),
         { "data-action": "change->stripe-cards#onSelectCard", "data-stripe-cards-target": "select" }
 
   .checkout-input{"data-stripe-cards-target": "stripeelements"}