diff --git a/lib/cart.js b/lib/cart.js index c973a682..e9fe64f6 100644 --- a/lib/cart.js +++ b/lib/cart.js @@ -109,24 +109,8 @@ const emptyCart = async (req, res, type, customMessage) => { res.redirect('/'); }; -const clearCustomer = (req) => { - // Clear our session - req.session.customerPresent = null; - req.session.customerEmail = null; - req.session.customerFirstname = null; - req.session.customerLastname = null; - req.session.customerAddress1 = null; - req.session.customerAddress2 = null; - req.session.customerCountry = null; - req.session.customerState = null; - req.session.customerPostcode = null; - req.session.customerPhone = null; - req.session.orderComment = null; -}; - module.exports = { updateTotalCart, updateSubscriptionCheck, - emptyCart, - clearCustomer + emptyCart }; diff --git a/lib/common.js b/lib/common.js index f1169a2a..70c6cfc5 100755 --- a/lib/common.js +++ b/lib/common.js @@ -268,6 +268,21 @@ const cleanAmount = (amount) => { return amount; }; +const clearCustomer = (req) => { + // Clear our session + req.session.customerPresent = null; + req.session.customerEmail = null; + req.session.customerFirstname = null; + req.session.customerLastname = null; + req.session.customerAddress1 = null; + req.session.customerAddress2 = null; + req.session.customerCountry = null; + req.session.customerState = null; + req.session.customerPostcode = null; + req.session.customerPhone = null; + req.session.orderComment = null; +}; + module.exports = { allowedMimeType, fileSizeLimit, @@ -287,6 +302,7 @@ module.exports = { newId, hooker, getCountryList, - getCountryNameToCode, - cleanAmount + cleanAmount, + clearCustomer, + getCountryNameToCode }; diff --git a/routes/order.js b/routes/order.js index befbec7b..da7dd74e 100644 --- a/routes/order.js +++ b/routes/order.js @@ -4,14 +4,14 @@ const { getCountryList, getId, sendEmail, - getEmailTemplate + getEmailTemplate, + clearCustomer } = require('../lib/common'); const { - paginateData + paginateData, } = require('../lib/paginate'); const { - emptyCart, - clearCustomer + emptyCart } = require('../lib/cart'); const { restrict, checkAccess } = require('../lib/auth'); const { indexOrders } = require('../lib/indexing');