Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop
This commit is contained in:
commit
088ef0e27e
|
@ -1,25 +1,14 @@
|
||||||
import React, { useEffect, useState } from "react";
|
import React, {useEffect, useState} from "react";
|
||||||
import {
|
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
|
||||||
Button,
|
import {observer} from "mobx-react-lite";
|
||||||
Form,
|
import {useHistory} from "react-router-dom";
|
||||||
Input,
|
import {useStore} from "../utils/useStore";
|
||||||
message,
|
import {LINKS} from "../routes/app";
|
||||||
Modal,
|
|
||||||
Select,
|
|
||||||
Space,
|
|
||||||
Table,
|
|
||||||
} from "antd";
|
|
||||||
import { observer } from "mobx-react-lite";
|
|
||||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
|
||||||
import { useHistory } from "react-router-dom";
|
|
||||||
import { capitalize } from "lodash";
|
|
||||||
import { useStore } from "../utils/useStore";
|
|
||||||
import { LINKS } from "../routes/app";
|
|
||||||
|
|
||||||
export const CommissionComponent = observer((props) => {
|
export const CommissionComponent = observer((props) => {
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
const { Option } = Select;
|
const {Option} = Select;
|
||||||
const history = useHistory();
|
const history = useHistory();
|
||||||
const [idData, setIdData] = useState("");
|
const [idData, setIdData] = useState("");
|
||||||
const [confirmLoading, setConfirmLoading] = useState(false);
|
const [confirmLoading, setConfirmLoading] = useState(false);
|
||||||
|
@ -88,8 +77,6 @@ export const CommissionComponent = observer((props) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleSubmit = async (data) => {
|
const handleSubmit = async (data) => {
|
||||||
console.log(data, "isi data2");
|
|
||||||
if (idData !== "") {
|
|
||||||
setConfirmLoading(true);
|
setConfirmLoading(true);
|
||||||
try {
|
try {
|
||||||
await store.commission.update(idData, data);
|
await store.commission.update(idData, data);
|
||||||
|
@ -101,20 +88,6 @@ export const CommissionComponent = observer((props) => {
|
||||||
store.commission.visibleModalCommission = false;
|
store.commission.visibleModalCommission = false;
|
||||||
setIdData("");
|
setIdData("");
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
} else {
|
|
||||||
setConfirmLoading(true);
|
|
||||||
try {
|
|
||||||
await store.commission.create(data);
|
|
||||||
message.success("Success Add New Member");
|
|
||||||
} catch (e) {
|
|
||||||
console.log(e, "apa errornya");
|
|
||||||
message.error("Failed Add Member");
|
|
||||||
}
|
|
||||||
setConfirmLoading(false);
|
|
||||||
store.commission.visibleModalCommission = false;
|
|
||||||
setIdData("");
|
|
||||||
form.resetFields();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -143,8 +116,8 @@ export const CommissionComponent = observer((props) => {
|
||||||
|
|
||||||
<Modal
|
<Modal
|
||||||
visible={store.commission.visibleModalCommission}
|
visible={store.commission.visibleModalCommission}
|
||||||
title={idData ? "Edit Commission" : "Create a new commission"}
|
title={"Edit Commission"}
|
||||||
okText={idData ? "Edit" : "Create"}
|
okText={"Edit"}
|
||||||
cancelText="Cancel"
|
cancelText="Cancel"
|
||||||
onCancel={() => {
|
onCancel={() => {
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
|
|
|
@ -1,26 +1,15 @@
|
||||||
import React, { useEffect, useState } from "react";
|
import React, {useEffect, useState} from "react";
|
||||||
import {
|
import {Button, Form, Input, message, Modal, Select, Space, Table, Tag,} from "antd";
|
||||||
Button,
|
import {observer} from "mobx-react-lite";
|
||||||
Form,
|
import {ExclamationCircleOutlined} from "@ant-design/icons";
|
||||||
Input,
|
import {useHistory} from "react-router-dom";
|
||||||
message,
|
import {useStore} from "../utils/useStore";
|
||||||
Modal,
|
import {LINKS} from "../routes/app";
|
||||||
Select,
|
|
||||||
Space,
|
|
||||||
Table,
|
|
||||||
Tag,
|
|
||||||
} from "antd";
|
|
||||||
import { observer } from "mobx-react-lite";
|
|
||||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
|
||||||
import { useHistory } from "react-router-dom";
|
|
||||||
import { capitalize } from "lodash";
|
|
||||||
import { useStore } from "../utils/useStore";
|
|
||||||
import { LINKS } from "../routes/app";
|
|
||||||
|
|
||||||
export const PartnerComponent = observer((props) => {
|
export const PartnerComponent = observer((props) => {
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
const { Option } = Select;
|
const {Option} = Select;
|
||||||
const history = useHistory();
|
const history = useHistory();
|
||||||
const [idData, setIdData] = useState("");
|
const [idData, setIdData] = useState("");
|
||||||
const [isChangePassword, setIsChangePassword] = useState(false);
|
const [isChangePassword, setIsChangePassword] = useState(false);
|
||||||
|
@ -306,7 +295,7 @@ export const PartnerComponent = observer((props) => {
|
||||||
? { required: false }
|
? { required: false }
|
||||||
: {
|
: {
|
||||||
required: true,
|
required: true,
|
||||||
message: "Please input password address!",
|
message: "Please input address!",
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
|
|
|
@ -33,11 +33,6 @@ export class Commission {
|
||||||
|
|
||||||
this.total_data = response.body.total_data ?? 0
|
this.total_data = response.body.total_data ?? 0
|
||||||
}
|
}
|
||||||
async create(data) {
|
|
||||||
const response = await http.post('/users/supplier').send(data);
|
|
||||||
await this.getData();
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
async update(id, data) {
|
async update(id, data) {
|
||||||
const response = await http.put(`/config/commission/${id}`).send(data);
|
const response = await http.put(`/config/commission/${id}`).send(data);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user