Merge 292289f into 5ecfe5d

sul-dlss · Jul 9, 2018 · 9c6e29a · 9c6e29a
2 parents 5ecfe5d + 292289f
commit 9c6e29a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/app/views/webforms_mailer/sal3_batch_email.html.erb b/app/views/webforms_mailer/sal3_batch_email.html.erb
@@ -5,7 +5,9 @@
   </head>
   <body>
     <h1><%= @sal3_batch_requests_batch.num_bcs %> barcodes submitted for SAL3 retrieval with values:</h1>
+    <p>Batch id: <%= @sal3_batch_requests_batch.batch_id %></p>
     <p>Batch name: <%= @sal3_batch_requests_batch.batch_name %></p>
+    <p>Requestor name: <%= @sal3_batch_requests_batch.user_name %></p>
     <p>Delivery location: <%= @sal3_batch_requests_batch.stopcode %></p>
     <p>Media type: <%= @sal3_batch_requests_batch.batch_media %></p>
     <p>Container type: <%= @sal3_batch_requests_batch.batch_container %></p>

diff --git a/app/views/webforms_mailer/sal3_batch_email.txt b/app/views/webforms_mailer/sal3_batch_email.txt
@@ -1,7 +1,9 @@
 <%= @sal3_batch_requests_batch.num_bcs %> barcodes submitted for SAL3 retrieval with values:
 ======================================================================================================
 
+Batch id: <%= @sal3_batch_requests_batch.batch_id %>
 Batch name: <%= @sal3_batch_requests_batch.batch_name %>
+Requestor name: <%= @sal3_batch_requests_batch.user_name %>
 Delivery location: <%= @sal3_batch_requests_batch.stopcode %>
 Media type: <%= @sal3_batch_requests_batch.batch_media %>
 Container type: <%= @sal3_batch_requests_batch.batch_container %>

diff --git a/spec/mailers/webforms_mailer_spec.rb b/spec/mailers/webforms_mailer_spec.rb
@@ -89,9 +89,15 @@
         expect(upload_body).to match(/Batch id: 1/)
         expect(delete_body).to match(/Batch id: 1/)
       end
-      it 'has the id of the sal3 batch' do
+      it 'has the name of the sal3 batch' do
         expect(sal3_body).to match(/Batch name: Batch name/)
       end
+      it 'has the id of the sal3 batch' do
+        expect(sal3_body).to match(/Batch id: 1/)
+      end
+      it 'has the name of the sal3 batch requestor' do
+        expect(sal3_body).to match(/Requestor name: Test User/)
+      end
     end
   end
 end