effective_mailchimp 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf2d88e8b2f00becc08815e465620acf595af2f94b2f4e17b181fdf3b31ab8c
-  data.tar.gz: '09e182375468981d4011eb7719ab31fd958eec207b6d233aff869395d6b63c3c'
+  metadata.gz: 49ad10cd9354cfacf479287b2c4c08fcd3bd4423e09214cb51e0c3b6ccfd16eb
+  data.tar.gz: 26616852a4c2fd9234b08653e4ffc0c0997888b100f4865be25ea27dea1af6f3
 SHA512:
-  metadata.gz: afd8bd97b2234900b447c395ddb6cef941b08b1bc3c611151732d6fd60ceedcb3741c7ac1452f05be4ac5293e81d31c017422285bb79980e9b6a68dbd6ecf9d0
-  data.tar.gz: 14e816947972b23155640a57844d2e58a285208f0c013a40805f08ca5f9cce960ddd9b807300bcc874d8326e703f8eee3f05760e78fcbc8dd40b00a7d4d80c10
+  metadata.gz: 06fe791199da318312aeca0e0c674f75b73e4d85147ac062f1504cea7cf80586ccac15e1da0eff8755c82627c908b62f90c4bc2bad3aea414047373dd592bf07
+  data.tar.gz: 2967fdadbe7296ca9b2d4f39c7f50c6506f44f335bed45379abda8e503b3d49b15655bd5091041e8f56c18a0508613967a1c40aaffa8ed4d6e583e77b4a5860e

data/app/models/concerns/effective_mailchimp_user.rb

@@ -34,7 +34,8 @@ module EffectiveMailchimpUser
     }
 
     # The user updated the form
-    after_commit(if: -> { mailchimp_member_update_required? }) do
+    after_commit(if: -> { mailchimp_member_update_required? }, unless: -> { EffectiveMailchimp.supressed? || @mailchimp_member_update_enqueued }) do
+      @mailchimp_member_update_enqueued = true
       EffectiveMailchimpUpdateJob.perform_later(self) # This calls user.mailchimp_update! on the background
     end
   end
@@ -123,7 +124,8 @@ module EffectiveMailchimpUser
         'CATEGORY': membership&.categories&.to_sentence,
         'STATUS': membership&.statuses&.to_sentence,
         'NUMBER': membership&.number,
-        'JOINED': membership&.joined_on&.strftime('%F')
+        'JOINED': membership&.joined_on&.strftime('%F'),
+        'FEESPAIDTO': mailchimp_membership_fees_paid_through_period()&.strftime('%F')
       )
     end
 
@@ -137,6 +139,29 @@ module EffectiveMailchimpUser
     atts
   end
 
+  # Returns the maximum fees_paid_through_period of the membership and any deferred membership_period fees
+  def mailchimp_membership_fees_paid_through_period
+    periods = []
+
+    # Find the fees_paid_through_period from any membership
+    if self.class.respond_to?(:effective_memberships_user?) && memberships.present?
+      membership = memberships.first() # Individual or organization membership
+      periods << membership&.fees_paid_through_period
+    end
+
+    # Find the fees_paid_through_period from any deferred membership fees
+    fees = if self.class.respond_to?(:effective_memberships_organization_user?) && organizations.present?
+      Effective::Fee.deferred.where(owner: [self, organizations])
+    else
+      Effective::Fee.deferred.where(owner: self)
+    end
+
+    periods += fees.select { |fee| fee.membership_period_fee? }.map(&:fees_paid_through_period)
+
+    # Return the maximum fees paid through period
+    periods.compact.max
+  end
+
   def mailchimp_subscribed_lists
     mailchimp_list_members.select(&:subscribed?).map(&:mailchimp_list)
   end

data/app/models/effective/mailchimp_api.rb

@@ -38,7 +38,7 @@ module Effective
     end
 
     def groups_url
-      "https://#{server}.admin.mailchimp.com/lists/dashboard/groups/"
+      "https://#{server}.admin.mailchimp.com/audience/groups/"
     end
 
     def contacts_url

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lib/effective_mailchimp.rb

@@ -60,4 +60,20 @@ module EffectiveMailchimp
     [ :mailchimp_user_form_action, mailchimp_list_members_attributes: [:id, :mailchimp_list_id, :subscribed, interests: []] ]
   end
 
+  # Used to supress any background jobs during import processes
+  def self.supressed=(value)
+    Thread.current[:effective_mailchimp_supressed] = value
+  end
+
+  def self.supressed(&block)
+    Thread.current[:effective_mailchimp_supressed] = true
+    value = yield
+    Thread.current[:effective_mailchimp_supressed] = nil
+    value
+  end
+
+  def self.supressed?
+    Thread.current[:effective_mailchimp_supressed] == true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails