effective_memberships 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcda6f904900bdb868f397b966b91246eb5199ccb40e2fd0ff585fe1a40a5c2d
-  data.tar.gz: 496de8f40e138891794d41f6ce816941638ace3701dbfd40e111f39c4e5aaa4a
+  metadata.gz: eee6457653137fc81d4b2bbb9523c2158da073a2a3742678f17e305047854b45
+  data.tar.gz: 5ad84fb485691eda2cef81d3b08b7de3c41306e07bd2adf62cef22903b42cdb6
 SHA512:
-  metadata.gz: 5bc4751c68972b32b0e851d42a837bfeacacf73291aa128871836fe339d339c56ef26f8cd78badb8b12bf2ad41ea0487b232d30b0fa71e0d2e955a7c2a2e8543
-  data.tar.gz: 8bdb806fe84d1c1034b6fa620a92268e6cf1c220f2679d58be9d705971501230a87af5a4a1d38e5bd7bd6f94f1a4638a464e15ce4937938f9269d10f404b189c
+  metadata.gz: da419613c6a9c13734575d280cbfbbc9d25c7cda500db77f3fd062d181b3c1a03de55a9915aedbbd2943e79d7f206be285945b723fb123fbeb8ba39f4d31bd90
+  data.tar.gz: 1f58b027945b279185489021ef228ecd21cf6df2cefd9a473d67ed50002fa1b8a2bc847efd1cf1cd6ad70a6e06357db62439613ab8e0d5e81ce208fafb32c3ea

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/config/locales/effective_memberships.en.yml

@@ -1,6 +1,7 @@
 en:
   effective_memberships:
     name: 'Effective Memberships'
+    acronym: 'Members'
 
     fees:
       applicant: 'Applicant Fee'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.12.0'
+  VERSION = '0.12.2'
 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.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-10 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