effective_memberships 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c86611361e96c3285e00fde6075fcffa29463c30a7dd2b50eaec13b9932874
-  data.tar.gz: faaa7786c43295547b10febc3c6f55b1e4041235d693f6f7e02094c22780f5af
+  metadata.gz: 4b47c4f81099d5e4078814e9f04765ae8b2790ac3fe19ff0a0f5442e9e5f6475
+  data.tar.gz: 727b05c16923003822a9383d3cd3b8f582655cae1e769df98de0245bdd0dedd7
 SHA512:
-  metadata.gz: b9c66aaa1fe570f885d5b36b83f733cf15f8b4d3e2a1968d5bd4db197cbddd33a91247405a60fde9ab5dbde210de04119d3f51594baf09946a7ebdcc8c29029d
-  data.tar.gz: 3b36dee1f865804437f63415680c49c131b9ee94a4ae7f8e31e2df789268ae413e43ea8db3ea8c8548e352a63cf33273b508832dcd1eb476ae877c19c8bcdc50
+  metadata.gz: fc8454e6c624109974f4f6bbcb65a92a892a9a19ed72565fdc53414017d03a30de766b1609fff6b4dca89a3f93c8800502ba4841032860bf3733fedc9b01da56
+  data.tar.gz: 0db5f5f98ea6271c36fd09c2cd32a3f757ef55ca7cda4f2be130e12f0162aaa6474993062247ef02cdca3dfb1da4df1cc54dc5a3e32f91cf49c412a351de30db

data/app/controllers/effective/fee_payments_controller.rb

@@ -16,6 +16,10 @@ module Effective
       end
     end
 
+    after_save do
+      flash.now[:success] = ''
+    end
+
     private
 
     def permitted_params

data/app/models/concerns/effective_memberships_applicant.rb

@@ -453,12 +453,17 @@ module EffectiveMembershipsApplicant
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner)
+    fees = submit_fees()
 
     # Adds fees, but does not overwrite any existing price.
-    submit_fees.each do |fee|
+    fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)
     end
 
+    order.purchasables.each do |purchasable|
+      order.remove(purchasable) unless fees.include?(purchasable)
+    end
+
     # From Billing Step
     order.billing_address = owner.billing_address if owner.billing_address.present?
 

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -205,17 +205,22 @@ module EffectiveMembershipsFeePayment
 
   # We take over the owner's outstanding fees.
   def find_or_build_submit_fees
-    Array(outstanding_fees).each { |fee| fees << fee }
+    Array(outstanding_fees).each { |fee| fees << fee unless fees.include?(fee) }
     submit_fees
   end
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner)
+    fees = submit_fees()
 
-    submit_fees.each do |fee|
+    fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)
     end
 
+    order.purchasables.each do |purchasable|
+      order.remove(purchasable) unless fees.include?(purchasable)
+    end
+
     order.billing_address = owner.billing_address if owner.billing_address.present?
 
     order

data/app/models/concerns/effective_memberships_owner.rb

@@ -177,6 +177,8 @@ module EffectiveMembershipsOwner
       late_on: nil,
       bad_standing_on: nil
     )
+
+    fee
   end
 
   def build_renewal_fee(category:, period:, late_on:, bad_standing_on:)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Code and Effect