Merge pull request #2289 from davidmillen50/issue-1922-add-description-to-invitation-emails

Issue 1922 add description to invitation emails

Author: olleolleolle

app/controllers/admin/chapters/organisers_controller.rb

@@ -12,11 +12,6 @@ def index
   def create
     authorize :organiser
 
-    if params[:organiser].blank? || params[:organiser][:organiser].blank?
-      flash[:alert] = 'Please select a member to make organiser.'
-      redirect_to admin_chapter_organisers_path(@chapter) and return
-    end
-
     member = Member.find(params[:organiser][:organiser])
     member.add_role(:organiser, @chapter)
 

app/views/layouts/_messages.html.haml

@@ -2,7 +2,7 @@
   - unless (name.eql?('notice') && @suppress_notices) || (name.eql?('warning') && @suppress_warnings)
     - name = name.eql?('notice') ? 'info' : name
     - if msg.is_a?(String)
-      .alert.alert-dismissible.fade.show.mb-0.text-center.bg-warning{ 'data-alert': '', class: "alert-#{name}", role: 'alert' }
+      .alert.alert-dismissible.fade.show.mb-0{ 'data-alert': '', class: "alert-#{name}", role: 'alert' }
         = content_tag :div, msg.html_safe
         %button.btn-close{ type: 'button', 'data-bs-dismiss': 'alert', 'aria-label': 'Close' }
     - elsif msg.is_a?(Array)

app/views/workshop_invitation_mailer/attending.html.haml

@@ -37,6 +37,10 @@
                   Workshop
                 %p #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'Update your attendance', full_url_for(invitation_url(@invitation)), class: 'btn'
+                - if @workshop.description.present?
+                  %p{ style: 'margin-top: 10px;' }
+                    %strong Description:
+                    = @workshop.description
 
         .content
           %table

app/views/workshop_invitation_mailer/attending_reminder.html.haml

@@ -32,6 +32,10 @@
                   %br
                   %p #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'Update your attendance', full_url_for(invitation_url(@invitation)), class: 'btn'
+                - if @workshop.description.present?
+                  %p{ style: 'margin-top: 10px;' }
+                    %strong Description:
+                    = @workshop.description
 
         .content
           %table

app/views/workshop_invitation_mailer/invite_coach.html.haml

@@ -38,6 +38,10 @@
                   %br
                   %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'View invitation and RSVP', full_url_for(invitation_url(@invitation)), class: 'btn'
+                - if @workshop.description.present?
+                  %p{ style: 'margin-top: 15px;' }
+                    %strong Description:
+                    = @workshop.description
               %td{ width: '40%', style: 'vertical-align: top;'}
                 %h4
                   Venue

app/views/workshop_invitation_mailer/invite_student.html.haml

@@ -35,6 +35,10 @@
                   %br
                   %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'View invitation and RSVP', full_url_for(invitation_url(@invitation)), class: 'btn'
+                - if @workshop.description.present?
+                  %p{ style: 'margin-top: 15px;' }
+                    %strong Description:
+                    = @workshop.description
               %td{ width: '40%', style: 'vertical-align: top;'}
                 %h4
                   Venue

spec/features/admin/managing_organisers_spec.rb

@@ -39,19 +39,6 @@
       end
     end
 
-    scenario 'show flash alert warning message if user clicks add organiser without selecting an organiser from the dropdown' do
-      chapter_subscriber = Fabricate(:member)
-      chapter = Fabricate(:chapter_with_groups)
-      Fabricate(:subscription, member: chapter_subscriber, group: chapter.groups.first)
-      visit admin_chapter_organisers_path(chapter)
-
-      click_on 'Add organiser'
-
-      expect(page).to have_content('Please select a member to make organiser.')
-      expect(current_path).to eq(admin_chapter_organisers_path(chapter))
-      expect(page.status_code).to eq(200)
-    end
-
     scenario 'can remove an organiser from a chapter' do
       visit admin_chapter_organisers_path(chapter)
       organiser_name = chapter.organisers.first.full_name

spec/mailers/virtual_workshop_invitation_mailer_spec.rb

@@ -29,6 +29,16 @@
     expect(email.body.encoded).to match('Accept the invitation')
   end
 
+  it '#attending includes the workshop description' do
+    description = "This is a test workshop description."
+    workshop = Fabricate(:workshop, description: description)
+    invitation = Fabricate(:workshop_invitation, workshop: workshop, member: member)
+
+    WorkshopInvitationMailer.attending(workshop, member, invitation).deliver_now
+
+    expect(email.body.encoded).to include(description)
+  end
+
   it '#invite_coach' do
     email_subject = "Virtual Workshop Coach Invitation #{humanize_date(workshop.date_and_time, with_time: true)}"
 

spec/mailers/workshop_invitation_mailer_spec.rb

@@ -60,4 +60,14 @@
     expect(email.body.encoded).to match("the workshop on #{humanize_date(workshop.date_and_time, with_time: true)}")
     expect(email.body.encoded).to match(workshop.chapter.email)
   end
+
+  it '#attending includes the workshop description' do
+    description = "This is a test workshop description."
+    workshop = Fabricate(:workshop, description: description)
+    invitation = Fabricate(:workshop_invitation, workshop: workshop, member: member)
+
+    WorkshopInvitationMailer.attending(workshop, member, invitation).deliver_now
+
+    expect(email.body.encoded).to include(description)
+  end
 end