serialized invoice numbering

panshak · Feb 6, 2022 · de3836b · de3836b
1 parent 53b757b
commit de3836b
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 33 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -1,9 +1,5 @@
 
-// Copyright: Panshak Solomon
-// A.P. Leventis Ornithological Research Institute.
-// University of Jos Biological Conservatory
-// All right reserved
-// ©2022 and beyond
+//Copyright (c) 2022 Panshak Solomon
 
 import React from 'react'
 import { BrowserRouter, Route, Switch, Redirect } from 'react-router-dom'

diff --git a/client/src/components/Footer/Footer.js b/client/src/components/Footer/Footer.js
@@ -14,7 +14,7 @@ const Footer = () => {
     return (
         <footer>
             <div className={styles.footerText}>
-            ©Arc Invoice| made with ♥ by Panshak Solomon <span><a href="https://github.com/Panshak/arcinvoice" target="_blank" rel="noopener noreferrer">[Download source code]</a></span>
+            ©Panshak Solomon  | Made with ♥ in 🇳🇬 <span><a href="https://github.com/Panshak/arcinvoice" target="_blank" rel="noopener noreferrer">[Download source code]</a></span>
             </div>
             {user && (
             <FabButton />

diff --git a/client/src/components/Header/Header.js b/client/src/components/Header/Header.js
@@ -13,6 +13,7 @@ import MenuItem from '@material-ui/core/MenuItem';
 import MenuList from '@material-ui/core/MenuList';
 import { makeStyles } from '@material-ui/core/styles';
 import Avatar from '@material-ui/core/Avatar';
+import axios from 'axios'
 
 
 const useStyles = makeStyles((theme) => ({
@@ -38,6 +39,17 @@ const Header = () => {
     },[location])
 
 
+
+    useEffect(() => {
+      getMetaData()
+    },[])
+
+
+    const getMetaData = async() => {
+      const response = await axios.get('https://api.github.com/repos/panshak/arc')
+          console.log(response.data);
+    }
+
     const logout =() => {
         dispatch({ type: 'LOGOUT' })
         history.push('/')

diff --git a/client/src/components/Invoice/Invoice.js b/client/src/components/Invoice/Invoice.js
@@ -94,11 +94,12 @@ const Invoice = () => {
         try {
           const response = await axios.get(`${process.env.REACT_APP_API}/invoices/count?searchQuery=${user?.result?._id}`);
         //   console.log(response.data);
-        setInvoiceData({...invoiceData, invoiceNumber: (response?.data)})
+        setInvoiceData({...invoiceData, invoiceNumber: (Number(response.data) + 1).toString().padStart(3, '0')})
         } catch (error) {
           console.error(error);
         }
       }
+
 
 
 
@@ -237,8 +238,8 @@ const Invoice = () => {
             dueDate: selectedDate, 
             invoiceNumber: `${
                 invoiceData.invoiceNumber < 100 ? 
-                (Number(invoiceData.invoiceNumber) + 1).toString().padStart(3, '0') 
-                : Number(invoiceData.invoiceNumber) + 1 
+                (Number(invoiceData.invoiceNumber)).toString().padStart(3, '0') 
+                : Number(invoiceData.invoiceNumber)
             }`,
             client, 
             type: type, 
@@ -277,11 +278,27 @@ const Invoice = () => {
                     </Grid>
                     <Grid item>
                         <InvoiceType type={type} setType={setType} />
-                        <p style={{color: 'gray'}}> Invoice#:
-                            <span 
-                            style={{paddingLeft: '20px', paddingRight: '20px'}}
-                            contentEditable
-                        onInput={e => setInvoiceData({...invoiceData, invoiceNumber: e.currentTarget.textContent})}>{invoice ? invoiceData.invoiceNumber : (Number(invoiceData.invoiceNumber) + 1).toString().padStart(3, '0')}</span></p>
+                        Invoice #:
+                        <div style={{
+                            marginTop: '15px',
+                            width: '100px',
+                            padding: '8px',
+                            display: 'inline-block',
+                            backgroundColor: '#f4f4f4',
+                            outline: '0px solid transparent'
+                        }} 
+                            contenteditable="true"
+                            onInput={e => setInvoiceData({
+                            ...invoiceData, invoiceNumber: e.currentTarget.textContent})
+                            }
+                        >
+                        <span style={{width:'40px',
+                            color: 'black',
+                            padding: '15px',
+                        }} 
+                            contenteditable="false"> {invoiceData.invoiceNumber}</span>
+                        <br/>
+                        </div>
                     </Grid>
                 </Grid >
             </Container>

diff --git a/client/src/index.js b/client/src/index.js
@@ -1,8 +1,4 @@
-// Copyright: Panshak Solomon
-// A.P. Leventis Ornithological Research Institute.
-// University of Jos Biological Conservatory
-// All right reserved
-// ©2022 and beyond
+//Copyright (c) 2022 Panshak Solomon
 
 import React from 'react';
 import ReactDOM from 'react-dom';

diff --git a/server/controllers/invoices.js b/server/controllers/invoices.js
@@ -1,21 +1,16 @@
-// Copyright: Panshak Solomon
-// A.P. Leventis Ornithological Research Institute.
-// University of Jos Biological Conservatory
-// All right reserved
-// ©2022 and beyond
+
+//Copyright (c) 2022 Panshak Solomon
 
 import express from 'express'
 import mongoose from 'mongoose'
 
 import InvoiceModel from '../models/InvoiceModel.js'
 
-
 export const getInvoicesByUser = async (req, res) => {
     const {searchQuery} = req.query;
 
     try {
         const invoices = await InvoiceModel.find({ creator: searchQuery });
-        // const invoices = await InvoiceModel.find().where('creator').in(searchQuery);
 
         res.status(200).json({ data: invoices });
     } catch (error) {    
@@ -38,12 +33,10 @@ export const getTotalCount = async (req, res) => {
 }
 
 
-
 export const getInvoices = async (req, res) => {
 
     try {
         const allInvoices = await InvoiceModel.find({}).sort({_id:-1}) 
-        //find({}).sort({_id:-1}) to sort according to date of creation
 
         res.status(200).json(allInvoices)
 

diff --git a/server/index.js b/server/index.js
@@ -1,3 +1,6 @@
+
+//Copyright (c) 2022 Panshak Solomon
+
 import express from 'express'
 import cors from 'cors'
 import mongoose from 'mongoose'
@@ -14,11 +17,6 @@ const __dirname = dirname(__filename);
 import invoiceRoutes from './routes/invoices.js'
 import clientRoutes from './routes/clients.js'
 import userRoutes from './routes/userRoutes.js'
-// Copyright: Panshak Solomon
-// A.P. Leventis Ornithological Research Institute.
-// University of Jos Biological Conservatory
-// All right reserved
-// ©2022 and beyond
 
 import profile from './routes/profile.js'
 import pdfTemplate from './documents/index.js'