Merge branch 'master' into 'tag-staging-email'

# Conflicts:
#   app/config/appConfig.js

app/helpers/emailContentGenerator.js

@@ -159,8 +159,42 @@ const generateEmailSubject = (numberOfRealEstates, singleRealEstateTitle) => {
   return `${stagingTag}Kivi: ${numberOfRealEstates} novih nekretnina`;
 };
 
+const generateCheckUpEmail = searchRequest => {
+  const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
+  const {
+    id,
+    gardenSizeMin,
+    gardenSizeMax,
+    sizeMin,
+    sizeMax,
+    priceMin,
+    priceMax
+  } = searchRequest;
+
+  const gardenSize = realEstateType.hasGardenSize
+    ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
+    : ``;
+
+  const emailFooter = generateEmailFooter(id);
+
+  return `<h3>Zdravo</h3>
+  <div><strong>Kivi tim traži nekretnine za Vas i kada to ne vidite.</strong></div>
+  <br />
+  <div>Vaša trenutno aktivna pretraga je:</div>
+  <br/>
+  <div>
+    <div><strong>Tip nekretnine: </strong>${realEstateType.title}</div>
+    <div><strong>Kvadratura nekretnine:</strong> Od ${sizeMin} do ${sizeMax} m2</div>
+    ${gardenSize}
+    <div><strong>Cijena:</strong> ${priceMin} do ${priceMax} KM</div>
+  </div>
+  <br/>
+  ${emailFooter}`;
+};
+
 module.exports = {
   generateNotificationEmail,
   generateNewSearchRequestEmail,
-  generateEmailSubject
+  generateEmailSubject,
+  generateCheckUpEmail
 };