diff --git a/backend/src/db/models/sales_invoices.js b/backend/src/db/models/sales_invoices.js index 77e9967..cecd516 100644 --- a/backend/src/db/models/sales_invoices.js +++ b/backend/src/db/models/sales_invoices.js @@ -1,9 +1,3 @@ -const config = require('../../config'); -const providers = config.providers; -const crypto = require('crypto'); -const bcrypt = require('bcrypt'); -const moment = require('moment'); - module.exports = function(sequelize, DataTypes) { const sales_invoices = sequelize.define( 'sales_invoices', @@ -129,22 +123,20 @@ notes: { sales_invoices.associate = (db) => { - db.sales_invoices.belongsToMany(db.sales_invoice_items, { + db.sales_invoices.hasMany(db.sales_invoice_items, { as: 'items', foreignKey: { - name: 'sales_invoices_itemsId', + name: 'invoiceId', }, constraints: false, - through: 'sales_invoicesItemsSales_invoice_items', }); - db.sales_invoices.belongsToMany(db.sales_invoice_items, { + db.sales_invoices.hasMany(db.sales_invoice_items, { as: 'items_filter', foreignKey: { - name: 'sales_invoices_itemsId', + name: 'invoiceId', }, constraints: false, - through: 'sales_invoicesItemsSales_invoice_items', }); diff --git a/frontend/src/components/AsideMenuLayer.tsx b/frontend/src/components/AsideMenuLayer.tsx index 521b634..09c4acf 100644 --- a/frontend/src/components/AsideMenuLayer.tsx +++ b/frontend/src/components/AsideMenuLayer.tsx @@ -3,12 +3,10 @@ import { mdiLogout, mdiClose } from '@mdi/js' import BaseIcon from './BaseIcon' import AsideMenuList from './AsideMenuList' import { MenuAsideItem } from '../interfaces' -import { useAppSelector } from '../stores/hooks' -import Link from 'next/link'; - -import { useAppDispatch } from '../stores/hooks'; -import { createAsyncThunk } from '@reduxjs/toolkit'; -import axios from 'axios'; +import Link from 'next/link' +import { useAppDispatch, useAppSelector } from '../stores/hooks' +import { createAsyncThunk } from '@reduxjs/toolkit' +import axios from 'axios' type Props = { diff --git a/frontend/src/components/NavBarItem.tsx b/frontend/src/components/NavBarItem.tsx index 72935e6..1e221a4 100644 --- a/frontend/src/components/NavBarItem.tsx +++ b/frontend/src/components/NavBarItem.tsx @@ -1,6 +1,5 @@ -import React, {useEffect, useRef} from 'react' +import React, { useEffect, useRef, useState } from 'react' import Link from 'next/link' -import { useState } from 'react' import { mdiChevronUp, mdiChevronDown } from '@mdi/js' import BaseDivider from './BaseDivider' import BaseIcon from './BaseIcon' @@ -10,8 +9,8 @@ import { useAppDispatch, useAppSelector } from '../stores/hooks' import { MenuNavBarItem } from '../interfaces' import { setDarkMode } from '../stores/styleSlice' import { logoutUser } from '../stores/authSlice' -import { useRouter } from 'next/router'; -import ClickOutside from "./ClickOutside"; +import { useRouter } from 'next/router' +import ClickOutside from './ClickOutside' type Props = { item: MenuNavBarItem diff --git a/frontend/src/layouts/Authenticated.tsx b/frontend/src/layouts/Authenticated.tsx index 1b9907d..3076bdf 100644 --- a/frontend/src/layouts/Authenticated.tsx +++ b/frontend/src/layouts/Authenticated.tsx @@ -1,6 +1,5 @@ -import React, { ReactNode, useEffect } from 'react' -import { useState } from 'react' -import jwt from 'jsonwebtoken'; +import React, { ReactNode, useEffect, useState } from 'react' +import jwt from 'jsonwebtoken' import { mdiForwardburger, mdiBackburger, mdiMenu } from '@mdi/js' import menuAside from '../menuAside' import menuNavBar from '../menuNavBar' @@ -10,11 +9,11 @@ import NavBarItemPlain from '../components/NavBarItemPlain' import AsideMenu from '../components/AsideMenu' import FooterBar from '../components/FooterBar' import { useAppDispatch, useAppSelector } from '../stores/hooks' -import Search from '../components/Search'; +import Search from '../components/Search' import { useRouter } from 'next/router' -import {findMe, logoutUser} from "../stores/authSlice"; +import { findMe, logoutUser } from '../stores/authSlice' -import {hasPermission} from "../helpers/userPermissions"; +import { hasPermission } from '../helpers/userPermissions' type Props = { diff --git a/frontend/src/pages/search.tsx b/frontend/src/pages/search.tsx index 00f5168..eb43805 100644 --- a/frontend/src/pages/search.tsx +++ b/frontend/src/pages/search.tsx @@ -1,9 +1,7 @@ import React, { ReactElement, useEffect, useState } from 'react'; import Head from 'next/head'; import 'react-datepicker/dist/react-datepicker.css'; -import { useAppDispatch } from '../stores/hooks'; - -import { useAppSelector } from '../stores/hooks'; +import { useAppDispatch, useAppSelector } from '../stores/hooks' import { useRouter } from 'next/router'; import LayoutAuthenticated from '../layouts/Authenticated';