Commit f100ab89 authored by Deep Dey's avatar Deep Dey

Merge branch 'master' into 'master'

fix: confirmation pdf question mark issue

See merge request deepdey/lamartin-webomagic!4
parents a406cf44 3b2e37b9
...@@ -18,6 +18,8 @@ import java.io.ByteArrayInputStream; ...@@ -18,6 +18,8 @@ import java.io.ByteArrayInputStream;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import static com.example.LaMartin.constants.EmailConstants.*;
@Controller @Controller
@AllArgsConstructor(onConstructor_ = @__({@Autowired})) @AllArgsConstructor(onConstructor_ = @__({@Autowired}))
public class AdmissionFormDAOController { public class AdmissionFormDAOController {
...@@ -144,20 +146,10 @@ public class AdmissionFormDAOController { ...@@ -144,20 +146,10 @@ public class AdmissionFormDAOController {
ByteArrayInputStream pdfStream = pdfService.convertHtmlToPdf(emailBody); ByteArrayInputStream pdfStream = pdfService.convertHtmlToPdf(emailBody);
String[] bcc = { String[] bcc = BCC_LM_BOYS;
"paritoshcanning@yahoo.co.in",
"secretary@lamartiniere.co",
"lmcao@lamartiniere.co",
"secretariat_lmb@lamartiniere.co"
};
if (!data.getSchool().equals("La Martiniere for Boys")) { if (!data.getSchool().equals("La Martiniere for Boys")) {
bcc = new String[]{ bcc = BCC_LM_GIRLS;
"paritoshcanning@yahoo.co.in",
"secretary@lamartiniere.co",
"lmcao@lamartiniere.co",
"lmgkolkata@gmail.com"
};
} }
this.emailService.sendHtmlEmail( this.emailService.sendHtmlEmail(
data.getFatherEmail(), data.getFatherEmail(),
...@@ -187,20 +179,10 @@ public class AdmissionFormDAOController { ...@@ -187,20 +179,10 @@ public class AdmissionFormDAOController {
ByteArrayInputStream pdfStream = pdfService.convertHtmlToPdf(emailBody); ByteArrayInputStream pdfStream = pdfService.convertHtmlToPdf(emailBody);
String[] bcc = { String[] bcc = BCC_LM_BOYS;
"paritoshcanning@yahoo.co.in",
"secretary@lamartiniere.co",
"lmcao@lamartiniere.co",
"secretariat_lmb@lamartiniere.co"
};
if (!data.getSchool().equals("La Martiniere for Boys")) { if (!data.getSchool().equals("La Martiniere for Boys")) {
bcc = new String[]{ bcc = BCC_LM_GIRLS;
"paritoshcanning@yahoo.co.in",
"secretary@lamartiniere.co",
"lmcao@lamartiniere.co",
"lmgkolkata@gmail.com"
};
} }
this.emailService.sendHtmlEmail( this.emailService.sendHtmlEmail(
......
package com.example.LaMartin.constants;
public class EmailConstants {
public static final String[] BCC_LM_BOYS = {
"paritoshcanning@yahoo.co.in",
"secretary@lamartiniere.co",
"lmcao@lamartiniere.co",
"secretariat_lmb@lamartiniere.co",
"principallmb@lamartiniere.co"
};
public static final String[] BCC_LM_GIRLS = {
"paritoshcanning@yahoo.co.in",
"secretary@lamartiniere.co",
"lmcao@lamartiniere.co",
"lmgkolkata@gmail.com"
};
}
...@@ -162,8 +162,8 @@ ...@@ -162,8 +162,8 @@
<span>14, Sarojini Naidu Sarani, Kolkata - 700 017,</span> <span>14, Sarojini Naidu Sarani, Kolkata - 700 017,</span>
</span> </span>
</strong> in person, along with a printout of this letter on <b><span th:text="${admissionForm.admissionDate}"></span> at <span th:text="${admissionForm.admissionTime}"></span></b> for necessary formalities.</p> </strong> in person, along with a printout of this letter on <b><span th:text="${admissionForm.admissionDate}"></span> at <span th:text="${admissionForm.admissionTime}"></span></b> for necessary formalities.</p>
<p>Parents willing to pay the full year fee may do so, or pay quarterly by way of Pay Order favouring <b>“La <p>Parents willing to pay the full year fee may do so, or pay quarterly by way of Pay Order favouring <b>&quot;La
Martiniere Calcutta”</b> or bank transfer, at the time of admission.</p> Martiniere Calcutta&quot;</b> or bank transfer, at the time of admission.</p>
<p>For the <b>1<sup>st</sup> Quarter (April to June <span th:text="(${givenYear + 1})"></span>)</b>, parents are to pay <b>Rs. 1,79,500/- (Rupees <p>For the <b>1<sup>st</sup> Quarter (April to June <span th:text="(${givenYear + 1})"></span>)</b>, parents are to pay <b>Rs. 1,79,500/- (Rupees
One Lacs Seventy Nine Thousand Five Hundred only)</b> towards Tuition Fees, Session Fees, One Lacs Seventy Nine Thousand Five Hundred only)</b> towards Tuition Fees, Session Fees,
Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit Infrastructure Development Fees, Admission Fees, Building Development Fees and Security Deposit
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
</table> </table>
<br /> <br />
<p><b><u>IMPORTANT</u> – School fees from the 2nd Quarter will be directly debited from your account by the Auto Debit process which is <u>mandatory</u>. Please bring a cancelled cheque for all Savings and Current accounts (along with a company rubber stamp for Current and HUF accounts) to complete the setting up of the auto debit process at the time of admission of your ward.</b></p> <p><b><u>IMPORTANT</u> &ndash; School fees from the 2nd Quarter will be directly debited from your account by the Auto Debit process which is <u>mandatory</u>. Please bring a cancelled cheque for all Savings and Current accounts (along with a company rubber stamp for Current and HUF accounts) to complete the setting up of the auto debit process at the time of admission of your ward.</b></p>
<table class="fee-details"> <table class="fee-details">
<tr> <tr>
...@@ -239,7 +239,6 @@ ...@@ -239,7 +239,6 @@
<br/> <br/>
<br/> <br/>
<br/> <br/>
<br/>
</span> </span>
<p><b>SUPRIYO DHAR</b><br />Secretary<br />La Martiniere, Kolkata</p> <p><b>SUPRIYO DHAR</b><br />Secretary<br />La Martiniere, Kolkata</p>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment