Merge pull request #2095 from unboxed/pre-app-mails-fixes

Pre app mails fixes

app/views/planning_application_mailer/receipt_notice_mail.text.erb

@@ -1,6 +1,6 @@
 Dear <%= @planning_application.agent_or_applicant_name %>,
 
-We’ve received your application for a <%= @planning_application.application_type.human_name %>.
+We’ve received your <%= @planning_application.application_type.human_name %> application.
 
 Here are the details of your <%= @planning_application.application_short_case %>:
 
@@ -14,12 +14,7 @@ What happens next:
 
 We will check your <%= @planning_application.application_short_case %> for errors and missing information. This can take up to 14 days but may take longer during busy times.
 
-If there are no issues with your <%= @planning_application.application_short_case %>, we will start assessing it
-<% if @planning_application.pre_application? %>
- and be able to provide advice.
-<% else %>
- against the relevant planning policies and legislation.
-<% end %>
+If there are no issues with your <%= @planning_application.application_short_case %>, we will start assessing it <%= @planning_application.pre_application? ? "and be able to provide advice." : "against the relevant planning policies and legislation." %>
 
 We may contact you or a person of your choosing to arrange a site visit.
 <% if @planning_application.lawfulness_certificate? %>
@@ -31,7 +26,9 @@ You have the right to appeal to the Secretary of State if by <%= (@planning_appl
 - you have not agreed in writing to extend the decision period
 <% end %>
 
+<% unless @planning_application.pre_application? %>
 You can find advice about your rights of appeal at https://www.gov.uk/topic/planning-development/planning-permission-appeals.
+<% end %>
 
 If you need help with your <%= @planning_application.application_short_case %>, contact us at <%= @planning_application.local_authority.email_address %>.
 

config/locales/en.yml

@@ -660,10 +660,8 @@ en:
       Yours
 
 
-      {{signatory_name}}
-      {{signatory_job_title}}
       {{local_authority}}
-    subject: Application for planning permission {{reference}}
+    subject: Comments requested for {{reference}}
   consultee_overview_component:
     chase_outstanding_consultees: Chase outstanding consultees
     consulted: Date last consulted

spec/mailer/planning_application_mailer_spec.rb

@@ -645,6 +645,22 @@
       expect(mail_body).to include("Application received: 3 May 2022")
     end
 
+    it "includes the additional relevant information" do
+      travel_to("2022-01-01") do
+        expect(mail_body).to include(
+          "If there are no issues with your application, we will start assessing it against the relevant planning policies and legislation."
+        )
+      end
+    end
+
+    it "includes the appeal information" do
+      travel_to("2022-01-01") do
+        expect(mail_body).to include(
+          "You can find advice about your rights of appeal at https://www.gov.uk/topic/planning-development/planning-permission-appeals."
+        )
+      end
+    end
+
     describe "pre-apps" do
       let(:application_type) { create(:application_type, :pre_application) }
 
@@ -669,6 +685,14 @@
       it "includes the received date" do
         expect(mail_body).to include("Pre-application received: 3 May 2022")
       end
+
+      it "includes the additional relevant information" do
+        travel_to("2022-01-01") do
+          expect(mail_body).to include(
+            "If there are no issues with your pre-application, we will start assessing it and be able to provide advice."
+          )
+        end
+      end
     end
   end
 

spec/system/planning_applications/consulting/send_emails_to_consultees_spec.rb

@@ -196,7 +196,7 @@
             email_address: "[email protected]",
             email_reply_to_id: "4485df6f-a728-41ed-bc46-cdb2fc6789aa",
             personalisation: hash_including(
-              "subject" => "Application for planning permission #{planning_application.reference}"
+              "subject" => "Comments requested for #{planning_application.reference}"
             )
           }
         ))
@@ -217,7 +217,7 @@
             email_address: "[email protected]",
             email_reply_to_id: "4485df6f-a728-41ed-bc46-cdb2fc6789aa",
             personalisation: hash_including(
-              "subject" => "Application for planning permission #{planning_application.reference}"
+              "subject" => "Comments requested for #{planning_application.reference}"
             )
           }
         ))