effective_mailchimp 0.6.0 → 0.8.0

data/app/models/effective/mailchimp_list.rb

@@ -3,6 +3,8 @@ module Effective
     self.table_name = (EffectiveMailchimp.mailchimp_lists_table_name || :mailchimp_lists).to_s
 
     has_many :mailchimp_list_members, dependent: :delete_all
+    has_many :mailchimp_categories, dependent: :delete_all
+    has_many :mailchimp_interests, dependent: :delete_all
 
     effective_resource do
       mailchimp_id    :string
@@ -16,18 +18,16 @@ module Effective
       timestamps
     end
 
-    def to_s
-      name.presence || model_name.human
-    end
-
-    scope :deep, -> { all }
+    scope :deep, -> { includes(:mailchimp_categories, :mailchimp_interests) }
     scope :sorted, -> { order(:name) }
     scope :subscribable, -> { where(can_subscribe: true) }
 
-    # Creates or builds all the Lists
-    def self.sync!
+    # Reads all the Lists from Mailchimp and creates local MailchimpList records
+    # Also writes our merge fields to Mailchimp if they don't exist
+    # This is part of the Sync changes from Mailchimp button
+    def self.sync!(api: EffectiveMailchimp.api)
       # All the Lists from Mailchimp
-      lists = EffectiveMailchimp.api.lists
+      lists = api.lists()
 
       # Get all our existing Effective::MailchimpList records
       mailchimp_lists = all()
@@ -35,11 +35,18 @@ module Effective
       # Find or create Effective::Mailchimp based on existing lists
       lists.each do |list|
         mailchimp_id = list['id']
-        web_id = list['web_id']
-        name = list['name']
 
         mailchimp_list = mailchimp_lists.find { |ml| ml.mailchimp_id == mailchimp_id } || new()
-        mailchimp_list.assign_attributes(mailchimp_id: mailchimp_id, web_id: web_id, name: name)
+        mailchimp_list.assign_attributes(
+          mailchimp_id: mailchimp_id,
+
+          web_id: list['web_id'],
+          name: list['name'],
+          member_count: (list.dig('stats', 'member_count') || 0),
+          updated_at: Time.zone.now
+        )
+
+        mailchimp_list.assign_attributes(can_subscribe: true) if mailchimp_list.new_record?
         mailchimp_list.save!
       end
 
@@ -49,18 +56,37 @@ module Effective
         mailchimp_list.destroy! unless list.present?
       end
 
+      # Sync merge fields
+      if (merge_fields = EffectiveMailchimp.merge_fields).present?
+        merge_field_keys = merge_fields.keys.map(&:to_s)
+
+        mailchimp_lists.reject(&:destroyed?).each do |mailchimp_list|
+          existing = api.list_merge_fields(mailchimp_list).map { |hash| hash['tag'] }
+          (merge_field_keys - existing).each { |name| api.add_merge_field(mailchimp_list, name: name) }
+        end
+      end
+
       true
     end
 
-    # This creates our local merge fields ON Mailchimp
-    def create_mailchimp_merge_fields!(merge_fields)
-      raise('expected a Hash of merge fields') unless merge_fields.kind_of?(Hash)
+    def subscribe_all_users!(now: false)
+      if now
+        subscribe_all!(EffectiveMailchimp.User.all)
+      else
+        EffectiveMailchimpSubscribeAllUsersJob.perform_later(self)
+      end
+    end
 
-      merge_fields.keys.each do |name|
-        EffectiveMailchimp.api.add_merge_field(mailchimp_id, name: name)
+    def subscribe_all_members!(now: false)
+      if now
+        subscribe_all!(EffectiveMailchimp.User.all.members)
+      else
+        EffectiveMailchimpSubscribeAllMembersJob.perform_later(self)
       end
+    end
 
-      true
+    def to_s
+      name.presence || model_name.human
     end
 
     def merge_fields
@@ -68,8 +94,12 @@ module Effective
       EffectiveMailchimp.api.list_merge_fields(mailchimp_id).map { |hash| hash['tag'] }.sort
     end
 
-    def url
-      EffectiveMailchimp.api.admin_url + "/campaigns/#f_list:#{web_id}"
+    def grouped?
+      mailchimp_categories.present? && mailchimp_categories.any? { |category| category.mailchimp_interests.present? }
+    end
+
+    def ungrouped?
+      !grouped?
     end
 
     def members_url
@@ -80,20 +110,20 @@ module Effective
       EffectiveMailchimp.api.admin_url + "/lists/settings/merge-tags?id=#{web_id}"
     end
 
-    def can_subscribe!
-      update!(can_subscribe: true)
-    end
-
-    def cannot_subscribe!
-      update!(can_subscribe: false)
-    end
-
-    def force_subscribe!
-      update!(force_subscribe: true)
-    end
+    private
+
+    def subscribe_all!(users)
+      users.find_each do |user|
+        begin
+          user.mailchimp_subscribe!(self, subscribed: true, now: true)
+        rescue => e
+          EffectiveLogger.error(e.message, associated: user) if defined?(EffectiveLogger)
+          ExceptionNotifier.notify_exception(e, data: { user_id: user.id, mailchimp_list_id: id }) if defined?(ExceptionNotifier)
+          raise(e) if Rails.env.test? || Rails.env.development?
+        end
+      end
 
-    def unforce_subscribe!
-      update!(force_subscribe: false)
+      true
     end
 
   end

data/app/models/effective/mailchimp_list_member.rb

@@ -14,6 +14,8 @@ module Effective
       email_address   :string
       full_name       :string
 
+      interests       :text   # Array of mailchimp_interest mailchimp_ids
+
       # We set this on our side to update mailchimp and subscribe the user
       subscribed              :boolean
 
@@ -26,10 +28,17 @@ module Effective
       timestamps
     end
 
+    if EffectiveResources.serialize_with_coder?
+      serialize :interests, type: Array, coder: YAML
+    else
+      serialize :interests, Array
+    end
+
     validates :mailchimp_list_id, uniqueness: { scope: [:user_type, :user_id] }
 
     scope :deep, -> { includes(:mailchimp_list, :user) }
     scope :sorted, -> { order(:id) }
+    scope :subscribed, -> { where(subscribed: true) }
 
     def to_s
       mailchimp_list&.to_s || model_name.human
@@ -39,6 +48,37 @@ module Effective
       email_address.presence || user.email
     end
 
+    # Array of MailchimpInterest mailchimp_ids
+    def interests
+      Array(self[:interests]) - [nil, '']
+    end
+
+    # Array of MailchimpInterests
+    def mailchimp_interests
+      all_mailchimp_interests.select { |interest| interests.include?(interest.mailchimp_id) }
+    end
+
+    # We use this to add the force_subscribed interests
+    def build_interests(mailchimp_interest)
+      mailchimp_ids = Array(mailchimp_interest).map { |interest| interest.try(:mailchimp_id) || interest }
+      raise('expected an array of MailchimpInterests or mailchimp_ids') unless mailchimp_ids.all? { |id| id.kind_of?(String) && id.length > 1 }
+
+      assign_attributes(interests: interests | mailchimp_ids)
+    end
+
+    # {"25a38426c9" => false, "9b826db370" => true }
+    def interests_hash
+      all_mailchimp_interests.each_with_object({}) do |interest, hash|
+        hash[interest.mailchimp_id] = interests.include?(interest.mailchimp_id)
+      end
+    end
+
+    # From the mailchimp list
+    def all_mailchimp_interests
+      return [] if mailchimp_list.blank?
+      mailchimp_list.mailchimp_categories.flat_map(&:mailchimp_interests)
+    end
+
     def assign_mailchimp_attributes(atts)
       assign_attributes(
         mailchimp_id: atts['id'],
@@ -46,7 +86,8 @@ module Effective
         email_address: atts['email_address'],
         full_name: atts['full_name'],
         subscribed: (atts['status'] == 'subscribed'),
-        last_synced_at: Time.zone.now
+        last_synced_at: Time.zone.now,
+        interests: Hash(atts['interests']).select { |_, subscribed| subscribed == true }.keys
       )
     end
 

data/app/views/admin/mailchimp/_sync.html.haml

@@ -0,0 +1,15 @@
+- if EffectiveResources.authorized?(self, :admin, :mailchimp_sync)
+  %p= link_to 'Sync changes from Mailchimp', effective_mailchimp.mailchimp_sync_admin_mailchimp_index_path, 'data-method': :post, class: 'btn btn-primary'
+
+%p.text-muted
+  %small
+    - mailchimp_last_synced_at = Effective::MailchimpList.maximum(:updated_at)
+
+    last synced with
+    = link_to 'Mailchimp', EffectiveMailchimp.api.admin_url, target: '_blank'
+
+    - if mailchimp_last_synced_at.present?
+      = time_ago_in_words(mailchimp_last_synced_at)
+      ago.
+    - else
+      never.

data/app/views/admin/mailchimp/index.html.haml

@@ -0,0 +1,79 @@
+%h1.effective-admin-heading= @page_title
+
+= card('Mailchimp Settings') do
+  - if EffectiveMailchimp.api_blank?
+    .alert.alert-danger You are not connected to Mailchimp. Please set your API key.
+
+  - if EffectiveMailchimp.api_present?
+    %p
+      = succeed('.') do
+        Please configure your
+        = link_to 'audiences', EffectiveMailchimp.api.audience_url, target: '_blank'
+        and 
+        = link_to 'groups', EffectiveMailchimp.api.groups_url, target: '_blank'
+        on the Mailchimp website then sync the changes so they can be updated below
+
+    %p
+      You can also visit the 
+      = link_to('contacts', EffectiveMailchimp.api.contacts_url, target: '_blank')
+      and
+      = link_to('campaigns', EffectiveMailchimp.api.campaigns_url, target: '_blank')
+      at anytime.
+
+    %p To change the names or display order of items below, please visit the Mailchimp website then sync changes.
+
+    = render('admin/mailchimp/sync')
+
+    %p.text-muted
+      %small This operation also creates the audience merge fields and updates the member and subscriber counts below.
+
+  = collapse('More settings') do
+    %p
+      For more information see
+      = succeed(',') do
+        = link_to(etsd(Effective::MailchimpList), effective_mailchimp.admin_mailchimp_lists_path, target: '_blank')
+      = succeed(',') do
+        = link_to(etsd(Effective::MailchimpListMember), effective_mailchimp.admin_mailchimp_list_members_path, target: '_blank')
+      = succeed(',') do
+        = link_to(etsd(Effective::MailchimpCategory), effective_mailchimp.admin_mailchimp_categories_path, target: '_blank')
+      and
+      = succeed('.') do
+        = link_to(etsd(Effective::MailchimpInterest), effective_mailchimp.admin_mailchimp_interests_path, target: '_blank')
+
+    %p The following merge fields are sent to Mailchimp when a user subscribes:
+
+    %ul
+      - EffectiveMailchimp.merge_fields.keys.sort.each do |key|
+        %li= key
+
+  .mb-4
+
+= card(Effective::MailchimpList) do
+  %p 
+    Audiences contain a list of your contacts.
+    View all #{link_to ets(Effective::MailchimpList), EffectiveMailchimp.api.audience_url, target: '_blank'}.
+
+  %p
+    %small
+      To change the name, please visit the Mailchimp website then sync changes.
+      Press the Edit button to change the Can Subscribe and Force Subscribe settings.
+
+  - datatable = Admin::EffectiveMailchimpListsDatatable.new
+  = render_datatable(datatable, inline: true, short: true, search: false, sort: false)
+
+= card(Effective::MailchimpCategory) do
+  %p 
+    The following groups are displayed to the user where they can opt-in to each interest.
+    View all #{link_to ets(Effective::MailchimpCategory), EffectiveMailchimp.api.groups_url, target: '_blank'}.
+
+  %p
+    %small
+      To change the name, please visit the Mailchimp website then sync changes.
+      Press the Edit button to change the Can Subscribe and Force Subscribe settings.
+      Sync changes to update the subscriber counts.
+
+  - Effective::MailchimpCategory.all.each do |mailchimp_category|
+    = card(mailchimp_category.to_s) do
+      - datatable = Admin::EffectiveMailchimpInterestsDatatable.new(mailchimp_category: mailchimp_category)
+      = render_datatable(datatable, inline: true, short: true, search: false, sort: false)
+

data/app/views/admin/mailchimp_interests/_form.html.haml

@@ -0,0 +1,10 @@
+= effective_form_with(model: [:admin, mailchimp_interest], engine: true) do |f|
+  = f.static_field :name, label: EffectiveResources.et(mailchimp_interest)
+
+  = f.check_box :can_subscribe, label: "Yes, display this interest and allow them to subscribe"
+
+  = f.check_box :force_subscribe,
+    label: "Yes, force users to subscribe. Subscribe them automatically and do not allow unsubscribe from the website",
+    hint: "They can still unsubscribe from the email link to unsubscribe"
+
+  = effective_submit(f)

data/app/views/admin/mailchimp_lists/_form.html.haml

@@ -1,5 +1,6 @@
 = effective_form_with(model: [:admin, mailchimp_list], engine: true) do |f|
   = f.static_field :name, label: EffectiveResources.et(mailchimp_list)
+  = f.static_field :merge_fields
 
   = f.check_box :can_subscribe, label: "Yes, display users and allow them to subscribe"
 

data/app/views/admin/mailchimp_user/_form.html.haml

@@ -1,13 +1,19 @@
-= card(ets(Effective::MailchimpList)) do
-  %p.text-muted #{user} is subscribed to #{pluralize(user.mailchimp_subscribed_lists.count, et(Effective::MailchimpList))}.
+= card('Mailchimp') do
+  %p.text-muted
+    = succeed('.') do
+      = user
+      is subscribed to 
+      = pluralize(user.mailchimp_subscribed_lists.count, etd(Effective::MailchimpList))
+      and
+      = pluralize(user.mailchimp_subscribed_interests.count, etd(Effective::MailchimpInterest))
 
   %p.text-muted
     Please visit
-    = link_to 'All ' + ets(Effective::MailchimpList), effective_mailchimp.admin_mailchimp_lists_path, target: '_blank'
+    = link_to 'Mailchimp Settings', effective_mailchimp.admin_mailchimp_path, target: '_blank'
     to configure which are displayed.
 
   %p
-    %strong Subscribed
+    %strong Subscribed to the following
 
   = effective_form_with model: [:admin, user] do |f|
     = f.hidden_field :id

data/app/views/effective/mailchimp_user/_fields.html.haml

@@ -7,14 +7,41 @@
   = fmlm.hidden_field :id
   = fmlm.hidden_field :mailchimp_list_id
 
-  - if mailchimp_list.force_subscribe?
-    %p
-      - if fmlm.object.cannot_be_subscribed?
-        = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required but unsubscribed', checked: false
+  - # With groups, probably single audience implementation
+  - if mailchimp_list.grouped?
+    = fmlm.hidden_field :subscribed, value: true
+
+    - # For each group / mailchimp_category
+    - mailchimp_list.mailchimp_categories.each do |mailchimp_category|
+      - mailchimp_interests = mailchimp_category.mailchimp_interests
+
+      - # Force subscription of each interest
+      - forced = mailchimp_interests.select { |mi| mi.force_subscribe? }
+      - fmlm.object.build_interests(forced)
+
+      - forced.each do |mailchimp_interest|
+        = fmlm.hidden_field :interests, name: "#{fmlm.object_name}[interests][]", value: mailchimp_interest.mailchimp_id
+
+      - # Add control for mailchimp interests
+      - mailchimp_interests_collection = mailchimp_list_member_interests_collection(mailchimp_interests)
+
+      - if mailchimp_category.display_type == 'select'
+        = fmlm.select :interests, mailchimp_interests_collection, label: mailchimp_category.to_s, name: "#{fmlm.object_name}[interests][]"
+      - elsif mailchimp_category.display_type == 'radio'
+        = fmlm.radios :interests, mailchimp_interests_collection, label: mailchimp_category.to_s, name: "#{fmlm.object_name}[interests][]"
       - else
-        = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required', checked: true
-        = fmlm.hidden_field :subscribed, value: true
+        = fmlm.checks :interests, mailchimp_interests_collection, label: mailchimp_category.to_s, name: "#{fmlm.object_name}[interests][]"
+
+  - # No groups, multiple audiences implementation
+  - if mailchimp_list.ungrouped?
+    - if mailchimp_list.force_subscribe?
+      %p
+        - if fmlm.object.cannot_be_subscribed?
+          = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required but unsubscribed', checked: false
+        - else
+          = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required', checked: true
+          = fmlm.hidden_field :subscribed, value: true
 
-  - elsif mailchimp_list.can_subscribe?
-    %p
-      = fmlm.check_box :subscribed, label: fmlm.object.to_s
+    - elsif mailchimp_list.can_subscribe?
+      %p
+        = fmlm.check_box :subscribed, label: fmlm.object.to_s

data/config/effective_mailchimp.rb

@@ -5,4 +5,10 @@ EffectiveMailchimp.setup do |config|
 
   # Mailchimp Settings
   config.api_key = ''  # From mailchimp's /account/api/ screen
+
+  # In Sandbox Mode you can only READ from Mailchimp not actually write to it
+  config.sandbox_mode = false
+
+  # Assign the User class name. For use in determining all merge_fields
+  # config.user_class_name = 'User'
 end

data/config/locales/effective_mailchimp.en.yml

@@ -0,0 +1,12 @@
+en:
+  effective_mailchimp:
+    name: 'Effective Mailchimp'
+    acronym: 'Mailchimp'
+
+  activerecord:
+    models:
+      # These ones should stay effective
+      effective/mailchimp_list: 'Mailchimp Audience'
+      effective/mailchimp_list_member: 'Mailchimp Audience Member'
+      effective/mailchimp_category: 'Mailchimp Group'
+      effective/mailchimp_interest: 'Mailchimp Group Interest'

data/config/routes.rb

@@ -14,18 +14,20 @@ EffectiveMailchimp::Engine.routes.draw do
 
   namespace :admin do
     resources :mailchimp_lists, only: [:index, :edit, :update] do
-      post :can_subscribe, on: :member
-      post :cannot_subscribe, on: :member
-
-      post :force_subscribe, on: :member
-      post :unforce_subscribe, on: :member
-
-      get :mailchimp_sync, on: :collection
+      post :subscribe_all_users, on: :member
+      post :subscribe_all_members, on: :member
     end
 
+    resources :mailchimp_interests, only: [:index, :edit, :update]
+    resources :mailchimp_categories, only: :index
+    resources :mailchimp_list_members, only: :index
+
     resources :mailchimp, only: [] do
+      post :mailchimp_sync, on: :collection
       post :mailchimp_sync_user, on: :member
     end
+
+    get '/mailchimp', to: 'mailchimp#index', as: :mailchimp
   end
 
 end

data/db/migrate/101_create_effective_mailchimp.rb

@@ -5,6 +5,43 @@ class CreateEffectiveMailchimp < ActiveRecord::Migration[6.0]
       t.string :web_id
       t.string :name
 
+      t.integer :member_count
+
+      t.boolean :can_subscribe
+      t.boolean :force_subscribe
+
+      t.timestamps
+    end
+
+    create_table :mailchimp_categories do |t|
+      t.integer :mailchimp_list_id
+
+      t.string :mailchimp_id
+      t.string :list_id
+
+      t.string :name
+      t.string :list_name
+
+      t.string :display_type
+
+      t.timestamps
+    end
+
+    create_table :mailchimp_interests do |t|
+      t.integer :mailchimp_list_id
+      t.integer :mailchimp_category_id
+
+      t.string :mailchimp_id
+      t.string :list_id
+      t.string :category_id
+
+      t.string :name
+      t.string :list_name
+      t.string :category_name
+
+      t.integer :display_order
+      t.integer :subscriber_count
+
       t.boolean :can_subscribe
       t.boolean :force_subscribe
 
@@ -26,6 +63,8 @@ class CreateEffectiveMailchimp < ActiveRecord::Migration[6.0]
       t.boolean :subscribed, default: false
       t.boolean :cannot_be_subscribed, default: false
 
+      t.text :interests
+
       t.datetime :last_synced_at
 
       t.timestamps

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/lib/effective_mailchimp.rb

@@ -7,9 +7,9 @@ module EffectiveMailchimp
 
   def self.config_keys
     [
-      :mailchimp_lists_table_name, :mailchimp_list_members_table_name,
+      :mailchimp_lists_table_name, :mailchimp_list_members_table_name, :mailchimp_categories_table_name, :mailchimp_interests_table_name,
       :layout,
-      :api_key
+      :api_key, :sandbox_mode, :user_class_name
     ]
   end
 
@@ -19,12 +19,37 @@ module EffectiveMailchimp
     Effective::MailchimpApi.new(api_key: api_key)
   end
 
+  def self.sandbox_mode?
+    !!sandbox_mode
+  end
+
   def self.api_present?
     api_key.present?
   end
 
+  def self.api_blank?
+    api_key.blank?
+  end
+
+  def self.User
+    klass = user_class_name.constantize if user_class_name.present?
+    klass ||= Tenant.User if defined?(Tenant)
+    klass ||= '::User'.safe_constantize
+
+    raise('unable to determine User klass. Please set config.user_class_name') unless klass.kind_of?(Class)
+    raise('expecting an effective_mailchimp_user User class') unless klass.respond_to?(:effective_mailchimp_user)
+
+    klass
+  end
+
+  def self.merge_fields
+    merge_fields = self.User().new.mailchimp_merge_fields
+    raise('expected a Hash of merge fields') unless merge_fields.kind_of?(Hash)
+    merge_fields
+  end
+
   def self.permitted_params
-    [ :mailchimp_user_form_action, mailchimp_list_members_attributes: [:id, :mailchimp_list_id, :subscribed] ]
+    [ :mailchimp_user_form_action, mailchimp_list_members_attributes: [:id, :mailchimp_list_id, :subscribed, interests: []] ]
   end
 
 end

data/lib/tasks/effective_mailchimp_tasks.rake

@@ -5,20 +5,4 @@ namespace :effective_mailchimp do
     load "#{__dir__}/../../db/seeds.rb"
   end
 
-  # bundle exec rake effective_mailchimp:create_mailchimp_merge_fields
-  task create_mailchimp_merge_fields: :environment do
-    merge_fields = User.new.mailchimp_merge_fields()
-
-    Effective::MailchimpList.sync!
-
-    collection = Effective::MailchimpList.all
-
-    collection.find_each do |list|
-      puts "Creating #{list} merge fields"
-      list.create_mailchimp_merge_fields!(merge_fields)
-    end
-
-    puts 'All done'
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,23 +193,36 @@ files:
 - app/assets/javascripts/effective_mailchimp/base.js
 - app/assets/stylesheets/effective_mailchimp.scss
 - app/assets/stylesheets/effective_mailchimp/base.scss
+- app/controllers/admin/mailchimp_categories_controller.rb
 - app/controllers/admin/mailchimp_controller.rb
+- app/controllers/admin/mailchimp_interests_controller.rb
+- app/controllers/admin/mailchimp_list_members_controller.rb
 - app/controllers/admin/mailchimp_lists_controller.rb
 - app/controllers/effective/mailchimp_controller.rb
+- app/datatables/admin/effective_mailchimp_categories_datatable.rb
+- app/datatables/admin/effective_mailchimp_interests_datatable.rb
+- app/datatables/admin/effective_mailchimp_list_members_datatable.rb
 - app/datatables/admin/effective_mailchimp_lists_datatable.rb
 - app/helpers/effective_mailchimp_helper.rb
+- app/jobs/effective_mailchimp_subscribe_all_members_job.rb
+- app/jobs/effective_mailchimp_subscribe_all_users_job.rb
 - app/jobs/effective_mailchimp_update_job.rb
 - app/models/concerns/effective_mailchimp_user.rb
 - app/models/effective/mailchimp_api.rb
+- app/models/effective/mailchimp_category.rb
+- app/models/effective/mailchimp_interest.rb
 - app/models/effective/mailchimp_list.rb
 - app/models/effective/mailchimp_list_member.rb
+- app/views/admin/mailchimp/_sync.html.haml
+- app/views/admin/mailchimp/index.html.haml
+- app/views/admin/mailchimp_interests/_form.html.haml
 - app/views/admin/mailchimp_lists/_form.html.haml
-- app/views/admin/mailchimp_lists/index.html.haml
 - app/views/admin/mailchimp_user/_form.html.haml
 - app/views/admin/mailchimp_user/_sync.html.haml
 - app/views/effective/mailchimp_user/_fields.html.haml
 - app/views/effective/mailchimp_user/_sync.html.haml
 - config/effective_mailchimp.rb
+- config/locales/effective_mailchimp.en.yml
 - config/routes.rb
 - db/migrate/101_create_effective_mailchimp.rb
 - db/seeds.rb

data/app/views/admin/mailchimp_lists/index.html.haml

@@ -1,20 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-- resource = (@_effective_resource || Effective::Resource.new(controller_path))
-
-.resource-buttons
-  = render_resource_buttons(resource.klass, (action ||= :index) => false)
-
-= card do
-  = collapse('Show merge field settings') do
-    %p The following Merge fields are sent to Mailchimp when a user subscribes:
-
-    %ul
-      - current_user.mailchimp_merge_fields.keys.each do |key|
-        %li= key
-
-    %p To have these fields displayed in Mailchimp, please configure each campaign with any of these merge fields.
-
-  .mb-4
-
-  = render_datatable @datatable