fghj

Author: dudkinox

src/contexts/StockContext.tsx

@@ -476,6 +476,15 @@ export function StockContextProvider({ children }: Readonly<ChildrenProps>) {
             ) {
               AlertWarning("กรุณากรอกข้อมูลให้ครบถ้วน");
             } else {
+              let baseParams =
+                "?date=" +
+                baseInsert.date +
+                "&id_card=" +
+                installmentPayment.id +
+                "&customer_status=" +
+                baseInsert.customerStatus +
+                "&major=" +
+                baseInsert.major;
               insertStock(baseParams, camelToSnakeObject(installmentPayment));
               isSuccess = true;
             }

src/layouts/stock/InstallmentMenuInsert.tsx

@@ -1,41 +1,36 @@
-import { useContext, useEffect, useState } from 'react'
-import { StockContext } from '../../contexts/StockContext'
+import { useContext, useEffect, useState } from "react";
+import { StockContext } from "../../contexts/StockContext";
 import {
   MenuInstallmentPaymentEnum,
   MenuKayEnum,
-} from '../../enum/menuInsert.enum'
-import { GetCustomerResponse } from '../../Models/Response/GetCustomerResponse'
-import DataList from '../../common/DataList'
-import { AppContext } from '../../contexts'
-import CustomerServices from '../../services/CustomerServices'
-import { AlertWarning } from '../../common/ToastrCommon'
-import { useLocation, useNavigate } from 'react-router-dom'
-import StockService from '../../services/StockServices'
-import PaymentService from '../../services/PaymentService'
-import ModalCommon from '../../common/Modal'
+} from "../../enum/menuInsert.enum";
+import { AppContext } from "../../contexts";
+import StockService from "../../services/StockServices";
+import PaymentService from "../../services/PaymentService";
+import ModalCommon from "../../common/Modal";
 
 interface InstallmentMenuInsertProps {
-  id: string
+  id: string;
   setEdit: React.Dispatch<
     React.SetStateAction<{
-      stockType: string
-      major: string
-      payload: {}
+      stockType: string;
+      major: string;
+      payload: {};
     }>
-  >
+  >;
   edit: {
-    stockType: string
-    major: string
-    payload: any
-  }
+    stockType: string;
+    major: string;
+    payload: any;
+  };
 }
 
 export default function InstallmentMenuInsert({
   id,
   setEdit,
   edit,
 }: Readonly<InstallmentMenuInsertProps>) {
-  const { majorUser } = useContext(AppContext)
+  const { majorUser } = useContext(AppContext);
   const {
     installmentNo,
     setInstallmentNo,
@@ -45,62 +40,64 @@ export default function InstallmentMenuInsert({
     setDocumentId,
     documentId,
     updateKey,
-  } = useContext(StockContext)
-  const [selectDocId, setSelectDocId] = useState<any[]>([])
+  } = useContext(StockContext);
+  const [selectDocId, setSelectDocId] = useState<any[]>([]);
   const [dataCustomer, setDataCustomer] = useState({
-    CUSTOMER_NAME: '',
-    ID_CARD: '',
-  })
+    CUSTOMER_NAME: "",
+    ID_CARD: "",
+  });
 
   useEffect(() => {
-    setStockType('ผ่อน')
+    setStockType("ผ่อน");
     if (!updateKey) {
       StockService.GetStockBye(majorUser).then((res) => {
-        setSelectDocId(res.data)
-      })
+        setSelectDocId(res.data);
+      });
     }
-  }, [])
+  }, []);
 
   useEffect(() => {
     if (!updateKey) {
       StockService.GetStockKay(majorUser).then((res) => {
-        const filter = res.data.filter((fil) => fil.ID === documentId)[0]
+        const filter = res.data.filter((fil) => fil.ID === documentId)[0];
 
-        setPriceTotal(filter.INSTALLMENT)
+        setPriceTotal(filter.INSTALLMENT);
         setDataCustomer({
           CUSTOMER_NAME: filter.CUSTOMER,
           ID_CARD: filter.ID_CARD,
-        })
-      })
+        });
+      });
     }
-  }, [documentId])
+  }, [documentId]);
 
   useEffect(() => {
-    const major = sessionStorage.getItem('majorEdit')
+    const major = sessionStorage.getItem("majorEdit");
 
     if (major) {
       StockService.GetStockInstallment(id).then((res) => {
         setEdit({
-          stockType: 'ผ่อน',
+          stockType: "ผ่อน",
           major: major,
           payload: res.data,
-        })
-      })
+        });
+      });
     }
-  }, [])
+  }, []);
 
   return (
     <>
       {!updateKey && (
         <>
           <ModalCommon
-            title={'ชำระครบถ้วน'}
-            id={'alert-installment-modal'}
+            title={"ชำระครบถ้วน"}
+            id={"alert-installment-modal"}
             content={
               <>
                 <div className="modal-body">
                   <div className="container-fluid">
-                    <h5 className="text-center">ชำระครบถ้วน หรืออาจไม่ได้ระบุ</h5>
+                    <h5 className="text-center">
+                      ชำระครบถ้วน หรืออาจไม่ได้ระบุ
+                    </h5>
                   </div>
                 </div>
                 <div className="modal-footer">
@@ -131,7 +128,7 @@ export default function InstallmentMenuInsert({
                 id="browser"
                 className="form-control col-10"
                 onChange={(e: any) => {
-                  setDocumentId(e.target.value)
+                  setDocumentId(e.target.value);
                 }}
                 placeholder={MenuInstallmentPaymentEnum.DOC_ID}
                 autoComplete="off"
@@ -150,13 +147,11 @@ export default function InstallmentMenuInsert({
                 type="button"
                 className="btn primary-btn col-lg-2 col-sm-auto"
                 onClick={() => {
-                  PaymentService.InstallmentNumber(documentId).then(
-                    (res) => {
-                      String(res.data) === 'false'
-                        ? ($('#alert-installment-modal') as any).modal('show')
-                        : setInstallmentNo(Number(res.data) + 1)
-                    },
-                  )
+                  PaymentService.InstallmentNumber(documentId).then((res) => {
+                    String(res.data) === "false"
+                      ? ($("#alert-installment-modal") as any).modal("show")
+                      : setInstallmentNo(Number(res.data) + 1);
+                  });
                 }}
               >
                 ตรวจสอบงวด
@@ -260,5 +255,5 @@ export default function InstallmentMenuInsert({
         </div>
       </div>
     </>
-  )
+  );
 }

src/pages/Stock/kay.tsx

@@ -445,8 +445,10 @@ export function StockKayPage() {
                         </td>
                         <td>{new Date(item.DATE_PAYMENT).getDate()}</td>
                         <td>{totalInstallment.toLocaleString()} บาท</td>
-                        <td>test</td>
-                        <td>ค้าง</td>
+                        <td>
+                          {Number(item.INSTALLMENT_NO).toLocaleString()} บาท
+                        </td>
+                        <td>{Number(item.PRICE_TOTAL).toLocaleString()} บาท</td>
                         {majorUser.toLocaleLowerCase() === "admin" && (
                           <td>
                             <span className="d-none">{profit}</span>
@@ -501,11 +503,11 @@ export function StockKayPage() {
                   })}
                   foot={
                     <tr className="text-center">
-                      <td colSpan={5}>รวม</td>
-                      <td>{totalProfit.toLocaleString()} บาท</td>
-                      <td colSpan={4}></td>
+                      <td colSpan={9}>รวม</td>
                       <td>{totalStarMoney.toLocaleString()} บาท</td>
-                      <td colSpan={4}></td>
+                      <td colSpan={6}></td>
+                      <td>{totalProfit.toLocaleString()} บาท</td>
+                      <td></td>
                     </tr>
                   }
                 />