Merge pull request idurar#590 from idurar/feat/invoice-createdBy

add createdBy to invoice table
eltonsoftware · Oct 22, 2023 · 2b24b26 · 2b24b26
2 parents 355c005 + c67c0ae
commit 2b24b26
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 3 deletions.
diff --git a/backend/controllers/appControllers/invoiceController/create.js b/backend/controllers/appControllers/invoiceController/create.js
@@ -47,6 +47,7 @@ const create = async (req, res) => {
     let paymentStatus = calculate.sub(total, discount) === 0 ? 'paid' : 'unpaid';
 
     body['paymentStatus'] = paymentStatus;
+    body['createdBy'] = req.admin._id;
     // Creating a new document in the collection
     const result = await new Model(body).save();
     const fileId = 'invoice-' + result._id + '.pdf';

diff --git a/backend/controllers/appControllers/offerController/create.js b/backend/controllers/appControllers/offerController/create.js
@@ -33,6 +33,7 @@ const create = async (req, res) => {
     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();

diff --git a/backend/controllers/appControllers/paymentInvoiceController/create.js b/backend/controllers/appControllers/paymentInvoiceController/create.js
@@ -37,7 +37,7 @@ const create = async (req, res) => {
         message: `The Max Amount you can add is ${maxAmount}`,
       });
     }
-
+    req.body['createdBy'] = req.admin._id;
     const result = await Model.create(req.body);
 
     const fileId = 'payment-invoice-report-' + result._id + '.pdf';

diff --git a/backend/controllers/appControllers/quoteController/create.js b/backend/controllers/appControllers/quoteController/create.js
@@ -33,6 +33,7 @@ const create = async (req, res) => {
     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();

diff --git a/backend/middlewares/permission.js b/backend/middlewares/permission.js
@@ -1,6 +1,7 @@
 //this middleware will check if the user has permission
 
 const roles = {
+  admin: ['create', 'read', 'update', 'delete', 'download', 'upload'],
   staffAdmin: ['create', 'read', 'update', 'delete', 'download', 'upload'],
   staff: ['create', 'read', 'update', 'download', 'upload'],
   createOnly: ['create', 'read', 'download', 'upload'],

diff --git a/backend/models/appModels/Client.js b/backend/models/appModels/Client.js
@@ -10,6 +10,7 @@ const clientSchema = new mongoose.Schema({
     type: Boolean,
     default: true,
   },
+  createdBy: { type: mongoose.Schema.ObjectId, ref: 'Admin', autopopulate: true, required: true },
   company: {
     type: String,
     trim: true,

diff --git a/backend/models/appModels/Invoice.js b/backend/models/appModels/Invoice.js
@@ -6,6 +6,7 @@ const invoiceSchema = new mongoose.Schema({
     type: Boolean,
     default: false,
   },
+  createdBy: { type: mongoose.Schema.ObjectId, ref: 'Admin', autopopulate: true, required: true },
   number: {
     type: Number,
     required: true,

diff --git a/backend/models/appModels/Lead.js b/backend/models/appModels/Lead.js
@@ -6,6 +6,7 @@ const leadSchema = new mongoose.Schema({
     type: Boolean,
     default: false,
   },
+  createdBy: { type: mongoose.Schema.ObjectId, ref: 'Admin', autopopulate: true, required: true },
   enabled: {
     type: Boolean,
     default: true,

diff --git a/backend/models/appModels/Offer.js b/backend/models/appModels/Offer.js
@@ -6,6 +6,7 @@ const offerSchema = new mongoose.Schema({
     type: Boolean,
     default: false,
   },
+  createdBy: { type: mongoose.Schema.ObjectId, ref: 'Admin', autopopulate: true, required: true },
   number: {
     type: Number,
     required: true,

diff --git a/backend/models/appModels/PaymentInvoice.js b/backend/models/appModels/PaymentInvoice.js
@@ -7,6 +7,7 @@ const paymentInvoiceSchema = new mongoose.Schema({
     type: Boolean,
     default: false,
   },
+  createdBy: { type: mongoose.Schema.ObjectId, ref: 'Admin', autopopulate: true, required: true },
   number: {
     type: Number,
     required: true,

diff --git a/backend/models/appModels/Quote.js b/backend/models/appModels/Quote.js
@@ -6,6 +6,7 @@ const quoteSchema = new mongoose.Schema({
     type: Boolean,
     default: false,
   },
+  createdBy: { type: mongoose.Schema.ObjectId, ref: 'Admin', autopopulate: true, required: true },
   converted: {
     type: Boolean,
     default: false,

diff --git a/frontend/src/pages/Invoice/index.jsx b/frontend/src/pages/Invoice/index.jsx
@@ -38,12 +38,12 @@ export default function Invoice() {
     {
       title: 'Total',
       dataIndex: 'total',
-      render: (amount) => moneyRowFormatter({ amount }),
+      render: (total) => moneyRowFormatter({ amount: total }),
     },
     {
       title: 'Balance',
       dataIndex: 'credit',
-      render: (amount) => moneyRowFormatter({ amount }),
+      render: (credit) => moneyRowFormatter({ amount: credit }),
     },
     {
       title: 'Status',
@@ -70,6 +70,11 @@ export default function Invoice() {
         return <Tag color={color}>{paymentStatus && paymentStatus.toUpperCase()}</Tag>;
       },
     },
+    {
+      title: 'Created By',
+      dataIndex: ['createdBy', 'name'],
+      render: (createdBy) => (createdBy ? createdBy : 'Adminstrator'),
+    },
   ];
 
   const config = {