idurar · salahlalami · Nov 11, 2023 · Nov 7, 2023 · Nov 7, 2023 · Nov 7, 2023
diff --git a/backend/app.js b/backend/app.js
@@ -24,6 +24,7 @@ const corsOptions = {
   origin: true,
   credentials: true,
 };
+app.use(cors(corsOptions));
 
 // setting cors at one place for all the routes
 // putting cors as first in order to avoid unneccessary requests from unallowed origins
@@ -35,9 +36,6 @@ const corsOptions = {
 //     cors()(req, res, next);
 //   }
 // });
-app.use(function (req, res, next) {
-  cors(corsOptions)(req, res, next);
-});
 
 // serves up static files from the public folder. Anything in public/ will just be served up as the file it is
 

diff --git a/backend/controllers/appControllers/invoiceController/summary.js b/backend/controllers/appControllers/invoiceController/summary.js
@@ -31,10 +31,10 @@ const summary = async (req, res) => {
       {
         $match: {
           removed: false,
-          date: {
-            $gte: startDate.toDate(),
-            $lte: endDate.toDate(),
-          },
+          // date: {
+          //   $gte: startDate.toDate(),
+          //   $lte: endDate.toDate(),
+          // },
         },
       },
       {
@@ -163,18 +163,22 @@ const summary = async (req, res) => {
       {
         $match: {
           removed: false,
-          date: {
-            $gte: startDate.toDate(),
-            $lte: endDate.toDate(),
+          // date: {
+          //   $gte: startDate.toDate(),
+          //   $lte: endDate.toDate(),
+          // },
+          paymentStatus: {
+            $in: ['unpaid', 'partially'],
           },
-          paymentStatus: 'unpaid',
         },
       },
       {
         $group: {
           _id: null,
           total_amount: {
-            $sum: '$total',
+            $sum: {
+              $subtract: ['$total', '$credit'],
+            },
           },
         },
       },

diff --git a/backend/controllers/appControllers/offerController/summary.js b/backend/controllers/appControllers/offerController/summary.js
@@ -31,10 +31,10 @@ const summary = async (req, res) => {
       {
         $match: {
           removed: false,
-          date: {
-            $gte: startDate.toDate(),
-            $lte: endDate.toDate(),
-          },
+          // date: {
+          //   $gte: startDate.toDate(),
+          //   $lte: endDate.toDate(),
+          // },
         },
       },
       {

diff --git a/backend/controllers/appControllers/paymentController/summary.js b/backend/controllers/appControllers/paymentController/summary.js
@@ -30,10 +30,10 @@ const summary = async (req, res) => {
       {
         $match: {
           removed: false,
-          date: {
-            $gte: startDate.toDate(),
-            $lte: endDate.toDate(),
-          },
+          // date: {
+          //   $gte: startDate.toDate(),
+          //   $lte: endDate.toDate(),
+          // },
         },
       },
       {

diff --git a/backend/controllers/appControllers/quoteController/summary.js b/backend/controllers/appControllers/quoteController/summary.js
@@ -31,10 +31,10 @@ const summary = async (req, res) => {
       {
         $match: {
           removed: false,
-          date: {
-            $gte: startDate.toDate(),
-            $lte: endDate.toDate(),
-          },
+          // date: {
+          //   $gte: startDate.toDate(),
+          //   $lte: endDate.toDate(),
+          // },
         },
       },
       {

diff --git a/backend/controllers/coreControllers/authJwtController/login.js b/backend/controllers/coreControllers/authJwtController/login.js
@@ -36,25 +36,27 @@ const login = async (req, res) => {
 
     const { error, value } = objectSchema.validate({ email, password });
     if (error) {
-      return res.status(400).json({
+      return res.status(409).json({
         success: false,
         result: null,
+        error: error,
         message: 'Invalid/Missing credentials.',
+        errorMessage: error.message,
       });
     }
 
     const admin = await Admin.findOne({ email: email, removed: false });
     // console.log(admin);
     if (!admin)
-      return res.status(400).json({
+      return res.status(404).json({
         success: false,
         result: null,
         message: 'No account with this email has been registered.',
       });
 
     const isMatch = await bcrypt.compare(password, admin.password);
     if (!isMatch)
-      return res.status(400).json({
+      return res.status(403).json({
         success: false,
         result: null,
         message: 'Invalid credentials.',
@@ -84,7 +86,8 @@ const login = async (req, res) => {
         httpOnly: true,
         secure: true,
         domain: req.hostname,
-        Path: '/',
+        path: '/',
+        Partitioned: true,
       })
       .json({
         success: true,

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -44,8 +44,8 @@
   "description": "Just you wait folks!",
   "main": "app.js",
   "keywords": [],
-  "author": "Salah Eddine Lalami",
-  "license": "MIT",
+  "author": "IDURAR",
+  "license": "Fair-code License",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/idurar/idurar-erp-crm/.git"

diff --git a/frontend/src/auth/auth.service.js b/frontend/src/auth/auth.service.js
@@ -6,22 +6,12 @@ import successHandler from '@/request/successHandler';
 
 export const login = async ({ loginData }) => {
   try {
-    const response = await fetch(API_BASE_URL + `login?timestamp=${new Date().getTime()}`, {
-      method: 'POST', // *GET, POST, PUT, DELETE, etc.
-      mode: 'cors', // no-cors, *cors, same-origin
-      cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cache
-      credentials: 'include',
-      headers: {
-        'Content-Type': 'application/json',
-        // 'Content-Type': 'application/x-www-form-urlencoded',
-      },
-      redirect: 'follow', // manual, *follow, error
-      referrerPolicy: 'no-referrer', // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
-      body: JSON.stringify(loginData), // body data type must match "Content-Type" header
-    });
+    const response = await axios.post(
+      API_BASE_URL + `login?timestamp=${new Date().getTime()}`,
+      loginData
+    );
 
-    const { status } = response;
-    const data = await response.json();
+    const { status, data } = response;
 
     successHandler(
       { data, status },

diff --git a/frontend/src/components/DeleteModal/index.jsx b/frontend/src/components/DeleteModal/index.jsx
@@ -22,7 +22,7 @@ export default function DeleteModal({ config }) {
   const { current, isLoading, isSuccess } = useSelector(selectDeletedItem);
   const { state, crudContextAction } = useCrudContext();
   const { appContextAction } = useAppContext();
-  const { panel, collapsedBox, readBox } = crudContextAction;
+  const { panel, readBox } = crudContextAction;
   const { navMenu } = appContextAction;
   const { isModalOpen } = state;
   const { modal } = crudContextAction;
@@ -45,8 +45,10 @@ export default function DeleteModal({ config }) {
     const id = current._id;
     dispatch(crud.delete({ entity, id }));
     readBox.close();
+    modal.close();
     panel.close();
     navMenu.collapse();
+    dispatch(crud.list({ entity }));
   };
   const handleCancel = () => {
     if (!isLoading) modal.close();

diff --git a/frontend/src/components/MoneyInputFormItem/index.jsx b/frontend/src/components/MoneyInputFormItem/index.jsx
@@ -10,11 +10,11 @@ export default function MoneyInputFormItem({ updatePrice, value = 0, readOnly =
         readOnly={readOnly}
         className="moneyInput"
         onChange={updatePrice}
-        value={value}
+        precision={money.cent_precision ? money.cent_precision : 2}
+        value={money.amountFormatter({ amount: value })}
         controls={false}
         addonAfter={money.currency_position === 'after' ? money.currency_symbol : undefined}
         addonBefore={money.currency_position === 'before' ? money.currency_symbol : undefined}
-        formatter={(value) => money.amountFormatter({ amount: value })}
       />
     </Form.Item>
   );

diff --git a/frontend/src/components/SelectAsync/index.jsx b/frontend/src/components/SelectAsync/index.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect } from 'react';
 import { request } from '@/request';
 import useFetch from '@/hooks/useFetch';
 import { Select } from 'antd';
@@ -11,6 +11,8 @@ export default function SelectAsync({
   outputValue = '_id',
   value,
   onChange,
+  loadDefault = false,
+  defaultField = 'isDefault',
   redirectLabel = '',
   withRedirect = false,
   urlToRedirect = '/',
@@ -51,6 +53,18 @@ export default function SelectAsync({
     }
   };
 
+  useEffect(() => {
+    if(loadDefault) {
+      const elem = selectOptions.find((option) => {
+        return option[defaultField] === true;
+      });
+      if (elem) {
+        setCurrentValue(elem[outputValue] || elem);
+        onChange(elem[outputValue] || elem);
+      }
+    }
+  }, [selectOptions]);
+
   return (
     <Select
       loading={fetchIsLoading}

diff --git a/frontend/src/forms/PaymentForm.jsx b/frontend/src/forms/PaymentForm.jsx
@@ -62,6 +62,7 @@ export default function PaymentForm({ maxAmount = null, isUpdateForm = false })
         <SelectAsync
           entity={'paymentMode'}
           displayLabels={['name']}
+          loadDefault={true}
           withRedirect={true}
           urlToRedirect="/payment/mode"
           redirectLabel="Add Payment Mode"

diff --git a/frontend/src/locale/antdLocale.js b/frontend/src/locale/antdLocale.js
@@ -36,6 +36,9 @@ import fiFi from 'antd/es/locale/fi_FI';
 import etEE from 'antd/es/locale/et_EE';
 import elGR from 'antd/es/locale/el_GR';
 import ltLT from 'antd/es/locale/lt_LT';
+import caES from 'antd/es/locale/ca_ES';
+import faIR from 'antd/es/locale/fa_IR';
+import srRS from 'antd/es/locale/sr_RS';
 
 const antdLocale = {
   zh_cn: zhCN,
@@ -74,8 +77,11 @@ const antdLocale = {
   lv_lv: lvLV,
   fi_fi: fiFi,
   et_ee: etEE,
-  el_GR: elGR,
-  lt_LT: ltLT,
+  el_gr: elGR,
+  lt_lt: ltLT,
+  ca_es: caES,
+  fa_ir: faIR,
+  sr_rs: srRS,
 };
 
 export default antdLocale;
diff --git a/frontend/src/locale/languages.js b/frontend/src/locale/languages.js
@@ -2,6 +2,7 @@ const languages = [
   { icon: '🇩🇿 ', label: 'Arabic', value: 'ar_eg', isRtl: true },
   { icon: '🇧🇩 ', label: 'Bengali', value: 'bn_bd' },
   { icon: '🇧🇬 ', label: 'Bulgarian', value: 'bg_bg' },
+  { icon: '🇪🇦 ', label: 'Catalonian', value: 'ca_es' },
   { icon: '🇨🇳 ', label: 'Chinese', value: 'zh_cn' },
   { icon: '🇭🇷 ', label: 'Croatian', value: 'hr_hr' },
   { icon: '🇨🇿 ', label: 'Czech', value: 'cs_cz' },
@@ -24,11 +25,13 @@ const languages = [
   { icon: '🇲🇰 ', label: 'Macedonian', value: 'mk_mk' },
   { icon: '🇲🇾 ', label: 'Malay', value: 'ms_my' },
   { icon: '🇳🇴 ', label: 'Norwegian', value: 'nb_no' },
+  { icon: '🇮🇷 ', label: 'Persian', value: 'fa_ir', isRtl: true },
   { icon: '🇵🇱 ', label: 'Polish', value: 'pl_pl' },
   { icon: '🇧🇷 ', label: 'Portuguese Brazil', value: 'pt_br' },
   { icon: '🇵🇹 ', label: 'Portuguese Portugal', value: 'pt_pt' },
   { icon: '🇷🇴 ', label: 'Romanian', value: 'ro_ro' },
   { icon: '🇷🇺 ', label: 'Russian', value: 'ru_ru' },
+  { icon: '🇷🇸 ', label: 'Serbian', value: 'sr_rs' },
   { icon: '🇸🇰 ', label: 'Slovak', value: 'sk_sk' },
   { icon: '🇸🇮 ', label: 'Slovenian', value: 'sl_si' },
   { icon: '🇪🇸 ', label: 'Spanish', value: 'es_es' },
@@ -38,10 +41,6 @@ const languages = [
   { icon: '🇺🇦 ', label: 'Ukrainian', value: 'uk_ua' },
   { icon: '🇵🇰 ', label: 'Urdu', value: 'ur_pk', isRtl: true },
   { icon: '🇻🇳 ', label: 'Vietnamese', value: 'vi_vn' },
-  { icon: '🇦🇱 ', label: 'Albanian', value: 'sq_al', disabled: true },
-  { icon: '🇷🇸 ', label: 'Serbian', value: 'sr_rs', disabled: true },
-  { icon: '🇪🇦 ', label: 'Catalonian', value: 'ca_es', disabled: true },
-  { icon: '🇮🇷 ', label: 'Persian', value: 'fa_ir', isRtl: true, disabled: true },
 ];
 
 export default languages;