confirmed months tab added to salary page

src/API/LayoutApi/accounting.ts

@@ -1,3 +1,4 @@
+import { TAccountingConfirmedMonths } from "./../../types/Accounting/TAccounting";
 import {
   TAccounting,
   TAccountingHistory,
@@ -25,6 +26,14 @@ export const AccountingController = {
     });
     return data;
   },
+
+  async confirmedMonths() {
+    const { data } = await instance.get<TAccountingConfirmedMonths[]>(
+      `/salaries-group/`
+    );
+    return data;
+  },
+
   async history(filterObject: TAccountingHistoryGetParams) {
     const params = { ...filterObject };
     if (!!filterObject.search) params.search = filterObject.search;

src/API/api.ts

@@ -4,6 +4,7 @@ import axios from "axios";
 //   baseURL: "http://10.10.10.64:8080/api/v1/",
 // });
 const instance = axios.create({
+  // baseURL: "https://board-api.ontime-logs.com/api/v1/",
   baseURL: "https://api.tteld.co/api/v1/",
   // baseURL: "http://10.10.10.64:8000/api/v1/",
 });

src/App.tsx

@@ -286,6 +286,7 @@ const App: React.FC = () => {
         // );
         // taskSocket = new WebSocket(`wss://api.tteld.co/global/?user_id=${admin_id}`);
         taskSocket = new WebSocket(
+          // `wss://board-socket.ontime-logs.com/global/?user_id=${admin_id}`
           `wss://ontime-socket.tteld.co/global/?user_id=${admin_id}`
           // `ws://10.10.10.64:8000/global/?user_id=${admin_id}`
         );

src/Components/Accounting/Accounting.tsx

@@ -1,5 +1,9 @@
 import { Button, DatePicker, Tabs, Typography } from "antd";
-import { ReloadOutlined } from "@ant-design/icons";
+import {
+  CheckCircleOutlined,
+  CheckSquareOutlined,
+  ReloadOutlined,
+} from "@ant-design/icons";
 import { theme } from "antd";
 
 import currentMonthActive from "../../assets/currentMonthActive.svg";
@@ -19,13 +23,14 @@ import AccountingLast from "./AccountingLast";
 import AccountingHistory from "./AccountingHistory";
 import dayjs from "dayjs";
 import { useAccountingData } from "../../Hooks/Accounting";
+import ConfirmedMonths from "./ConfirmedMonths";
 
 const Accounting: React.FC = () => {
   const { token } = theme.useToken();
 
   const [activeTab, setActiveTab] = useState("1");
 
-  const month = activeTab === "1" ? "current" : "last";
+  const month = activeTab === "" ? "current" : "last";
 
   const { data, isLoading, refetch } = useAccountingData({
     month: month,
@@ -140,18 +145,35 @@ const Accounting: React.FC = () => {
         >
           <AccountingLast />
         </TabPane>
+        <TabPane
+          tab={
+            <span style={{ display: "flex", alignItems: "center" }}>
+              <CheckCircleOutlined
+                style={{
+                  fontSize: 16,
+                  marginRight: 5,
+                  color: activeTab === "3" ? "#F99E2C" : "#A1A2AB",
+                }}
+              />
+              Confirmed Months
+            </span>
+          }
+          key="3"
+        >
+          <ConfirmedMonths />
+        </TabPane>
         <TabPane
           tab={
             <span style={{ display: "flex", alignItems: "center" }}>
               <img
                 style={{ marginRight: 5 }}
-                src={activeTab === "3" ? historyActive : history}
+                src={activeTab === "4" ? historyActive : history}
                 alt="icon"
               />
               History
             </span>
           }
-          key="3"
+          key="4"
         >
           <AccountingHistory />
         </TabPane>

src/Components/Accounting/AccountingDetails.tsx

@@ -58,7 +58,7 @@ const AccountingDetails = () => {
 
   useEffect(() => {
     const fetchUserDetails = async () => {
-      const API_URL = `https://api.tteld.co/api/v1/user-salaries/${id}`;
+      const API_URL = `https://board-api.ontime-logs.com/api/v1/user-salaries/${id}`;
       const AUTH_TOKEN = localStorage.getItem("access");
 
       try {

src/Components/Accounting/AccountingHistory.tsx

@@ -527,10 +527,7 @@ const AccountingHistory: React.FC = () => {
                                   icon={<EyeOutlined />}
                                   onClick={() =>
                                     record.salary_document_path &&
-                                    window.open(
+                                    window.open(record.salary_document_path)
-                                      record.salary_document_path,
-                                      "_blank"
-                                    )
                                   }
                                   disabled={!record.salary_document_path}
                                 />

src/Components/Accounting/ConfirmedMonths.tsx

@@ -0,0 +1,87 @@
+import { useConfirmedMonths } from "../../Hooks/Accounting";
+import { Button, Table, theme } from "antd";
+import tagIcon from "../../assets/tagIcon.svg";
+import dayjs from "dayjs";
+
+function ConfirmedMonths() {
+  const { data, isLoading, refetch } = useConfirmedMonths();
+
+  const { token } = theme.useToken();
+
+  return (
+    <div>
+      <Table
+        size="middle"
+        bordered
+        dataSource={data?.map((u, i) => ({
+          no: i + 1,
+          ...u,
+        }))}
+        columns={[
+          {
+            title: <img src={tagIcon} alt="" />,
+            dataIndex: "no",
+            key: "no",
+            width: "5%",
+            align: "center",
+          },
+          {
+            title: "Year",
+            dataIndex: "year",
+            key: "year",
+            width: "20%",
+          },
+          {
+            title: "Month",
+            dataIndex: "month",
+            key: "month",
+            width: "20%",
+          },
+          {
+            title: "Confirmed",
+            dataIndex: "created_at",
+            key: "created_at",
+            width: "30%",
+            render: (text: string) => dayjs(text).format("YYYY-MM-DD HH:mm"),
+          },
+          {
+            title: "Action",
+            key: "action",
+            align: "center",
+            width: "10%",
+            render: (_: any, record: any) => (
+              <Button
+                type="primary"
+                href={record.salary_document_path}
+                target="_blank"
+              >
+                Download
+              </Button>
+            ),
+          },
+        ]}
+        loading={isLoading}
+        rowKey="id"
+        pagination={{
+          pageSize: 10,
+          size: "default",
+          style: {
+            margin: 0,
+            justifyContent: "end",
+            position: "fixed",
+            bottom: 0,
+            left: 0,
+            width: "100%",
+            backgroundColor: token.colorBgContainer,
+            boxShadow: "0 4px 8px rgba(0, 0, 0, 0.4)",
+            padding: "10px 0",
+            zIndex: 1000,
+          },
+          showLessItems: true,
+        }}
+      />
+    </div>
+  );
+}
+
+export default ConfirmedMonths;

src/Components/Statistics/Statistic.tsx

@@ -33,6 +33,7 @@ import {
 } from "antd";
 import { SearchOutlined } from "@ant-design/icons";
 import TabPane from "antd/es/tabs/TabPane";
+import api from "../../API/api";
 // @ts-ignore
 import IconSearch from "../../assets/searchIcon.png";
 import {
@@ -274,7 +275,6 @@ const Stat = () => {
     null
   );
 
-  const token = localStorage.getItem("access");
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {
@@ -289,13 +289,9 @@ const Stat = () => {
         }
         const formattedEndDate = finalEndDate.format("YYYY-MM-DD HH:mm:ss");
 
-        const response = await axios.get(
+        const response = await api.get("stats/general-stats", {
-          "https://api.tteld.co/api/v1/stats/general-stats",
-          {
           params: { start_date: startDate, end_date: formattedEndDate },
-            headers: { Authorization: `Bearer ${token}` },
+        });
-          }
-        );
         if (response.data.daily_stats) {
           setChartData(response.data.daily_stats);
         }
@@ -310,7 +306,7 @@ const Stat = () => {
     };
 
     fetchData();
-  }, [token, startDate, endDate]);
+  }, [startDate, endDate]);
 
   const formatDate = (dateString: string): string => {
     const date = new Date(dateString);

src/Components/Updates/UpdateEdit.tsx

@@ -219,7 +219,7 @@ const UpdateEdit = () => {
                                 </Form.Item>
                               </Col>
                             )}
-                            {customerId !== null && (
+                            {/* {customerId !== null && (
                               <Col span={8}>
                                 <Form.Item
                                   wrapperCol={{ span: "100%" }}
@@ -227,12 +227,25 @@ const UpdateEdit = () => {
                                 >
                                   {data?.customer.id !== undefined && (
                                     <Input
-                                      defaultValue={data?.customer.name}
+                                      defaultValue={data?.customer?.name}
                                       readOnly
                                     />
                                   )}
                                 </Form.Item>
                               </Col>
+                            )} */}
+                            {customerId !== null && (
+                              <Col span={8}>
+                                <Form.Item
+                                  wrapperCol={{ span: "100%" }}
+                                  label="Driver"
+                                >
+                                  <Input
+                                    defaultValue={data?.customer?.name || ""}
+                                    readOnly
+                                  />
+                                </Form.Item>
+                              </Col>
                             )}
                           </Row>
                         </Form>

src/Hooks/Accounting/index.ts

@@ -34,3 +34,13 @@ export const useAccountingHistory = ({
     }
   );
 };
+
+export const useConfirmedMonths = () => {
+  return useQuery(
+    [`/salaries-group`],
+    () => AccountingController.confirmedMonths(),
+    {
+      refetchOnWindowFocus: false,
+    }
+  );
+};

src/types/Accounting/TAccounting.ts

@@ -13,6 +13,14 @@ export type TAccounting = {
   username: string;
 };
 
+export type TAccountingConfirmedMonths = {
+  id: number;
+  month: string;
+  year: number;
+  salary_document_path: string;
+  created_at: string;
+};
+
 export type TAccountingHistory = {
   id: number;
   full_name: string;