Merge branch 'supporter_level_goal' into 4207-add-first-name-merge-ta…

…g-for-use-in-mailchimp-journey
CommitChange · Oct 1, 2023 · 6d2fae2 · 6d2fae2
2 parents 5130b50 + 489c5e8
commit 6d2fae2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/mailchimp/nonprofit_user_subscribe.json.jbuilder b/app/views/mailchimp/nonprofit_user_subscribe.json.jbuilder
@@ -4,6 +4,6 @@ json.email_address @user.email
 json.status 'subscribed'
 
 json.merge_fields do
-  json.NONPROFIT_ID  @nonprofit.id
+  json.NP_ID  @nonprofit.id
   json.FNAME @user.calculated_first_name || ""
 end 
diff --git a/spec/lib/mailchimp_spec.rb b/spec/lib/mailchimp_spec.rb
@@ -116,7 +116,7 @@
 				'email_address' => user.email,
 				'status' => 'subscribed',
 				'merge_fields' => {
-					'NONPROFIT_ID' => nonprofit.id,
+					'NP_ID' => nonprofit.id,
 					'FNAME' => "",
 				}
 			})

diff --git a/spec/views/mailchimp/nonprofit_user_subscribe.json.jbuilder_spec.rb b/spec/views/mailchimp/nonprofit_user_subscribe.json.jbuilder_spec.rb
@@ -22,7 +22,7 @@
         email_address: User.first.email,
         status: 'subscribed',
         merge_fields: {
-          NONPROFIT_ID: User.first.roles.first.host.id,
+          NP_ID: User.first.roles.first.host.id,
           FNAME: ""
         }
       )
@@ -43,7 +43,7 @@
           email_address: User.first.email,
           status: 'subscribed',
           merge_fields: {
-            NONPROFIT_ID: User.first.roles.first.host.id,
+            NP_ID: User.first.roles.first.host.id,
             FNAME: User.first.name
           }
         )