Repair Menu

2021-12-24 10:48:06 +07:00
parent 884a23ae80
commit c371a727b1
13 changed files with 267 additions and 193 deletions
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -213,12 +213,16 @@ export const Membership = observer(() => {
      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(() => {
                              </small>{" "}
                              <br />
                              <Button
-                              style={{marginRight:10}}
+                                style={{ marginRight: 10 }}
                                onClick={() => {
                                  setDestination(item?.id);
                                  console.log(item?.id);
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -176,13 +176,19 @@ export const Payback = observer(() => {
    try {
      const response = await store.payback.confirmPayback(id, type);
      if (response.body.status !== 201) {
-        message.error(`Failed ${capitalize(type)} Payback`);
+        message.error(
+          response?.body?.message || `Failed ${capitalize(type)} Payback`
+        );
      } else {
-        message.success(`Success ${capitalize(type)} Payback`);
+        message.success(
+          response?.body?.message || `Success ${capitalize(type)} Payback`
+        );
      }
    } catch (e) {
      console.error(e, "apa errornya");
-      message.error("Failed Handler Action Payback");
+      message.error(
+        e.response?.body?.message || "Failed Handler Action Payback"
+      );
    }
    modalLoader.setLoading(false);
  };
--- a/src/pages/Payback/PaybackModal.js
+++ b/src/pages/Payback/PaybackModal.js
@@ -1,11 +1,11 @@
-import React, {useContext, useState} from "react";
-import {Form, InputNumber, message, Modal, Upload,} from "antd";
-import {useStore} from "../../utils/useStore";
-import {LoadingOutlined, PlusOutlined} from "@ant-design/icons";
-import {ModalLoaderContext} from "../../utils/modal";
-import {appConfig} from "../../config/app";
+import React, { useContext, useState } from "react";
+import { Form, InputNumber, message, Modal, Upload } from "antd";
+import { useStore } from "../../utils/useStore";
+import { LoadingOutlined, PlusOutlined } from "@ant-design/icons";
+import { ModalLoaderContext } from "../../utils/modal";
+import { appConfig } from "../../config/app";

-export const PaybackModal = ({initialData}) => {
+export const PaybackModal = ({ initialData }) => {
  const [form] = Form.useForm();
  const store = useStore();
  const [image, setImage] = useState("");
@@ -34,28 +34,30 @@ export const PaybackModal = ({initialData}) => {
    const res = await store.payback.uploadImages(file);
    setImage(`${appConfig.apiUrl}/config/image/${res.body.filename}`);
    setResponseFilename(res.body.filename);
-    setFileList([{
-      uid: '-1',
-      name: res.body.filename,
-      status: 'done',
-      url: `${appConfig.apiUrl}/config/image/${res.body.filename}`,
-    }]);
+    setFileList([
+      {
+        uid: "-1",
+        name: res.body.filename,
+        status: "done",
+        url: `${appConfig.apiUrl}/config/image/${res.body.filename}`,
+      },
+    ]);
    setLoading(false);
  };

  const handleChange = (info) => {
-    if (info.file.status === 'uploading') {
+    if (info.file.status === "uploading") {
      setLoading(true);
    } else {
-      setLoading(false)
+      setLoading(false);
    }
  };

  const uploadButton = (
-      <div>
-        {loading ? <LoadingOutlined/> : <PlusOutlined/>}
-        <div style={{marginTop: 8}}>Click to Upload</div>
-      </div>
+    <div>
+      {loading ? <LoadingOutlined /> : <PlusOutlined />}
+      <div style={{ marginTop: 8 }}>Click to Upload</div>
+    </div>
  );

  const handleSubmit = async (data) => {
@@ -64,10 +66,10 @@ export const PaybackModal = ({initialData}) => {
      const request = {
        ...data,
        destination: store.authentication.profileData.superior?.id,
-        image_prove: responseFilename
-      }
-      await store.payback.create(request);
-      message.success("Success Add Created");
+        image_prove: responseFilename,
+      };
+      const response = await store.payback.create(request);
+      message.success(response?.body?.message || "Success Add Created");
    } catch (e) {
      if (e.response?.body?.message) {
        message.error(e.response.body.message);
@@ -91,77 +93,77 @@ export const PaybackModal = ({initialData}) => {
    setPreviewImage("");
    setResponseFilename("");
    store.payback.visibleModalPayback = false;
-  }
+  };

  return (
-      <Modal
-          visible={store.payback.visibleModalPayback}
-          title={"Create a new Created"}
-          okText={"Create"}
-          cancelText="Cancel"
-          onCancel={handleCancel}
-          onOk={() => {
-            form
-                .validateFields()
-                .then((values) => {
-                  handleSubmit(values);
-                  form.resetFields();
-                })
-                .catch((info) => {
-                  console.log("Validate Failed:", info);
-                });
-          }}
+    <Modal
+      visible={store.payback.visibleModalPayback}
+      title={"Create a new Created"}
+      okText={"Create"}
+      cancelText="Cancel"
+      onCancel={handleCancel}
+      onOk={() => {
+        form
+          .validateFields()
+          .then((values) => {
+            handleSubmit(values);
+            form.resetFields();
+          })
+          .catch((info) => {
+            console.log("Validate Failed:", info);
+          });
+      }}
+    >
+      <Form
+        form={form}
+        layout="vertical"
+        name="form_in_modal"
+        initialValues={initialData}
      >
-        <Form
-            form={form}
-            layout="vertical"
-            name="form_in_modal"
-            initialValues={initialData}
-        >
-          <Form.Item
-              label="Upload Picture"
-              name="image_prove"
-          >
-            <div>
-              <Upload
-                  listType="picture-card"
-                  fileList={fileList}
-                  onPreview={(file) => {
-                    setPreviewImage(file.url || file.filename);
-                  }}
-                  showUploadList={true}
-                  onChange={handleChange}
-                  beforeUpload={(file) => beforeUpload(file)}
-                  customRequest={(args) => uploadHandler(args)}
-                  onRemove={(file) => {
-                    setImage('');
-                    setLoading(false);
-                    setFileList([]);
-                  }}
-              >
-
-                {image === "" ? uploadButton : null}
-              </Upload>
-              <h5 style={{
+        <Form.Item label="Upload Picture" name="image_prove">
+          <div>
+            <Upload
+              listType="picture-card"
+              fileList={fileList}
+              onPreview={(file) => {
+                setPreviewImage(file.url || file.filename);
+              }}
+              showUploadList={true}
+              onChange={handleChange}
+              beforeUpload={(file) => beforeUpload(file)}
+              customRequest={(args) => uploadHandler(args)}
+              onRemove={(file) => {
+                setImage("");
+                setLoading(false);
+                setFileList([]);
+              }}
+            >
+              {image === "" ? uploadButton : null}
+            </Upload>
+            <h5
+              style={{
                marginTop: 12,
                color: "rgba(0, 0, 0, 0.45)",
-              }}>
-                Max size of file 2 MB
-              </h5>
-            </div>
-          </Form.Item>
-          <Form.Item
-              name="amount"
-              label="amount"
-              rules={[{required: true, message: "Please input Amount!"}]}
-          >
-            <InputNumber
-                style={{width: "100%"}}
-                formatter={value => `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
-                parser={value => value.replace(/\Rp.\s?|(,*)/g, '')}
-            />
-          </Form.Item>
-        </Form>
-      </Modal>
+              }}
+            >
+              Max size of file 2 MB
+            </h5>
+          </div>
+        </Form.Item>
+        <Form.Item
+          name="amount"
+          label="amount"
+          rules={[{ required: true, message: "Please input Amount!" }]}
+        >
+          <InputNumber
+            style={{ width: "100%" }}
+            formatter={(value) =>
+              `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+            }
+            parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
+          />
+        </Form.Item>
+      </Form>
+    </Modal>
  );
 };
--- a/src/pages/Transaction/Product.js
+++ b/src/pages/Transaction/Product.js
@@ -48,9 +48,9 @@ export const Product = observer(() => {
        productCode: data,
      });
      if (response.status === 201) {
-        message.success("Berhasil Beli Produk");
+        message.success(response?.body?.message || "Berhasil Beli Produk");
      } else {
-        message.error("Gagal Beli Produk", 3);
+        message.error(response?.body?.message || "Gagal Beli Produk", 3);
      }
    } catch (e) {
      if (e.response?.body?.message) {