diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js index ffeda10..42adce7 100644 --- a/src/component/CategoryComponent.js +++ b/src/component/CategoryComponent.js @@ -1,10 +1,19 @@ -import React, {useContext, useState} from "react"; -import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd"; -import {observer} from "mobx-react-lite"; -import {useHistory} from "react-router-dom"; -import {useStore} from "../utils/useStore"; -import {LINKS} from "../routes/app"; -import {ModalLoaderContext} from "../utils/modal"; +import React, { useContext, useState } from "react"; +import { + Button, + Form, + Input, + message, + Modal, + Select, + Space, + Table, +} from "antd"; +import { observer } from "mobx-react-lite"; +import { useHistory } from "react-router-dom"; +import { useStore } from "../utils/useStore"; +import { LINKS } from "../routes/app"; +import { ModalLoaderContext } from "../utils/modal"; export const CategoryComponent = observer((props) => { const store = useStore(); @@ -69,12 +78,16 @@ export const CategoryComponent = observer((props) => { if (idData !== "") { modalLoader.setLoading(true); try { - const response =await store.category.update(idData, data); + const response = await store.category.update(idData, data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Ubah Kategori") - : message.error("Gagal Ubah Kategori"); + ? message.success( + response?.body?.message || "Berhasil Ubah Data Kategori" + ) + : message.error( + response?.body?.message || "Gagal Ubah Data Kategori" + ); } catch (e) { - message.error("Gagal Ubah Data Kategori"); + message.error(e.response?.body?.message || "Gagal Ubah Data Kategori"); } modalLoader.setLoading(false); store.category.visibleModalCategory = false; @@ -83,13 +96,15 @@ export const CategoryComponent = observer((props) => { } else { modalLoader.setLoading(true); try { - const response=await store.category.create(data); + const response = await store.category.create(data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Tambah Kategori") - : message.error("Gagal Tambah Kategori"); + ? message.success( + response?.body?.message || "Berhasil Tambah Kategori" + ) + : message.error(response?.body?.message || "Gagal Tambah Kategori"); } catch (e) { console.log(e, "apa errornya"); - message.error("Gagal Tambah Kategori"); + message.error(e.response?.body?.message || "Gagal Tambah Kategori"); } modalLoader.setLoading(false); store.category.visibleModalCategory = false; @@ -101,7 +116,7 @@ export const CategoryComponent = observer((props) => { return (
{ - + - + diff --git a/src/component/CommissionComponent.js b/src/component/CommissionComponent.js index 97c7e69..f63f249 100644 --- a/src/component/CommissionComponent.js +++ b/src/component/CommissionComponent.js @@ -1,9 +1,9 @@ -import React, {useContext, useState} from "react"; -import {Button, Form, Input, message, Modal, Space, Table,} from "antd"; -import {observer} from "mobx-react-lite"; -import {useHistory} from "react-router-dom"; -import {useStore} from "../utils/useStore"; -import {ModalLoaderContext} from "../utils/modal"; +import React, { useContext, useState } from "react"; +import { Button, Form, Input, message, Modal, Space, Table } from "antd"; +import { observer } from "mobx-react-lite"; +import { useHistory } from "react-router-dom"; +import { useStore } from "../utils/useStore"; +import { ModalLoaderContext } from "../utils/modal"; export const CommissionComponent = observer((props) => { const store = useStore(); @@ -52,12 +52,12 @@ export const CommissionComponent = observer((props) => { const handleSubmit = async (data) => { modalLoader.setLoading(true); try { - const response=await store.commission.update(idData, data); + const response = await store.commission.update(idData, data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Ubah Komisi") - : message.error("Gagal Ubah Komisi"); + ? message.success(response?.body?.message || "Berhasil Ubah Komisi") + : message.error(response?.body?.message || "Gagal Ubah Komisi"); } catch (e) { - message.error("Gagal Ubah Komisi"); + message.error(e.response?.body?.message || "Gagal Ubah Komisi"); } modalLoader.setLoading(false); store.commission.visibleModalCommission = false; @@ -68,7 +68,7 @@ export const CommissionComponent = observer((props) => { return (
{ - + diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js index 7ed747c..99bdbb4 100644 --- a/src/component/PartnerComponent.js +++ b/src/component/PartnerComponent.js @@ -48,6 +48,7 @@ export const PartnerComponent = observer((props) => { name: data.name, npwp: data.npwp, address: data.address, + code: data.code, }); setIsChangePassword(false); store.partner.visibleModalPartner = true; @@ -72,6 +73,11 @@ export const PartnerComponent = observer((props) => { dataIndex: "name", key: "name", }, + { + title: "Kode", + dataIndex: "code", + key: "code", + }, { title: "Npwp", dataIndex: "npwp", @@ -181,11 +187,13 @@ export const PartnerComponent = observer((props) => { const response = await store.partner.create(data); modalLoader.setLoading(false); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Tambah Partner") - : message.error("Gagal Tambah Partner"); + ? message.success( + response?.body?.message || "Berhasil Tambah Partner" + ) + : message.error(response?.body?.message || "Gagal Tambah Partner"); } catch (e) { console.log(e, "apa errornya"); - message.error("Gagal Tambah Partner"); + message.error(e.response?.body?.message || "Gagal Tambah Partner"); } modalLoader.setLoading(false); store.partner.visibleModalPartner = false; @@ -272,7 +280,7 @@ export const PartnerComponent = observer((props) => { > {item?.status === true ? "Inactive" : "Active"} - {/* */} @@ -349,6 +357,19 @@ export const PartnerComponent = observer((props) => { )} + {!idData && ( + + + + )} {!idData && ( { rules={[ idData ? { required: false } - : { required: true, message: "Please input password owner!" }, + : { required: true, message: "Please input owner name!" }, ]} > diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 293fffa..059b695 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -83,7 +83,6 @@ export const ProductComponent = observer((props) => { title: "Supplier", dataIndex: "supplier_name", key: "supplier_name", - }, { title: "Sub Category", @@ -157,12 +156,14 @@ export const ProductComponent = observer((props) => { if (idData !== "") { modalLoader.setLoading(true); try { - const response=await store.product.update(idData, data); + const response = await store.product.update(idData, data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Ubah Data Produk") - : message.error("Gagal Ubah Data Produk"); + ? message.success( + response?.body?.message || "Berhasil Ubah Data Produk" + ) + : message.error(response?.body?.message || "Gagal Ubah Data Produk"); } catch (e) { - message.error("Gagal Ubah Data Produk"); + message.error(e.response?.body?.message || "Gagal Ubah Data Produk"); } modalLoader.setLoading(false); store.product.visibleModalProduct = false; @@ -171,13 +172,13 @@ export const ProductComponent = observer((props) => { } else { modalLoader.setLoading(true); try { - const response=await store.product.create(data); + const response = await store.product.create(data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Tambah Produk") - : message.error("Gagal Tambah Produk"); + ? message.success(response?.body?.message || "Berhasil Tambah Produk") + : message.error(response?.body?.message || "Gagal Tambah Produk"); } catch (e) { console.log(e, "apa errornya"); - message.error("Gagal Tambah Produk"); + message.error(e.response?.body?.message || "Gagal Tambah Produk"); } modalLoader.setLoading(false); store.product.visibleModalProduct = false; diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js index cec4f97..3cbeb2a 100644 --- a/src/component/SubcategoryComponent.js +++ b/src/component/SubcategoryComponent.js @@ -1,19 +1,29 @@ -import React, {useContext, useEffect, useState} from "react"; -import {Button, Divider, Form, Input, List, message, Modal, Select, Space, Table,} from "antd"; -import {observer} from "mobx-react-lite"; -import {useStore} from "../utils/useStore"; -import {ModalLoaderContext} from "../utils/modal"; +import React, { useContext, useEffect, useState } from "react"; +import { + Button, + Divider, + Form, + Input, + List, + message, + Modal, + Select, + Space, + Table, +} from "antd"; +import { observer } from "mobx-react-lite"; +import { useStore } from "../utils/useStore"; +import { ModalLoaderContext } from "../utils/modal"; export const SubcategoryComponent = observer((props) => { const store = useStore(); const [form] = Form.useForm(); - const {Option} = Select; + const { Option } = Select; const [idData, setIdData] = useState(""); const modalLoader = useContext(ModalLoaderContext); useEffect(() => { - - getData() - }, []) + getData(); + }, []); const getData = async () => { await store.category.getData(); await store.subcategory.getData(); @@ -67,13 +77,19 @@ export const SubcategoryComponent = observer((props) => { if (idData !== "") { modalLoader.setLoading(true); try { - const response=await store.subcategory.update(idData, data); + const response = await store.subcategory.update(idData, data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Ubah Data Sub Kategori") - : message.error("Gagal Ubah Data Sub Kategori"); + ? message.success( + response?.body?.message || "Berhasil Ubah Data Sub Kategori" + ) + : message.error( + response?.body?.message || "Gagal Ubah Data Sub Kategori" + ); //await getData(); } catch (e) { - message.error("Gagal Ubah Data Sub Kategori"); + message.error( + e.response?.body?.message || "Gagal Ubah Data Sub Kategori" + ); } modalLoader.setLoading(false); store.subcategory.visibleModalSubcategory = false; @@ -82,13 +98,17 @@ export const SubcategoryComponent = observer((props) => { } else { modalLoader.setLoading(true); try { - const response =await store.subcategory.create(data); + const response = await store.subcategory.create(data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Tambah Sub Kategori") - : message.error("Gagal Tambah Sub Kategori"); + ? message.success( + response?.body?.message || "Berhasil Tambah Sub Kategori" + ) + : message.error( + response?.body?.message || "Gagal Tambah Sub Kategori" + ); } catch (e) { console.log(e, "apa errornya"); - message.error("Gagal Tambah Sub Kategori"); + message.error(e.response?.body?.message || "Gagal Tambah Sub Kategori"); } modalLoader.setLoading(false); store.subcategory.visibleModalSubcategory = false; @@ -137,7 +157,7 @@ export const SubcategoryComponent = observer((props) => { pageSize: store.subcategory.pageSize, total: store.subcategory.total_data, current: store.subcategory.page + 1, - style: {marginBottom: "1rem", marginRight: "1rem"}, + style: { marginBottom: "1rem", marginRight: "1rem" }, }} dataSource={store.subcategory.data} style={{ padding: 0 }} diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js index 331f028..b7f3d3e 100644 --- a/src/component/SupplierComponent.js +++ b/src/component/SupplierComponent.js @@ -1,12 +1,23 @@ -import React, {useContext, useState} from "react"; -import {Button, Divider, Form, Input, List, message, Modal, Space, Table, Tag,} from "antd"; -import {observer} from "mobx-react-lite"; -import {ExclamationCircleOutlined} from "@ant-design/icons"; -import {useHistory} from "react-router-dom"; -import {useStore} from "../utils/useStore"; -import {LINKS} from "../routes/app"; -import {TopupsaldoModal} from "./TopupsaldoModal"; -import {ModalLoaderContext} from "../utils/modal"; +import React, { useContext, useState } from "react"; +import { + Button, + Divider, + Form, + Input, + List, + message, + Modal, + Space, + Table, + Tag, +} from "antd"; +import { observer } from "mobx-react-lite"; +import { ExclamationCircleOutlined } from "@ant-design/icons"; +import { useHistory } from "react-router-dom"; +import { useStore } from "../utils/useStore"; +import { LINKS } from "../routes/app"; +import { TopupsaldoModal } from "./TopupsaldoModal"; +import { ModalLoaderContext } from "../utils/modal"; export const SupplierComponent = observer((props) => { const store = useStore(); @@ -160,13 +171,17 @@ export const SupplierComponent = observer((props) => { if (idData !== "") { try { modalLoader.setLoading(true); - const response=await store.supplier.update(idData, data); + const response = await store.supplier.update(idData, data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Ubah Data Supplier") - : message.error("Gagal Ubah Data Supplier"); + ? message.success( + response?.body?.message || "Berhasil Ubah Data Supplier" + ) + : message.error( + response?.body?.message || "Gagal Ubah Data Supplier" + ); } catch (e) { modalLoader.setLoading(false); - message.error("Gagal Ubah Data Supplie"); + message.error(e.response?.body?.message || "Gagal Ubah Data Supplie"); } modalLoader.setLoading(false); @@ -176,13 +191,20 @@ export const SupplierComponent = observer((props) => { } else { try { modalLoader.setLoading(true); - const response=await store.supplier.create(data); + const response = await store.supplier.create(data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Tambah Supplier Baru") - : message.error("Gagal Tambah Supplier Baru"); + ? message.success( + response?.body?.message || "Berhasil Tambah Supplier Baru" + ) + : message.error( + response?.body?.statusCode === 406 + ? response?.body?.error || "Supplier Sudah Ada" + : response?.body?.message || "Gagal Tambah Supplier Baru" + //response?.body?.message || "Gagal Tambah Supplier Baru" + ); } catch (e) { console.log(e, "apa errornya"); - message.error("Gagal Tambah Supplier Baru"); + message.error(e.response?.body?.message || "Gagal Tambah Supplier"); } modalLoader.setLoading(false); @@ -232,7 +254,7 @@ export const SupplierComponent = observer((props) => { pageSize: store.supplier.pageSize, total: store.supplier.total_data, current: store.supplier.page + 1, - style: {marginBottom: "1rem", marginRight: "1rem"}, + style: { marginBottom: "1rem", marginRight: "1rem" }, }} dataSource={store.supplier.data} style={{ padding: 0 }} diff --git a/src/component/TopupsaldoModal.js b/src/component/TopupsaldoModal.js index cd9ff86..f2abe07 100644 --- a/src/component/TopupsaldoModal.js +++ b/src/component/TopupsaldoModal.js @@ -16,11 +16,11 @@ export const TopupsaldoModal = observer((props) => { const handleSubmitTransaction = async (data) => { try { modalLoader.setLoading(true); - await store.supplier.createTransaction(data); - message.success("Success Top Up"); + const response = await store.supplier.createTransaction(data); + message.success(response?.body?.message || "Success Top Up"); } catch (e) { console.log(e, "apa errornya"); - message.error("Failed Top Up"); + message.error(e.response?.body?.message || "Failed Top Up"); } modalLoader.setLoading(false); diff --git a/src/config/app.js b/src/config/app.js index ffdd851..de2c9a2 100644 --- a/src/config/app.js +++ b/src/config/app.js @@ -1,5 +1,6 @@ export const appConfig = { - apiUrl: 'https://ppob-backend.k3s.bangun-kreatif.com/v1' + // apiUrl: 'https://ppob-backend.k3s.bangun-kreatif.com/v1' + apiUrl: 'http://localhost:3222/v1' // apiUrl: 'http://localhost:3222/v1' }; diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js index 9e34298..7a46f2e 100644 --- a/src/pages/Login/Login.js +++ b/src/pages/Login/Login.js @@ -48,7 +48,7 @@ export const Login = observer(() => { color: "#413d3e", }} > - Boilerplate + PPOB { try { const response = await store.membership.create(data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 - ? message.success("Berhasil Tambah Member Baru") - : message.error("Gagal Tambah Member Baru"); + ? message.success( + response?.body?.message || "Berhasil Tambah Member Baru" + ) + : message.error( + response?.body?.message || "Gagal Tambah Member Baru" + ); await getData(); } catch (e) { console.log(e, "apa errornya"); - message.error("Gagal Tambah Member Baru"); + message.error(e.response?.body?.message || "Gagal Tambah Member Baru"); } modalLoader.setLoading(false); setConfirmLoading(false); @@ -333,7 +337,7 @@ export const Membership = observer(() => { {" "}