From d85597fe4ce53596327538c4c2e7f59a71831f09 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:27:22 +0000 Subject: [PATCH] Rename stripe cards controller --- .../split_checkout/payment/_stripe_sca.html.haml | 8 +++++--- ...ripe_controller.js => stripe_cards_controller.js} | 2 ++ ...oller_test.js => stripe_cards_controller_test.js} | 12 ++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) rename app/webpacker/controllers/{stripe_controller.js => stripe_cards_controller.js} (83%) rename spec/javascripts/stimulus/{stripe_controller_test.js => stripe_cards_controller_test.js} (75%) diff --git a/app/views/split_checkout/payment/_stripe_sca.html.haml b/app/views/split_checkout/payment/_stripe_sca.html.haml index 0931b81e64..db56c50faa 100644 --- a/app/views/split_checkout/payment/_stripe_sca.html.haml +++ b/app/views/split_checkout/payment/_stripe_sca.html.haml @@ -3,14 +3,16 @@ :javascript angular.module('Darkswarm').value("stripeObject", Stripe("#{Stripe.publishable_key}")) -%div{"data-controller": "stripe"} +%div{"data-controller": "stripe-cards"} - if @saved_credit_cards.length > 0 .checkout-input %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), { "data-action": "change->stripe#onSelectCard", "data-stripe-target": "select" } + = 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), + { "data-action": "change->stripe-cards#onSelectCard", "data-stripe-cards-target": "select" } - .checkout-input{"data-stripe-target": "stripeelements"} + .checkout-input{"data-stripe-cards-target": "stripeelements"} - if @saved_credit_cards.length == 0 %label = t('split_checkout.step2.form.stripe.use_new_card') diff --git a/app/webpacker/controllers/stripe_controller.js b/app/webpacker/controllers/stripe_cards_controller.js similarity index 83% rename from app/webpacker/controllers/stripe_controller.js rename to app/webpacker/controllers/stripe_cards_controller.js index 0d388ee991..03eb1ef4ec 100644 --- a/app/webpacker/controllers/stripe_controller.js +++ b/app/webpacker/controllers/stripe_cards_controller.js @@ -1,5 +1,7 @@ import { Controller } from "stimulus"; +// Handles form elements for selecting previously saved Stripe cards from a list of cards + export default class extends Controller { static targets = ["stripeelements", "select"]; diff --git a/spec/javascripts/stimulus/stripe_controller_test.js b/spec/javascripts/stimulus/stripe_cards_controller_test.js similarity index 75% rename from spec/javascripts/stimulus/stripe_controller_test.js rename to spec/javascripts/stimulus/stripe_cards_controller_test.js index d3cd70833f..98b590861a 100644 --- a/spec/javascripts/stimulus/stripe_controller_test.js +++ b/spec/javascripts/stimulus/stripe_cards_controller_test.js @@ -3,21 +3,21 @@ */ import { Application } from "stimulus"; -import stripe_controller from "../../../app/webpacker/controllers/stripe_controller"; +import stripe_cards_controller from "../../../app/webpacker/controllers/stripe_cards_controller"; -describe("StripeController", () => { +describe("StripeCardsController", () => { beforeEach(() => { - document.body.innerHTML = `
- -
+
`; const application = Application.start(); - application.register("stripe", stripe_controller); + application.register("stripe-cards", stripe_cards_controller); }); describe("#connect", () => { it("initialize with the right display state", () => {