- Open "Fair-Code" Source ERP / CRM | Node.js React.js
+Open Source ERP / CRM Accounting Invoice Quote
-
IDURAR ERP CRM | Simple To Use | 44 Languages
+IDURAR ERP CRM | Simple To Use
- [www.idurarapp.com/open-source-erp-crm/](https://www.idurarapp.com/open-source-erp-crm/) - -## ๐ฆ๐ฑ ๐ฉ๐ฟ ๐ง๐ฉ ๐ง๐ฌ ๐จ๐ณ ๐ญ๐ท ๐จ๐ฟ ๐ฉ๐ฐ ๐ณ๐ฑ ๐บ๐ธ ๐ช๐ช ๐ซ๐ท ๐ฉ๐ช ๐ฌ๐ท ๐ฎ๐ณ ๐ญ๐บ ๐ฎ๐ฉ ๐ฎ๐น ๐ฏ๐ต ๐ฐ๐ท ๐ฑ๐ป ๐ฑ๐น ๐ฒ๐ฐ ๐ฒ๐พ ๐ณ๐ด ๐ต๐ฑ ๐ง๐ท ๐ต๐น ๐ฎ๐ท ๐ท๐ด ๐ท๐บ ๐ธ๐ฐ ๐ธ๐ฎ ๐ช๐ธ ๐ธ๐ช ๐น๐ญ ๐น๐ท ๐บ๐ฆ ๐ต๐ฐ ๐ป๐ณ ๐ท๐ธ ๐ช๐ฆ ๐ต๐ญ ๐ซ๐ฎ - -IDURAR is Open "Fair-Code" Source ERP / CRM (Invoice / Inventory / Accounting / HR) Based on Advanced Mern Stack (Node.js / Express.js / MongoDb / React.js ) with Ant Design (AntD) and Redux - - - -**Live App Free Cloud Version** : [https://www.idurarapp.com/demo-erp-crm/](https://www.idurarapp.com/demo-erp-crm/) ``` -๐ Give a Star โญ๏ธ & Fork to this project ... Happy coding! ๐คฉ` + Give a Star โญ๏ธ & Fork to this project ... Happy coding! ๐คฉ` ``` -## Translation : +IDURAR is Open Source ERP / CRM (Invoice / Quote / Accounting ) Based on Advanced Mern Stack (Node.js / Express.js / MongoDb / React.js ) with Ant Design (AntD) and Redux -[French](doc/README.fr.md#French-Translation) , [Spanish](doc/README.sp.md#Spanish-Translation) -## License + + +**๐ Self-hosted Entreprise Version** : [https://cloud.idurarapp.com](https://cloud.idurarapp.com) -IDURAR is Free Open Code Source [fair-code](http://faircode.io) distributed under the -[**IDURAR License 1.0**](https://github.com/idurar/idurar-erp-crm/blob/master/LICENSE) -## License FAQ : -## Features : +## Features : -Invoice Management ๐ฐ +Invoice Management -Inventory Management ๐งณ +Payment Management -Accounting Management ๐ +Quote Management -HR Management ๐งโ๐คโ๐ง +Customer Management Ant Design Framework(AntD) ๐ @@ -49,21 +38,6 @@ Based on Mern Stack (Node.js / Express.js / MongoDb / React.js ) ๐จโ๐ป - Yes You can use IDURAR for free for personal or Commercial use. -### May i can customize IDURAR as Saas and provide it to other users ? - -No, you cannot customize IDURAR as a SaaS and provide it to other users , You are not allowed to provide IDURAR software to third parties as a hosted or managed service or as softwase as service (Saas), where the service provides users with access to any substantial set of the features or functionality of this software. - -### For custom developement service or premium Support : - -[Get in touch](mailto:hello@idurarapp.com) - -## How To Deploy IDURAR ERP CRM : - -๐ฅ I would like to invite you for a weekly free IDURAR Webinar (Node.js React.js course), where you learn how to deploy IDURAR on cloud , and create a new api and new crud app with IDURAR in just one hour ? -Please fill this form if you are interested : [https://forms.gle/qz2YZ3xQFQ77bGhS8](https://forms.gle/qz2YZ3xQFQ77bGhS8) - -The Webinar will be this Wednesday at 1pm GMT. - ## Our Sponsors @@ -78,14 +52,11 @@ The Webinar will be this Wednesday at 1pm GMT. IDURAR is Open "Fair-Code" Source ERP / CRM (Invoice / Inventory / Accounting / HR) Based on Mern Stack (Node.js / Express.js / MongoDb / React.js ) with Ant Design (AntD) and Redux -**Live App Demo** : [https://www.idurarapp.com/demo-erp-crm/](https://www.idurarapp.com/demo-erp-crm/) ## Getting started - 1.[Clone the repository](INSTALLATION-INSTRUCTIONS.md#step-1-clone-the-repository) - 2.[Create Your MongoDB Account and Database Cluster](INSTALLATION-INSTRUCTIONS.md#Step-2-Create-Your-MongoDB-Account-and-Database-Cluster) 3.[Edit the Environment File](INSTALLATION-INSTRUCTIONS.md#Step-3-Edit-the-Environment-File) @@ -102,24 +73,6 @@ IDURAR is Open "Fair-Code" Source ERP / CRM (Invoice / Inventory / Accounting / 9.[Run the Frontend Server](INSTALLATION-INSTRUCTIONS.md#Step-9-Run-the-Frontend-Server) -## Docker Compose for local development - -- setup additional env variables, if necessary in the below file - -```bash -docker-compose.yml -``` - -- After the necessary configurations run below command : - -```bash -docker-compose up -d -``` - -This will build the images and bring up the containers for frontend, backend and mongodb. - -**_NOTE:_** This docker-compose setup is associated for local development only. - ## Contributing 1.[How to contribute](https://github.com/idurar/idurar-erp-crm/blob/master/CONTRIBUTING.md#how-to-contribute) @@ -136,10 +89,13 @@ This will build the images and bring up the containers for frontend, backend and 7.[Questions](https://github.com/idurar/idurar-erp-crm/blob/master/CONTRIBUTING.md#questions) -## Custom Development Service - -Custom Development Service are available : [Get in touch](mailto:hello@idurarapp.com) ## Show your support Dont forget to give a โญ๏ธ to this project ... Happy coding! + +**๐ Self-hosted Entreprise Version** : [https://cloud.idurarapp.com](https://cloud.idurarapp.com) + +## License + +IDURAR is Free Open Source Released under the GNU Affero General Public License v3.0. diff --git a/backend/Dockerfile b/backend/Dockerfile deleted file mode 100644 index 69b7179bd..000000000 --- a/backend/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:20.9.0-alpine - -WORKDIR /usr/src/app - -RUN npm install -g npm@10.2.4 - -COPY package*.json ./ - -COPY . . - -RUN npm install - -EXPOSE 8888 - -CMD ["npm", "run", "dev"] \ No newline at end of file diff --git a/backend/package-lock.json b/backend/package-lock.json index 268204e70..3635c8039 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "idurar-erp-crm", - "version": "4.0.0-beta.3", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "idurar-erp-crm", - "version": "4.0.0-beta.3", + "version": "4.0.0", "license": "Fair-code License", "dependencies": { "@aws-sdk/client-s3": "^3.509.0", diff --git a/backend/package.json b/backend/package.json index 2e28def1c..ee2b151ea 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "idurar-erp-crm", - "version": "4.0.0", + "version": "4.1.0", "engines": { "npm": "10.2.4", "node": "20.9.0" diff --git a/backend/src/controllers/appControllers/clientController/create.js b/backend/src/controllers/appControllers/clientController/create.js deleted file mode 100644 index fdb96dab3..000000000 --- a/backend/src/controllers/appControllers/clientController/create.js +++ /dev/null @@ -1,91 +0,0 @@ -const mongoose = require('mongoose'); - -const People = mongoose.model('People'); -const Company = mongoose.model('Company'); - -const create = async (Model, req, res) => { - // Creating a new document in the collection - - if (req.body.type === 'people') { - if (!req.body.people) { - return res.status(403).json({ - success: false, - message: 'Please select a people', - }); - } else { - let client = await Model.findOne({ - people: req.body.people, - removed: false, - }); - - if (client) { - return res.status(403).json({ - success: false, - result: null, - message: 'Client Already Exist', - }); - } - - let { firstname, lastname } = await People.findOneAndUpdate( - { - _id: req.body.people, - removed: false, - }, - { isClient: true }, - { - new: true, // return the new result instead of the old one - runValidators: true, - } - ).exec(); - req.body.name = firstname + ' ' + lastname; - req.body.company = undefined; - } - } else { - if (!req.body.company) { - return res.status(403).json({ - success: false, - message: 'Please select a company', - }); - } else { - let client = await Model.findOne({ - company: req.body.company, - removed: false, - }); - - if (client) { - return res.status(403).json({ - success: false, - result: null, - message: 'Client Already Exist', - }); - } - let { name } = await Company.findOneAndUpdate( - { - _id: req.body.company, - removed: false, - }, - { isClient: true }, - { - new: true, // return the new result instead of the old one - runValidators: true, - } - ).exec(); - req.body.name = name; - req.body.people = undefined; - } - } - - req.body.removed = false; - const result = await new Model({ - ...req.body, - }).save(); - - // Returning successfull response - return res.status(200).json({ - success: true, - result, - message: 'Successfully Created the document in Model ', - }); -}; - -module.exports = create; diff --git a/backend/src/controllers/appControllers/clientController/index.js b/backend/src/controllers/appControllers/clientController/index.js index 668727b75..6411c1951 100644 --- a/backend/src/controllers/appControllers/clientController/index.js +++ b/backend/src/controllers/appControllers/clientController/index.js @@ -1,28 +1,13 @@ const mongoose = require('mongoose'); const createCRUDController = require('@/controllers/middlewaresControllers/createCRUDController'); -const remove = require('./remove'); -const summary = require('./summary'); - -const create = require('./create'); -const read = require('./read'); -const search = require('./search'); -const update = require('./update'); -const listAll = require('./listAll'); -const paginatedList = require('./paginatedList'); +const summary = require('./summary'); function modelController() { const Model = mongoose.model('Client'); const methods = createCRUDController('Client'); - methods.read = (req, res) => read(Model, req, res); - methods.delete = (req, res) => remove(Model, req, res); - methods.list = (req, res) => paginatedList(Model, req, res); methods.summary = (req, res) => summary(Model, req, res); - methods.create = (req, res) => create(Model, req, res); - methods.update = (req, res) => update(Model, req, res); - methods.search = (req, res) => search(Model, req, res); - methods.listAll = (req, res) => listAll(Model, req, res); return methods; } diff --git a/backend/src/controllers/appControllers/clientController/listAll.js b/backend/src/controllers/appControllers/clientController/listAll.js deleted file mode 100644 index 82a836d44..000000000 --- a/backend/src/controllers/appControllers/clientController/listAll.js +++ /dev/null @@ -1,30 +0,0 @@ -const { migrate } = require('./migrate'); - -const listAll = async (Model, req, res) => { - const sort = parseInt(req.query.sort) || 'desc'; - - // Query the database for a list of all results - const result = await Model.find({ - removed: false, - }) - .sort({ created: sort }) - .populate() - .exec(); - - const migratedData = result.map((x) => migrate(x)); - if (result.length > 0) { - return res.status(200).json({ - success: true, - result: migratedData, - message: 'Successfully found all documents', - }); - } else { - return res.status(203).json({ - success: true, - result: [], - message: 'Collection is Empty', - }); - } -}; - -module.exports = listAll; diff --git a/backend/src/controllers/appControllers/clientController/migrate.js b/backend/src/controllers/appControllers/clientController/migrate.js deleted file mode 100644 index cc6659d9a..000000000 --- a/backend/src/controllers/appControllers/clientController/migrate.js +++ /dev/null @@ -1,16 +0,0 @@ -exports.migrate = (result) => { - const client = result.type === 'people' ? result.people : result.company; - let newData = {}; - newData._id = result._id; - newData.type = result.type; - newData.name = result.name; - newData.phone = client.phone; - newData.email = client.email; - newData.website = client.website; - newData.country = client.country; - newData.address = client.address; - newData.people = result.people; - newData.company = result.company; - newData.notes = result.notes; - return newData; -}; diff --git a/backend/src/controllers/appControllers/clientController/paginatedList.js b/backend/src/controllers/appControllers/clientController/paginatedList.js deleted file mode 100644 index 9e121a66a..000000000 --- a/backend/src/controllers/appControllers/clientController/paginatedList.js +++ /dev/null @@ -1,67 +0,0 @@ -const { migrate } = require('./migrate'); - -const paginatedList = async (Model, req, res) => { - const page = req.query.page || 1; - - const limit = parseInt(req.query.items) || 10; - const skip = page * limit - limit; - - const { sortBy = 'enabled', sortValue = -1, filter, equal } = req.query; - - const fieldsArray = req.query.fields ? req.query.fields.split(',') : []; - - let fields; - - fields = fieldsArray.length === 0 ? {} : { $or: [] }; - - for (const field of fieldsArray) { - fields.$or.push({ [field]: { $regex: new RegExp(req.query.q, 'i') } }); - } - - // Query the database for a list of all results - const resultsPromise = Model.find({ - removed: false, - [filter]: equal, - ...fields, - }) - .skip(skip) - .limit(limit) - .sort({ [sortBy]: sortValue }) - .populate() - .exec(); - - // Counting the total documents - const countPromise = Model.countDocuments({ - removed: false, - - [filter]: equal, - ...fields, - }); - // Resolving both promises - const [result, count] = await Promise.all([resultsPromise, countPromise]); - // console.log('๐ ~ file: paginatedList.js:23 ~ paginatedList ~ result:', result); - - // Calculating total pages - const pages = Math.ceil(count / limit); - - const pagination = { page, pages, count }; - if (count > 0) { - const migratedData = result.map((x) => migrate(x)); - // console.log('๐ ~ file: paginatedList.js:23 ~ paginatedList ~ migratedData:', migratedData); - return res.status(200).json({ - success: true, - result: migratedData, - pagination, - message: 'Successfully found all documents', - }); - } else { - return res.status(203).json({ - success: true, - result: [], - pagination, - message: 'Collection is Empty', - }); - } -}; - -module.exports = paginatedList; diff --git a/backend/src/controllers/appControllers/clientController/read.js b/backend/src/controllers/appControllers/clientController/read.js deleted file mode 100644 index 9f6c27db0..000000000 --- a/backend/src/controllers/appControllers/clientController/read.js +++ /dev/null @@ -1,29 +0,0 @@ -const { migrate } = require('./migrate'); - -const read = async (Model, req, res) => { - // Find document by id - let result = await Model.findOne({ - _id: req.params.id, - removed: false, - }).exec(); - // If no results found, return document not found - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No document found ', - }); - } else { - // Return success resposne - - const migratedData = migrate(result); - - return res.status(200).json({ - success: true, - result: migratedData, - message: 'we found this document ', - }); - } -}; - -module.exports = read; diff --git a/backend/src/controllers/appControllers/clientController/remove.js b/backend/src/controllers/appControllers/clientController/remove.js deleted file mode 100644 index 64f301384..000000000 --- a/backend/src/controllers/appControllers/clientController/remove.js +++ /dev/null @@ -1,84 +0,0 @@ -const mongoose = require('mongoose'); - -const QuoteModel = mongoose.model('Quote'); -const InvoiceModel = mongoose.model('Invoice'); -const People = mongoose.model('People'); -const Company = mongoose.model('Company'); - -const remove = async (Model, req, res) => { - // cannot delete client it it have one invoice or quotes: - // check if client have invoice or quotes: - const { id } = req.params; - - // first find if there alt least one quote or invoice exist corresponding to the client - const resultQuotes = QuoteModel.findOne({ - client: id, - removed: false, - }).exec(); - const resultInvoice = InvoiceModel.findOne({ - client: id, - removed: false, - }).exec(); - - const [quotes, invoice] = await Promise.allSettled([resultQuotes, resultInvoice]); - if (quotes?.value) { - return res.status(400).json({ - success: false, - result: null, - message: 'Cannot delete client if client have any quote or invoice', - }); - } - if (invoice?.value) { - return res.status(400).json({ - success: false, - result: null, - message: 'Cannot delete client if client have any quote or invoice', - }); - } - - let result = await Model.findOneAndDelete({ - _id: id, - removed: false, - }).exec(); - - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No client found by this id: ' + id, - }); - } - - if (result.type === 'people') { - await People.findOneAndUpdate( - { - _id: result.people._id, - removed: false, - }, - { isClient: false }, - { - new: true, // return the new result instead of the old one - runValidators: true, - } - ).exec(); - } else { - await Company.findOneAndUpdate( - { - _id: result.company._id, - removed: false, - }, - { isClient: false }, - { - new: true, // return the new result instead of the old one - runValidators: true, - } - ).exec(); - } - - return res.status(200).json({ - success: true, - result: null, - message: 'Successfully Deleted the client by id: ' + id, - }); -}; -module.exports = remove; diff --git a/backend/src/controllers/appControllers/clientController/search.js b/backend/src/controllers/appControllers/clientController/search.js deleted file mode 100644 index 343d09586..000000000 --- a/backend/src/controllers/appControllers/clientController/search.js +++ /dev/null @@ -1,51 +0,0 @@ -const { migrate } = require('./migrate'); - -const search = async (Model, req, res) => { - // console.log(req.query.fields) - // if (req.query.q === undefined || req.query.q.trim() === '') { - // return res - // .status(202) - // .json({ - // success: false, - // result: [], - // message: 'No document found by this request', - // }) - // .end(); - // } - const fieldsArray = req.query.fields ? req.query.fields.split(',') : ['name']; - - const fields = { $or: [] }; - - for (const field of fieldsArray) { - fields.$or.push({ [field]: { $regex: new RegExp(req.query.q, 'i') } }); - } - // console.log(fields) - - let results = await Model.find({ - ...fields, - }) - .where('removed', false) - .limit(20) - .exec(); - - const migratedData = results.map((x) => migrate(x)); - - if (results.length >= 1) { - return res.status(200).json({ - success: true, - result: migratedData, - message: 'Successfully found all documents', - }); - } else { - return res - .status(202) - .json({ - success: false, - result: [], - message: 'No document found by this request', - }) - .end(); - } -}; - -module.exports = search; diff --git a/backend/src/controllers/appControllers/clientController/update.js b/backend/src/controllers/appControllers/clientController/update.js deleted file mode 100644 index 3068e8a95..000000000 --- a/backend/src/controllers/appControllers/clientController/update.js +++ /dev/null @@ -1,12 +0,0 @@ -const mongoose = require('mongoose'); - -const update = async (Model, req, res) => { - // Find document by id and updates with the required fields - return res.status(200).json({ - success: false, - result: null, - message: 'You cant update client once is created', - }); -}; - -module.exports = update; diff --git a/backend/src/controllers/appControllers/companyController/index.js b/backend/src/controllers/appControllers/companyController/index.js deleted file mode 100644 index 3b3308320..000000000 --- a/backend/src/controllers/appControllers/companyController/index.js +++ /dev/null @@ -1,24 +0,0 @@ -const mongoose = require('mongoose'); -const { modelsFiles } = require('@/models/utils'); -const createCRUDController = require('@/controllers/middlewaresControllers/createCRUDController'); - -const remove = require('./remove'); -const update = require('./update'); - -function modelController() { - const modelName = 'Company'; - - if (!modelsFiles.includes(modelName)) { - throw new Error(`Model ${modelName} does not exist`); - } else { - const Model = mongoose.model(modelName); - const methods = createCRUDController(modelName); - - methods.delete = (req, res) => remove(Model, req, res); - methods.update = (req, res) => update(Model, req, res); - - return methods; - } -} - -module.exports = modelController(); diff --git a/backend/src/controllers/appControllers/companyController/remove.js b/backend/src/controllers/appControllers/companyController/remove.js deleted file mode 100644 index f3257244e..000000000 --- a/backend/src/controllers/appControllers/companyController/remove.js +++ /dev/null @@ -1,57 +0,0 @@ -const mongoose = require('mongoose'); - -const Client = mongoose.model('Client'); -const People = mongoose.model('People'); - -const remove = async (Model, req, res) => { - // cannot delete client it it have one invoice or Client: - // check if client have invoice or quotes: - const { id } = req.params; - - // first find if there alt least one quote or invoice exist corresponding to the client - const client = await Client.findOne({ - company: id, - removed: false, - }).exec(); - if (client) { - return res.status(400).json({ - success: false, - result: null, - message: 'Cannot delete company if company attached to any people or she is client', - }); - } - const people = await People.findOne({ - company: id, - removed: false, - }).exec(); - if (people) { - return res.status(400).json({ - success: false, - result: null, - message: 'Cannot delete company if company attached to any people or she is client', - }); - } - - // if no People or quote, delete the client - const result = await Model.findOneAndUpdate( - { _id: id, removed: false }, - { - $set: { - removed: true, - }, - } - ).exec(); - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No people found by this id: ' + id, - }); - } - return res.status(200).json({ - success: true, - result, - message: 'Successfully Deleted the people by id: ' + id, - }); -}; -module.exports = remove; diff --git a/backend/src/controllers/appControllers/companyController/update.js b/backend/src/controllers/appControllers/companyController/update.js deleted file mode 100644 index 7dc04138d..000000000 --- a/backend/src/controllers/appControllers/companyController/update.js +++ /dev/null @@ -1,44 +0,0 @@ -const mongoose = require('mongoose'); -const Client = mongoose.model('Client'); -const Lead = mongoose.model('People'); - -const update = async (Model, req, res) => { - // Find document by id and updates with the required fields - req.body.removed = false; - const result = await Model.findOneAndUpdate({ _id: req.params.id, removed: false }, req.body, { - new: true, // return the new result instead of the old one - runValidators: true, - }).exec(); - - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No document found ', - }); - } else { - await Client.findOneAndUpdate( - { company: result._id }, - { name: result.name }, - { - new: true, // return the new result instead of the old one - } - ).exec(); - - await Lead.findOneAndUpdate( - { company: result._id }, - { name: result.name }, - { - new: true, // return the new result instead of the old one - } - ).exec(); - - return res.status(200).json({ - success: true, - result, - message: 'we update this document ', - }); - } -}; - -module.exports = update; diff --git a/backend/src/controllers/appControllers/invoiceController/remove.js b/backend/src/controllers/appControllers/invoiceController/remove.js index f4798289d..94bc7bfa6 100644 --- a/backend/src/controllers/appControllers/invoiceController/remove.js +++ b/backend/src/controllers/appControllers/invoiceController/remove.js @@ -1,13 +1,36 @@ const mongoose = require('mongoose'); const Model = mongoose.model('Invoice'); -const ModalPayment = mongoose.model('Payment'); +const ModelPayment = mongoose.model('Payment'); const remove = async (req, res) => { + const deletedInvoice = await Model.findOneAndUpdate( + { + _id: req.params.id, + removed: false, + }, + { + $set: { + removed: true, + }, + } + ).exec(); + + if (!deletedInvoice) { + return res.status(404).json({ + success: false, + result: null, + message: 'Invoice not found', + }); + } + const paymentsInvoices = await ModelPayment.updateMany( + { invoice: deletedInvoice._id }, + { $set: { removed: true } } + ); return res.status(200).json({ success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', + result: deletedInvoice, + message: 'Invoice deleted successfully', }); }; diff --git a/backend/src/controllers/appControllers/invoiceController/update.js b/backend/src/controllers/appControllers/invoiceController/update.js index 8fe7f9b31..64bcbaa51 100644 --- a/backend/src/controllers/appControllers/invoiceController/update.js +++ b/backend/src/controllers/appControllers/invoiceController/update.js @@ -8,10 +8,75 @@ const { calculate } = require('@/helpers'); const schema = require('./schemaValidate'); const update = async (req, res) => { + let body = req.body; + + const { error, value } = schema.validate(body); + if (error) { + const { details } = error; + return res.status(400).json({ + success: false, + result: null, + message: details[0]?.message, + }); + } + + const previousInvoice = await Model.findOne({ + _id: req.params.id, + removed: false, + }); + + const { credit } = previousInvoice; + + const { items = [], taxRate = 0, discount = 0 } = req.body; + + if (items.length === 0) { + return res.status(400).json({ + success: false, + result: null, + message: 'Items cannot be empty', + }); + } + + // default + let subTotal = 0; + let taxTotal = 0; + let total = 0; + + //Calculate the items array with subTotal, total, taxTotal + items.map((item) => { + let total = calculate.multiply(item['quantity'], item['price']); + //sub total + subTotal = calculate.add(subTotal, total); + //item total + item['total'] = total; + }); + taxTotal = calculate.multiply(subTotal, taxRate / 100); + total = calculate.add(subTotal, taxTotal); + + body['subTotal'] = subTotal; + body['taxTotal'] = taxTotal; + body['total'] = total; + body['items'] = items; + body['pdf'] = 'invoice-' + req.params.id + '.pdf'; + if (body.hasOwnProperty('currency')) { + delete body.currency; + } + // Find document by id and updates with the required fields + + let paymentStatus = + calculate.sub(total, discount) === credit ? 'paid' : credit > 0 ? 'partially' : 'unpaid'; + body['paymentStatus'] = paymentStatus; + + const result = await Model.findOneAndUpdate({ _id: req.params.id, removed: false }, body, { + new: true, // return the new result instead of the old one + }).exec(); + + // Returning successfull response + return res.status(200).json({ success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', + result, + message: 'we update this document ', }); }; diff --git a/backend/src/controllers/appControllers/leadController/create.js b/backend/src/controllers/appControllers/leadController/create.js deleted file mode 100644 index 2b70d7ab0..000000000 --- a/backend/src/controllers/appControllers/leadController/create.js +++ /dev/null @@ -1,51 +0,0 @@ -const mongoose = require('mongoose'); -const People = mongoose.model('People'); -const Company = mongoose.model('Company'); - -const create = async (Model, req, res) => { - // Creating a new document in the collection - - if (req.body.type === 'people') { - if (!req.body.people) { - return res.status(403).json({ - success: false, - message: 'Please select a people', - }); - } else { - let { firstname, lastname } = await People.findOne({ - _id: req.body.people, - removed: false, - }).exec(); - req.body.name = firstname + ' ' + lastname; - req.body.company = null; - } - } else { - if (!req.body.company) { - return res.status(403).json({ - success: false, - message: 'Please select a company', - }); - } else { - let { name } = await Company.findOne({ - _id: req.body.company, - removed: false, - }).exec(); - req.body.name = name; - req.body.people = null; - } - } - - req.body.removed = false; - const result = await new Model({ - ...req.body, - }).save(); - - // Returning successfull response - return res.status(200).json({ - success: true, - result, - message: 'Successfully Created the document in Model ', - }); -}; - -module.exports = create; diff --git a/backend/src/controllers/appControllers/leadController/index.js b/backend/src/controllers/appControllers/leadController/index.js deleted file mode 100644 index 59f036bc8..000000000 --- a/backend/src/controllers/appControllers/leadController/index.js +++ /dev/null @@ -1,29 +0,0 @@ -const mongoose = require('mongoose'); -const createCRUDController = require('@/controllers/middlewaresControllers/createCRUDController'); -const remove = require('./remove'); -const summary = require('./summary'); - -const create = require('./create'); -const update = require('./update'); -const read = require('./read'); -const search = require('./search'); - -const listAll = require('./listAll'); -const paginatedList = require('./paginatedList'); - -function modelController() { - const modelName = 'Lead'; - const Model = mongoose.model(modelName); - const methods = createCRUDController(modelName); - methods.read = (req, res) => read(Model, req, res); - methods.delete = (req, res) => remove(Model, req, res); - methods.list = (req, res) => paginatedList(Model, req, res); - methods.summary = (req, res) => summary(Model, req, res); - methods.create = (req, res) => create(Model, req, res); - methods.update = (req, res) => update(Model, req, res); - methods.search = (req, res) => search(Model, req, res); - methods.listAll = (req, res) => listAll(Model, req, res); - return methods; -} - -module.exports = modelController(); diff --git a/backend/src/controllers/appControllers/leadController/listAll.js b/backend/src/controllers/appControllers/leadController/listAll.js deleted file mode 100644 index 82a836d44..000000000 --- a/backend/src/controllers/appControllers/leadController/listAll.js +++ /dev/null @@ -1,30 +0,0 @@ -const { migrate } = require('./migrate'); - -const listAll = async (Model, req, res) => { - const sort = parseInt(req.query.sort) || 'desc'; - - // Query the database for a list of all results - const result = await Model.find({ - removed: false, - }) - .sort({ created: sort }) - .populate() - .exec(); - - const migratedData = result.map((x) => migrate(x)); - if (result.length > 0) { - return res.status(200).json({ - success: true, - result: migratedData, - message: 'Successfully found all documents', - }); - } else { - return res.status(203).json({ - success: true, - result: [], - message: 'Collection is Empty', - }); - } -}; - -module.exports = listAll; diff --git a/backend/src/controllers/appControllers/leadController/migrate.js b/backend/src/controllers/appControllers/leadController/migrate.js deleted file mode 100644 index 69fb308f6..000000000 --- a/backend/src/controllers/appControllers/leadController/migrate.js +++ /dev/null @@ -1,18 +0,0 @@ -exports.migrate = (result) => { - let lead = result.type === 'people' ? result.people : result.company; - let newData = {}; - newData._id = result._id; - newData.type = result.type; - newData.status = result.status; - newData.source = result.source; - newData.name = result.name; - newData.phone = lead.phone; - newData.email = lead.email; - newData.website = lead.website; - newData.country = lead.country; - newData.address = lead.address; - newData.people = result.people; - newData.company = result.company; - newData.notes = result.notes; - return newData; -}; diff --git a/backend/src/controllers/appControllers/leadController/paginatedList.js b/backend/src/controllers/appControllers/leadController/paginatedList.js deleted file mode 100644 index dc39e3001..000000000 --- a/backend/src/controllers/appControllers/leadController/paginatedList.js +++ /dev/null @@ -1,68 +0,0 @@ -const { migrate } = require('./migrate'); - -const paginatedList = async (Model, req, res) => { - const page = req.query.page || 1; - - const limit = parseInt(req.query.items) || 10; - const skip = page * limit - limit; - - const { sortBy = 'enabled', sortValue = -1, filter, equal } = req.query; - - const fieldsArray = req.query.fields ? req.query.fields.split(',') : []; - - let fields; - - fields = fieldsArray.length === 0 ? {} : { $or: [] }; - - for (const field of fieldsArray) { - fields.$or.push({ [field]: { $regex: new RegExp(req.query.q, 'i') } }); - } - - // Query the database for a list of all results - const resultsPromise = Model.find({ - removed: false, - - [filter]: equal, - ...fields, - }) - .skip(skip) - .limit(limit) - .sort({ [sortBy]: sortValue }) - .populate() - .exec(); - - // Counting the total documents - const countPromise = Model.countDocuments({ - removed: false, - - [filter]: equal, - ...fields, - }); - // Resolving both promises - const [result, count] = await Promise.all([resultsPromise, countPromise]); - // console.log('๐ ~ file: paginatedList.js:23 ~ paginatedList ~ result:', result); - - // Calculating total pages - const pages = Math.ceil(count / limit); - - const pagination = { page, pages, count }; - if (count > 0) { - const migratedData = result.map((x) => migrate(x)); - // console.log('๐ ~ file: paginatedList.js:23 ~ paginatedList ~ migratedData:', migratedData); - return res.status(200).json({ - success: true, - result: migratedData, - pagination, - message: 'Successfully found all documents', - }); - } else { - return res.status(203).json({ - success: true, - result: [], - pagination, - message: 'Collection is Empty', - }); - } -}; - -module.exports = paginatedList; diff --git a/backend/src/controllers/appControllers/leadController/read.js b/backend/src/controllers/appControllers/leadController/read.js deleted file mode 100644 index 9f6c27db0..000000000 --- a/backend/src/controllers/appControllers/leadController/read.js +++ /dev/null @@ -1,29 +0,0 @@ -const { migrate } = require('./migrate'); - -const read = async (Model, req, res) => { - // Find document by id - let result = await Model.findOne({ - _id: req.params.id, - removed: false, - }).exec(); - // If no results found, return document not found - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No document found ', - }); - } else { - // Return success resposne - - const migratedData = migrate(result); - - return res.status(200).json({ - success: true, - result: migratedData, - message: 'we found this document ', - }); - } -}; - -module.exports = read; diff --git a/backend/src/controllers/appControllers/leadController/remove.js b/backend/src/controllers/appControllers/leadController/remove.js deleted file mode 100644 index 00021092d..000000000 --- a/backend/src/controllers/appControllers/leadController/remove.js +++ /dev/null @@ -1,10 +0,0 @@ -const mongoose = require('mongoose'); - -const remove = async (Model, req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); -}; -module.exports = remove; diff --git a/backend/src/controllers/appControllers/leadController/search.js b/backend/src/controllers/appControllers/leadController/search.js deleted file mode 100644 index e5ab7f765..000000000 --- a/backend/src/controllers/appControllers/leadController/search.js +++ /dev/null @@ -1,50 +0,0 @@ -const { migrate } = require('./migrate'); - -const search = async (Model, req, res) => { - // if (req.query.q === undefined || req.query.q.trim() === '') { - // return res - // .status(202) - // .json({ - // success: false, - // result: [], - // message: 'No document found by this request', - // }) - // .end(); - // } - const fieldsArray = req.query.fields ? req.query.fields.split(',') : ['name']; - - const fields = { $or: [] }; - - for (const field of fieldsArray) { - fields.$or.push({ [field]: { $regex: new RegExp(req.query.q, 'i') } }); - } - // console.log(fields) - - let results = await Model.find({ - ...fields, - }) - .where('removed', false) - .limit(20) - .exec(); - - const migratedData = results.map((x) => migrate(x)); - - if (results.length >= 1) { - return res.status(200).json({ - success: true, - result: migratedData, - message: 'Successfully found all documents', - }); - } else { - return res - .status(202) - .json({ - success: false, - result: [], - message: 'No document found by this request', - }) - .end(); - } -}; - -module.exports = search; diff --git a/backend/src/controllers/appControllers/leadController/summary.js b/backend/src/controllers/appControllers/leadController/summary.js deleted file mode 100644 index 8bc80d95a..000000000 --- a/backend/src/controllers/appControllers/leadController/summary.js +++ /dev/null @@ -1,97 +0,0 @@ -const mongoose = require('mongoose'); -const moment = require('moment'); - -const OfferModel = mongoose.model('Offer'); - -const summary = async (Model, req, res) => { - let defaultType = 'month'; - const { type } = req.query; - - if (type && ['week', 'month', 'year'].includes(type)) { - defaultType = type; - } else if (type) { - return res.status(400).json({ - success: false, - result: null, - message: 'Invalid type', - }); - } - - const currentDate = moment(); - let startDate = currentDate.clone().startOf(defaultType); - let endDate = currentDate.clone().endOf(defaultType); - - const pipeline = [ - { - $facet: { - totalClients: [ - { - $match: { - removed: false, - enabled: true, - }, - }, - { - $count: 'count', - }, - ], - newClients: [ - { - $match: { - removed: false, - created: { $gte: startDate.toDate(), $lte: endDate.toDate() }, - enabled: true, - }, - }, - { - $count: 'count', - }, - ], - activeClients: [ - { - $lookup: { - from: OfferModel.collection.name, - localField: '_id', // Match _id from ClientModel - foreignField: 'lead', // Match client field in OfferModel - as: 'offer', - }, - }, - { - $match: { - 'offer.removed': false, - }, - }, - { - $group: { - _id: '$_id', - }, - }, - { - $count: 'count', - }, - ], - }, - }, - ]; - - const aggregationResult = await Model.aggregate(pipeline); - - const result = aggregationResult[0]; - const totalClients = result.totalClients[0] ? result.totalClients[0].count : 0; - const totalNewClients = result.newClients[0] ? result.newClients[0].count : 0; - const activeClients = result.activeClients[0] ? result.activeClients[0].count : 0; - - const totalActiveClientsPercentage = totalClients > 0 ? (activeClients / totalClients) * 100 : 0; - const totalNewClientsPercentage = totalClients > 0 ? (totalNewClients / totalClients) * 100 : 0; - - return res.status(200).json({ - success: true, - result: { - new: Math.round(totalNewClientsPercentage), - active: Math.round(totalActiveClientsPercentage), - }, - message: 'Successfully get summary of new clients', - }); -}; - -module.exports = summary; diff --git a/backend/src/controllers/appControllers/leadController/update.js b/backend/src/controllers/appControllers/leadController/update.js deleted file mode 100644 index 002d5023b..000000000 --- a/backend/src/controllers/appControllers/leadController/update.js +++ /dev/null @@ -1,13 +0,0 @@ -const mongoose = require('mongoose'); -const People = mongoose.model('People'); -const Company = mongoose.model('Company'); - -const update = async (Model, req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); -}; - -module.exports = update; diff --git a/backend/src/controllers/appControllers/offerController/create.js b/backend/src/controllers/appControllers/offerController/create.js deleted file mode 100644 index 99ca822de..000000000 --- a/backend/src/controllers/appControllers/offerController/create.js +++ /dev/null @@ -1,61 +0,0 @@ -const mongoose = require('mongoose'); - -const Model = mongoose.model('Offer'); - -const custom = require('@/controllers/pdfController'); - -const { calculate } = require('@/helpers'); -const { increaseBySettingKey } = require('@/middlewares/settings'); - -const create = async (req, res) => { - const { items = [], taxRate = 0, discount = 0 } = req.body; - - // default - let subTotal = 0; - let taxTotal = 0; - let total = 0; - // let credit = 0; - - //Calculate the items array with subTotal, total, taxTotal - items.map((item) => { - let total = calculate.multiply(item['quantity'], item['price']); - //sub total - subTotal = calculate.add(subTotal, total); - //item total - item['total'] = total; - }); - taxTotal = calculate.multiply(subTotal, taxRate / 100); - total = calculate.add(subTotal, taxTotal); - - let body = req.body; - - body['subTotal'] = subTotal; - body['taxTotal'] = taxTotal; - body['total'] = total; - body['items'] = items; - body['createdBy'] = req.admin._id; - - // Creating a new document in the collection - const result = await new Model(body).save(); - const fileId = 'offer-' + result._id + '.pdf'; - const updateResult = await Model.findOneAndUpdate( - { _id: result._id }, - { pdf: fileId }, - { - new: true, - } - ).exec(); - // Returning successfull response - - increaseBySettingKey({ - settingKey: 'last_offer_number', - }); - - // Returning successfull response - return res.status(200).json({ - success: true, - result: updateResult, - message: 'Offer created successfully', - }); -}; -module.exports = create; diff --git a/backend/src/controllers/appControllers/offerController/index.js b/backend/src/controllers/appControllers/offerController/index.js deleted file mode 100644 index a9f7c2dd1..000000000 --- a/backend/src/controllers/appControllers/offerController/index.js +++ /dev/null @@ -1,18 +0,0 @@ -const createCRUDController = require('@/controllers/middlewaresControllers/createCRUDController'); -const methods = createCRUDController('Offer'); - -const create = require('./create'); -const summary = require('./summary'); -const update = require('./update'); -const paginatedList = require('./paginatedList'); -const read = require('./read'); -const sendMail = require('./sendMail'); - -methods.list = paginatedList; -methods.read = read; -methods.mail = sendMail; -methods.create = create; -methods.update = update; -methods.summary = summary; - -module.exports = methods; diff --git a/backend/src/controllers/appControllers/offerController/paginatedList.js b/backend/src/controllers/appControllers/offerController/paginatedList.js deleted file mode 100644 index 3fcae7c5a..000000000 --- a/backend/src/controllers/appControllers/offerController/paginatedList.js +++ /dev/null @@ -1,68 +0,0 @@ -const mongoose = require('mongoose'); - -const Model = mongoose.model('Offer'); - -const paginatedList = async (req, res) => { - const page = req.query.page || 1; - const limit = parseInt(req.query.items) || 10; - const skip = page * limit - limit; - - // Query the database for a list of all results - const { sortBy = 'enabled', sortValue = -1, filter, equal } = req.query; - - const fieldsArray = req.query.fields ? req.query.fields.split(',') : []; - - let fields; - - fields = fieldsArray.length === 0 ? {} : { $or: [] }; - - for (const field of fieldsArray) { - fields.$or.push({ [field]: { $regex: new RegExp(req.query.q, 'i') } }); - } - - // Query the database for a list of all results - const resultsPromise = Model.find({ - removed: false, - - [filter]: equal, - ...fields, - }) - .skip(skip) - .limit(limit) - .sort({ [sortBy]: sortValue }) - .populate('createdBy', 'name') - .exec(); - - // Counting the total documents - const countPromise = Model.countDocuments({ - removed: false, - - [filter]: equal, - ...fields, - }); - - // Resolving both promises - const [result, count] = await Promise.all([resultsPromise, countPromise]); - // Calculating total pages - const pages = Math.ceil(count / limit); - - // Getting Pagination Object - const pagination = { page, pages, count }; - if (count > 0) { - return res.status(200).json({ - success: true, - result, - pagination, - message: 'Successfully found all documents', - }); - } else { - return res.status(203).json({ - success: true, - result: [], - pagination, - message: 'Collection is Empty', - }); - } -}; - -module.exports = paginatedList; diff --git a/backend/src/controllers/appControllers/offerController/read.js b/backend/src/controllers/appControllers/offerController/read.js deleted file mode 100644 index c74e7dd8a..000000000 --- a/backend/src/controllers/appControllers/offerController/read.js +++ /dev/null @@ -1,30 +0,0 @@ -const mongoose = require('mongoose'); - -const Model = mongoose.model('Offer'); - -const read = async (req, res) => { - // Find document by id - const result = await Model.findOne({ - _id: req.params.id, - removed: false, - }) - .populate('createdBy', 'name') - .exec(); - // If no results found, return document not found - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No document found ', - }); - } else { - // Return success resposne - return res.status(200).json({ - success: true, - result, - message: 'we found this document ', - }); - } -}; - -module.exports = read; diff --git a/backend/src/controllers/appControllers/offerController/sendMail.js b/backend/src/controllers/appControllers/offerController/sendMail.js deleted file mode 100644 index 5cdabe784..000000000 --- a/backend/src/controllers/appControllers/offerController/sendMail.js +++ /dev/null @@ -1,9 +0,0 @@ -const mail = async (req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); -}; - -module.exports = mail; diff --git a/backend/src/controllers/appControllers/offerController/summary.js b/backend/src/controllers/appControllers/offerController/summary.js deleted file mode 100644 index 56f63b946..000000000 --- a/backend/src/controllers/appControllers/offerController/summary.js +++ /dev/null @@ -1,123 +0,0 @@ -const mongoose = require('mongoose'); -const moment = require('moment'); - -const Model = mongoose.model('Offer'); - -const summary = async (req, res) => { - let defaultType = 'month'; - - const { type } = req.query; - - if (type) { - if (['week', 'month', 'year'].includes(type)) { - defaultType = type; - } else { - return res.status(400).json({ - success: false, - result: null, - message: 'Invalid type', - }); - } - } - - const currentDate = moment(); - let startDate = currentDate.clone().startOf(defaultType); - let endDate = currentDate.clone().endOf(defaultType); - - const statuses = ['draft', 'pending', 'sent', 'expired', 'declined', 'accepted']; - - const response = await Model.aggregate([ - { - $match: { - removed: false, - - // date: { - // $gte: startDate.toDate(), - // $lte: endDate.toDate(), - // }, - }, - }, - { - $facet: { - totalOffer: [ - { - $group: { - _id: null, - total: { - $sum: '$total', - }, - count: { - $sum: 1, - }, - }, - }, - { - $project: { - _id: 0, - total: '$total', - count: '$count', - }, - }, - ], - statusCounts: [ - { - $group: { - _id: '$status', - count: { - $sum: 1, - }, - }, - }, - { - $project: { - _id: 0, - status: '$_id', - count: '$count', - }, - }, - ], - }, - }, - ]); - let result = []; - - const totalOffers = response[0].totalOffer ? response[0].totalOffer[0] : 0; - const statusResult = response[0].statusCounts || []; - // const overdueResult = response[0].overdueCounts || []; - - const statusResultMap = statusResult.map((item) => { - return { - ...item, - percentage: Math.round((item.count / totalOffers.count) * 100), - }; - }); - - // const overdueResultMap = overdueResult.map((item) => { - // return { - // ...item, - // status: 'expired', - // percentage: Math.round((item.count / totalOffers.count) * 100), - // }; - // }); - - statuses.forEach((status) => { - const found = [...statusResultMap].find((item) => item.status === status); - if (found) { - result.push(found); - } - }); - - const finalResult = { - total: totalOffers?.total, - type, - performance: result, - }; - - return res.status(200).json({ - success: true, - result: finalResult, - message: `Successfully found all invoices for the last ${defaultType}`, - }); -}; - -module.exports = summary; diff --git a/backend/src/controllers/appControllers/offerController/update.js b/backend/src/controllers/appControllers/offerController/update.js deleted file mode 100644 index 5d0265e4a..000000000 --- a/backend/src/controllers/appControllers/offerController/update.js +++ /dev/null @@ -1,10 +0,0 @@ -const mongoose = require('mongoose'); - -const update = async (req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); -}; -module.exports = update; diff --git a/backend/src/controllers/appControllers/paymentController/remove.js b/backend/src/controllers/appControllers/paymentController/remove.js index 5d329047e..93939da85 100644 --- a/backend/src/controllers/appControllers/paymentController/remove.js +++ b/backend/src/controllers/appControllers/paymentController/remove.js @@ -1,8 +1,67 @@ +const mongoose = require('mongoose'); + +const Model = mongoose.model('Payment'); +const Invoice = mongoose.model('Invoice'); + const remove = async (req, res) => { + // Find document by id and updates with the required fields + const previousPayment = await Model.findOne({ + _id: req.params.id, + removed: false, + }); + + if (!previousPayment) { + return res.status(404).json({ + success: false, + result: null, + message: 'No document found ', + }); + } + + const { _id: paymentId, amount: previousAmount } = previousPayment; + const { id: invoiceId, total, discount, credit: previousCredit } = previousPayment.invoice; + + // Find the document by id and delete it + let updates = { + removed: true, + }; + // Find the document by id and delete it + const result = await Model.findOneAndUpdate( + { _id: req.params.id, removed: false }, + { $set: updates }, + { + new: true, // return the new result instead of the old one + } + ).exec(); + // If no results found, return document not found + + let paymentStatus = + total - discount === previousCredit - previousAmount + ? 'paid' + : previousCredit - previousAmount > 0 + ? 'partially' + : 'unpaid'; + + const updateInvoice = await Invoice.findOneAndUpdate( + { _id: invoiceId }, + { + $pull: { + payment: paymentId, + }, + $inc: { credit: -previousAmount }, + $set: { + paymentStatus: paymentStatus, + }, + }, + { + new: true, // return the new result instead of the old one + } + ).exec(); + return res.status(200).json({ success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', + result, + message: 'Successfully Deleted the document ', }); }; module.exports = remove; diff --git a/backend/src/controllers/appControllers/paymentController/update.js b/backend/src/controllers/appControllers/paymentController/update.js index ca4f0c3b7..0691048eb 100644 --- a/backend/src/controllers/appControllers/paymentController/update.js +++ b/backend/src/controllers/appControllers/paymentController/update.js @@ -1,8 +1,85 @@ +const mongoose = require('mongoose'); + +const Model = mongoose.model('Payment'); +const Invoice = mongoose.model('Invoice'); +const custom = require('@/controllers/pdfController'); + +const { calculate } = require('@/helpers'); + const update = async (req, res) => { + if (req.body.amount === 0) { + return res.status(202).json({ + success: false, + result: null, + message: `The Minimum Amount couldn't be 0`, + }); + } + // Find document by id and updates with the required fields + const previousPayment = await Model.findOne({ + _id: req.params.id, + removed: false, + }); + + const { amount: previousAmount } = previousPayment; + const { id: invoiceId, total, discount, credit: previousCredit } = previousPayment.invoice; + + const { amount: currentAmount } = req.body; + + const changedAmount = calculate.sub(currentAmount, previousAmount); + const maxAmount = calculate.sub(total, calculate.add(discount, previousCredit)); + + if (changedAmount > maxAmount) { + return res.status(202).json({ + success: false, + result: null, + message: `The Max Amount you can add is ${maxAmount + previousAmount}`, + error: `The Max Amount you can add is ${maxAmount + previousAmount}`, + }); + } + + let paymentStatus = + calculate.sub(total, discount) === calculate.add(previousCredit, changedAmount) + ? 'paid' + : calculate.add(previousCredit, changedAmount) > 0 + ? 'partially' + : 'unpaid'; + + const updatedDate = new Date(); + const updates = { + number: req.body.number, + date: req.body.date, + amount: req.body.amount, + paymentMode: req.body.paymentMode, + ref: req.body.ref, + description: req.body.description, + updated: updatedDate, + }; + + const result = await Model.findOneAndUpdate( + { _id: req.params.id, removed: false }, + { $set: updates }, + { + new: true, // return the new result instead of the old one + } + ).exec(); + + const updateInvoice = await Invoice.findOneAndUpdate( + { _id: result.invoice._id.toString() }, + { + $inc: { credit: changedAmount }, + $set: { + paymentStatus: paymentStatus, + }, + }, + { + new: true, // return the new result instead of the old one + } + ).exec(); + return res.status(200).json({ success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', + result, + message: 'Successfully updated the Payment ', }); }; diff --git a/backend/src/controllers/appControllers/peopleController/index.js b/backend/src/controllers/appControllers/peopleController/index.js deleted file mode 100644 index 7adf66966..000000000 --- a/backend/src/controllers/appControllers/peopleController/index.js +++ /dev/null @@ -1,21 +0,0 @@ -const mongoose = require('mongoose'); - -const createCRUDController = require('@/controllers/middlewaresControllers/createCRUDController'); -const read = require('./read'); -const remove = require('./remove'); -const update = require('./update'); -const paginatedList = require('./paginatedList'); - -function modelController() { - const Model = mongoose.model('People'); - const methods = createCRUDController('People'); - - methods.read = (req, res) => read(Model, req, res); - methods.update = (req, res) => update(Model, req, res); - methods.delete = (req, res) => remove(Model, req, res); - methods.list = (req, res) => paginatedList(Model, req, res); - - return methods; -} - -module.exports = modelController(); diff --git a/backend/src/controllers/appControllers/peopleController/paginatedList.js b/backend/src/controllers/appControllers/peopleController/paginatedList.js deleted file mode 100644 index 43b6fe28c..000000000 --- a/backend/src/controllers/appControllers/peopleController/paginatedList.js +++ /dev/null @@ -1,64 +0,0 @@ -const paginatedList = async (Model, req, res) => { - const page = req.query.page || 1; - const limit = parseInt(req.query.items) || 10; - const skip = page * limit - limit; - - const { sortBy = 'enabled', sortValue = -1, filter, equal } = req.query; - - const fieldsArray = req.query.fields ? req.query.fields.split(',') : []; - - let fields; - - fields = fieldsArray.length === 0 ? {} : { $or: [] }; - - for (const field of fieldsArray) { - fields.$or.push({ [field]: { $regex: new RegExp(req.query.q, 'i') } }); - } - - // Query the database for a list of all results - const resultsPromise = Model.find({ - removed: false, - - [filter]: equal, - ...fields, - }) - .skip(skip) - .limit(limit) - .sort({ [sortBy]: sortValue }) - .populate('company', 'name') - .exec(); - - // Counting the total documents - const countPromise = Model.countDocuments({ - removed: false, - - [filter]: equal, - ...fields, - }); - - // Resolving both promises - const [result, count] = await Promise.all([resultsPromise, countPromise]); - - // Calculating total pages - const pages = Math.ceil(count / limit); - - // Getting Pagination Object - const pagination = { page, pages, count }; - if (count > 0) { - return res.status(200).json({ - success: true, - result, - pagination, - message: 'Successfully found all documents', - }); - } else { - return res.status(203).json({ - success: true, - result: [], - pagination, - message: 'Collection is Empty', - }); - } -}; - -module.exports = paginatedList; diff --git a/backend/src/controllers/appControllers/peopleController/read.js b/backend/src/controllers/appControllers/peopleController/read.js deleted file mode 100644 index 8b0f39786..000000000 --- a/backend/src/controllers/appControllers/peopleController/read.js +++ /dev/null @@ -1,26 +0,0 @@ -const read = async (Model, req, res) => { - // Find document by id - const result = await Model.findOne({ - _id: req.params.id, - removed: false, - }) - .populate('company', 'name') - .exec(); - // If no results found, return document not found - if (!result) { - return res.status(404).json({ - success: false, - result: null, - message: 'No document found ', - }); - } else { - // Return success resposne - return res.status(200).json({ - success: true, - result, - message: 'we found this document ', - }); - } -}; - -module.exports = read; diff --git a/backend/src/controllers/appControllers/peopleController/remove.js b/backend/src/controllers/appControllers/peopleController/remove.js deleted file mode 100644 index 7e851a28e..000000000 --- a/backend/src/controllers/appControllers/peopleController/remove.js +++ /dev/null @@ -1,8 +0,0 @@ -const remove = async (Model, req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); -}; -module.exports = remove; diff --git a/backend/src/controllers/appControllers/peopleController/update.js b/backend/src/controllers/appControllers/peopleController/update.js deleted file mode 100644 index 7a2511b4d..000000000 --- a/backend/src/controllers/appControllers/peopleController/update.js +++ /dev/null @@ -1,13 +0,0 @@ -const mongoose = require('mongoose'); -const Client = mongoose.model('Client'); -const Lead = mongoose.model('People'); - -const update = async (Model, req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); -}; - -module.exports = update; diff --git a/backend/src/controllers/appControllers/quoteController/update.js b/backend/src/controllers/appControllers/quoteController/update.js index a649e634d..a4f32696d 100644 --- a/backend/src/controllers/appControllers/quoteController/update.js +++ b/backend/src/controllers/appControllers/quoteController/update.js @@ -1,8 +1,61 @@ +const mongoose = require('mongoose'); + +const Model = mongoose.model('Quote'); + +const custom = require('@/controllers/pdfController'); + +const { calculate } = require('@/helpers'); + const update = async (req, res) => { + const { items = [], taxRate = 0, discount = 0 } = req.body; + + if (items.length === 0) { + return res.status(400).json({ + success: false, + result: null, + message: 'Items cannot be empty', + }); + } + // default + let subTotal = 0; + let taxTotal = 0; + let total = 0; + // let credit = 0; + + //Calculate the items array with subTotal, total, taxTotal + items.map((item) => { + let total = calculate.multiply(item['quantity'], item['price']); + //sub total + subTotal = calculate.add(subTotal, total); + //item total + item['total'] = total; + }); + taxTotal = calculate.multiply(subTotal, taxRate / 100); + total = calculate.add(subTotal, taxTotal); + + let body = req.body; + + body['subTotal'] = subTotal; + body['taxTotal'] = taxTotal; + body['total'] = total; + body['items'] = items; + body['pdf'] = 'quote-' + req.params.id + '.pdf'; + + if (body.hasOwnProperty('currency')) { + delete body.currency; + } + // Find document by id and updates with the required fields + + const result = await Model.findOneAndUpdate({ _id: req.params.id, removed: false }, body, { + new: true, // return the new result instead of the old one + }).exec(); + + // Returning successfull response + return res.status(200).json({ success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', + result, + message: 'we update this document ', }); }; module.exports = update; diff --git a/backend/src/controllers/appControllers/taxesController/index.js b/backend/src/controllers/appControllers/taxesController/index.js index 4f6f167dc..ba31f817a 100644 --- a/backend/src/controllers/appControllers/taxesController/index.js +++ b/backend/src/controllers/appControllers/taxesController/index.js @@ -38,10 +38,43 @@ methods.delete = async (req, res) => { }; methods.update = async (req, res) => { + const { id } = req.params; + const tax = await Model.findOne({ + _id: req.params.id, + removed: false, + }).exec(); + const { isDefault = tax.isDefault, enabled = tax.enabled } = req.body; + + // if isDefault:false , we update first - isDefault:true + // if enabled:false and isDefault:true , we update first - isDefault:true + if (!isDefault || (!enabled && isDefault)) { + await Model.findOneAndUpdate({ _id: { $ne: id }, enabled: true }, { isDefault: true }); + } + + // if isDefault:true and enabled:true, we update other taxes and make is isDefault:false + if (isDefault && enabled) { + await Model.updateMany({ _id: { $ne: id } }, { isDefault: false }); + } + + const taxesCount = await Model.countDocuments({}); + + // if enabled:false and it's only one exist, we can't disable + if ((!enabled || !isDefault) && taxesCount <= 1) { + return res.status(422).json({ + success: false, + result: null, + message: 'You cannot disable the tax because it is the only existing one', + }); + } + + const result = await Model.findOneAndUpdate({ _id: id }, req.body, { + new: true, + }); + return res.status(200).json({ success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', + message: 'Tax updated successfully', + result, }); }; diff --git a/backend/src/controllers/coreControllers/emailController/index.js b/backend/src/controllers/coreControllers/emailController/index.js deleted file mode 100644 index 98072d97c..000000000 --- a/backend/src/controllers/coreControllers/emailController/index.js +++ /dev/null @@ -1,14 +0,0 @@ -const createCRUDController = require('@/controllers/middlewaresControllers/createCRUDController'); -const crudController = createCRUDController('Email'); - -const emailMethods = { - create:crudController.create, - read: crudController.read, - update: crudController.update, - list: crudController.list, - listAll: crudController.listAll, - filter: crudController.filter, - search: crudController.search, -}; - -module.exports = emailMethods; diff --git a/backend/src/controllers/coreControllers/settingController/updateBySettingKey.js b/backend/src/controllers/coreControllers/settingController/updateBySettingKey.js index d93a0c317..f6e1aebc1 100644 --- a/backend/src/controllers/coreControllers/settingController/updateBySettingKey.js +++ b/backend/src/controllers/coreControllers/settingController/updateBySettingKey.js @@ -1,9 +1,49 @@ +const mongoose = require('mongoose'); + +const Model = mongoose.model('Setting'); + const updateBySettingKey = async (req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); + const settingKey = req.params.settingKey || undefined; + + if (!settingKey) { + return res.status(202).json({ + success: false, + result: null, + message: 'No settingKey provided ', + }); + } + const { settingValue } = req.body; + + if (!settingValue) { + return res.status(202).json({ + success: false, + result: null, + message: 'No settingValue provided ', + }); + } + const result = await Model.findOneAndUpdate( + { settingKey }, + { + settingValue, + }, + { + new: true, // return the new result instead of the old one + runValidators: true, + } + ).exec(); + if (!result) { + return res.status(404).json({ + success: false, + result: null, + message: 'No document found by this settingKey: ' + settingKey, + }); + } else { + return res.status(200).json({ + success: true, + result, + message: 'we update this document by this settingKey: ' + settingKey, + }); + } }; module.exports = updateBySettingKey; diff --git a/backend/src/controllers/coreControllers/settingController/updateManySetting.js b/backend/src/controllers/coreControllers/settingController/updateManySetting.js index 39b99af8e..cdd7c41f2 100644 --- a/backend/src/controllers/coreControllers/settingController/updateManySetting.js +++ b/backend/src/controllers/coreControllers/settingController/updateManySetting.js @@ -1,9 +1,58 @@ +const mongoose = require('mongoose'); + +const Model = mongoose.model('Setting'); + const updateManySetting = async (req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); + // req/body = [{settingKey:"",settingValue}] + let settingsHasError = false; + const updateDataArray = []; + const { settings } = req.body; + + for (const setting of settings) { + if (!setting.hasOwnProperty('settingKey') || !setting.hasOwnProperty('settingValue')) { + settingsHasError = true; + break; + } + + const { settingKey, settingValue } = setting; + + updateDataArray.push({ + updateOne: { + filter: { settingKey: settingKey }, + update: { settingValue: settingValue }, + }, + }); + } + + if (updateDataArray.length === 0) { + return res.status(202).json({ + success: false, + result: null, + message: 'No settings provided ', + }); + } + if (settingsHasError) { + return res.status(202).json({ + success: false, + result: null, + message: 'Settings provided has Error', + }); + } + const result = await Model.bulkWrite(updateDataArray); + + if (!result || result.nMatched < 1) { + return res.status(404).json({ + success: false, + result: null, + message: 'No settings found by to update', + }); + } else { + return res.status(200).json({ + success: true, + result: [], + message: 'we update all settings', + }); + } }; module.exports = updateManySetting; diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/authUser.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/authUser.js index e9cbe7359..546d56311 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/authUser.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/authUser.js @@ -28,29 +28,29 @@ const authUser = async (req, res, { user, databasePassword, password, UserPasswo } ).exec(); - res - .status(200) - .cookie('token', token, { - maxAge: req.body.remember ? 365 * 24 * 60 * 60 * 1000 : null, - sameSite: 'Lax', - httpOnly: true, - secure: false, - domain: req.hostname, - path: '/', - Partitioned: true, - }) - .json({ - success: true, - result: { - _id: user._id, - name: user.name, - surname: user.surname, - role: user.role, - email: user.email, - photo: user.photo, - }, - message: 'Successfully login user', - }); + // .cookie(`token_${user.cloud}`, token, { + // maxAge: req.body.remember ? 365 * 24 * 60 * 60 * 1000 : null, + // sameSite: 'None', + // httpOnly: true, + // secure: true, + // domain: req.hostname, + // path: '/', + // Partitioned: true, + // }) + res.status(200).json({ + success: true, + result: { + _id: user._id, + name: user.name, + surname: user.surname, + role: user.role, + email: user.email, + photo: user.photo, + token: token, + maxAge: req.body.remember ? 365 : null, + }, + message: 'Successfully login user', + }); } else { return res.status(403).json({ success: false, diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/forgetPassword.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/forgetPassword.js index ec90dfe84..176cdd1ce 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/forgetPassword.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/forgetPassword.js @@ -35,13 +35,6 @@ const forgetPassword = async (req, res, { userModel }) => { const user = await User.findOne({ email: email, removed: false }); const databasePassword = await UserPassword.findOne({ user: user._id, removed: false }); - if (!user.enabled) - return res.status(409).json({ - success: false, - result: null, - message: 'Your account is disabled, contact your account adminstrator', - }); - // console.log(user); if (!user) return res.status(404).json({ diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/isValidAuthToken.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/isValidAuthToken.js index ce79f4829..33a963f5e 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/isValidAuthToken.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/isValidAuthToken.js @@ -6,7 +6,11 @@ const isValidAuthToken = async (req, res, next, { userModel, jwtSecret = 'JWT_SE try { const UserPassword = mongoose.model(userModel + 'Password'); const User = mongoose.model(userModel); - const token = req.cookies.token; + + // const token = req.cookies[`token_${cloud._id}`]; + const authHeader = req.headers['authorization']; + const token = authHeader && authHeader.split(' ')[1]; // Extract the token + if (!token) return res.status(401).json({ success: false, @@ -39,6 +43,7 @@ const isValidAuthToken = async (req, res, next, { userModel, jwtSecret = 'JWT_SE }); const { loggedSessions } = userPassword; + if (!loggedSessions.includes(token)) return res.status(401).json({ success: false, @@ -52,12 +57,13 @@ const isValidAuthToken = async (req, res, next, { userModel, jwtSecret = 'JWT_SE next(); } } catch (error) { - return res.status(503).json({ + return res.status(500).json({ success: false, result: null, message: error.message, error: error, controller: 'isValidAuthToken', + jwtExpired: true, }); } }; diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/login.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/login.js index 7b57c615e..7b1eccee8 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/login.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/login.js @@ -1,15 +1,7 @@ -const bcrypt = require('bcryptjs'); -const jwt = require('jsonwebtoken'); const Joi = require('joi'); const mongoose = require('mongoose'); -const checkAndCorrectURL = require('./checkAndCorrectURL'); -const sendMail = require('./sendMail'); - -const { loadSettings } = require('@/middlewares/settings'); -const { useAppSettings } = require('@/settings'); - const authUser = require('./authUser'); const login = async (req, res, { userModel }) => { @@ -56,7 +48,12 @@ const login = async (req, res, { userModel }) => { }); // authUser if your has correct password - authUser(req, res, { user, databasePassword, password, UserPasswordModel }); + authUser(req, res, { + user, + databasePassword, + password, + UserPasswordModel, + }); }; module.exports = login; diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/logout.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/logout.js index 253bf753a..9eea8aedd 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/logout.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/logout.js @@ -3,29 +3,33 @@ const mongoose = require('mongoose'); const logout = async (req, res, { userModel }) => { const UserPassword = mongoose.model(userModel + 'Password'); - const token = req.cookies.token; - await UserPassword.findOneAndUpdate( - { user: req.admin._id }, - { $pull: { loggedSessions: token } }, - { - new: true, - } - ).exec(); + // const token = req.cookies[`token_${cloud._id}`]; - res - .clearCookie('token', { - maxAge: null, - sameSite: 'none', - httpOnly: true, - secure: true, - domain: req.hostname, - Path: '/', - }) - .json({ - success: true, - result: {}, - message: 'Successfully logout', - }); + const authHeader = req.headers['authorization']; + const token = authHeader && authHeader.split(' ')[1]; // Extract the token + + if (token) + await UserPassword.findOneAndUpdate( + { user: req.admin._id }, + { $pull: { loggedSessions: token } }, + { + new: true, + } + ).exec(); + else + await UserPassword.findOneAndUpdate( + { user: req.admin._id }, + { loggedSessions: [] }, + { + new: true, + } + ).exec(); + + return res.json({ + success: true, + result: {}, + message: 'Successfully logout', + }); }; module.exports = logout; diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/resetPassword.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/resetPassword.js index de8eb1a3a..d9bb0a811 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/resetPassword.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/resetPassword.js @@ -13,31 +13,6 @@ const resetPassword = async (req, res, { userModel }) => { const databasePassword = await UserPassword.findOne({ user: userId, removed: false }); const user = await User.findOne({ _id: userId, removed: false }).exec(); - if (!user.enabled && user.role === 'owner') { - const settings = useAppSettings(); - const idurar_app_email = settings['idurar_app_email']; - const idurar_base_url = settings['idurar_base_url']; - - const url = checkAndCorrectURL(idurar_base_url); - - const link = url + '/verify/' + user._id + '/' + databasePassword.emailToken; - - await sendMail({ - email, - name: user.name, - link, - idurar_app_email, - emailToken: databasePassword.emailToken, - }); - - return res.status(403).json({ - success: false, - result: null, - message: - 'your email account is not verified , check your email inbox to activate your account', - }); - } - if (!user.enabled) return res.status(409).json({ success: false, @@ -110,29 +85,29 @@ const resetPassword = async (req, res, { userModel }) => { databasePassword.resetToken !== undefined && databasePassword.resetToken !== null ) - return res - .status(200) - .cookie('token', token, { - maxAge: 24 * 60 * 60 * 1000, - sameSite: 'Lax', - httpOnly: true, - secure: false, - domain: req.hostname, - path: '/', - Partitioned: true, - }) - .json({ - success: true, - result: { - _id: user._id, - name: user.name, - surname: user.surname, - role: user.role, - email: user.email, - photo: user.photo, - }, - message: 'Successfully resetPassword user', - }); + // .cookie(`token_${user.cloud}`, token, { + // maxAge: 24 * 60 * 60 * 1000, + // sameSite: 'None', + // httpOnly: true, + // secure: true, + // domain: req.hostname, + // path: '/', + // Partitioned: true, + // }) + return res.status(200).json({ + success: true, + result: { + _id: user._id, + name: user.name, + surname: user.surname, + role: user.role, + email: user.email, + photo: user.photo, + token: token, + maxAge: req.body.remember ? 365 : null, + }, + message: 'Successfully resetPassword user', + }); }; module.exports = resetPassword; diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendIdurarOffer.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendIdurarOffer.js deleted file mode 100644 index c2826e4fb..000000000 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendIdurarOffer.js +++ /dev/null @@ -1,18 +0,0 @@ -const { afterRegistrationSuccess } = require('@/emailTemplate/emailVerfication'); - -const { Resend } = require('resend'); - -const sendIdurarOffer = async ({ email, name }) => { - const resend = new Resend(process.env.RESEND_API); - - const { data } = await resend.emails.send({ - from: 'hello@idurarapp.com', - to: email, - subject: 'Customize IDURAR ERP CRM or build your own SaaS', - html: afterRegistrationSuccess({ name }), - }); - - return data; -}; - -module.exports = sendIdurarOffer; diff --git a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendMail.js b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendMail.js index c1d85fa0c..b16d2e487 100644 --- a/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendMail.js +++ b/backend/src/controllers/middlewaresControllers/createAuthMiddleware/sendMail.js @@ -1,4 +1,4 @@ -const { emailVerfication, passwordVerfication } = require('@/emailTemplate/emailVerfication'); +const { passwordVerfication } = require('@/emailTemplate/emailVerfication'); const { Resend } = require('resend'); @@ -17,10 +17,7 @@ const sendMail = async ({ from: idurar_app_email, to: email, subject, - html: - type === 'emailVerfication' - ? emailVerfication({ name, link, emailToken }) - : passwordVerfication({ name, link }), + html: passwordVerfication({ name, link }), }); return data; diff --git a/backend/src/controllers/middlewaresControllers/createCRUDController/remove.js b/backend/src/controllers/middlewaresControllers/createCRUDController/remove.js index c39be4395..5072eae18 100644 --- a/backend/src/controllers/middlewaresControllers/createCRUDController/remove.js +++ b/backend/src/controllers/middlewaresControllers/createCRUDController/remove.js @@ -1,9 +1,32 @@ const remove = async (Model, req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); + // Find the document by id and delete it + let updates = { + removed: true, + }; + // Find the document by id and delete it + const result = await Model.findOneAndUpdate( + { + _id: req.params.id, + }, + { $set: updates }, + { + new: true, // return the new result instead of the old one + } + ).exec(); + // If no results found, return document not found + if (!result) { + return res.status(404).json({ + success: false, + result: null, + message: 'No document found ', + }); + } else { + return res.status(200).json({ + success: true, + result, + message: 'Successfully Deleted the document ', + }); + } }; module.exports = remove; diff --git a/backend/src/controllers/middlewaresControllers/createCRUDController/update.js b/backend/src/controllers/middlewaresControllers/createCRUDController/update.js index 2e4e0f977..8438598d6 100644 --- a/backend/src/controllers/middlewaresControllers/createCRUDController/update.js +++ b/backend/src/controllers/middlewaresControllers/createCRUDController/update.js @@ -1,9 +1,30 @@ const update = async (Model, req, res) => { - return res.status(200).json({ - success: true, - result: null, - message: 'Please Upgrade to Premium Version to have full features', - }); + // Find document by id and updates with the required fields + req.body.removed = false; + const result = await Model.findOneAndUpdate( + { + _id: req.params.id, + removed: false, + }, + req.body, + { + new: true, // return the new result instead of the old one + runValidators: true, + } + ).exec(); + if (!result) { + return res.status(404).json({ + success: false, + result: null, + message: 'No document found ', + }); + } else { + return res.status(200).json({ + success: true, + result, + message: 'we update this document ', + }); + } }; module.exports = update; diff --git a/backend/src/controllers/middlewaresControllers/createUserController/updatePassword.js b/backend/src/controllers/middlewaresControllers/createUserController/updatePassword.js index df57cb545..f9b6d3fb8 100644 --- a/backend/src/controllers/middlewaresControllers/createUserController/updatePassword.js +++ b/backend/src/controllers/middlewaresControllers/createUserController/updatePassword.js @@ -17,6 +17,14 @@ const updatePassword = async (userModel, req, res) => { // Find document by id and updates with the required fields + if (userProfile.email === 'admin@demo.com') { + return res.status(403).json({ + success: false, + result: null, + message: "you couldn't update demo password", + }); + } + const salt = uniqueId(); const passwordHash = bcrypt.hashSync(salt + password); diff --git a/backend/src/controllers/middlewaresControllers/createUserController/updateProfile.js b/backend/src/controllers/middlewaresControllers/createUserController/updateProfile.js index 9a17247c8..8842e71be 100644 --- a/backend/src/controllers/middlewaresControllers/createUserController/updateProfile.js +++ b/backend/src/controllers/middlewaresControllers/createUserController/updateProfile.js @@ -5,6 +5,15 @@ const updateProfile = async (userModel, req, res) => { const reqUserName = userModel.toLowerCase(); const userProfile = req[reqUserName]; + + if (userProfile.email === 'admin@demo.com') { + return res.status(403).json({ + success: false, + result: null, + message: "you couldn't update demo informations", + }); + } + let updates = req.body.photo ? { email: req.body.email, diff --git a/backend/src/controllers/middlewaresControllers/createUserController/updateProfilePassword.js b/backend/src/controllers/middlewaresControllers/createUserController/updateProfilePassword.js index c3c0c4130..f8ce21dd9 100644 --- a/backend/src/controllers/middlewaresControllers/createUserController/updateProfilePassword.js +++ b/backend/src/controllers/middlewaresControllers/createUserController/updateProfilePassword.js @@ -32,6 +32,13 @@ const updateProfilePassword = async (userModel, req, res) => { salt: salt, }; + if (userProfile.email === 'admin@demo.com') { + return res.status(403).json({ + success: false, + result: null, + message: "you couldn't update demo password", + }); + } const resultPassword = await UserPassword.findOneAndUpdate( { user: userProfile._id, removed: false }, { $set: UserPasswordData }, diff --git a/backend/src/emailTemplate/emailVerfication.js b/backend/src/emailTemplate/emailVerfication.js index 393bbcdc5..cae578940 100644 --- a/backend/src/emailTemplate/emailVerfication.js +++ b/backend/src/emailTemplate/emailVerfication.js @@ -1,37 +1,3 @@ -exports.emailVerfication = ({ - title = 'Verify your email', - name = '', - link = '', - time = new Date(), - emailToken, -}) => { - return ` -
-
-
-
- ${title}
-
-
-
-
-
-
-
- `;
-};
-
exports.passwordVerfication = ({
title = 'Reset your Password',
name = '',
@@ -54,43 +20,9 @@ exports.passwordVerfication = ({
${title}
--
Hello ${name},
-Code :
${emailToken}
Thank you for signing up for IDURAR ! Before we can activate your account, we kindly ask you to verify your email address by clicking on the link provided below:
- -Thank you for choosing IDURAR. We look forward to having you as a valued user!
--
Best regards,
-Salah Eddine Lalami
-Founder @ IDURAR
- -Hello ${name},
We have received a request to reset the password for your account on IDURAR. To proceed with the password reset, please click on the link provided below:
--
Best regards,
-Salah Eddine Lalami
-Founder @ IDURAR
-