effective_memberships 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcda6f904900bdb868f397b966b91246eb5199ccb40e2fd0ff585fe1a40a5c2d
-  data.tar.gz: 496de8f40e138891794d41f6ce816941638ace3701dbfd40e111f39c4e5aaa4a
+  metadata.gz: '094156a30bcf510cbd5c6023d496887f8b2b3d254ce4e1f540517648867b5e65'
+  data.tar.gz: bb3c32887f6a0765ea0f4ac5fd462a9f597138343b4f1f6ef6147ea4cd0c4054
 SHA512:
-  metadata.gz: 5bc4751c68972b32b0e851d42a837bfeacacf73291aa128871836fe339d339c56ef26f8cd78badb8b12bf2ad41ea0487b232d30b0fa71e0d2e955a7c2a2e8543
-  data.tar.gz: 8bdb806fe84d1c1034b6fa620a92268e6cf1c220f2679d58be9d705971501230a87af5a4a1d38e5bd7bd6f94f1a4638a464e15ce4937938f9269d10f404b189c
+  metadata.gz: 4b5f000b750d32d0ba69944fe926426144988e3dfd9f430e9a32afaffc205d4d3b71157ebdca9ceaf130ec3d966fd97c695e4137cf4ef10770e48d15b6058127
+  data.tar.gz: 5ac39c63eea4e9a46e989fefeaf21c5b2119c84d06fdb7d8c2a6dabcab331c89f5b9b6a06560cfb76d7e19ad8a3985e3c4d3017a79cf05e96d22d1289c28e525

data/app/models/concerns/effective_memberships_registrar.rb

@@ -96,7 +96,9 @@ module EffectiveMembershipsRegistrar
 
     if changed
       membership.registration_on = date # Always new registration_on
-      save!(owner, date: date)
+
+      owner.build_membership_history(start_on: date)
+      owner.save!
     end
 
     # Assign member role
@@ -153,7 +155,8 @@ module EffectiveMembershipsRegistrar
     add_member_role(owner)
 
     # Save owner
-    save!(owner, date: date)
+    owner.build_membership_history(start_on: date)
+    owner.save!
   end
 
   def reclassify!(owner, to:, status: nil, date: nil, skip_fees: false)
@@ -198,7 +201,9 @@ module EffectiveMembershipsRegistrar
       end
     end
 
-    save!(owner, date: date)
+    # Save owner
+    owner.build_membership_history(start_on: date)
+    owner.save!
   end
 
   def reinstate!(owner, to: nil, date: nil, skip_fees: false)
@@ -254,7 +259,8 @@ module EffectiveMembershipsRegistrar
     add_member_role(owner)
 
     # Save owner
-    save!(owner, date: date)
+    owner.build_membership_history(start_on: date)
+    owner.save!
   end
 
   def status_clear!(owner, date: nil)
@@ -302,7 +308,9 @@ module EffectiveMembershipsRegistrar
     changed = membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }
 
     if changed
-      save!(owner, date: date, notes: notes)
+      # Save owner
+      owner.build_membership_history(start_on: date, notes: notes)
+      owner.save!
     end
 
     true
@@ -552,9 +560,4 @@ module EffectiveMembershipsRegistrar
     true
   end
 
-  def save!(owner, date: Time.zone.now, notes: nil)
-    owner.build_membership_history(start_on: date, notes: notes)
-    owner.save!
-  end
-
 end

data/app/views/effective/applicants/_owner.html.haml

@@ -0,0 +1,3 @@
+= applicant.owner.to_s
+%br
+= mail_to(applicant.owner.email)

data/app/views/effective/applicants/_summary.html.haml

@@ -3,9 +3,7 @@
     %tr
       %th.border-0 Applicant
       %td.border-0
-        = applicant.owner.to_s
-        %br
-        = mail_to(applicant.owner.email)
+        = render('effective/applicants/owner', applicant: applicant, owner: applicant.owner)
 
     - if request.path.start_with?('/admin')
       %tr

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -435,6 +435,7 @@ files:
 - app/views/effective/applicants/_missing_info.html.haml
 - app/views/effective/applicants/_orders.html.haml
 - app/views/effective/applicants/_organization.html.haml
+- app/views/effective/applicants/_owner.html.haml
 - app/views/effective/applicants/_references.html.haml
 - app/views/effective/applicants/_reinstatement.html.haml
 - app/views/effective/applicants/_select.html.haml