Merge pull request #1227 from Crown-Commercial-Service/feature/nrmi-250-include-email-in-invoice

Feature/nrmi 250 include email in invoice

Author: reemi1510

app/models/workday/submit_invoice.rb

@@ -67,7 +67,7 @@ def invoice_memo
     end
 
     def submitted_by_note_content
-      submission.submitted_by.name if submission.submitted_by.present?
+      "#{submission.submitted_by.name} : #{submission.submitted_by.email}" if submission.submitted_by.present?
     end
 
     def line_item_description

app/models/workday/submit_reversal_invoice.rb

@@ -13,15 +13,17 @@ def initialize(submission, user = nil)
     attr_reader :user
 
     def line_item_description
-      "Reversal of invoice adjustment for #{task_period_in_words} management charge"
+      # rubocop:disable Layout/LineLength
+      "Reversal of invoice #{submission.invoice_details[:invoice_number]} adjustment for #{task_period_in_words} management charge"
+      # rubocop:enable Layout/LineLength
     end
 
     def total_spend
       -super
     end
 
     def submitted_by_note_content
-      user&.name
+      "#{user&.name} : #{user&.email}"
     end
   end
 end

app/models/workday/submit_reversal_invoice_adjustment.rb

@@ -15,15 +15,15 @@ def initialize(submission, user = nil)
     attr_reader :user
 
     def line_item_description
-      "Reversal of invoice for #{task_period_in_words} management charge"
+      "Reversal of invoice #{submission.invoice_details[:invoice_number]} for #{task_period_in_words} management charge"
     end
 
     def total_spend
       -super
     end
 
     def submitted_by_note_content
-      user&.name
+      "#{user&.name} : #{user&.email}"
     end
   end
 end

spec/models/workday/submit_invoice_request_spec.rb

@@ -50,7 +50,7 @@
     end
 
     it 'sets Note_Data with the name of the user who submitted the Submission' do
-      expect(text_at_xpath('//ns0:Note_Data//ns0:Note_Content')).to eq 'Forename Surname'
+      expect(text_at_xpath('//ns0:Note_Data//ns0:Note_Content')).to eq "Forename Surname : #{user.email}"
     end
 
     it 'sets the invoice as submitted' do

spec/models/workday/submit_reversal_invoice_adjustment_spec.rb

@@ -9,6 +9,7 @@
                       submitted_by: user,
                       task: task)
   end
+  let!(:submission_invoice) { FactoryBot.create(:submission_invoice, submission: submission) }
   let(:framework) { submission.framework }
   let(:task) { FactoryBot.create(:task, period_month: 12, period_year: 2018, status: :in_progress) }
   let(:supplier) { submission.supplier }
@@ -19,6 +20,20 @@
       revenue_category_ids: { framework.short_name => 'Revenue_Category_WID' }
     )
     allow(Workday::CommercialAgreements).to receive(:new).and_return(commercial_agreements)
+
+    customer_invoice = instance_double(
+      Workday::CustomerInvoice,
+      invoice_details: {
+        invoice_amount: '0.20',
+        invoice_date: '2018-12-31-00:00',
+        invoice_number: 'CINV-00000001',
+        payment_status: 'Paid'
+      }
+    )
+
+    # rubocop:disable Layout/LineLength
+    allow(Workday::CustomerInvoice).to receive(:new).with(submission_invoice.workday_reference).and_return(customer_invoice)
+    # rubocop:enable Layout/LineLength
   end
 
   it_behaves_like 'a workday request'
@@ -51,7 +66,7 @@
     end
 
     it 'sets Note_Data with the name of the user who submitted the correction submission' do
-      expect(text_at_xpath('//ns0:Note_Data//ns0:Note_Content')).to eq 'ForenameR SurnameR'
+      expect(text_at_xpath('//ns0:Note_Data//ns0:Note_Content')).to eq "ForenameR SurnameR : #{correcting_user.email}"
     end
 
     it 'sets the invoice adjustment as submitted' do
@@ -63,7 +78,7 @@
       it 'sets Line_Item_Description with a description of the charge' do
         expect(
           text_at_xpath('//ns0:Customer_Invoice_Line_Replacement_Data//ns0:Line_Item_Description')
-        ).to eq 'Reversal of invoice for December 2018 management charge'
+        ).to eq 'Reversal of invoice CINV-00000001 for December 2018 management charge'
       end
 
       it 'sets Analytical_Amount as the negative value of the total spend for the submission' do

spec/models/workday/submit_reversal_invoice_spec.rb

@@ -9,6 +9,7 @@
                       submitted_by: user,
                       task: task)
   end
+  let!(:submission_invoice) { FactoryBot.create(:submission_invoice, submission: submission) }
   let(:framework) { submission.framework }
   let(:task) { FactoryBot.create(:task, period_month: 12, period_year: 2018) }
   let(:supplier) { submission.supplier }
@@ -19,6 +20,20 @@
       revenue_category_ids: { framework.short_name => 'Revenue_Category_WID' }
     )
     allow(Workday::CommercialAgreements).to receive(:new).and_return(commercial_agreements)
+
+    customer_invoice = instance_double(
+      Workday::CustomerInvoice,
+      invoice_details: {
+        invoice_amount: '0.20',
+        invoice_date: '2018-12-31-00:00',
+        invoice_number: 'CINV-00000001',
+        payment_status: 'Paid'
+      }
+    )
+
+    # rubocop:disable Layout/LineLength
+    allow(Workday::CustomerInvoice).to receive(:new).with(submission_invoice.workday_reference).and_return(customer_invoice)
+    # rubocop:enable Layout/LineLength
   end
 
   it_behaves_like 'a workday request'
@@ -51,7 +66,7 @@
     end
 
     it 'sets Note_Data with the name of the user who submitted the correction submission' do
-      expect(text_at_xpath('//ns0:Note_Data//ns0:Note_Content')).to eq 'ForenameR SurnameR'
+      expect(text_at_xpath('//ns0:Note_Data//ns0:Note_Content')).to eq "ForenameR SurnameR : #{correcting_user.email}"
     end
 
     it 'sets the invoice as submitted' do
@@ -63,7 +78,7 @@
       it 'sets Line_Item_Description with a description of the charge' do
         expect(
           text_at_xpath('//ns0:Customer_Invoice_Line_Replacement_Data//ns0:Line_Item_Description')
-        ).to eq 'Reversal of invoice adjustment for December 2018 management charge'
+        ).to eq 'Reversal of invoice CINV-00000001 adjustment for December 2018 management charge'
       end
 
       it 'sets Analytical_Amount as the negative value of the total spend for the submission' do