Nonprofit and cards references

app/legacy_lib/insert_card.rb

@@ -4,7 +4,7 @@ module InsertCard
   # If a stripe_customer_id is present, then update that customer's primary source; otherwise create a new customer
   # @param [ActiveSupport::HashWithIndifferentAccess] card_data card data
   # @option card_data [Integer] holder_id the primary key of the card's holder
-  # @option card_data [String] holder_type the type of the card holder. Must be 'Nonprofit' or 'Supporter'
+  # @option card_data [String] holder_type the type of the card holder. Must be'Supporter'
 
   # @option card_data [String] stripe_card_token the card token from stripe
   # @option card_data [String] stripe_card_id the card id from stripe
@@ -18,7 +18,7 @@ module InsertCard
   def self.with_stripe(card_data, stripe_account_id = nil, event_id = nil, current_user = nil)
     begin
       ParamValidation.new(card_data.to_deprecated_h.merge({event_id: event_id}), {
-        holder_type: {required: true, included_in: ["Nonprofit", "Supporter"]},
+        holder_type: {required: true, included_in: [ "Supporter"]},
         holder_id: {required: true},
         stripe_card_id: {not_blank: true, required: true},
         stripe_card_token: {not_blank: true, required: true},
@@ -32,15 +32,12 @@ def self.with_stripe(card_data, stripe_account_id = nil, event_id = nil, current
     # validate that the user is with the correct nonprofit
 
     card_data = card_data.slice(:holder_type, :holder_id, :stripe_card_id, :stripe_card_token, :name)
-    holder_types = {"Nonprofit" => :nonprofit, "Supporter" => :supporter}
+    holder_types = { "Supporter" => :supporter}
     holder_type = holder_types[card_data[:holder_type]]
     holder = nil
     begin
-      if holder_type == :nonprofit
-        holder = Nonprofit.select("id, email").includes(:cards).find(card_data[:holder_id])
-      elsif holder_type == :supporter
-        holder = Supporter.select("id, email, nonprofit_id").includes(:cards, :nonprofit).find(card_data[:holder_id])
-      end
+      holder_type == :supporter
+      holder = Supporter.select("id, email, nonprofit_id").includes(:cards, :nonprofit).find(card_data[:holder_id])
     rescue ActiveRecord::RecordNotFound
       return {json: {error: "Sorry, you need to provide a nonprofit or supporter"}, status: :unprocessable_entity}
     end
@@ -86,18 +83,14 @@ def self.with_stripe(card_data, stripe_account_id = nil, event_id = nil, current
     source_token = nil
     begin
       Card.transaction {
-        if holder_type == :nonprofit
-          # @type [Nonprofit] holder
-          card = holder.create_active_card(card_data)
-        elsif holder_type == :supporter
+        holder_type == :supporter
           # @type [Supporter] holder
           card = holder.cards.create(card_data)
           params = {}
           if event
             params[:event] = event
           end
           source_token = InsertSourceToken.create_record(card, params).token
-        end
         card.save!
       }
     rescue ActiveRecord::ActiveRecordError => e

app/mailers/billing_subscription_mailer.rb

@@ -3,7 +3,6 @@ class BillingSubscriptionMailer < BaseMailer
   def failed_notice(np_id)
     @nonprofit = Nonprofit.find(np_id)
     @billing_subscription = @nonprofit.billing_subscription
-    @card = @nonprofit.active_card
     @billing_plan = @billing_subscription.billing_plan
     @emails = QueryUsers.all_nonprofit_user_emails(@nonprofit.id)
     mail(to: @emails, subject: "Action Needed, Please Update Your #{Settings.general.name} Account")

app/models/card.rb

@@ -9,13 +9,11 @@ class Card < ApplicationRecord
     :stripe_card_token, # str
     :stripe_card_id, # str
     :stripe_customer_id, # str
-    :holder, :holder_id, :holder_type, # polymorphic cardholder association
-    :inactive # a card is inactive. This is currently only meaningful for nonprofit cards
-
-  scope :amex_only,	-> { where("cards.name ILIKE ? OR cards.name ILIKE ?", "American Express%", "amex%") }
+    :holder, :holder_id, :holder_type # polymorphic cardholder association
+
+  scope :amex_only, -> { where("cards.name ILIKE ? OR cards.name ILIKE ?", "American Express%", "amex%") }
   scope :not_amex, -> { where("cards.name NOT ILIKE ? AND cards.name NOT ILIKE ?", "American Express%", "amex%") }
 
-  scope :held_by_nonprofits, -> { where("cards.holder_type = ? ", "Nonprofit") }
   scope :held_by_supporters, -> { where("cards.holder_type = ? ", "Supporter") }
 
   attr_accessor :failure_message

app/models/nonprofit.rb

@@ -143,7 +143,6 @@ def for_export_enumerable(query, chunk_limit = 15000)
   has_many :activities, as: :host, dependent: :destroy
   has_many :imports
   has_many :email_settings
-  has_many :cards, as: :holder
   has_many :supporter_cards, through: :supporters, source: :cards, class_name: "Card"
   has_many :periodic_reports
   has_many :export_formats
@@ -269,33 +268,6 @@ def can_process_charge?
       !nonprofit_deactivation&.deactivated)
   end
 
-  def active_cards
-    cards.where("COALESCE(cards.inactive, FALSE) = FALSE")
-  end
-
-  # @param [Card] card the new active_card
-  def active_card=(card)
-    unless card.class == Card
-      raise ArgumentError.new "Pass a card to active_card or else"
-    end
-    Card.transaction do
-      active_cards.update_all inactive: true
-      return cards << card
-    end
-  end
-
-  def active_card
-    active_cards.first
-  end
-
-  def create_active_card(card_data)
-    if card_data[:inactive]
-      raise ArgumentError.new "This method is for creating active cards only"
-    end
-    active_cards.update_all inactive: true
-    cards.create(card_data)
-  end
-
   def currency_symbol
     Settings.intntl.all_currencies.find { |i| i.abbv.downcase == currency.downcase }&.symbol
   end

app/views/settings/_pricing.html.erb

@@ -15,13 +15,8 @@
     <p><a class='u-color--red u-small' href='/nonprofits/<%=@nonprofit.id%>/billing_subscription/cancellation'>Unsubscribe from plan</a></p>
   <% end %>
 
-	<% if @nonprofit.active_card %>
-		<hr>
-		<label>Payment Method</label>
-		<p>Current payment method for your nonprofit:
-			<strong><%= @nonprofit.active_card.name %></strong>
-		</p>
-	<% end %>
+	<hr>
+	<label>Payment Method</label>		
 
 	<p class='note u-marginTop--10'>If you have any questions about your current plan, please contact <a href='mailto:<%= Settings.devise.mailer_sender %>'><%= Settings.devise.mailer_sender %></a></p>
 </div>

spec/factories/nonprofits.rb

@@ -10,14 +10,6 @@
     billing_subscription { build(:billing_subscription, billing_plan: build(:billing_plan_percentage_fee_of_2_5_percent_and_5_cents_flat)) }
     vetted { true }
 
-    factory :nonprofit_with_cards do
-      after(:create) { |nonprofit, evaluator|
-        create(:active_card_1, holder: nonprofit)
-        create(:active_card_2, holder: nonprofit)
-        create(:inactive_card, holder: nonprofit)
-      }
-    end
-
     factory :nonprofit_with_billing_plan_percentage_fee_of_2_5_percent_and_5_cents_flat do
     end
 

spec/factory_specs/nonprofits_spec.rb

@@ -1,25 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 require "rails_helper"
 describe "nonprofits factory" do
-  describe :with_billing_subscription_on_stripe do
-    it "creates one Nonprofit" do
-      create(:nonprofit_base, :with_billing_subscription_on_stripe)
-      expect(Nonprofit.count).to eq 1
-    end
-
-    it "creates one BillingSubscription" do
-      create(:nonprofit_base, :with_billing_subscription_on_stripe)
-      expect(BillingSubscription.count).to eq 1
-    end
-
-    it "creates 1 BillingPlan" do
-      create(:nonprofit_base, :with_billing_subscription_on_stripe)
-      expect(BillingPlan.count).to eq 1
-    end
-
-    it "creates 1 Card" do
-      create(:nonprofit_base, :with_billing_subscription_on_stripe)
-      expect(Card.count).to eq 1
-    end
-  end
 end

spec/factory_specs/nonprofits_specs.rb

@@ -1,10 +1,4 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 require "rails_helper"
 describe "nonprofits factory" do
-  describe :with_billing_subscription_on_stripe do
-    it {
-      nonprofit = create(:nonprofit_base, :with_billing_subscription_on_stripe)
-      expect(nonprofit).to have_attributes(attributes_for(:nonprofit_base, :with_billing_subscription_on_stripe))
-    }
-  end
 end