diff --git a/app/controllers/publishRealEstate.js b/app/controllers/publishRealEstate.js index 0dde499..ef822c7 100644 --- a/app/controllers/publishRealEstate.js +++ b/app/controllers/publishRealEstate.js @@ -1,6 +1,6 @@ const { currentRealEstate } = require("../helpers/url"); const { createRealEstate } = require("../helpers/db/realEstate"); -const { createKiviOriginal } = require("../helpers/db/kiviOriginal"); +const { getKiviOriginalById } = require("../helpers/db/kiviOriginal"); const { AD_CATEGORY, @@ -174,9 +174,11 @@ const postPublishInputs = async (req, res) => { return; } - //const nextStepPage = req.query.nextStep || "pregled"; - // const nextStepUrl = `/${nextStepPage}/${searchRequest.id}`; - const nextStepUrl = "/unsubscribe/"; + const kiviOriginal = await getKiviOriginalById( + parseInt(realEstate.dataValues.agencyObjectId) + ); + + const nextStepPage = req.query.nextStep || "/uspjesnaobjava"; const balcony = req.body.balcony === "on"; const elevator = req.body.elevator === "on"; @@ -236,6 +238,8 @@ const postPublishInputs = async (req, res) => { const locationLat = req.body.lat || null; const locationLong = req.body.lng || null; + //Contact email saved in other table + const contactEmail = req.body.email || ""; realEstate.balcony = balcony; realEstate.elevator = elevator; @@ -284,9 +288,13 @@ const postPublishInputs = async (req, res) => { realEstate.locationLat = locationLat; realEstate.locationLong = locationLong; + kiviOriginal.email = contactEmail; + await realEstate.save(); - res.redirect(nextStepUrl); + await kiviOriginal.save(); + + res.redirect(nextStepPage); }; module.exports = { diff --git a/app/controllers/publishSuccess.js b/app/controllers/publishSuccess.js new file mode 100644 index 0000000..f444b9f --- /dev/null +++ b/app/controllers/publishSuccess.js @@ -0,0 +1,8 @@ +const publishSuccess = async (req, res) => { + const title = "Uspjeh!"; + res.render("publishSuccess", { title }); +}; + +module.exports = { + publishSuccess +}; diff --git a/app/helpers/db/kiviOriginal.js b/app/helpers/db/kiviOriginal.js index c1e7296..7e4d0f1 100644 --- a/app/helpers/db/kiviOriginal.js +++ b/app/helpers/db/kiviOriginal.js @@ -6,6 +6,15 @@ const createKiviOriginal = async (kiviAdFields = {}) => { return await db.KiviOriginal.create(kiviAdFields); }; -module.exports = { - createKiviOriginal +const getKiviOriginalById = async id => { + try { + return db.KiviOriginal.findByPk(id); + } catch (error) { + console.log("kiviOriginal.js", error); + return null; + } +}; +module.exports = { + createKiviOriginal, + getKiviOriginalById }; diff --git a/app/routes/index.js b/app/routes/index.js index b068e32..1be2cfc 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -20,6 +20,7 @@ const { postQueryReview } = require("../controllers/queryReview"); const { getGoAgain } = require("../controllers/goAgain"); +const { publishSuccess } = require("../controllers/publishSuccess"); const { getLocation, postLocation } = require("../controllers/location"); const { getUnsubscribe } = require("../controllers/unsubscribe"); const { getRealEstates } = require("../controllers/realEstates"); @@ -57,6 +58,8 @@ router.get("/odjava/:searchRequestId", getUnsubscribe); router.get("/ponovo", getGoAgain); +router.get("/uspjesnaobjava", publishSuccess); + router.get("/nekretnine/:searchRequestId", getRealEstates); router.get("/redirect/:id", getRedirect); diff --git a/app/views/publishEnd.ejs b/app/views/publishEnd.ejs index 1378dc8..654b32c 100644 --- a/app/views/publishEnd.ejs +++ b/app/views/publishEnd.ejs @@ -1,10 +1,20 @@
- Vaš oglas je spreman za objavu. +

Vaš oglas je spreman!

+ Unesite kontakt email i objavite oglas. +
+
+ +
- -
+
+
+
diff --git a/app/views/publishSuccess.ejs b/app/views/publishSuccess.ejs new file mode 100644 index 0000000..1696a01 --- /dev/null +++ b/app/views/publishSuccess.ejs @@ -0,0 +1,11 @@ +
+
+

Vaš oglas je spašen u Kivi bazu.

+
+
+ kivi logo +
+
+

Poslali smo potvrdni email sa detaljima oglasa na Vašu email adresu.

+ Nova pretraga +
\ No newline at end of file