Merge pull request #815 from idurar/dev

3.0.0-beta.14
FoxDev810 · Nov 17, 2023 · 1d78891 · 1d78891
2 parents e53cf35 + 8848751
commit 1d78891
Show file tree

Hide file tree

Showing 11 changed files with 232 additions and 2,538 deletions.
diff --git a/backend/controllers/appControllers/invoiceController/paginatedList.js b/backend/controllers/appControllers/invoiceController/paginatedList.js
@@ -14,7 +14,7 @@ const paginatedList = async (req, res) => {
       .sort({ created: 'desc' })
       .populate('createdBy', 'name');
     // Counting the total documents
-    const countPromise = Model.count({ removed: false });
+    const countPromise = Model.countDocuments({ removed: false });
     // Resolving both promises
     const [result, count] = await Promise.all([resultsPromise, countPromise]);
     // Calculating total pages

diff --git a/backend/controllers/appControllers/offerController/paginatedList.js b/backend/controllers/appControllers/offerController/paginatedList.js
@@ -14,7 +14,7 @@ const paginatedList = async (req, res) => {
       .sort({ created: 'desc' })
       .populate('createdBy', 'name');
     // Counting the total documents
-    const countPromise = Model.count({ removed: false });
+    const countPromise = Model.countDocuments({ removed: false });
     // Resolving both promises
     const [result, count] = await Promise.all([resultsPromise, countPromise]);
     // Calculating total pages

diff --git a/backend/controllers/appControllers/quoteController/paginatedList.js b/backend/controllers/appControllers/quoteController/paginatedList.js
@@ -14,7 +14,7 @@ const paginatedList = async (req, res) => {
       .sort({ created: 'desc' })
       .populate('createdBy', 'name');
     // Counting the total documents
-    const countPromise = Model.count({ removed: false });
+    const countPromise = Model.countDocuments({ removed: false });
     // Resolving both promises
     const [result, count] = await Promise.all([resultsPromise, countPromise]);
     // Calculating total pages

diff --git a/backend/controllers/middlewaresControllers/createCRUDController/paginatedList.js b/backend/controllers/middlewaresControllers/createCRUDController/paginatedList.js
@@ -10,7 +10,7 @@ const paginatedList = async (Model, req, res) => {
       .sort({ created: 'desc' })
       .populate();
     // Counting the total documents
-    const countPromise = Model.count({ removed: false });
+    const countPromise = Model.countDocuments({ removed: false });
     // Resolving both promises
     const [result, count] = await Promise.all([resultsPromise, countPromise]);
     // Calculating total pages

diff --git a/backend/models/appModels/Payment.js b/backend/models/appModels/Payment.js
@@ -1,5 +1,4 @@
 const mongoose = require('mongoose');
-const AutoIncrement = require('mongoose-sequence')(mongoose);
 mongoose.Promise = global.Promise;
 
 const paymentSchema = new mongoose.Schema({