effective_memberships 0.11.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9a748ab11ca8d852d0b69ed6f5d05e40e0e67b966e1c85f6cf98592db2dc32
-  data.tar.gz: b048158b7cea70c82fa04ab13cc91a37fcc20edcd5b6356b0ff6d9efbb967314
+  metadata.gz: '094156a30bcf510cbd5c6023d496887f8b2b3d254ce4e1f540517648867b5e65'
+  data.tar.gz: bb3c32887f6a0765ea0f4ac5fd462a9f597138343b4f1f6ef6147ea4cd0c4054
 SHA512:
-  metadata.gz: 0603ffd2a17a89df9de2e7325f0d2c4a0d03583da2d3f431425f2e69edbadb201878582a60086ff48c9313dfd218c6d7b173a876a17e35737ebb98e3ebecd7ef
-  data.tar.gz: dbe77a3674d19fa2fed6be7bc23a09f1a66b7b7c2dfe7908516193c99f378b81e3a522d2a7ceaf2e105fd59d2247a2c1f87097451deadf9d29e0d22b92d6ff98
+  metadata.gz: 4b5f000b750d32d0ba69944fe926426144988e3dfd9f430e9a32afaffc205d4d3b71157ebdca9ceaf130ec3d966fd97c695e4137cf4ef10770e48d15b6058127
+  data.tar.gz: 5ac39c63eea4e9a46e989fefeaf21c5b2119c84d06fdb7d8c2a6dabcab331c89f5b9b6a06560cfb76d7e19ad8a3985e3c4d3017a79cf05e96d22d1289c28e525

data/app/models/concerns/effective_memberships_category.rb

@@ -260,4 +260,8 @@ module EffectiveMembershipsCategory
     tax_exempt
   end
 
+  def cpd_target_score(cpd_cycle:)
+    nil
+  end
+
 end

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/models/effective/fee.rb

@@ -144,7 +144,13 @@ module Effective
     end
 
     def default_title
-      [period&.strftime('%Y'), category, fee_type, 'Fee'].compact.join(' ')
+      return nil unless period.present? && fee_type.present?
+
+      [
+        period.strftime('%Y'),
+        category,
+        EffectiveResources.et("effective_memberships.fees.#{fee_type.downcase}")
+      ].join(' ')
     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

@@ -0,0 +1,39 @@
+en:
+  effective_memberships:
+    name: 'Effective Memberships'
+
+    fees:
+      applicant: 'Applicant Fee'
+      prorated: 'Prorated Fee'
+      reinstatement: 'Reinstatement Fee'
+      renewal: 'Renewal Fee'
+      late: 'Late Fee'
+      discount: 'Discount Fee'
+      admin: 'Admin Fee'
+
+  activerecord:
+    models:
+      # These ones might be app level
+      app/applicant: 'Applicant'
+      app/applicant_review: 'Applicant Review'
+      app/membership_card: 'Membership Card'
+      app/category: 'Category'
+      app/directory: 'Directory'
+      app/fee_payment: 'Fee Payment'
+      app/organization: 'Organization'
+      app/status: 'Status'
+
+      # These ones should stay effective
+      effective/applicant_course_area: 'Course Area'
+      effective/applicant_course_name: 'Course Name'
+      effective/applicant_course: 'Course'
+      effective/applicant_education: 'Education'
+      effective/applicant_endorsement: 'Endorsement'
+      effective/applicant_equivalence: 'Equivalence'
+      effective/applicant_experience: 'Experience'
+      effective/applicant_reference: 'Reference'
+      effective/document: 'Document'
+      effective/fee: 'Fee'
+      effective/membership_history: 'Membership History'
+      effective/membership: 'Membership'
+      effective/representative: 'Representative'

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.11.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.11.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 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
@@ -513,6 +514,7 @@ files:
 - app/views/users/_demographics.html.haml
 - app/views/users/_fields_demographics.html.haml
 - config/effective_memberships.rb
+- config/locales/effective_memberships.en.yml
 - config/routes.rb
 - db/migrate/01_create_effective_memberships.rb.erb
 - db/seeds.rb