From d683951c4947d8b361bc3fa7eaad86e0663842e2 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 19:26:02 +0700
Subject: [PATCH 01/36] Bug Fixing

---
 src/component/ProductComponent.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 4a37738..3a3cc7c 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -228,9 +228,13 @@ export const ProductComponent = observer((props) => {
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
+    store.authentication.userData.role === "Admin Partner"
+                ? await store.product.getData()
+                : await store.product.getData()
     await store.product.getData();
     modalLoader.setLoading(false);
     store.product.visibleModalFilterProduct = false;
+    //store.product.page=1
   };
 
   const footerLayoutFilter = [
@@ -478,6 +482,7 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalFilterProduct}
         title={"Filter"}
         footer={footerLayoutFilter}
+        onClick={store.product.page + 1}
         onCancel={async () => {
           // setFilterSupplier([]);
           // setFilterSubCategories([]);

From 8ec940d618c317dcc34a3610c619e0d2677c589f Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 19:51:51 +0700
Subject: [PATCH 02/36] Bug Fixing

---
 src/component/ProductComponent.js    |  8 +++---
 src/pages/Product/Product.js         |  1 +
 src/pages/Transaction/Product.js     | 37 ++++++++++++++--------------
 src/pages/Transaction/Transaction.js | 37 ++++++++++++++--------------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 3a3cc7c..b01aca2 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -228,9 +228,9 @@ export const ProductComponent = observer((props) => {
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
-    store.authentication.userData.role === "Admin Partner"
-                ? await store.product.getData()
-                : await store.product.getData()
+    // store.authentication.userData.role === "Admin Partner"
+    //             ? await store.product.getData()
+    //             : await store.product.getData()
     await store.product.getData();
     modalLoader.setLoading(false);
     store.product.visibleModalFilterProduct = false;
@@ -482,7 +482,7 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalFilterProduct}
         title={"Filter"}
         footer={footerLayoutFilter}
-        onClick={store.product.page + 1}
+        
         onCancel={async () => {
           // setFilterSupplier([]);
           // setFilterSubCategories([]);
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js
index 3cadd9c..1ff75cf 100644
--- a/src/pages/Product/Product.js
+++ b/src/pages/Product/Product.js
@@ -195,6 +195,7 @@ export const Product = observer(() => {
               <Button
                 onClick={() => {
                   store.product.visibleModalFilterProduct = true;
+                  store.product.page=0
                 }}
               >
                 <FilterOutlined />
diff --git a/src/pages/Transaction/Product.js b/src/pages/Transaction/Product.js
index ff73f3c..2d89bca 100644
--- a/src/pages/Transaction/Product.js
+++ b/src/pages/Transaction/Product.js
@@ -215,6 +215,7 @@ export const Product = observer(() => {
             style={{
               backgroundColor: "#4e79e7",
               color: "#fff",
+              marginRight:10
             }}
             onClick={() => {
               form
@@ -231,24 +232,24 @@ export const Product = observer(() => {
           >
             Beli
           </Button>,
-          <Button
-            key="Beli Stag"
-            type="primary"
-            onClick={() => {
-              form
-                .validateFields()
-                .then((values) => {
-                  console.log(values, "isi form");
-                  handleBuyStag(values, barang.product_code);
-                  form.resetFields();
-                })
-                .catch((info) => {
-                  console.error("Validate Failed:", info);
-                });
-            }}
-          >
-            Beli Staging
-          </Button>,
+          // <Button
+          //   key="Beli Stag"
+          //   type="primary"
+          //   onClick={() => {
+          //     form
+          //       .validateFields()
+          //       .then((values) => {
+          //         console.log(values, "isi form");
+          //         handleBuyStag(values, barang.product_code);
+          //         form.resetFields();
+          //       })
+          //       .catch((info) => {
+          //         console.error("Validate Failed:", info);
+          //       });
+          //   }}
+          // >
+          //   Beli Staging
+          // </Button>,
         ]}
       >
         <Form form={form} layout="vertical">
diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js
index 3a8ec96..69468dc 100644
--- a/src/pages/Transaction/Transaction.js
+++ b/src/pages/Transaction/Transaction.js
@@ -294,6 +294,7 @@ export const Transaction = observer(() => {
                   style={{
                     backgroundColor: "#4e79e7",
                     color: "#fff",
+                    marginRight:10
                   }}
                   onClick={() => {
                     form
@@ -310,24 +311,24 @@ export const Transaction = observer(() => {
                 >
                   Beli
                 </Button>,
-                <Button
-                  key="Beli Stag"
-                  type="primary"
-                  onClick={() => {
-                    form
-                      .validateFields()
-                      .then((values) => {
-                        console.log(values, "isi form");
-                        handleBuyStag(values, barang.product_code);
-                        form.resetFields();
-                      })
-                      .catch((info) => {
-                        console.error("Validate Failed:", info);
-                      });
-                  }}
-                >
-                  Beli Staging
-                </Button>,
+                // <Button
+                //   key="Beli Stag"
+                //   type="primary"
+                //   onClick={() => {
+                //     form
+                //       .validateFields()
+                //       .then((values) => {
+                //         console.log(values, "isi form");
+                //         handleBuyStag(values, barang.product_code);
+                //         form.resetFields();
+                //       })
+                //       .catch((info) => {
+                //         console.error("Validate Failed:", info);
+                //       });
+                //   }}
+                // >
+                //   Beli Staging
+                // </Button>,
               ]}
             >
               <Form form={form} layout="vertical">

From a790a23c93e479479bb23b64f95c53e1b9d5ed7a Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 20:20:04 +0700
Subject: [PATCH 03/36] Bug Fixing

---
 src/component/ProductComponent.js  |  4 ++--
 src/pages/Membership/DetailUser.js |  4 ++--
 src/pages/Membership/Membership.js | 22 ++++++++++++----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index b01aca2..df8ddf6 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -128,7 +128,7 @@ export const ProductComponent = observer((props) => {
       ),
     },
   ];
-  if (store.authentication.userData.role !== "Admin") columns.pop();
+  //if (store.authentication.userData.role !== "Admin") columns.pop();
   //if (store.authentication.userData.role === "Admin Partner") delete columns[2];
   if (store.authentication.userData.role === "Admin Partner") delete columns[3];
   if (store.authentication.userData.role != "Admin Partner") delete columns[4];
@@ -136,7 +136,7 @@ export const ProductComponent = observer((props) => {
   if (store.authentication.userData.role !== "Admin") delete columns[2];
   if (store.authentication.userData.role !== "Admin") delete columns[5];
   if (store.authentication.userData.role === "Admin Partner") delete columns[7];
-  if (store.authentication.userData.role !== "Admin") delete columns[8];
+  //if (store.authentication.userData.role !== "Admin") delete columns[8];
   //if (store.authentication.userData.role === "Admin Partner") delete columns[5];
 
   const deleteData = async (id) => {
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 7257b59..642ae26 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -412,8 +412,8 @@ export const DetailUser = observer(() => {
             Detail User
           </Title>
           <Col
-            lg={store.authentication.userData.role === "Admin" ? 18 : 13}
-            xs={store.authentication.userData.role === "Admin" ? 18 : 13}
+            lg={store.authentication.userData.role === "Admin" ? 18 : 17}
+            xs={store.authentication.userData.role === "Admin" ? 18 : 17}
             style={{ textAlign: "right" }}
           >
             <Space
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 8852743..d843581 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -201,15 +201,17 @@ export const Membership = observer(() => {
       key: "action",
       render: (text, record) => (
         <Space size="middle">
-          <Button
-            onClick={() => {
-              setDestination(record?.id);
-              console.log(record?.id);
-              setIsVisibleTopUpModal(true);
-            }}
-          >
-            <DownloadOutlined /> Top Up Saldo
-          </Button>
+          {store.authentication.userData.role === "Admin" && (
+            <Button
+              onClick={() => {
+                setDestination(record?.id);
+                console.log(record?.id);
+                setIsVisibleTopUpModal(true);
+              }}
+            >
+              <DownloadOutlined /> Top Up Saldo
+            </Button>
+          )}
           <Button
             onClick={async () => {
               await store.transaction.getDataHistoryTopUp(record.id);
@@ -226,7 +228,7 @@ export const Membership = observer(() => {
     },
   ];
 
-  if (store.authentication.userData.role === "Customer Service") columns.pop();
+  //if (store.authentication.userData.role === "Customer Service") columns.pop();
   const routeData = [
     {
       route: LINKS.HOME,

From 23f210ccd52fc1c238821a670e8423a86dd9bdbe Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 21:13:09 +0700
Subject: [PATCH 04/36] Bug Fixing

---
 src/component/CategoryComponent.js    |   8 +-
 src/component/ProductComponent.js     |  76 ++++++++----
 src/component/SubcategoryComponent.js |  38 +++---
 src/pages/Membership/DetailUser.js    |   2 +-
 src/pages/Membership/Membership.js    |  23 ++--
 src/pages/Product/ProductDetail.js    | 166 ++++++++++++++++++++++----
 6 files changed, 236 insertions(+), 77 deletions(-)

diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js
index 70fc4f1..62ce17b 100644
--- a/src/component/CategoryComponent.js
+++ b/src/component/CategoryComponent.js
@@ -195,9 +195,11 @@ export const CategoryComponent = observer((props) => {
                         margin: 0,
                       }}
                     >
-                      <Button onClick={() => handleEditButton(item)}>
-                        Edit
-                      </Button>
+                      {store.authentication.userData.role === "Admin" && (
+                        <Button onClick={() => handleEditButton(item)}>
+                          Edit
+                        </Button>
+                      )}
                     </p>
                   </div>
                 </List.Item>
diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index df8ddf6..e6d68dd 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -213,7 +213,12 @@ export const ProductComponent = observer((props) => {
     store.product.filterSubCategory = null;
     setFilterSupplier([]);
     setFilterSubCategories([]);
-    await store.product.getData();
+    store.authentication.userData.role === "Admin Partner"
+      ? await store.product.getProductPartner(
+          store.authentication.profileData.id
+        )
+      : await store.product.getData();
+    //await store.product.getData();
     store.product.visibleModalFilterProduct = false;
   };
 
@@ -221,17 +226,24 @@ export const ProductComponent = observer((props) => {
     store.product.filterSubCategory = null;
     store.product.filterSupplier = null;
     store.product.visibleModalFilterProduct = false;
-    await store.product.getData();
+    store.authentication.userData.role === "Admin Partner"
+      ? await store.product.getProductPartner(
+          store.authentication.profileData.id
+        )
+      : await store.product.getData();
+    //await store.product.getData();
   };
 
   const handleSubmitFilter = async () => {
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
-    // store.authentication.userData.role === "Admin Partner"
-    //             ? await store.product.getData()
-    //             : await store.product.getData()
-    await store.product.getData();
+    store.authentication.userData.role === "Admin Partner"
+      ? await store.product.getProductPartner(
+          store.authentication.profileData.id
+        )
+      : await store.product.getData();
+    //await store.product.getData();
     modalLoader.setLoading(false);
     store.product.visibleModalFilterProduct = false;
     //store.product.page=1
@@ -273,16 +285,19 @@ export const ProductComponent = observer((props) => {
       {store.ui.mediaQuery.isDesktop && (
         <Table
           style={
-            store.authentication.userData.role === "Admin"
-              ? {
-                  cursor: "pointer",
-                  textAlign: "center",
-                  width: store.ui.mediaQuery.isMobile ? 250 : "",
-                }
-              : {
-                  textAlign: "center",
-                  width: store.ui.mediaQuery.isMobile ? 250 : "",
-                }
+            // store.authentication.userData.role === "Admin"
+            //   ? {
+            {
+              cursor: "pointer",
+              textAlign: "center",
+              width: store.ui.mediaQuery.isMobile ? 250 : "",
+            }
+
+            //   }
+            // : {
+            //     textAlign: "center",
+            //     width: store.ui.mediaQuery.isMobile ? 250 : "",
+            //   }
           }
           columns={columns}
           dataSource={
@@ -290,9 +305,7 @@ export const ProductComponent = observer((props) => {
               ? store.product.dataProductPartner
               : store.product.data
           }
-          onRow={
-            store.authentication.userData.role === "Admin" ? handleClickRow : ""
-          }
+          onRow={handleClickRow}
           pagination={{
             pageSize: store.product.pageSize,
             total:
@@ -322,7 +335,12 @@ export const ProductComponent = observer((props) => {
               store.product.pageSize = pageSize;
               store.product.page = page - 1;
               modalLoader.setLoading(true);
-              await store.product.getData();
+              store.authentication.userData.role === "Admin Partner"
+                ? await store.product.getProductPartner(
+                    store.authentication.profileData.id
+                  )
+                : await store.product.getData();
+              //await store.product.getData();
               modalLoader.setLoading(false);
             },
             pageSize: store.product.pageSize,
@@ -357,6 +375,19 @@ export const ProductComponent = observer((props) => {
                           {/* <small>Harga Beli : {item.current_price_price}</small>
                           <br /> */}
                           <small>Harga Jual : {item.mark_up_price}</small>
+                          <br />
+                          <Button
+                            onClick={async () => {
+                              history.push(
+                                LINKS.PRODUCT_DETAIL.replace(
+                                  ":id",
+                                  item.product_id
+                                )
+                              );
+                            }}
+                          >
+                            Detail
+                          </Button>
                         </p>
                         <p></p>
                       </div>
@@ -457,8 +488,8 @@ export const ProductComponent = observer((props) => {
             rules={[{ required: true, message: "Please select Status!" }]}
           >
             <Select placeholder="Select Sub Category" allowClear>
-              <Option value="ACTIVE">ACTIVE</Option>
-              <Option value="INACTIVE">INACTIVE</Option>
+              <Option value="ACTIVE">AKTIF</Option>
+              <Option value="INACTIVE">INAKTIF</Option>
             </Select>
           </Form.Item>
           <Form.Item
@@ -482,7 +513,6 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalFilterProduct}
         title={"Filter"}
         footer={footerLayoutFilter}
-        
         onCancel={async () => {
           // setFilterSupplier([]);
           // setFilterSubCategories([]);
diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js
index 1abbf07..5434bcd 100644
--- a/src/component/SubcategoryComponent.js
+++ b/src/component/SubcategoryComponent.js
@@ -68,7 +68,7 @@ export const SubcategoryComponent = observer((props) => {
   ];
 
   if (store.authentication.userData.role === "Customer Service") columns.pop();
-  
+
   const handleCancel = () => {
     setIdData("");
     store.subcategory.visibleModalSubcategory = false;
@@ -150,7 +150,7 @@ export const SubcategoryComponent = observer((props) => {
           itemLayout="horizontal"
           position={"top"}
           pagination={{
-            onChange: async (page,pageSize) => {
+            onChange: async (page, pageSize) => {
               store.subcategory.pageSize = pageSize;
               store.subcategory.page = page - 1;
               modalLoader.setLoading(true);
@@ -200,9 +200,11 @@ export const SubcategoryComponent = observer((props) => {
                         margin: 0,
                       }}
                     >
-                      <Button onClick={() => handleEditButton(item)}>
-                        Edit
-                      </Button>
+                      {store.authentication.userData.role === "Admin" && (
+                        <Button onClick={() => handleEditButton(item)}>
+                          Edit
+                        </Button>
+                      )}
                     </p>
                   </div>
                 </List.Item>
@@ -254,19 +256,19 @@ export const SubcategoryComponent = observer((props) => {
             <Input />
           </Form.Item>
           {/* {!idData && ( */}
-            <Form.Item
-              name="categoryId"
-              label="Categories"
-              rules={[{ required: true, message: "Please input category id!" }]}
-            >
-              <Select placeholder="Select Category" allowClear>
-                {store.category.data.map((item) => (
-                  <Option value={item.id} key={item.id} defaultValue={item.name}>
-                    {item.name}
-                  </Option>
-                ))}
-              </Select>
-            </Form.Item>
+          <Form.Item
+            name="categoryId"
+            label="Categories"
+            rules={[{ required: true, message: "Please input category id!" }]}
+          >
+            <Select placeholder="Select Category" allowClear>
+              {store.category.data.map((item) => (
+                <Option value={item.id} key={item.id} defaultValue={item.name}>
+                  {item.name}
+                </Option>
+              ))}
+            </Select>
+          </Form.Item>
           {/* )} */}
         </Form>
       </Modal>
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 642ae26..b5bc83f 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -938,7 +938,7 @@ export const DetailUser = observer(() => {
                               }}
                             >
                               <List.Item.Meta
-                                className={["cariparkir-container"].join(" ")}
+                                className={[""].join(" ")}
                                 title={item.name}
                                 description={
                                   <div style={{}}>
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index d843581..8bb2407 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -448,16 +448,19 @@ export const Membership = observer(() => {
                               <small>Username : {item.username}</small> <br />
                               <small>Role : {item.roles?.name}</small> <br />
                               <small>Saldo : {item.coa?.amount}</small> <br />
-                              <Button
-                                style={{ marginRight: 10, marginTop: 7 }}
-                                onClick={() => {
-                                  setDestination(item?.id);
-                                  console.log(item?.id);
-                                  setIsVisibleTopUpModal(true);
-                                }}
-                              >
-                                <DownloadOutlined /> Top Up Saldo
-                              </Button>
+                              {store.authentication.userData.role ===
+                                "Admin" && (
+                                <Button
+                                  style={{ marginRight: 10, marginTop: 7 }}
+                                  onClick={() => {
+                                    setDestination(item?.id);
+                                    console.log(item?.id);
+                                    setIsVisibleTopUpModal(true);
+                                  }}
+                                >
+                                  <DownloadOutlined /> Top Up Saldo
+                                </Button>
+                              )}
                               <Button
                                 onClick={async () => {
                                   await store.transaction.getDataHistoryTopUp(
diff --git a/src/pages/Product/ProductDetail.js b/src/pages/Product/ProductDetail.js
index de8aa00..6364f74 100644
--- a/src/pages/Product/ProductDetail.js
+++ b/src/pages/Product/ProductDetail.js
@@ -1,5 +1,15 @@
 import React, { useContext, useEffect } from "react";
-import { Card, Col, Row, Table, Typography, Tag } from "antd";
+import {
+  Card,
+  Col,
+  Row,
+  Table,
+  Typography,
+  Tag,
+  List,
+  Button,
+  Divider,
+} from "antd";
 import { BreadcumbComponent } from "../../component/BreadcumbComponent";
 import { LINKS } from "../../routes/app";
 import { useStore } from "../../utils/useStore";
@@ -101,7 +111,7 @@ export const ProductDetail = observer(() => {
     : null;
 
   return (
-    <div className={[""].join(" ")}>
+    <div className={["ppob-container"].join(" ")}>
       <BreadcumbComponent data={routeData} />
       <Card>
         <Title strong>Product Detail</Title>
@@ -141,26 +151,138 @@ export const ProductDetail = observer(() => {
               <Title strong level={3}>
                 Product Price History
               </Title>
-              <Table
-                columns={columns}
-                dataSource={store.product.dataPriceHistory}
-                bordered
-                pagination={{
-                  pageSize: store.product.pageSizePriceHistory,
-                  total: store.product.totalDataPriceHistory,
-                  current: store.product.pagePriceHistory + 1,
-                  showSizeChanger: true,
-                  simple: false,
-                }}
-                onChange={async (page) => {
-                  let pageNumber = page.current;
-                  store.product.pageSizePriceHistory = page.pageSize;
-                  store.product.pagePriceHistory = pageNumber - 1;
-                  modalLoader.setLoading(true);
-                  await store.product.getPriceHistoryByProduct(id);
-                  modalLoader.setLoading(false);
-                }}
-              />
+              {store.ui.mediaQuery.isDesktop && (
+                <Table
+                  columns={columns}
+                  dataSource={store.product.dataPriceHistory}
+                  bordered
+                  pagination={{
+                    pageSize: store.product.pageSizePriceHistory,
+                    total: store.product.totalDataPriceHistory,
+                    current: store.product.pagePriceHistory + 1,
+                    showSizeChanger: true,
+                    simple: false,
+                  }}
+                  onChange={async (page) => {
+                    let pageNumber = page.current;
+                    store.product.pageSizePriceHistory = page.pageSize;
+                    store.product.pagePriceHistory = pageNumber - 1;
+                    modalLoader.setLoading(true);
+                    await store.product.getPriceHistoryByProduct(id);
+                    modalLoader.setLoading(false);
+                  }}
+                />
+              )}
+              {store.ui.mediaQuery.isMobile && (
+                <List
+                  itemLayout="horizontal"
+                  position={"top"}
+                  pagination={{
+                    onChange: async (page, pageSize) => {
+                      store.product.pageSizePriceHistory = pageSize;
+                      store.product.pagePriceHistory = page - 1;
+                      modalLoader.setLoading(true);
+                      await store.product.getPriceHistoryByProduct(id);
+                      modalLoader.setLoading(false);
+                    },
+                    pageSize: store.product.pageSizePriceHistory,
+                    total: store.product.totalDataPriceHistory,
+                    current: store.product.pagePriceHistory + 1,
+                    style: { marginBottom: "1rem", marginRight: "1rem" },
+                  }}
+                  dataSource={store.product.dataPriceHistory}
+                  style={{ padding: 0 }}
+                  renderItem={(item) => {
+                    return (
+                      <div>
+                        <List.Item
+                          key={item.id}
+                          style={{
+                            backgroundColor: "#ffffff",
+                            paddingTop: 0,
+                            paddingBottom: 0,
+                            display: "flex",
+                            flexDirection: "row",
+                            alignItems: "center",
+                            justifyContent: "center",
+                          }}
+                        >
+                          <List.Item.Meta
+                            className={[""].join(" ")}
+                            //title={item.mark_up_price}
+                            description={
+                              <div style={{}}>
+                                <p>
+                                  <small>
+                                    Markup Price :{" "}
+                                    {new Intl.NumberFormat("id-ID", {
+                                      style: "currency",
+                                      currency: "IDR",
+                                    }).format(item.mark_up_price)}
+                                  </small>{" "}
+                                  <br />
+                                  <small>
+                                    Price:{" "}
+                                    {new Intl.NumberFormat("id-ID", {
+                                      style: "currency",
+                                      currency: "IDR",
+                                    }).format(item.price)}
+                                  </small>{" "}
+                                  <br />
+                                  <small>
+                                    {" "}
+                                    Tanggal Berlaku :
+                                    {item.startDate
+                                      ? format(
+                                          parseISO(item.startDate),
+                                          "dd MMMM yyyy"
+                                        )
+                                      : "-"}
+                                  </small>{" "}
+                                  <br />
+                                  <small>
+                                    Tanggal Berakhir :{" "}
+                                    {item.endDate
+                                      ? format(
+                                          parseISO(item.endDate),
+                                          "dd MMMM yyyy"
+                                        )
+                                      : "Sampai Sekarang"}
+                                  </small>{" "}
+                                  <br />
+                                </p>
+                                <p></p>
+                              </div>
+                            }
+                          />
+                          {/* <div style={{ marginRight: 16 }}>
+                            <p
+                              style={{
+                                fontSize: 9,
+                                margin: 0,
+                              }}
+                            >
+                              <Tag
+                                color={
+                                  item?.product_status === "ACTIVE"
+                                    ? "blue"
+                                    : "#E3E8EE"
+                                }
+                                style={{ color: "#4F566B" }}
+                              >
+                                {item?.product_status === "ACTIVE"
+                                  ? " Tersedia"
+                                  : "Tidak"}
+                              </Tag>
+                            </p>
+                          </div> */}
+                        </List.Item>
+                        <Divider plain style={{ margin: 0 }} />
+                      </div>
+                    );
+                  }}
+                />
+              )}
             </div>
           </Col>
         </Row>

From aed1657b9a0969311fe98a96c5eb2a22a5777d2f Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 22:47:31 +0700
Subject: [PATCH 05/36] Bug Fixing

---
 src/pages/App/DesktopLayout.js       |  4 +-
 src/pages/App/MenuList.js            |  3 +-
 src/pages/Payback/PaybackCreated.js  |  4 +-
 src/pages/Transaction/Transaction.js | 71 +++++++++++++++-------------
 4 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index 6a7332b..75b8d2e 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -312,7 +312,9 @@ export const DesktopLayout = observer(() => {
                       </Link>
                     </Menu.Item>
                   )}
-                  {store.authentication.userData.role !== "Admin" && (
+                  {store.authentication.userData.role !== "Admin" &&
+                    store.authentication.userData.role !==
+                      "Customer Service" && (
                       <Menu.Item key="payback-from-user">
                         <Link to={LINKS.PAYBACK_CREATED}>
                           <AlipayOutlined />
diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js
index 8cec5e6..a0d6af3 100644
--- a/src/pages/App/MenuList.js
+++ b/src/pages/App/MenuList.js
@@ -242,7 +242,8 @@ export const MenuList = observer((props) => {
               </Link>
             </Menu.Item>
           )}
-          {store.authentication.userData.role !== "Admin" && (
+          {store.authentication.userData.role !== "Admin" &&
+            store.authentication.userData.role !== "Customer Service" && (
               <Menu.Item key="payback-from-user">
                 <Link to={LINKS.PAYBACK_CREATED}>
                   <FileProtectOutlined />
diff --git a/src/pages/Payback/PaybackCreated.js b/src/pages/Payback/PaybackCreated.js
index 24e2fcd..47da21b 100644
--- a/src/pages/Payback/PaybackCreated.js
+++ b/src/pages/Payback/PaybackCreated.js
@@ -117,14 +117,14 @@ export const PaybackCreated = observer(() => {
     },
     {
       route: LINKS.PAYBACK_CREATED,
-      name: <span style={{ fontWeight: "bold" }}>Buat Pembayaran</span>,
+      name: <span style={{ fontWeight: "bold" }}>Bukti Pembayaran</span>,
     },
   ];
 
   const dataRoute = [
     {
       route: LINKS.PAYBACK_CREATED,
-      name: "Buat Pembayaran",
+      name: "Bukti Pembayaran",
     },
   ];
 
diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js
index 69468dc..ca66f0c 100644
--- a/src/pages/Transaction/Transaction.js
+++ b/src/pages/Transaction/Transaction.js
@@ -1,4 +1,4 @@
-import React, { message, useContext, useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { useStore } from "../../utils/useStore";
 import {
   Card,
@@ -11,8 +11,10 @@ import {
   Row,
   DatePicker,
   Form,
-  Input,
+  message,
+  Input
 } from "antd";
+
 import { BreadcumbComponent } from "../../component/BreadcumbComponent";
 import { Product } from "./Product";
 import { LINKS } from "../../routes/app";
@@ -89,6 +91,7 @@ export const Transaction = observer(() => {
       } else {
         message.error(response?.body?.error || "Gagal Beli Produk", 3);
       }
+      setVisibleModalBuy(false);
     } catch (e) {
       console.log("testingan");
       console.log(e.response, "testingan");
@@ -102,40 +105,43 @@ export const Transaction = observer(() => {
       console.log(e, "apa errornya");
       message.error("Gagal Beli Product");
     }
+   // message.success("Berhasil Beli Produk");
     setVisibleModalBuy(false);
     modalLoader.setLoading(false);
   };
 
-  const handleBuyStag = async (data, productCode) => {
-    modalLoader.setLoading(true);
-    try {
-      const response = await store.transaction.buyProduct({
-        ...data,
-        productCode: productCode,
-      });
-      if (response.status === 201) {
-        message.success(response?.body?.message || "Berhasil Beli Produk");
-      } else {
-        message.error(response?.body?.error || "Gagal Beli Produk", 3);
-      }
-    } catch (e) {
-      console.log("testingan");
-      console.log(e.response, "testingan");
-      console.log(e.result, "testingan1");
-      if (e.response?.body?.error) {
-        message.error(e.response.body.error);
-        setVisibleModalBuy(false);
-        modalLoader.setLoading(false);
-        return;
-      }
-      console.log(e, "apa errornya");
-      message.error("Gagal Beli Product");
-    }
-    // setDataProd(false);
-    // setDataStag(false);
-    setVisibleModalBuy(false);
-    modalLoader.setLoading(false);
-  };
+  // const handleBuyStag = async (data, productCode) => {
+  //   modalLoader.setLoading(true);
+  //   try {
+  //     const response = await store.transaction.buyProduct({
+  //       ...data,
+  //       productCode: productCode,
+  //     });
+  //     if (response.status === 201) {
+  //       message.success(response?.body?.message || "Berhasil Beli Produk");
+  //     } else {
+  //       message.error(response?.body?.error || "Gagal Beli Produk", 3);
+  //     }
+  //   } catch (e) {
+  //     console.log("testingan");
+  //     console.log(e.response, "testingan");
+  //     console.log(e.result, "testingan1");
+  //     if (e.response?.body?.error) {
+  //       message.error(e.response.body.error);
+  //       setVisibleModalBuy(false);
+  //       modalLoader.setLoading(false);
+  //       return;
+  //     }
+  //     console.log(e, "apa errornya");
+  //     message.error("Gagal Beli Product");
+  //   }
+  //   // setDataProd(false);
+  //   // setDataStag(false);
+  //   setVisibleModalBuy(false);
+  //   modalLoader.setLoading(false);
+  // };
+
+
   const handleCancel = () => {
     form.resetFields();
     setVisibleModalBuy(false);
@@ -241,6 +247,7 @@ export const Transaction = observer(() => {
                       onClick={() => {
                         setVisibleModalBuy(true);
                         setBarang(item);
+                        console.log(item?.product_name)
                       }}
                       hoverable
                       style={{

From 0283dedfbc518e0edcb7a306376a4e4f2bf93751 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 22:58:21 +0700
Subject: [PATCH 06/36] Top Saldo Feature

---
 src/pages/Membership/Membership.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 8bb2407..d2ca68e 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -201,7 +201,7 @@ export const Membership = observer(() => {
       key: "action",
       render: (text, record) => (
         <Space size="middle">
-          {store.authentication.userData.role === "Admin" && (
+          {store.authentication.userData.role !== "Customer Service" && (
             <Button
               onClick={() => {
                 setDestination(record?.id);
@@ -448,8 +448,8 @@ export const Membership = observer(() => {
                               <small>Username : {item.username}</small> <br />
                               <small>Role : {item.roles?.name}</small> <br />
                               <small>Saldo : {item.coa?.amount}</small> <br />
-                              {store.authentication.userData.role ===
-                                "Admin" && (
+                              {store.authentication.userData.role !==
+                                "Customer Service" && (
                                 <Button
                                   style={{ marginRight: 10, marginTop: 7 }}
                                   onClick={() => {

From 9789247fa34f8ea75cce0bfbf4423025204fb442 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Sat, 5 Feb 2022 00:11:27 +0700
Subject: [PATCH 07/36] Tambah Fitur Ganti PAssowrd

---
 src/pages/Profile/Profile.js | 81 +++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index cc6a0cf..763111f 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -15,6 +15,8 @@ import {
   Image,
   Tag,
   Tabs,
+  Space,
+  message,
 } from "antd";
 import moment from "moment";
 import { BreadcumbComponent } from "../../component/BreadcumbComponent";
@@ -37,6 +39,7 @@ export const Profile = observer(() => {
   const [filterStart, setFilterStart] = useState([]);
   const [filterEnd, setFilterEnd] = useState([]);
   const [actionFilter, setAction] = useState(false);
+  const [visible, setVisible] = useState(false);
 
   const routeData = [
     {
@@ -257,7 +260,7 @@ export const Profile = observer(() => {
       render: (text, record) => {
         return (
           <Text>
-            {format(parseISO(record.transaction_date), "dd MMMM yyyy")}
+            {format(parseISO(record.transaction_date), "dd MMMM yyyy HH:mm:ss")}
           </Text>
         );
       },
@@ -277,6 +280,22 @@ export const Profile = observer(() => {
       }
     : null;
 
+  const handleSubmit = async (id, data) => {
+    try {
+      modalLoader.setLoading(true);
+      const response = await store.membership.update(id, data);
+      console.log(id,"id yang masuk")
+      console.log(data,"data yang masuk")
+      message.success(response?.body?.message || "Berhasil Ganti Password");
+    } catch (e) {
+      console.log(e, "apa errornya");
+      message.error(e.response?.body?.message || "Gagal Ganti Password");
+    }
+
+    modalLoader.setLoading(false);
+    setVisible(false);
+    form.resetFields();
+  };
   return (
     <div className={["ppob-container"].join(" ")}>
       <BreadcumbComponent
@@ -289,6 +308,7 @@ export const Profile = observer(() => {
       />
       <Card>
         <Title strong>Profile</Title>
+
         <Row style={{ marginBottom: 20 }}>
           <Col lg={12} xs={24}>
             <Row>
@@ -407,6 +427,25 @@ export const Profile = observer(() => {
                 </Row>
               </Col>
             )}
+          {store.authentication.userData.role === "Retail" && (
+            <Button
+              onClick={() => {
+                // setInitialData({
+                //   id: store.membership.dataDetail.id,
+                //   name: store.membership.dataDetail.userDetail.name,
+                //   username: store.membership.dataDetail.username,
+                //   phone_number:
+                //     store.membership.dataDetail.userDetail.phone_number,
+                //   roleId: store.membership.dataDetail.roles.id,
+                //   isChangePassword: true,
+                console.log(store.authentication.profileData?.id,"id nya")
+                console.log(store.authentication.profileData?.userDetail.id,"id member")
+                setVisible(true);
+              }}
+            >
+              Ganti Password
+            </Button>
+          )}
         </Row>
         <Row>
           <Col span={24}>
@@ -710,6 +749,46 @@ export const Profile = observer(() => {
           </Col>
         </Row>
       </Modal>
+
+      <Modal
+        visible={visible}
+        title={"Ganti Password"}
+        okText={"Ganti"}
+        cancelText="Batal"
+        onCancel={() => {
+          form.resetFields();
+          //handleCancelTransaction();
+          setVisible(false);
+        }}
+        onOk={() => {
+          form
+            .validateFields()
+            .then((values) => {
+              console.log(store.authentication.profileData?.id, "id pass");
+              console.log(values, "id data");
+              console.log(store.membership.dataDetail.id, "id member");
+              handleSubmit(store.authentication.profileData?.id, values);
+              form.resetFields();
+            })
+            .catch((info) => {
+              console.error("Validate Failed:", info);
+            });
+        }}
+      >
+        <Form
+          form={form}
+          layout="vertical"
+          // initialValues={{ supplier: store.supplier.code }}
+        >
+          <Form.Item
+            name="password"
+            label="Password"
+            rules={[{ required: false, message: "Please input password!" }]}
+          >
+            <Input.Password />
+          </Form.Item>
+        </Form>
+      </Modal>
     </div>
   );
 });

From 1dedad70835e7e6362334f98e4a01b87a5186165 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Sat, 5 Feb 2022 00:26:07 +0700
Subject: [PATCH 08/36] Ganti Password

---
 src/component/PartnerComponent.js | 6 +++---
 src/pages/Profile/Profile.js      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js
index b4ea10f..f1f1cc1 100644
--- a/src/component/PartnerComponent.js
+++ b/src/component/PartnerComponent.js
@@ -329,10 +329,10 @@ export const PartnerComponent = observer((props) => {
         visible={store.partner.visibleModalPartner}
         title={
           isChangePassword
-            ? "Change Member Password"
+            ? "Ganti Password Rekanan"
             : idData
-            ? "Edit Partner"
-            : "Create a new partner"
+            ? "Edit Rekanan"
+            : "Buat Rekanan Baru"
         }
         okText={idData ? "Edit" : "Create"}
         cancelText="Batal"
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 763111f..647e901 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -283,7 +283,7 @@ export const Profile = observer(() => {
   const handleSubmit = async (id, data) => {
     try {
       modalLoader.setLoading(true);
-      const response = await store.membership.update(id, data);
+      const response = await store.membership.changePassword(id, data);
       console.log(id,"id yang masuk")
       console.log(data,"data yang masuk")
       message.success(response?.body?.message || "Berhasil Ganti Password");
@@ -778,7 +778,7 @@ export const Profile = observer(() => {
         <Form
           form={form}
           layout="vertical"
-          // initialValues={{ supplier: store.supplier.code }}
+          initialValues={{ id : store.authentication.profileData?.id }}
         >
           <Form.Item
             name="password"

From 861532d9b5594add28c01cd5555d0be156d38273 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Sun, 6 Feb 2022 12:09:29 +0700
Subject: [PATCH 09/36] Bug Fixing

---
 src/pages/App/DesktopLayout.js | 81 +++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index 75b8d2e..3226142 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Button, Drawer, Layout, Menu, Popover, Typography } from "antd";
+import { Button, Drawer, Layout, Menu, Popover, Typography, Card } from "antd";
 import { MenuList } from "./MenuList";
 import { Link, useHistory } from "react-router-dom";
 import {
@@ -394,8 +394,8 @@ export const DesktopLayout = observer(() => {
                   width: "100%",
                   paddingLeft: store.ui.mediaQuery.isMobile ? 10 : 20,
                   paddingRight: store.ui.mediaQuery.isMobile ? 0 : 20,
-                  paddingBottom: 4,
-                  marginTop: -5,
+
+                  marginTop: -20,
                 }}
               >
                 <Button
@@ -424,28 +424,29 @@ export const DesktopLayout = observer(() => {
                     paddingTop: 5,
                   }}
                 >
-                  {/*<img*/}
-                  {/*    className={[classes.logoFull]}*/}
-                  {/*    style={{*/}
-                  {/*        maxHeight: 18,*/}
-                  {/*        maxWidth: 75,*/}
-                  {/*    }}*/}
-                  {/*    src={parkirLogoFull}*/}
-                  {/*/>*/}
-                  {/*<Paragraph*/}
-                  {/*    style={{*/}
-                  {/*        margin: "-5px 0px 0px 2px",*/}
-                  {/*        padding: 0,*/}
-                  {/*        lineHeight: "18px",*/}
-                  {/*        fontSize: 8,*/}
-                  {/*        fontWeight: 800,*/}
-                  {/*        color: "#8c8c8c",*/}
-                  {/*        textAlign: "center",*/}
-                  {/*    }}*/}
-                  {/*>*/}
-                  {/*    {store.authentication.userData.role || "Apps"}*/}
-                  {/*</Paragraph>*/}
+                  {/* <img
+                    className={[classes.logoFull]}
+                    style={{
+                      maxHeight: 18,
+                      maxWidth: 75,
+                    }}
+                    src={parkirLogoFull}
+                  /> */}
+                  {/* <Paragraph
+                    style={{
+                     
+                      padding: 0,
+                      lineHeight: "18px",
+                      fontSize: 8,
+                      fontWeight: 800,
+                      color: "#8c8c8c",
+                     
+                    }}
+                  >
+                    {store.authentication.userData.role || "Apps"}
+                  </Paragraph> */}
                 </div>
+
                 <Popover
                   className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
                   autoAdjustOverflow={true}
@@ -496,9 +497,14 @@ export const DesktopLayout = observer(() => {
                   visible={clicked}
                   onVisibleChange={() => setClicked(!clicked)}
                 >
+                  {new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.authentication.profileData?.wallet || 0)}
                   <Button
                     size={"default"}
                     type={store.ui.mediaQuery.isDesktop ? "" : "link"}
+                    title="tes"
                     style={{
                       marginRight: store.ui.mediaQuery.isDesktop ? 20 : 10,
                     }}
@@ -548,6 +554,28 @@ export const DesktopLayout = observer(() => {
                   width: "100%",
                 }}
               ></div>
+              <Card
+                size="small"
+                title={
+                  <span
+                    style={{
+                      fontStyle: "bold",
+                      textAlign: "center",
+                    }}
+                  >
+                    Saldo :{" "}
+                    {new Intl.NumberFormat("id-ID", {
+                      style: "currency",
+                      currency: "IDR",
+                    }).format(store.authentication.profileData?.wallet || 0)}
+                  </span>
+                }
+                style={{
+                  marginRight: 10,
+                  width: 210,
+                  height: 31,
+                }}
+              ></Card>
               <Popover
                 className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
                 autoAdjustOverflow={true}
@@ -602,11 +630,12 @@ export const DesktopLayout = observer(() => {
                   size={"default"}
                   type={store.ui.mediaQuery.isDesktop ? "" : "link"}
                   style={{
-                    marginRight: store.ui.mediaQuery.isDesktop ? 20 : 10,
+                    marginRight: store.ui.mediaQuery.isDesktop ? 30 : 10,
+                    width: 50,
                   }}
                   icon={
                     store.ui.mediaQuery.isDesktop ? (
-                      <UserOutlined style={{ fontSize: "13px" }} />
+                      <UserOutlined style={{ fontSize: "15px" }} />
                     ) : (
                       <UserOutlined
                         style={{ fontSize: "13px", color: "#5b5b5b" }}

From 22bf0dbf8685e3d1594f80d372689ea1e3f47f99 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Sun, 6 Feb 2022 12:17:12 +0700
Subject: [PATCH 10/36] Fixing Saldo

---
 src/pages/App/DesktopLayout.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index 3226142..bf2edd2 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -1,7 +1,8 @@
-import React, { useState } from "react";
+import React, { useState,useEffect ,useContext} from "react";
 import { Button, Drawer, Layout, Menu, Popover, Typography, Card } from "antd";
 import { MenuList } from "./MenuList";
 import { Link, useHistory } from "react-router-dom";
+import { ModalLoaderContext } from "../../utils/modal";
 import {
   AlipayOutlined,
   DatabaseOutlined,
@@ -37,11 +38,26 @@ const { Header, Content, Sider } = Layout;
 const { SubMenu } = Menu;
 
 export const DesktopLayout = observer(() => {
+  const modalLoader = useContext(ModalLoaderContext);
   let history = useHistory();
   const xl = useMediaQuery({ minWidth: 1024 });
   const store = useStore();
   const [clicked, setClicked] = useState(false);
 
+  useEffect(() => {
+    (async () => {
+      modalLoader.setLoading(true);
+
+      await Promise.allSettled([
+        store.authentication.getProfile(),
+        store.transaction.getDataHistoryTransaction(),
+      ]);
+      await store.transaction.getDataHistoryTopUpProfile(
+        store.authentication.profileData?.id
+      );
+      modalLoader.setLoading(false);
+    })();
+  }, []);
   return (
     <Layout
       theme={"light"}

From 97fb498654d51e5757a79aab136ebdedfd902bc1 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Sun, 6 Feb 2022 12:51:37 +0700
Subject: [PATCH 11/36] Bug Fix

---
 src/pages/App/DesktopLayout.js | 68 ++++++++++++++++------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index bf2edd2..d1699a4 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -1,4 +1,4 @@
-import React, { useState,useEffect ,useContext} from "react";
+import React, { useState, useEffect, useContext } from "react";
 import { Button, Drawer, Layout, Menu, Popover, Typography, Card } from "antd";
 import { MenuList } from "./MenuList";
 import { Link, useHistory } from "react-router-dom";
@@ -47,14 +47,7 @@ export const DesktopLayout = observer(() => {
   useEffect(() => {
     (async () => {
       modalLoader.setLoading(true);
-
-      await Promise.allSettled([
-        store.authentication.getProfile(),
-        store.transaction.getDataHistoryTransaction(),
-      ]);
-      await store.transaction.getDataHistoryTopUpProfile(
-        store.authentication.profileData?.id
-      );
+      await Promise.allSettled([store.authentication.getProfile()]);
       modalLoader.setLoading(false);
     })();
   }, []);
@@ -387,7 +380,6 @@ export const DesktopLayout = observer(() => {
         >
           {store.ui.mediaQuery.isMobile && (
             <div
-              className={store.ui.mediaQuery.isMobile ? "shadow" : null}
               style={{
                 top: 0,
                 left: 0,
@@ -513,10 +505,12 @@ export const DesktopLayout = observer(() => {
                   visible={clicked}
                   onVisibleChange={() => setClicked(!clicked)}
                 >
-                  {new Intl.NumberFormat("id-ID", {
-                    style: "currency",
-                    currency: "IDR",
-                  }).format(store.authentication.profileData?.wallet || 0)}
+                  {store.authentication.userData.role !== "Admin" &&
+                    new Intl.NumberFormat("id-ID", {
+                      style: "currency",
+                      currency: "IDR",
+                    }).format(store.authentication.profileData?.wallet || 0)}
+
                   <Button
                     size={"default"}
                     type={store.ui.mediaQuery.isDesktop ? "" : "link"}
@@ -570,28 +564,30 @@ export const DesktopLayout = observer(() => {
                   width: "100%",
                 }}
               ></div>
-              <Card
-                size="small"
-                title={
-                  <span
-                    style={{
-                      fontStyle: "bold",
-                      textAlign: "center",
-                    }}
-                  >
-                    Saldo :{" "}
-                    {new Intl.NumberFormat("id-ID", {
-                      style: "currency",
-                      currency: "IDR",
-                    }).format(store.authentication.profileData?.wallet || 0)}
-                  </span>
-                }
-                style={{
-                  marginRight: 10,
-                  width: 210,
-                  height: 31,
-                }}
-              ></Card>
+              {store.authentication.userData.role !== "Admin" && (
+                <Card
+                  size="small"
+                  title={
+                    <span
+                      style={{
+                        fontStyle: "bold",
+                        textAlign: "center",
+                      }}
+                    >
+                      Saldo :{" "}
+                      {new Intl.NumberFormat("id-ID", {
+                        style: "currency",
+                        currency: "IDR",
+                      }).format(store.authentication.profileData?.wallet || 0)}
+                    </span>
+                  }
+                  style={{
+                    marginRight: 10,
+                    width: 210,
+                    height: 31,
+                  }}
+                ></Card>
+              )}
               <Popover
                 className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
                 autoAdjustOverflow={true}

From 6a1503b61ae50de35da8df25d577ba66d1d58a66 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Mon, 7 Feb 2022 10:26:07 +0700
Subject: [PATCH 12/36] Change Alert

---
 src/component/SupplierComponent.js | 10 +++++++---
 src/pages/Home/Home.js             |  8 ++++----
 src/pages/Membership/Membership.js | 16 +++++++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js
index a715ef8..02e4b75 100644
--- a/src/component/SupplierComponent.js
+++ b/src/component/SupplierComponent.js
@@ -183,7 +183,7 @@ export const SupplierComponent = observer((props) => {
             );
       } catch (e) {
         modalLoader.setLoading(false);
-        message.error(e.response?.body?.message || "Gagal Ubah Data Supplie");
+        message.error(e.response?.body?.message || "Gagal Ubah Data Supplier");
       }
 
       modalLoader.setLoading(false);
@@ -206,7 +206,11 @@ export const SupplierComponent = observer((props) => {
         console.log(e.response, "testingan");
         console.log(e.result, "testingan1");
         if (e.response?.body?.error) {
-          message.error(e.response.body.error);
+          message.error(
+            e.response.body.error
+              ? "Supplier Tersebut Sudah Terdaftar"
+              : e.response.body.error
+          );
           modalLoader.setLoading(false);
           store.supplier.visibleModalSupplier = false;
           return;
@@ -253,7 +257,7 @@ export const SupplierComponent = observer((props) => {
           itemLayout="horizontal"
           position={"top"}
           pagination={{
-            onChange: async (page,pageSize) => {
+            onChange: async (page, pageSize) => {
               store.supplier.pageSize = pageSize;
               store.supplier.page = page - 1;
               modalLoader.setLoading(true);
diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js
index 3d0eea6..036e9cd 100644
--- a/src/pages/Home/Home.js
+++ b/src/pages/Home/Home.js
@@ -80,7 +80,7 @@ export const Home = observer(() => {
                 height: 200,
                 marginBottom: 10,
                 borderColor: "salmon",
-                width: "45%",
+                width: "47%",
               }}
             >
               <Row>
@@ -154,7 +154,7 @@ export const Home = observer(() => {
                 height: 200,
                 marginBottom: 10,
                 borderColor: "salmon",
-                width: "45%",
+                width: "47%",
               }}
             >
               <Row>
@@ -238,7 +238,7 @@ export const Home = observer(() => {
                 height: 200,
                 marginBottom: 10,
                 borderColor: "salmon",
-                width: "45%",
+                width: "47%",
               }}
             >
               <Row>
@@ -262,7 +262,7 @@ export const Home = observer(() => {
                 height: 200,
                 marginBottom: 10,
                 borderColor: "salmon",
-                width: "45%",
+                width: "47%",
               }}
             >
               <Row>
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index d2ca68e..b0bf541 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -301,13 +301,23 @@ export const Membership = observer(() => {
         const response = await store.membership.create(request);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
           ? message.success(
-              response?.body?.message || "Berhasil Tambah Member Baru"
+              response?.body?.message
+                ? "Berhasil Tambah Member Baru"
+                : response?.body?.message
             )
-          : message.error(response?.body?.error || "Gagal");
+          : message.error(
+              response?.body?.error
+                ? "Username Tersebut Sudah Terdaftar"
+                : response?.body?.error
+            );
         await getData();
       } catch (e) {
         console.log(e, "apa errornya");
-        message.error(e.response?.body?.message || "Gagal Tambah Member Baru");
+        message.error(
+          e.response?.body?.error
+            ? "Username Tersebut Sudah Terdaftar"
+            : e.response?.body?.error
+        );
       }
       modalLoader.setLoading(false);
       setConfirmLoading(false);

From a6ce4a8c5316a3900176e3ceda44402b3dc83ad0 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Mon, 7 Feb 2022 10:49:43 +0700
Subject: [PATCH 13/36] Bug Fixing

---
 src/pages/Membership/Membership.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index b0bf541..6aaf9c5 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -305,19 +305,11 @@ export const Membership = observer(() => {
                 ? "Berhasil Tambah Member Baru"
                 : response?.body?.message
             )
-          : message.error(
-              response?.body?.error
-                ? "Username Tersebut Sudah Terdaftar"
-                : response?.body?.error
-            );
+          : message.error("Username Tersebut Sudah Terdaftar");
         await getData();
       } catch (e) {
         console.log(e, "apa errornya");
-        message.error(
-          e.response?.body?.error
-            ? "Username Tersebut Sudah Terdaftar"
-            : e.response?.body?.error
-        );
+        message.error(e.response?.body?.error);
       }
       modalLoader.setLoading(false);
       setConfirmLoading(false);

From 947d6cea0acf081df375dc5facdf16cba053b10a Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Mon, 7 Feb 2022 13:43:13 +0700
Subject: [PATCH 14/36] Bug Fixing

---
 src/component/ProductComponent.js  | 20 +++++---------------
 src/pages/Membership/DetailUser.js |  4 ++++
 src/pages/Membership/Membership.js |  1 +
 src/pages/Profile/Profile.js       | 18 ++++++++++--------
 src/store/transaction.js           |  4 ++--
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index e6d68dd..008fb69 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -284,21 +284,11 @@ export const ProductComponent = observer((props) => {
     <div>
       {store.ui.mediaQuery.isDesktop && (
         <Table
-          style={
-            // store.authentication.userData.role === "Admin"
-            //   ? {
-            {
-              cursor: "pointer",
-              textAlign: "center",
-              width: store.ui.mediaQuery.isMobile ? 250 : "",
-            }
-
-            //   }
-            // : {
-            //     textAlign: "center",
-            //     width: store.ui.mediaQuery.isMobile ? 250 : "",
-            //   }
-          }
+          style={{
+            cursor: "pointer",
+            textAlign: "center",
+            width: store.ui.mediaQuery.isMobile ? 250 : "",
+          }}
           columns={columns}
           dataSource={
             store.authentication.userData.role === "Admin Partner"
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index b5bc83f..cb08660 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -741,6 +741,7 @@ export const DetailUser = observer(() => {
                       style={{ marginBottom: "1rem", marginLeft: 5 }}
                       onClick={() => {
                         store.transaction.visibleModalFilterTransaction = true;
+                        store.transaction.page=0;
                         setAction(true);
                       }}
                     >
@@ -777,6 +778,7 @@ export const DetailUser = observer(() => {
                       style={{ marginBottom: "1rem" }}
                       onClick={() => {
                         store.transaction.visibleModalFilterTransaction = true;
+                        store.transaction.page=0;
                         setAction(true);
                       }}
                     >
@@ -858,6 +860,7 @@ export const DetailUser = observer(() => {
                       style={{ marginBottom: "1rem", marginLeft: 5 }}
                       onClick={() => {
                         store.transaction.visibleModalFilterTransaction = true;
+                        store.transaction.page=0;
                       }}
                     >
                       <FilterOutlined />
@@ -897,6 +900,7 @@ export const DetailUser = observer(() => {
                       style={{ marginBottom: "1rem" }}
                       onClick={() => {
                         store.transaction.visibleModalFilterTransaction = true;
+                        store.transaction.page=0;
                       }}
                     >
                       <FilterOutlined />
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 6aaf9c5..f04c120 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -334,6 +334,7 @@ export const Membership = observer(() => {
                 <Button
                   onClick={() => {
                     store.membership.visibleModalFilterMembership = true;
+                    store.membership.page=0;
                   }}
                 >
                   <FilterOutlined />
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 647e901..24d11c8 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -455,6 +455,7 @@ export const Profile = observer(() => {
                   style={{ marginBottom: "1rem", marginLeft: 5 }}
                   onClick={() => {
                     store.transaction.visibleModalFilterTransaction = true;
+                    store.transaction.page=0;
                     setAction(true);
                   }}
                 >
@@ -570,6 +571,7 @@ export const Profile = observer(() => {
                   style={{ marginBottom: "1rem", marginLeft: 5 }}
                   onClick={() => {
                     store.transaction.visibleModalFilterTransaction = true;
+                    store.transaction.page=0
                   }}
                 >
                   <FilterOutlined />
@@ -583,17 +585,17 @@ export const Profile = observer(() => {
                     //scroll={{ x: 1500, y: 300 }}
                     dataSource={store.transaction.dataHistoryTransaction}
                     pagination={{
-                      pageSize: store.transaction.pageSizeHistoryTransaction,
+                      pageSize: store.transaction.pageSize,
                       total: store.transaction.total_dataHistoryTransaction,
-                      current: store.transaction.pageHistoryTransaction + 1,
+                      current: store.transaction.page + 1,
                       showSizeChanger: true,
                       simple: false,
                     }}
                     onChange={async (page) => {
                       let pageNumber = page.current;
-                      store.transaction.pageSizeHistoryTransaction =
+                      store.transaction.pageSize =
                         page.pageSize;
-                      store.transaction.pageHistoryTransaction = pageNumber - 1;
+                      store.transaction.page = pageNumber - 1;
                       modalLoader.setLoading(true);
                       await store.transaction.getDataHistoryTransaction();
                       modalLoader.setLoading(false);
@@ -610,16 +612,16 @@ export const Profile = observer(() => {
                         onChange: async (page, pageSize) => {
                           console.log(page, "Page");
                           console.log(pageSize, "Page size");
-                          store.transaction.pageSizeHistoryTransaction =
+                          store.transaction.page =
                             pageSize;
-                          store.transaction.pageHistoryTransaction = page - 1;
+                          store.transaction.page = page - 1;
                           modalLoader.setLoading(true);
                           await store.transaction.getDataHistoryTransaction();
                           modalLoader.setLoading(false);
                         },
-                        pageSize: store.transaction.pageSizeHistoryTransaction,
+                        pageSize: store.transaction.pageSize,
                         total: store.transaction.total_dataHistoryTransaction,
-                        current: store.transaction.pageHistoryTransaction + 1,
+                        current: store.transaction.page + 1,
                         style: { marginBottom: "1rem", marginRight: "1rem" },
                       }}
                       style={{ padding: 0 }}
diff --git a/src/store/transaction.js b/src/store/transaction.js
index 62eefd4..da74f34 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -133,7 +133,7 @@ export class Transaction {
   async getDataHistoryTransaction() {
     try {
       const response = await http.get(
-        `/transaction/history?page=${this.pageHistoryTransaction}&pageSize=${this.pageSizeHistoryTransaction}&start=${this.filterStart}&end=${this.filterEnd}`
+        `/transaction/history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}`
       );
       console.log(response);
       this.dataHistoryTransaction = response.body.data ?? [];
@@ -158,7 +158,7 @@ export class Transaction {
   async getDataHistoryTopUp(id) {
     try {
       const response = await http.get(
-        `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
+        `/transaction/history-deposit?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
       );
       console.log(response,'get data history')
       this.dataHistoryTopUp = response.body.data ?? [];

From 7d1bf48fe90b0ff4c50d0da741f3ceb4bf6f67b5 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Mon, 7 Feb 2022 15:02:51 +0700
Subject: [PATCH 15/36] Bug Fixing

---
 src/pages/App/DesktopLayout.js | 52 ++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index d1699a4..c278af9 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -506,6 +506,7 @@ export const DesktopLayout = observer(() => {
                   onVisibleChange={() => setClicked(!clicked)}
                 >
                   {store.authentication.userData.role !== "Admin" &&
+                    store.authentication.userData.role !== "Customer Service" &&
                     new Intl.NumberFormat("id-ID", {
                       style: "currency",
                       currency: "IDR",
@@ -564,30 +565,33 @@ export const DesktopLayout = observer(() => {
                   width: "100%",
                 }}
               ></div>
-              {store.authentication.userData.role !== "Admin" && (
-                <Card
-                  size="small"
-                  title={
-                    <span
-                      style={{
-                        fontStyle: "bold",
-                        textAlign: "center",
-                      }}
-                    >
-                      Saldo :{" "}
-                      {new Intl.NumberFormat("id-ID", {
-                        style: "currency",
-                        currency: "IDR",
-                      }).format(store.authentication.profileData?.wallet || 0)}
-                    </span>
-                  }
-                  style={{
-                    marginRight: 10,
-                    width: 210,
-                    height: 31,
-                  }}
-                ></Card>
-              )}
+              {store.authentication.userData.role !== "Admin" &&
+                store.authentication.userData.role !== "Customer Service" && (
+                  <Card
+                    size="small"
+                    title={
+                      <span
+                        style={{
+                          fontStyle: "bold",
+                          textAlign: "center",
+                        }}
+                      >
+                        Saldo :{" "}
+                        {new Intl.NumberFormat("id-ID", {
+                          style: "currency",
+                          currency: "IDR",
+                        }).format(
+                          store.authentication.profileData?.wallet || 0
+                        )}
+                      </span>
+                    }
+                    style={{
+                      marginRight: 10,
+                      width: 210,
+                      height: 31,
+                    }}
+                  ></Card>
+                )}
               <Popover
                 className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
                 autoAdjustOverflow={true}

From c019881070bfc4ea561e29ca08de31e0d2288a1a Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Mon, 7 Feb 2022 16:20:03 +0700
Subject: [PATCH 16/36] Bug Fixing

---
 src/component/CategoryComponent.js      |  4 +--
 src/component/SubcategoryComponent.js   |  4 +--
 src/component/SupplierComponent.js      |  4 +--
 src/pages/Membership/Konfirmasi.js      |  7 +++--
 src/pages/Membership/Membership.js      |  9 ++++---
 src/pages/Membership/MembershipModal.js |  6 ++---
 src/pages/Payback/Payback.js            |  8 +++---
 src/pages/Payback/PaybackModal.js       |  4 +--
 src/pages/Product/Product.js            |  9 ++++---
 src/pages/Profile/Profile.js            | 34 ++++++++++---------------
 10 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js
index 62ce17b..9ac2bbe 100644
--- a/src/component/CategoryComponent.js
+++ b/src/component/CategoryComponent.js
@@ -211,8 +211,8 @@ export const CategoryComponent = observer((props) => {
       )}
       <Modal
         visible={store.category.visibleModalCategory}
-        title={idData ? "Edit Category" : "Create a new Category"}
-        okText={idData ? "Edit" : "Create"}
+        title={idData ? "Edit Kategori" : "Buat Kategori Baru"}
+        okText={idData ? "Edit" : "Buat"}
         cancelText="Batal"
         onCancel={() => {
           form.resetFields();
diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js
index 5434bcd..6ff8d12 100644
--- a/src/component/SubcategoryComponent.js
+++ b/src/component/SubcategoryComponent.js
@@ -216,8 +216,8 @@ export const SubcategoryComponent = observer((props) => {
       )}
       <Modal
         visible={store.subcategory.visibleModalSubcategory}
-        title={idData ? "Edit Sub Category" : "Create a new sub category"}
-        okText={idData ? "Edit" : "Create"}
+        title={idData ? "Edit Sub Kategori" : "Buat Sub Kategori Baru"}
+        okText={idData ? "Edit" : "Buat"}
         cancelText="Batal"
         onCancel={() => {
           form.resetFields();
diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js
index 02e4b75..4f1fda2 100644
--- a/src/component/SupplierComponent.js
+++ b/src/component/SupplierComponent.js
@@ -346,8 +346,8 @@ export const SupplierComponent = observer((props) => {
       )}
       <Modal
         visible={store.supplier.visibleModalSupplier}
-        title={idData ? "Edit Supplier" : "Create a new Supplier"}
-        okText={idData ? "Edit" : "Create"}
+        title={idData ? "Edit Supplier" : "Buat Supplier Baru"}
+        okText={idData ? "Edit" : "Buat"}
         cancelText="Batal"
         onCancel={() => {
           form.resetFields();
diff --git a/src/pages/Membership/Konfirmasi.js b/src/pages/Membership/Konfirmasi.js
index b521967..f9018fe 100644
--- a/src/pages/Membership/Konfirmasi.js
+++ b/src/pages/Membership/Konfirmasi.js
@@ -99,7 +99,7 @@ export const Konfirmasi = observer(() => {
       render: (text, record) =>
         record.roles?.name !== "Sales" &&
         (record.user_detail?.image_store !== "[]" ||
-        record.user_detail?.image_store !== '""') ? (
+          record.user_detail?.image_store !== '""') ? (
           <Button
             onClick={async () => {
               setToko(record);
@@ -236,7 +236,10 @@ export const Konfirmasi = observer(() => {
     <div className={["ppob-container"].join(" ")}>
       <BreadcumbComponent
         data={
-          store.authentication.userData.role === "Admin" ? routeData : dataRoute
+          store.authentication.userData.role === "Admin" ||
+          store.authentication.userData.role === "Customer Service"
+            ? routeData
+            : dataRoute
         }
       />
       <Card>
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index f04c120..32a275d 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -323,7 +323,10 @@ export const Membership = observer(() => {
     <div className={["ppob-container"].join(" ")}>
       <BreadcumbComponent
         data={
-          store.authentication.userData.role === "Admin" ? routeData : dataRoute
+          store.authentication.userData.role === "Admin" ||
+          store.authentication.userData.role === "Customer Service"
+            ? routeData
+            : dataRoute
         }
       />
       <Card>
@@ -334,7 +337,7 @@ export const Membership = observer(() => {
                 <Button
                   onClick={() => {
                     store.membership.visibleModalFilterMembership = true;
-                    store.membership.page=0;
+                    store.membership.page = 0;
                   }}
                 >
                   <FilterOutlined />
@@ -596,7 +599,7 @@ export const Membership = observer(() => {
           </Col>
           <Col span={24}>
             <Title level={5} type={"secondary"} strong>
-              Type
+              Tipe
             </Title>
             <Select
               mode={"multiple"}
diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js
index fa83e47..cb46dbb 100644
--- a/src/pages/Membership/MembershipModal.js
+++ b/src/pages/Membership/MembershipModal.js
@@ -189,10 +189,10 @@ export const MembershipModal = ({
       visible={visible}
       title={
         initialData.isChangePassword
-          ? "Change Member Password"
+          ? "Ganti Password Anggota"
           : initialData.id
-          ? "Edit Member"
-          : "Create a new Membership"
+          ? "Edit Anggota"
+          : "Buat Anggota Baru"
       }
       okText={initialData.id ? "Edit" : "Create"}
       cancelText="Batal"
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index 1c0d954..029b505 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -35,7 +35,6 @@ import { capitalize } from "lodash";
 import { PAYBACK_STATUS } from "../../constants/payback";
 import moment from "moment";
 
-
 export const Payback = observer(() => {
   const { Option } = Select;
   const { Title } = Typography;
@@ -274,7 +273,10 @@ export const Payback = observer(() => {
     <div className={["ppob-container"].join(" ")}>
       <BreadcumbComponent
         data={
-          store.authentication.userData.role === "Admin" ? routeData : dataRoute
+          store.authentication.userData.role === "Admin" ||
+          store.authentication.userData.role === "Customer Service"
+            ? routeData
+            : dataRoute
         }
       />
       <Card>
@@ -501,7 +503,7 @@ export const Payback = observer(() => {
                 label="Dari Tanggal"
                 rules={[{ required: true, message: "Please input Date!" }]}
               >
-                <DatePicker style={{ width: "100%" }}/>
+                <DatePicker style={{ width: "100%" }} />
               </Form.Item>
               <Form.Item
                 name="end_date"
diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js
index 43c597c..225ac2c 100644
--- a/src/pages/Payback/PaybackModal.js
+++ b/src/pages/Payback/PaybackModal.js
@@ -98,8 +98,8 @@ export const PaybackModal = ({ initialData }) => {
   return (
     <Modal
       visible={store.payback.visibleModalPayback}
-      title={"Create a new Created"}
-      okText={"Create"}
+      title={"Buat Pembayaran Baru"}
+      okText={"Buat"}
       cancelText="Batal"
       onCancel={handleCancel}
       onOk={() => {
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js
index 1ff75cf..37b888a 100644
--- a/src/pages/Product/Product.js
+++ b/src/pages/Product/Product.js
@@ -183,7 +183,8 @@ export const Product = observer(() => {
       <BreadcumbComponent
         data={
           store.authentication.userData.role === "Admin" ||
-          store.authentication.userData.role === "Admin Partner"
+          store.authentication.userData.role === "Admin Partner" ||
+          store.authentication.userData.role === "Customer Service"
             ? routeData
             : dataRoute
         }
@@ -195,7 +196,7 @@ export const Product = observer(() => {
               <Button
                 onClick={() => {
                   store.product.visibleModalFilterProduct = true;
-                  store.product.page=0
+                  store.product.page = 0;
                 }}
               >
                 <FilterOutlined />
@@ -249,8 +250,8 @@ export const Product = observer(() => {
 
       <Modal
         visible={visibleModalUpload}
-        title={"Upload Excel Product"}
-        okText={"Create"}
+        title={"Upload Excel Produk"}
+        okText={"Buat"}
         cancelText="Batal"
         onCancel={() => {
           form.resetFields();
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 24d11c8..2f860b3 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -284,8 +284,8 @@ export const Profile = observer(() => {
     try {
       modalLoader.setLoading(true);
       const response = await store.membership.changePassword(id, data);
-      console.log(id,"id yang masuk")
-      console.log(data,"data yang masuk")
+      console.log(id, "id yang masuk");
+      console.log(data, "data yang masuk");
       message.success(response?.body?.message || "Berhasil Ganti Password");
     } catch (e) {
       console.log(e, "apa errornya");
@@ -301,7 +301,8 @@ export const Profile = observer(() => {
       <BreadcumbComponent
         data={
           store.authentication.userData.role === "Admin" ||
-          store.authentication.userData.role === "Admin Partner"
+          store.authentication.userData.role === "Admin Partner" ||
+          store.authentication.userData.role === "Customer Service"
             ? routeData
             : dataRoute
         }
@@ -430,16 +431,11 @@ export const Profile = observer(() => {
           {store.authentication.userData.role === "Retail" && (
             <Button
               onClick={() => {
-                // setInitialData({
-                //   id: store.membership.dataDetail.id,
-                //   name: store.membership.dataDetail.userDetail.name,
-                //   username: store.membership.dataDetail.username,
-                //   phone_number:
-                //     store.membership.dataDetail.userDetail.phone_number,
-                //   roleId: store.membership.dataDetail.roles.id,
-                //   isChangePassword: true,
-                console.log(store.authentication.profileData?.id,"id nya")
-                console.log(store.authentication.profileData?.userDetail.id,"id member")
+                console.log(store.authentication.profileData?.id, "id nya");
+                console.log(
+                  store.authentication.profileData?.userDetail.id,
+                  "id member"
+                );
                 setVisible(true);
               }}
             >
@@ -455,7 +451,7 @@ export const Profile = observer(() => {
                   style={{ marginBottom: "1rem", marginLeft: 5 }}
                   onClick={() => {
                     store.transaction.visibleModalFilterTransaction = true;
-                    store.transaction.page=0;
+                    store.transaction.page = 0;
                     setAction(true);
                   }}
                 >
@@ -571,7 +567,7 @@ export const Profile = observer(() => {
                   style={{ marginBottom: "1rem", marginLeft: 5 }}
                   onClick={() => {
                     store.transaction.visibleModalFilterTransaction = true;
-                    store.transaction.page=0
+                    store.transaction.page = 0;
                   }}
                 >
                   <FilterOutlined />
@@ -593,8 +589,7 @@ export const Profile = observer(() => {
                     }}
                     onChange={async (page) => {
                       let pageNumber = page.current;
-                      store.transaction.pageSize =
-                        page.pageSize;
+                      store.transaction.pageSize = page.pageSize;
                       store.transaction.page = pageNumber - 1;
                       modalLoader.setLoading(true);
                       await store.transaction.getDataHistoryTransaction();
@@ -612,8 +607,7 @@ export const Profile = observer(() => {
                         onChange: async (page, pageSize) => {
                           console.log(page, "Page");
                           console.log(pageSize, "Page size");
-                          store.transaction.page =
-                            pageSize;
+                          store.transaction.page = pageSize;
                           store.transaction.page = page - 1;
                           modalLoader.setLoading(true);
                           await store.transaction.getDataHistoryTransaction();
@@ -780,7 +774,7 @@ export const Profile = observer(() => {
         <Form
           form={form}
           layout="vertical"
-          initialValues={{ id : store.authentication.profileData?.id }}
+          initialValues={{ id: store.authentication.profileData?.id }}
         >
           <Form.Item
             name="password"

From 99950f97062abf78f8303760ffa587d627d46401 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Fri, 1 Apr 2022 23:40:19 +0700
Subject: [PATCH 17/36] Feat: add form input url

---
 src/component/SupplierComponent.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js
index 4f1fda2..ce2affb 100644
--- a/src/component/SupplierComponent.js
+++ b/src/component/SupplierComponent.js
@@ -176,11 +176,11 @@ export const SupplierComponent = observer((props) => {
         const response = await store.supplier.update(idData, data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
           ? message.success(
-              response?.body?.message || "Berhasil Ubah Data Supplier"
-            )
+            response?.body?.message || "Berhasil Ubah Data Supplier"
+          )
           : message.error(
-              response?.body?.message || "Gagal Ubah Data Supplier"
-            );
+            response?.body?.message || "Gagal Ubah Data Supplier"
+          );
       } catch (e) {
         modalLoader.setLoading(false);
         message.error(e.response?.body?.message || "Gagal Ubah Data Supplier");
@@ -374,6 +374,13 @@ export const SupplierComponent = observer((props) => {
           >
             <Input />
           </Form.Item>
+          <Form.Item
+            name="url"
+            label="Url"
+            rules={[{ required: true, message: "Please input url!" }]}
+          >
+            <Input />
+          </Form.Item>
           {!idData && (
             <Form.Item
               name="code"

From 972ea146d3dc0ef400735c4908acd83d5dbb34f3 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Sat, 2 Apr 2022 01:33:19 +0700
Subject: [PATCH 18/36] Feat: add form supplier

---
 src/component/SupplierComponent.js | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js
index ce2affb..9c98998 100644
--- a/src/component/SupplierComponent.js
+++ b/src/component/SupplierComponent.js
@@ -367,10 +367,17 @@ export const SupplierComponent = observer((props) => {
         }}
       >
         <Form form={form} layout="vertical">
+          <Form.Item
+            name="irs_id"
+            label="Id"
+            rules={[{ required: true, message: "Please input name!" }]}
+          >
+            <Input />
+          </Form.Item>
           <Form.Item
             name="name"
             label="Name"
-            rules={[{ required: true, message: "Please input name!" }]}
+            rules={[{ required: true, message: "Please input url!" }]}
           >
             <Input />
           </Form.Item>
@@ -381,6 +388,27 @@ export const SupplierComponent = observer((props) => {
           >
             <Input />
           </Form.Item>
+          <Form.Item
+            name="irs_pin"
+            label="Pin"
+            rules={[{ required: true, message: "Please input url!" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            name="irs_user"
+            label="User"
+            rules={[{ required: true, message: "Please input url!" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            name="irs_pass"
+            label="Password"
+            rules={[{ required: true, message: "Please input url!" }]}
+          >
+            <Input />
+          </Form.Item>
           {!idData && (
             <Form.Item
               name="code"

From 7c949403e20cceaae1427eb6305781c3a2b442f8 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Wed, 13 Apr 2022 11:41:32 +0700
Subject: [PATCH 19/36] feat: fixing data table produk and pagination in role
 admin table

---
 src/component/ProductComponent.js | 52 ++++++++++++++++++-------------
 src/pages/Product/Product.js      |  4 +--
 src/store/product.js              | 14 +++++----
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 008fb69..bf2f694 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -180,8 +180,8 @@ export const ProductComponent = observer((props) => {
         const response = await store.product.update(idData, data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
           ? message.success(
-              response?.body?.message || "Berhasil Ubah Data Produk"
-            )
+            response?.body?.message || "Berhasil Ubah Data Produk"
+          )
           : message.error(response?.body?.message || "Gagal Ubah Data Produk");
       } catch (e) {
         message.error(e.response?.body?.message || "Gagal Ubah Data Produk");
@@ -215,8 +215,8 @@ export const ProductComponent = observer((props) => {
     setFilterSubCategories([]);
     store.authentication.userData.role === "Admin Partner"
       ? await store.product.getProductPartner(
-          store.authentication.profileData.id
-        )
+        store.authentication.profileData.id
+      )
       : await store.product.getData();
     //await store.product.getData();
     store.product.visibleModalFilterProduct = false;
@@ -228,8 +228,8 @@ export const ProductComponent = observer((props) => {
     store.product.visibleModalFilterProduct = false;
     store.authentication.userData.role === "Admin Partner"
       ? await store.product.getProductPartner(
-          store.authentication.profileData.id
-        )
+        store.authentication.profileData.id
+      )
       : await store.product.getData();
     //await store.product.getData();
   };
@@ -240,8 +240,8 @@ export const ProductComponent = observer((props) => {
     modalLoader.setLoading(true);
     store.authentication.userData.role === "Admin Partner"
       ? await store.product.getProductPartner(
-          store.authentication.profileData.id
-        )
+        store.authentication.profileData.id
+      )
       : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
@@ -297,21 +297,25 @@ export const ProductComponent = observer((props) => {
           }
           onRow={handleClickRow}
           pagination={{
-            pageSize: store.product.pageSize,
+            pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
             total:
               store.authentication.userData.role === "Admin Partner"
                 ? store.product.total_data_partner
                 : store.product.total_data,
-            current: store.product.page + 1,
+            current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
             showSizeChanger: true,
             simple: false,
           }}
           onChange={async (page) => {
             let pageNumber = page.current;
-            store.product.pageSize = page.pageSize;
-            store.product.page = pageNumber - 1;
+            store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
+            store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
             modalLoader.setLoading(true);
-            await store.product.getData();
+            store.authentication.userData.role === "Admin Partner"
+              ? await store.product.getProductPartner(
+                // store.authentication.profileData.id
+              )
+              : await store.product.getData();
             modalLoader.setLoading(false);
           }}
         />
@@ -322,23 +326,29 @@ export const ProductComponent = observer((props) => {
           position={"top"}
           pagination={{
             onChange: async (page, pageSize) => {
-              store.product.pageSize = pageSize;
-              store.product.page = page - 1;
+              store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
+              store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
               modalLoader.setLoading(true);
               store.authentication.userData.role === "Admin Partner"
                 ? await store.product.getProductPartner(
-                    store.authentication.profileData.id
-                  )
+                  // store.authentication.profileData.id
+                )
                 : await store.product.getData();
               //await store.product.getData();
               modalLoader.setLoading(false);
             },
-            pageSize: store.product.pageSize,
-            total: store.product.total_data,
-            current: store.product.page + 1,
+            pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
+            total: store.authentication.userData.role === "Admin Partner"
+              ? store.product.total_data_partner
+              : store.product.total_data,
+            current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
             style: { marginBottom: "1rem", marginRight: "1rem" },
           }}
-          dataSource={store.product.data}
+          dataSource={
+            store.authentication.userData.role === "Admin Partner"
+              ? store.product.dataProductPartner
+              : store.product.data
+          }
           style={{ padding: 0 }}
           renderItem={(item) => {
             return (
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js
index 37b888a..6a82286 100644
--- a/src/pages/Product/Product.js
+++ b/src/pages/Product/Product.js
@@ -183,8 +183,8 @@ export const Product = observer(() => {
       <BreadcumbComponent
         data={
           store.authentication.userData.role === "Admin" ||
-          store.authentication.userData.role === "Admin Partner" ||
-          store.authentication.userData.role === "Customer Service"
+            store.authentication.userData.role === "Admin Partner" ||
+            store.authentication.userData.role === "Customer Service"
             ? routeData
             : dataRoute
         }
diff --git a/src/store/product.js b/src/store/product.js
index 903ed5b..46caacb 100644
--- a/src/store/product.js
+++ b/src/store/product.js
@@ -1,12 +1,12 @@
-import {makeAutoObservable} from "mobx";
-import {http} from "../utils/http";
+import { makeAutoObservable } from "mobx";
+import { http } from "../utils/http";
 
 export class Product {
     page = 0;
     pageSize = 10
     data = [];
     total_data = 0;
-    total_data_partner=0;
+    total_data_partner = 0;
     filterSupplier = null;
     filterSubCategory = null;
     visibleModalProduct = false;
@@ -28,10 +28,11 @@ export class Product {
     totalDataPriceHistory = 0;
     pagePriceHistory = 0;
     pageProductPartner = 0;
+    pageSizeProductPartner = 10
     pageSizePriceHistory = 10
 
     dataDetailProduct = {};
-    dataProductPartner=[]
+    dataProductPartner = []
 
     constructor(ctx) {
         this.ctx = ctx;
@@ -54,6 +55,7 @@ export class Product {
         }
     }
 
+
     async getDataSubCategories() {
         try {
             const response = await http.get(`/product/sub-categories?category=${this.filterCategory}&page=${this.pageSubCategories}&pageSize=${this.pageSizeSubCategories}`);
@@ -100,10 +102,10 @@ export class Product {
 
     async getProductPartner(id) {
         try {
-            const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=10&sub-category=${id}`);
+            const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
             console.log(response)
             this.dataProductPartner = response.body.data
-            this.total_data_partner= response?.body?.count ?? 0
+            this.total_data_partner = response?.body?.count ?? 0
         } catch (e) {
             console.error(e);
         }

From 930a757652a8673d5a340981f4b50396d8a9d06d Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Fri, 6 May 2022 15:12:37 +0700
Subject: [PATCH 20/36] feat: hide column tindakan for roles other than admin

---
 src/component/ProductComponent.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index bf2f694..d7d14cf 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -132,6 +132,7 @@ export const ProductComponent = observer((props) => {
   //if (store.authentication.userData.role === "Admin Partner") delete columns[2];
   if (store.authentication.userData.role === "Admin Partner") delete columns[3];
   if (store.authentication.userData.role != "Admin Partner") delete columns[4];
+  if (store.authentication.userData.role !== "Admin") delete columns[8];
   if (store.authentication.userData.role !== "Admin") delete columns[6];
   if (store.authentication.userData.role !== "Admin") delete columns[2];
   if (store.authentication.userData.role !== "Admin") delete columns[5];

From b031687c5c33b47703e94e5decdd768b83e8fc2d Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Mon, 9 May 2022 20:52:03 +0700
Subject: [PATCH 21/36] feat: fixing filter admin partner

---
 src/component/ProductComponent.js | 15 ++++++---------
 src/store/product.js              | 27 ++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index d7d14cf..393c078 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -210,17 +210,16 @@ export const ProductComponent = observer((props) => {
   };
 
   const handleRemoveFilter = async () => {
+    store.product.visibleModalFilterProduct = false;
     store.product.filterSupplier = null;
     store.product.filterSubCategory = null;
     setFilterSupplier([]);
     setFilterSubCategories([]);
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner(
-        store.authentication.profileData.id
-      )
+      ? await store.product.getProductPartner()
       : await store.product.getData();
     //await store.product.getData();
-    store.product.visibleModalFilterProduct = false;
+    modalLoader.setLoading(false);
   };
 
   const handleCancelFilter = async () => {
@@ -228,25 +227,23 @@ export const ProductComponent = observer((props) => {
     store.product.filterSupplier = null;
     store.product.visibleModalFilterProduct = false;
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner(
-        store.authentication.profileData.id
-      )
+      ? await store.product.getProductPartner()
       : await store.product.getData();
     //await store.product.getData();
   };
 
   const handleSubmitFilter = async () => {
+    store.product.visibleModalFilterProduct = false;
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
     store.authentication.userData.role === "Admin Partner"
       ? await store.product.getProductPartner(
-        store.authentication.profileData.id
+        filterSubCategories
       )
       : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
-    store.product.visibleModalFilterProduct = false;
     //store.product.page=1
   };
 
diff --git a/src/store/product.js b/src/store/product.js
index 46caacb..057db3f 100644
--- a/src/store/product.js
+++ b/src/store/product.js
@@ -101,14 +101,27 @@ export class Product {
     }
 
     async getProductPartner(id) {
-        try {
-            const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
-            console.log(response)
-            this.dataProductPartner = response.body.data
-            this.total_data_partner = response?.body?.count ?? 0
-        } catch (e) {
-            console.error(e);
+
+        if (id === undefined) {
+            try {
+                const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`);
+                console.log(response)
+                this.dataProductPartner = response.body.data
+                this.total_data_partner = response?.body?.count ?? 0
+            } catch (e) {
+                console.error(e);
+            }
+        } else {
+            try {
+                const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
+                console.log(response)
+                this.dataProductPartner = response.body.data
+                this.total_data_partner = response?.body?.count ?? 0
+            } catch (e) {
+                console.error(e);
+            }
         }
+
     }
 
     async create(data) {

From b18f91ec4b4c87965ee97d59ca26f242fe51af58 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Mon, 9 May 2022 21:08:10 +0700
Subject: [PATCH 22/36] feat: revisi fixing filter admin partner

---
 src/component/ProductComponent.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 393c078..55515ed 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -223,12 +223,7 @@ export const ProductComponent = observer((props) => {
   };
 
   const handleCancelFilter = async () => {
-    store.product.filterSubCategory = null;
-    store.product.filterSupplier = null;
     store.product.visibleModalFilterProduct = false;
-    store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner()
-      : await store.product.getData();
     //await store.product.getData();
   };
 
@@ -238,9 +233,7 @@ export const ProductComponent = observer((props) => {
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner(
-        filterSubCategories
-      )
+      ? await store.product.getProductPartner(filterSubCategories)
       : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);

From 498985faa0d99bdef71b59964c6775b5ea1245e9 Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Tue, 10 May 2022 17:02:40 +0700
Subject: [PATCH 23/36] fix product filter when page 2 and then filter didn't
 detect list item < 10

---
 src/component/ProductComponent.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 55515ed..3024ec7 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -219,6 +219,7 @@ export const ProductComponent = observer((props) => {
       ? await store.product.getProductPartner()
       : await store.product.getData();
     //await store.product.getData();
+    store.product.pageProductPartner = 0
     modalLoader.setLoading(false);
   };
 
@@ -238,6 +239,7 @@ export const ProductComponent = observer((props) => {
     //await store.product.getData();
     modalLoader.setLoading(false);
     //store.product.page=1
+    store.product.pageProductPartner = 0
   };
 
   const footerLayoutFilter = [

From 3def5a72aa869ed6eb8c46068b68308356239618 Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Tue, 10 May 2022 18:07:52 +0700
Subject: [PATCH 24/36] fix product filter when page 2 and then filter didn't
 detect list item < 10

---
 src/component/ProductComponent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 3024ec7..37c4d00 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -210,6 +210,7 @@ export const ProductComponent = observer((props) => {
   };
 
   const handleRemoveFilter = async () => {
+    store.product.pageProductPartner = 0
     store.product.visibleModalFilterProduct = false;
     store.product.filterSupplier = null;
     store.product.filterSubCategory = null;
@@ -219,7 +220,6 @@ export const ProductComponent = observer((props) => {
       ? await store.product.getProductPartner()
       : await store.product.getData();
     //await store.product.getData();
-    store.product.pageProductPartner = 0
     modalLoader.setLoading(false);
   };
 
@@ -229,6 +229,7 @@ export const ProductComponent = observer((props) => {
   };
 
   const handleSubmitFilter = async () => {
+    store.product.pageProductPartner = 0
     store.product.visibleModalFilterProduct = false;
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
@@ -239,7 +240,6 @@ export const ProductComponent = observer((props) => {
     //await store.product.getData();
     modalLoader.setLoading(false);
     //store.product.page=1
-    store.product.pageProductPartner = 0
   };
 
   const footerLayoutFilter = [

From e1c7c673a7e81931fefd4e77ecb08242a003dd5c Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Wed, 11 May 2022 18:57:17 +0700
Subject: [PATCH 25/36] - fix filter list product when in page 2 dst - add
 biaya admin in list product

---
 src/component/ProductComponent.js  | 661 +++++++++++++++--------------
 src/pages/Product/ProductDetail.js | 358 ++++++++--------
 2 files changed, 520 insertions(+), 499 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 37c4d00..c4d28b5 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -64,30 +64,40 @@ export const ProductComponent = observer((props) => {
       dataIndex: "current_price_price",
       key: "current_price_price",
       render: (text) =>
-        new Intl.NumberFormat("id-ID", {
-          style: "currency",
-          currency: "IDR",
-        }).format(text),
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Harga Jual",
       dataIndex: "mark_up_price",
       key: "mark_up_price",
       render: (text) =>
-        new Intl.NumberFormat("id-ID", {
-          style: "currency",
-          currency: "IDR",
-        }).format(text),
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Harga",
       dataIndex: "price",
       key: "price",
       render: (text) =>
-        new Intl.NumberFormat("id-ID", {
-          style: "currency",
-          currency: "IDR",
-        }).format(text),
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
+    },
+    {
+      title: "Biaya Admin",
+      dataIndex: "admin_price",
+      key: "admin_price",
+      render: (text) =>
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Supplier",
@@ -104,27 +114,27 @@ export const ProductComponent = observer((props) => {
       dataIndex: "tersedia",
       key: "tersedia",
       render: (text, record) => (
-        <Tag
-          color={record?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"}
-          style={{ color: "#4F566B" }}
-        >
-          {record?.product_status === "ACTIVE" ? " Tersedia" : "Tidak"}
-        </Tag>
+          <Tag
+              color={record?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"}
+              style={{ color: "#4F566B" }}
+          >
+            {record?.product_status === "ACTIVE" ? " Tersedia" : "Tidak"}
+          </Tag>
       ),
     },
     {
       title: "Tindakan",
       key: "action",
       render: (text, record) => (
-        <Button
-          onClick={async () => {
-            history.push(
-              LINKS.PRODUCT_DETAIL.replace(":id", record.product_id)
-            );
-          }}
-        >
-          Detail
-        </Button>
+          <Button
+              onClick={async () => {
+                history.push(
+                    LINKS.PRODUCT_DETAIL.replace(":id", record.product_id)
+                );
+              }}
+          >
+            Detail
+          </Button>
       ),
     },
   ];
@@ -180,10 +190,10 @@ export const ProductComponent = observer((props) => {
       try {
         const response = await store.product.update(idData, data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
-          ? message.success(
-            response?.body?.message || "Berhasil Ubah Data Produk"
-          )
-          : message.error(response?.body?.message || "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(e.response?.body?.message || "Gagal Ubah Data Produk");
       }
@@ -196,8 +206,8 @@ export const ProductComponent = observer((props) => {
       try {
         const response = await store.product.create(data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
-          ? message.success(response?.body?.message || "Berhasil Tambah Produk")
-          : message.error(response?.body?.message || "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(e.response?.body?.message || "Gagal Tambah Produk");
@@ -217,8 +227,8 @@ export const ProductComponent = observer((props) => {
     setFilterSupplier([]);
     setFilterSubCategories([]);
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner()
-      : await store.product.getData();
+        ? await store.product.getProductPartner()
+        : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
   };
@@ -235,8 +245,8 @@ export const ProductComponent = observer((props) => {
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
     store.authentication.userData.role === "Admin Partner"
-      ? await store.product.getProductPartner(filterSubCategories)
-      : await store.product.getData();
+        ? await store.product.getProductPartner(filterSubCategories)
+        : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
     //store.product.page=1
@@ -244,12 +254,12 @@ export const ProductComponent = observer((props) => {
 
   const footerLayoutFilter = [
     <Button
-      key={"remove"}
-      onClick={handleRemoveFilter}
-      style={{
-        backgroundColor: "#e74e5e",
-        color: "#fff",
-      }}
+        key={"remove"}
+        onClick={handleRemoveFilter}
+        style={{
+          backgroundColor: "#e74e5e",
+          color: "#fff",
+        }}
     >
       Hapus Filter
     </Button>,
@@ -257,12 +267,12 @@ export const ProductComponent = observer((props) => {
       Batal
     </Button>,
     <Button
-      key={"submit"}
-      onClick={handleSubmitFilter}
-      style={{
-        backgroundColor: "#4e79e7",
-        color: "#fff",
-      }}
+        key={"submit"}
+        onClick={handleSubmitFilter}
+        style={{
+          backgroundColor: "#4e79e7",
+          color: "#fff",
+        }}
     >
       Terapkan
     </Button>,
@@ -274,292 +284,293 @@ export const ProductComponent = observer((props) => {
     },
   });
   return (
-    <div>
-      {store.ui.mediaQuery.isDesktop && (
-        <Table
-          style={{
-            cursor: "pointer",
-            textAlign: "center",
-            width: store.ui.mediaQuery.isMobile ? 250 : "",
-          }}
-          columns={columns}
-          dataSource={
-            store.authentication.userData.role === "Admin Partner"
-              ? store.product.dataProductPartner
-              : store.product.data
-          }
-          onRow={handleClickRow}
-          pagination={{
-            pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
-            total:
-              store.authentication.userData.role === "Admin Partner"
-                ? store.product.total_data_partner
-                : store.product.total_data,
-            current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
-            showSizeChanger: true,
-            simple: false,
-          }}
-          onChange={async (page) => {
-            let pageNumber = page.current;
-            store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
-            store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
-            modalLoader.setLoading(true);
-            store.authentication.userData.role === "Admin Partner"
-              ? await store.product.getProductPartner(
-                // store.authentication.profileData.id
-              )
-              : await store.product.getData();
-            modalLoader.setLoading(false);
-          }}
-        />
-      )}
-      {store.ui.mediaQuery.isMobile && (
-        <List
-          itemLayout="horizontal"
-          position={"top"}
-          pagination={{
-            onChange: async (page, pageSize) => {
-              store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
-              store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
-              modalLoader.setLoading(true);
-              store.authentication.userData.role === "Admin Partner"
-                ? await store.product.getProductPartner(
-                  // store.authentication.profileData.id
-                )
-                : await store.product.getData();
-              //await store.product.getData();
-              modalLoader.setLoading(false);
-            },
-            pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
-            total: store.authentication.userData.role === "Admin Partner"
-              ? store.product.total_data_partner
-              : store.product.total_data,
-            current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
-            style: { marginBottom: "1rem", marginRight: "1rem" },
-          }}
-          dataSource={
-            store.authentication.userData.role === "Admin Partner"
-              ? store.product.dataProductPartner
-              : store.product.data
-          }
-          style={{ padding: 0 }}
-          renderItem={(item) => {
-            return (
-              <div>
-                <List.Item
-                  key={item.id}
-                  style={{
-                    backgroundColor: "#ffffff",
-                    paddingTop: 0,
-                    paddingBottom: 0,
-                    display: "flex",
-                    flexDirection: "row",
-                    alignItems: "center",
-                    justifyContent: "center",
-                  }}
-                >
-                  <List.Item.Meta
-                    className={[""].join(" ")}
-                    title={item.product_code}
-                    description={
-                      <div style={{}}>
-                        <p>
-                          <small>{item.product_name}</small> <br />
-                          {/* <small>Harga Beli : {item.current_price_price}</small>
-                          <br /> */}
-                          <small>Harga Jual : {item.mark_up_price}</small>
-                          <br />
-                          <Button
-                            onClick={async () => {
-                              history.push(
-                                LINKS.PRODUCT_DETAIL.replace(
-                                  ":id",
-                                  item.product_id
-                                )
-                              );
+      <div>
+        {store.ui.mediaQuery.isDesktop && (
+            <Table
+                style={{
+                  cursor: "pointer",
+                  textAlign: "center",
+                  width: store.ui.mediaQuery.isMobile ? 250 : "",
+                }}
+                columns={columns}
+                dataSource={
+                  store.authentication.userData.role === "Admin Partner"
+                      ? store.product.dataProductPartner
+                      : store.product.data
+                }
+                onRow={handleClickRow}
+                pagination={{
+                  pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
+                  total:
+                      store.authentication.userData.role === "Admin Partner"
+                          ? store.product.total_data_partner
+                          : store.product.total_data,
+                  current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
+                  showSizeChanger: true,
+                  simple: false,
+                }}
+                onChange={async (page) => {
+                  let pageNumber = page.current;
+                  store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
+                  store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
+                  store.product.filterSubCategory = filterSubCategories
+                  modalLoader.setLoading(true);
+                  store.authentication.userData.role === "Admin Partner"
+                      ? await store.product.getProductPartner(
+                          // store.authentication.profileData.id
+                      )
+                      : await store.product.getData();
+                  modalLoader.setLoading(false);
+                }}
+            />
+        )}
+        {store.ui.mediaQuery.isMobile && (
+            <List
+                itemLayout="horizontal"
+                position={"top"}
+                pagination={{
+                  onChange: async (page, pageSize) => {
+                    store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
+                    store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
+                    modalLoader.setLoading(true);
+                    store.authentication.userData.role === "Admin Partner"
+                        ? await store.product.getProductPartner(
+                            // store.authentication.profileData.id
+                        )
+                        : await store.product.getData();
+                    //await store.product.getData();
+                    modalLoader.setLoading(false);
+                  },
+                  pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
+                  total: store.authentication.userData.role === "Admin Partner"
+                      ? store.product.total_data_partner
+                      : store.product.total_data,
+                  current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
+                  style: { marginBottom: "1rem", marginRight: "1rem" },
+                }}
+                dataSource={
+                  store.authentication.userData.role === "Admin Partner"
+                      ? store.product.dataProductPartner
+                      : store.product.data
+                }
+                style={{ padding: 0 }}
+                renderItem={(item) => {
+                  return (
+                      <div>
+                        <List.Item
+                            key={item.id}
+                            style={{
+                              backgroundColor: "#ffffff",
+                              paddingTop: 0,
+                              paddingBottom: 0,
+                              display: "flex",
+                              flexDirection: "row",
+                              alignItems: "center",
+                              justifyContent: "center",
                             }}
-                          >
-                            Detail
-                          </Button>
-                        </p>
-                        <p></p>
+                        >
+                          <List.Item.Meta
+                              className={[""].join(" ")}
+                              title={item.product_code}
+                              description={
+                                <div style={{}}>
+                                  <p>
+                                    <small>{item.product_name}</small> <br />
+                                    {/* <small>Harga Beli : {item.current_price_price}</small>
+                          <br /> */}
+                                    <small>Harga Jual : {item.mark_up_price}</small>
+                                    <br />
+                                    <Button
+                                        onClick={async () => {
+                                          history.push(
+                                              LINKS.PRODUCT_DETAIL.replace(
+                                                  ":id",
+                                                  item.product_id
+                                              )
+                                          );
+                                        }}
+                                    >
+                                      Detail
+                                    </Button>
+                                  </p>
+                                  <p></p>
+                                </div>
+                              }
+                          />
+                          <div style={{ marginRight: 16 }}>
+                            <p
+                                style={{
+                                  fontSize: 9,
+                                  margin: 0,
+                                }}
+                            >
+                              <Tag
+                                  color={
+                                    item?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"
+                                  }
+                                  style={{ color: "#4F566B" }}
+                              >
+                                {item?.product_status === "ACTIVE"
+                                    ? " Tersedia"
+                                    : "Tidak"}
+                              </Tag>
+                            </p>
+                          </div>
+                        </List.Item>
+                        <Divider plain style={{ margin: 0 }} />
                       </div>
-                    }
-                  />
-                  <div style={{ marginRight: 16 }}>
-                    <p
-                      style={{
-                        fontSize: 9,
-                        margin: 0,
-                      }}
-                    >
-                      <Tag
-                        color={
-                          item?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"
-                        }
-                        style={{ color: "#4F566B" }}
-                      >
-                        {item?.product_status === "ACTIVE"
-                          ? " Tersedia"
-                          : "Tidak"}
-                      </Tag>
-                    </p>
-                  </div>
-                </List.Item>
-                <Divider plain style={{ margin: 0 }} />
-              </div>
-            );
-          }}
-        />
-      )}
-      <Modal
-        visible={store.product.visibleModalProduct}
-        title={idData ? "Edit Product" : "Create a new Product"}
-        okText={idData ? "Edit" : "Create"}
-        cancelText="Batal"
-        onCancel={() => {
-          form.resetFields();
-          handleCancel();
-        }}
-        onOk={() => {
-          form
-            .validateFields()
-            .then((values) => {
-              console.log(values, "isi form");
-              handleSubmit(values);
+                  );
+                }}
+            />
+        )}
+        <Modal
+            visible={store.product.visibleModalProduct}
+            title={idData ? "Edit Product" : "Create a new Product"}
+            okText={idData ? "Edit" : "Create"}
+            cancelText="Batal"
+            onCancel={() => {
               form.resetFields();
-            })
-            .catch((info) => {
-              console.error("Validate Failed:", info);
-            });
-        }}
-      >
-        <Form form={form} layout="vertical">
-          <Form.Item
-            name="name"
-            label="Name"
-            rules={[{ required: true, message: "Please input name!" }]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="price"
-            label="Price"
-            rules={[{ required: true, message: "Please input price!" }]}
-          >
-            <InputNumber
-              style={{ width: "100%" }}
-              formatter={(value) =>
-                `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
-              }
-              parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
-            />
-          </Form.Item>
-          <Form.Item
-            name="markUpPrice"
-            label="Mark Up Price"
-            rules={[{ required: true, message: "Please input mark up price!" }]}
-          >
-            <InputNumber
-              style={{ width: "100%" }}
-              formatter={(value) =>
-                `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
-              }
-              parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
-            />
-          </Form.Item>
-          <Form.Item
-            name="code"
-            label="Code"
-            rules={[{ required: true, message: "Please input code!" }]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="status"
-            label="Status"
-            rules={[{ required: true, message: "Please select Status!" }]}
-          >
-            <Select placeholder="Select Sub Category" allowClear>
-              <Option value="ACTIVE">AKTIF</Option>
-              <Option value="INACTIVE">INAKTIF</Option>
-            </Select>
-          </Form.Item>
-          <Form.Item
-            name="subCategoriesId"
-            label="Sub categories"
-            rules={[
-              { required: true, message: "Please select sub categories!" },
-            ]}
-          >
-            <Select placeholder="Select Sub Category" allowClear>
-              {store.category.dataSubCategories.map((item) => (
-                <Option value={item.id} key={item.id}>
-                  {item.name}
-                </Option>
-              ))}
-            </Select>
-          </Form.Item>
-        </Form>
-      </Modal>
-      <Modal
-        visible={store.product.visibleModalFilterProduct}
-        title={"Filter"}
-        footer={footerLayoutFilter}
-        onCancel={async () => {
-          // setFilterSupplier([]);
-          // setFilterSubCategories([]);
-          store.product.filterSupplier = null;
-          store.product.filterSubCategory = null;
-          store.product.visibleModalFilterProduct = false;
-          await store.product.getData();
-        }}
-      >
-        <Row>
-          {store.authentication.userData.role === "Admin" && (
+              handleCancel();
+            }}
+            onOk={() => {
+              form
+                  .validateFields()
+                  .then((values) => {
+                    console.log(values, "isi form");
+                    handleSubmit(values);
+                    form.resetFields();
+                  })
+                  .catch((info) => {
+                    console.error("Validate Failed:", info);
+                  });
+            }}
+        >
+          <Form form={form} layout="vertical">
+            <Form.Item
+                name="name"
+                label="Name"
+                rules={[{ required: true, message: "Please input name!" }]}
+            >
+              <Input />
+            </Form.Item>
+            <Form.Item
+                name="price"
+                label="Price"
+                rules={[{ required: true, message: "Please input price!" }]}
+            >
+              <InputNumber
+                  style={{ width: "100%" }}
+                  formatter={(value) =>
+                      `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+                  }
+                  parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
+              />
+            </Form.Item>
+            <Form.Item
+                name="markUpPrice"
+                label="Mark Up Price"
+                rules={[{ required: true, message: "Please input mark up price!" }]}
+            >
+              <InputNumber
+                  style={{ width: "100%" }}
+                  formatter={(value) =>
+                      `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+                  }
+                  parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
+              />
+            </Form.Item>
+            <Form.Item
+                name="code"
+                label="Code"
+                rules={[{ required: true, message: "Please input code!" }]}
+            >
+              <Input />
+            </Form.Item>
+            <Form.Item
+                name="status"
+                label="Status"
+                rules={[{ required: true, message: "Please select Status!" }]}
+            >
+              <Select placeholder="Select Sub Category" allowClear>
+                <Option value="ACTIVE">AKTIF</Option>
+                <Option value="INACTIVE">INAKTIF</Option>
+              </Select>
+            </Form.Item>
+            <Form.Item
+                name="subCategoriesId"
+                label="Sub categories"
+                rules={[
+                  { required: true, message: "Please select sub categories!" },
+                ]}
+            >
+              <Select placeholder="Select Sub Category" allowClear>
+                {store.category.dataSubCategories.map((item) => (
+                    <Option value={item.id} key={item.id}>
+                      {item.name}
+                    </Option>
+                ))}
+              </Select>
+            </Form.Item>
+          </Form>
+        </Modal>
+        <Modal
+            visible={store.product.visibleModalFilterProduct}
+            title={"Filter"}
+            footer={footerLayoutFilter}
+            onCancel={async () => {
+              // setFilterSupplier([]);
+              // setFilterSubCategories([]);
+              store.product.filterSupplier = null;
+              store.product.filterSubCategory = null;
+              store.product.visibleModalFilterProduct = false;
+              await store.product.getData();
+            }}
+        >
+          <Row>
+            {store.authentication.userData.role === "Admin" && (
+                <Col span={24}>
+                  <Title level={5} type={"secondary"} strong>
+                    Filter Supplier
+                  </Title>
+                  <Select
+                      mode={"multiple"}
+                      placeholder="Choose Supplier"
+                      onChange={(val) => {
+                        setFilterSupplier(val);
+                      }}
+                      style={{ marginBottom: "20px", width: "100%" }}
+                      value={filterSupplier}
+                  >
+                    {store.supplier.data.map((item) => (
+                        <Option value={item.id} key={item.id}>
+                          {item.name}
+                        </Option>
+                    ))}
+                  </Select>
+                </Col>
+            )}
             <Col span={24}>
               <Title level={5} type={"secondary"} strong>
-                Filter Supplier
+                Filter Sub-Categories
               </Title>
               <Select
-                mode={"multiple"}
-                placeholder="Choose Supplier"
-                onChange={(val) => {
-                  setFilterSupplier(val);
-                }}
-                style={{ marginBottom: "20px", width: "100%" }}
-                value={filterSupplier}
+                  mode={"multiple"}
+                  placeholder="Choose Sub-Category"
+                  onChange={(val) => {
+                    setFilterSubCategories(val);
+                  }}
+                  style={{ marginBottom: "20px", width: "100%" }}
+                  value={filterSubCategories}
               >
-                {store.supplier.data.map((item) => (
-                  <Option value={item.id} key={item.id}>
-                    {item.name}
-                  </Option>
+                {store.product.dataSubCategories.map((item) => (
+                    <Option value={item.id} key={item.id}>
+                      {item.name}
+                    </Option>
                 ))}
               </Select>
             </Col>
-          )}
-          <Col span={24}>
-            <Title level={5} type={"secondary"} strong>
-              Filter Sub-Categories
-            </Title>
-            <Select
-              mode={"multiple"}
-              placeholder="Choose Sub-Category"
-              onChange={(val) => {
-                setFilterSubCategories(val);
-              }}
-              style={{ marginBottom: "20px", width: "100%" }}
-              value={filterSubCategories}
-            >
-              {store.product.dataSubCategories.map((item) => (
-                <Option value={item.id} key={item.id}>
-                  {item.name}
-                </Option>
-              ))}
-            </Select>
-          </Col>
-        </Row>
-      </Modal>
-    </div>
+          </Row>
+        </Modal>
+      </div>
   );
 });
diff --git a/src/pages/Product/ProductDetail.js b/src/pages/Product/ProductDetail.js
index 6364f74..caa71a8 100644
--- a/src/pages/Product/ProductDetail.js
+++ b/src/pages/Product/ProductDetail.js
@@ -57,20 +57,30 @@ export const ProductDetail = observer(() => {
       dataIndex: "mark_up_price",
       key: "mark_up_price",
       render: (text) =>
-        new Intl.NumberFormat("id-ID", {
-          style: "currency",
-          currency: "IDR",
-        }).format(text),
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Price",
       dataIndex: "price",
       key: "price",
       render: (text) =>
-        new Intl.NumberFormat("id-ID", {
-          style: "currency",
-          currency: "IDR",
-        }).format(text),
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
+    },
+    {
+      title: "Biaya Admin",
+      dataIndex: "admin_price",
+      key: "admin_price",
+      render: (text) =>
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Tanggal Berlaku",
@@ -78,7 +88,7 @@ export const ProductDetail = observer(() => {
       key: "startDate",
       render: (text) => {
         return (
-          <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "-"}</Text>
+            <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "-"}</Text>
         );
       },
     },
@@ -88,174 +98,174 @@ export const ProductDetail = observer(() => {
       key: "endDate",
       render: (text) => {
         return (
-          <Text>
-            {text ? format(parseISO(text), "dd MMMM yyyy") : "Sampai Sekarang"}
-          </Text>
+            <Text>
+              {text ? format(parseISO(text), "dd MMMM yyyy") : "Sampai Sekarang"}
+            </Text>
         );
       },
     },
   ];
 
   const styleSaldoTitle = store.ui.mediaQuery.isDesktop
-    ? {
+      ? {
         display: "flex",
         justifyContent: "center",
       }
-    : { fontSize: "0.75rem" };
+      : { fontSize: "0.75rem" };
   const styleSaldoContent = store.ui.mediaQuery.isDesktop
-    ? {
+      ? {
         fontSize: "1.25rem",
         display: "flex",
         justifyContent: "center",
       }
-    : null;
+      : null;
 
   return (
-    <div className={["ppob-container"].join(" ")}>
-      <BreadcumbComponent data={routeData} />
-      <Card>
-        <Title strong>Product Detail</Title>
-        <Row style={{ marginBottom: 20 }}>
-          <Col lg={12} xs={24}>
-            <Row>
-              <Col span={12}>
-                <Text strong>Kode</Text>
-              </Col>
-              <Col span={12}>
-                <Text>{store.product?.dataDetailProduct?.code}</Text>
-              </Col>
-              <Col span={12}>
-                <Text strong>Nama Produk</Text>
-              </Col>
-              <Col span={10}>
-                <Text>{store.product?.dataDetailProduct?.name}</Text>
-              </Col>
-              <Col span={12}>
-                <Text strong>Supplier</Text>
-              </Col>
-              <Col span={12}>
-                <Text>{store.product?.dataDetailProduct?.supplier?.name}</Text>
-              </Col>
-              <Col span={12}>
-                <Text strong>Status</Text>
-              </Col>
-              <Col span={12}>
-                <Text>{store.product?.dataDetailProduct?.status}</Text>
-              </Col>
-            </Row>
-          </Col>
-        </Row>
-        <Row>
-          <Col span={24}>
-            <div>
-              <Title strong level={3}>
-                Product Price History
-              </Title>
-              {store.ui.mediaQuery.isDesktop && (
-                <Table
-                  columns={columns}
-                  dataSource={store.product.dataPriceHistory}
-                  bordered
-                  pagination={{
-                    pageSize: store.product.pageSizePriceHistory,
-                    total: store.product.totalDataPriceHistory,
-                    current: store.product.pagePriceHistory + 1,
-                    showSizeChanger: true,
-                    simple: false,
-                  }}
-                  onChange={async (page) => {
-                    let pageNumber = page.current;
-                    store.product.pageSizePriceHistory = page.pageSize;
-                    store.product.pagePriceHistory = pageNumber - 1;
-                    modalLoader.setLoading(true);
-                    await store.product.getPriceHistoryByProduct(id);
-                    modalLoader.setLoading(false);
-                  }}
-                />
-              )}
-              {store.ui.mediaQuery.isMobile && (
-                <List
-                  itemLayout="horizontal"
-                  position={"top"}
-                  pagination={{
-                    onChange: async (page, pageSize) => {
-                      store.product.pageSizePriceHistory = pageSize;
-                      store.product.pagePriceHistory = page - 1;
-                      modalLoader.setLoading(true);
-                      await store.product.getPriceHistoryByProduct(id);
-                      modalLoader.setLoading(false);
-                    },
-                    pageSize: store.product.pageSizePriceHistory,
-                    total: store.product.totalDataPriceHistory,
-                    current: store.product.pagePriceHistory + 1,
-                    style: { marginBottom: "1rem", marginRight: "1rem" },
-                  }}
-                  dataSource={store.product.dataPriceHistory}
-                  style={{ padding: 0 }}
-                  renderItem={(item) => {
-                    return (
-                      <div>
-                        <List.Item
-                          key={item.id}
-                          style={{
-                            backgroundColor: "#ffffff",
-                            paddingTop: 0,
-                            paddingBottom: 0,
-                            display: "flex",
-                            flexDirection: "row",
-                            alignItems: "center",
-                            justifyContent: "center",
-                          }}
-                        >
-                          <List.Item.Meta
-                            className={[""].join(" ")}
-                            //title={item.mark_up_price}
-                            description={
-                              <div style={{}}>
-                                <p>
-                                  <small>
-                                    Markup Price :{" "}
-                                    {new Intl.NumberFormat("id-ID", {
-                                      style: "currency",
-                                      currency: "IDR",
-                                    }).format(item.mark_up_price)}
-                                  </small>{" "}
-                                  <br />
-                                  <small>
-                                    Price:{" "}
-                                    {new Intl.NumberFormat("id-ID", {
-                                      style: "currency",
-                                      currency: "IDR",
-                                    }).format(item.price)}
-                                  </small>{" "}
-                                  <br />
-                                  <small>
-                                    {" "}
-                                    Tanggal Berlaku :
-                                    {item.startDate
-                                      ? format(
-                                          parseISO(item.startDate),
-                                          "dd MMMM yyyy"
-                                        )
-                                      : "-"}
-                                  </small>{" "}
-                                  <br />
-                                  <small>
-                                    Tanggal Berakhir :{" "}
-                                    {item.endDate
-                                      ? format(
-                                          parseISO(item.endDate),
-                                          "dd MMMM yyyy"
-                                        )
-                                      : "Sampai Sekarang"}
-                                  </small>{" "}
-                                  <br />
-                                </p>
-                                <p></p>
-                              </div>
-                            }
-                          />
-                          {/* <div style={{ marginRight: 16 }}>
+      <div className={["ppob-container"].join(" ")}>
+        <BreadcumbComponent data={routeData} />
+        <Card>
+          <Title strong>Product Detail</Title>
+          <Row style={{ marginBottom: 20 }}>
+            <Col lg={12} xs={24}>
+              <Row>
+                <Col span={12}>
+                  <Text strong>Kode</Text>
+                </Col>
+                <Col span={12}>
+                  <Text>{store.product?.dataDetailProduct?.code}</Text>
+                </Col>
+                <Col span={12}>
+                  <Text strong>Nama Produk</Text>
+                </Col>
+                <Col span={10}>
+                  <Text>{store.product?.dataDetailProduct?.name}</Text>
+                </Col>
+                <Col span={12}>
+                  <Text strong>Supplier</Text>
+                </Col>
+                <Col span={12}>
+                  <Text>{store.product?.dataDetailProduct?.supplier?.name}</Text>
+                </Col>
+                <Col span={12}>
+                  <Text strong>Status</Text>
+                </Col>
+                <Col span={12}>
+                  <Text>{store.product?.dataDetailProduct?.status}</Text>
+                </Col>
+              </Row>
+            </Col>
+          </Row>
+          <Row>
+            <Col span={24}>
+              <div>
+                <Title strong level={3}>
+                  Product Price History
+                </Title>
+                {store.ui.mediaQuery.isDesktop && (
+                    <Table
+                        columns={columns}
+                        dataSource={store.product.dataPriceHistory}
+                        bordered
+                        pagination={{
+                          pageSize: store.product.pageSizePriceHistory,
+                          total: store.product.totalDataPriceHistory,
+                          current: store.product.pagePriceHistory + 1,
+                          showSizeChanger: true,
+                          simple: false,
+                        }}
+                        onChange={async (page) => {
+                          let pageNumber = page.current;
+                          store.product.pageSizePriceHistory = page.pageSize;
+                          store.product.pagePriceHistory = pageNumber - 1;
+                          modalLoader.setLoading(true);
+                          await store.product.getPriceHistoryByProduct(id);
+                          modalLoader.setLoading(false);
+                        }}
+                    />
+                )}
+                {store.ui.mediaQuery.isMobile && (
+                    <List
+                        itemLayout="horizontal"
+                        position={"top"}
+                        pagination={{
+                          onChange: async (page, pageSize) => {
+                            store.product.pageSizePriceHistory = pageSize;
+                            store.product.pagePriceHistory = page - 1;
+                            modalLoader.setLoading(true);
+                            await store.product.getPriceHistoryByProduct(id);
+                            modalLoader.setLoading(false);
+                          },
+                          pageSize: store.product.pageSizePriceHistory,
+                          total: store.product.totalDataPriceHistory,
+                          current: store.product.pagePriceHistory + 1,
+                          style: { marginBottom: "1rem", marginRight: "1rem" },
+                        }}
+                        dataSource={store.product.dataPriceHistory}
+                        style={{ padding: 0 }}
+                        renderItem={(item) => {
+                          return (
+                              <div>
+                                <List.Item
+                                    key={item.id}
+                                    style={{
+                                      backgroundColor: "#ffffff",
+                                      paddingTop: 0,
+                                      paddingBottom: 0,
+                                      display: "flex",
+                                      flexDirection: "row",
+                                      alignItems: "center",
+                                      justifyContent: "center",
+                                    }}
+                                >
+                                  <List.Item.Meta
+                                      className={[""].join(" ")}
+                                      //title={item.mark_up_price}
+                                      description={
+                                        <div style={{}}>
+                                          <p>
+                                            <small>
+                                              Markup Price :{" "}
+                                              {new Intl.NumberFormat("id-ID", {
+                                                style: "currency",
+                                                currency: "IDR",
+                                              }).format(item.mark_up_price)}
+                                            </small>{" "}
+                                            <br />
+                                            <small>
+                                              Price:{" "}
+                                              {new Intl.NumberFormat("id-ID", {
+                                                style: "currency",
+                                                currency: "IDR",
+                                              }).format(item.price)}
+                                            </small>{" "}
+                                            <br />
+                                            <small>
+                                              {" "}
+                                              Tanggal Berlaku :
+                                              {item.startDate
+                                                  ? format(
+                                                      parseISO(item.startDate),
+                                                      "dd MMMM yyyy"
+                                                  )
+                                                  : "-"}
+                                            </small>{" "}
+                                            <br />
+                                            <small>
+                                              Tanggal Berakhir :{" "}
+                                              {item.endDate
+                                                  ? format(
+                                                      parseISO(item.endDate),
+                                                      "dd MMMM yyyy"
+                                                  )
+                                                  : "Sampai Sekarang"}
+                                            </small>{" "}
+                                            <br />
+                                          </p>
+                                          <p></p>
+                                        </div>
+                                      }
+                                  />
+                                  {/* <div style={{ marginRight: 16 }}>
                             <p
                               style={{
                                 fontSize: 9,
@@ -276,18 +286,18 @@ export const ProductDetail = observer(() => {
                               </Tag>
                             </p>
                           </div> */}
-                        </List.Item>
-                        <Divider plain style={{ margin: 0 }} />
-                      </div>
-                    );
-                  }}
-                />
-              )}
-            </div>
-          </Col>
-        </Row>
-        <div />
-      </Card>
-    </div>
+                                </List.Item>
+                                <Divider plain style={{ margin: 0 }} />
+                              </div>
+                          );
+                        }}
+                    />
+                )}
+              </div>
+            </Col>
+          </Row>
+          <div />
+        </Card>
+      </div>
   );
 });

From 6a26068339b72098484b05f7e0819298dfe6620c Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Wed, 11 May 2022 20:33:04 +0700
Subject: [PATCH 26/36] feat: revisi fixing filter admin partner and add column
 biaya admin

---
 src/component/ProductComponent.js | 661 +++++++++++++++---------------
 src/store/product.js              |   2 +-
 2 files changed, 331 insertions(+), 332 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index c4d28b5..ccc771b 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -64,40 +64,40 @@ export const ProductComponent = observer((props) => {
       dataIndex: "current_price_price",
       key: "current_price_price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Harga Jual",
       dataIndex: "mark_up_price",
       key: "mark_up_price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Harga",
       dataIndex: "price",
       key: "price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Biaya Admin",
       dataIndex: "admin_price",
       key: "admin_price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Supplier",
@@ -114,27 +114,27 @@ export const ProductComponent = observer((props) => {
       dataIndex: "tersedia",
       key: "tersedia",
       render: (text, record) => (
-          <Tag
-              color={record?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"}
-              style={{ color: "#4F566B" }}
-          >
-            {record?.product_status === "ACTIVE" ? " Tersedia" : "Tidak"}
-          </Tag>
+        <Tag
+          color={record?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"}
+          style={{ color: "#4F566B" }}
+        >
+          {record?.product_status === "ACTIVE" ? " Tersedia" : "Tidak"}
+        </Tag>
       ),
     },
     {
       title: "Tindakan",
       key: "action",
       render: (text, record) => (
-          <Button
-              onClick={async () => {
-                history.push(
-                    LINKS.PRODUCT_DETAIL.replace(":id", record.product_id)
-                );
-              }}
-          >
-            Detail
-          </Button>
+        <Button
+          onClick={async () => {
+            history.push(
+              LINKS.PRODUCT_DETAIL.replace(":id", record.product_id)
+            );
+          }}
+        >
+          Detail
+        </Button>
       ),
     },
   ];
@@ -145,7 +145,6 @@ export const ProductComponent = observer((props) => {
   if (store.authentication.userData.role !== "Admin") delete columns[8];
   if (store.authentication.userData.role !== "Admin") delete columns[6];
   if (store.authentication.userData.role !== "Admin") delete columns[2];
-  if (store.authentication.userData.role !== "Admin") delete columns[5];
   if (store.authentication.userData.role === "Admin Partner") delete columns[7];
   //if (store.authentication.userData.role !== "Admin") delete columns[8];
   //if (store.authentication.userData.role === "Admin Partner") delete columns[5];
@@ -190,10 +189,10 @@ export const ProductComponent = observer((props) => {
       try {
         const response = await store.product.update(idData, data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
-            ? message.success(
-                response?.body?.message || "Berhasil Ubah Data Produk"
-            )
-            : message.error(response?.body?.message || "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(e.response?.body?.message || "Gagal Ubah Data Produk");
       }
@@ -206,8 +205,8 @@ export const ProductComponent = observer((props) => {
       try {
         const response = await store.product.create(data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
-            ? message.success(response?.body?.message || "Berhasil Tambah Produk")
-            : message.error(response?.body?.message || "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(e.response?.body?.message || "Gagal Tambah Produk");
@@ -227,8 +226,8 @@ export const ProductComponent = observer((props) => {
     setFilterSupplier([]);
     setFilterSubCategories([]);
     store.authentication.userData.role === "Admin Partner"
-        ? await store.product.getProductPartner()
-        : await store.product.getData();
+      ? await store.product.getProductPartner()
+      : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
   };
@@ -245,8 +244,8 @@ export const ProductComponent = observer((props) => {
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
     store.authentication.userData.role === "Admin Partner"
-        ? await store.product.getProductPartner(filterSubCategories)
-        : await store.product.getData();
+      ? await store.product.getProductPartner(filterSubCategories)
+      : await store.product.getData();
     //await store.product.getData();
     modalLoader.setLoading(false);
     //store.product.page=1
@@ -254,12 +253,12 @@ export const ProductComponent = observer((props) => {
 
   const footerLayoutFilter = [
     <Button
-        key={"remove"}
-        onClick={handleRemoveFilter}
-        style={{
-          backgroundColor: "#e74e5e",
-          color: "#fff",
-        }}
+      key={"remove"}
+      onClick={handleRemoveFilter}
+      style={{
+        backgroundColor: "#e74e5e",
+        color: "#fff",
+      }}
     >
       Hapus Filter
     </Button>,
@@ -267,12 +266,12 @@ export const ProductComponent = observer((props) => {
       Batal
     </Button>,
     <Button
-        key={"submit"}
-        onClick={handleSubmitFilter}
-        style={{
-          backgroundColor: "#4e79e7",
-          color: "#fff",
-        }}
+      key={"submit"}
+      onClick={handleSubmitFilter}
+      style={{
+        backgroundColor: "#4e79e7",
+        color: "#fff",
+      }}
     >
       Terapkan
     </Button>,
@@ -284,293 +283,293 @@ export const ProductComponent = observer((props) => {
     },
   });
   return (
-      <div>
-        {store.ui.mediaQuery.isDesktop && (
-            <Table
-                style={{
-                  cursor: "pointer",
-                  textAlign: "center",
-                  width: store.ui.mediaQuery.isMobile ? 250 : "",
-                }}
-                columns={columns}
-                dataSource={
-                  store.authentication.userData.role === "Admin Partner"
-                      ? store.product.dataProductPartner
-                      : store.product.data
-                }
-                onRow={handleClickRow}
-                pagination={{
-                  pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
-                  total:
-                      store.authentication.userData.role === "Admin Partner"
-                          ? store.product.total_data_partner
-                          : store.product.total_data,
-                  current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
-                  showSizeChanger: true,
-                  simple: false,
-                }}
-                onChange={async (page) => {
-                  let pageNumber = page.current;
-                  store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
-                  store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
-                  store.product.filterSubCategory = filterSubCategories
-                  modalLoader.setLoading(true);
-                  store.authentication.userData.role === "Admin Partner"
-                      ? await store.product.getProductPartner(
-                          // store.authentication.profileData.id
-                      )
-                      : await store.product.getData();
-                  modalLoader.setLoading(false);
-                }}
-            />
-        )}
-        {store.ui.mediaQuery.isMobile && (
-            <List
-                itemLayout="horizontal"
-                position={"top"}
-                pagination={{
-                  onChange: async (page, pageSize) => {
-                    store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
-                    store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
-                    modalLoader.setLoading(true);
-                    store.authentication.userData.role === "Admin Partner"
-                        ? await store.product.getProductPartner(
-                            // store.authentication.profileData.id
-                        )
-                        : await store.product.getData();
-                    //await store.product.getData();
-                    modalLoader.setLoading(false);
-                  },
-                  pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
-                  total: store.authentication.userData.role === "Admin Partner"
-                      ? store.product.total_data_partner
-                      : store.product.total_data,
-                  current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
-                  style: { marginBottom: "1rem", marginRight: "1rem" },
-                }}
-                dataSource={
-                  store.authentication.userData.role === "Admin Partner"
-                      ? store.product.dataProductPartner
-                      : store.product.data
-                }
-                style={{ padding: 0 }}
-                renderItem={(item) => {
-                  return (
-                      <div>
-                        <List.Item
-                            key={item.id}
-                            style={{
-                              backgroundColor: "#ffffff",
-                              paddingTop: 0,
-                              paddingBottom: 0,
-                              display: "flex",
-                              flexDirection: "row",
-                              alignItems: "center",
-                              justifyContent: "center",
-                            }}
-                        >
-                          <List.Item.Meta
-                              className={[""].join(" ")}
-                              title={item.product_code}
-                              description={
-                                <div style={{}}>
-                                  <p>
-                                    <small>{item.product_name}</small> <br />
-                                    {/* <small>Harga Beli : {item.current_price_price}</small>
+    <div>
+      {store.ui.mediaQuery.isDesktop && (
+        <Table
+          style={{
+            cursor: "pointer",
+            textAlign: "center",
+            width: store.ui.mediaQuery.isMobile ? 250 : "",
+          }}
+          columns={columns}
+          dataSource={
+            store.authentication.userData.role === "Admin Partner"
+              ? store.product.dataProductPartner
+              : store.product.data
+          }
+          onRow={handleClickRow}
+          pagination={{
+            pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
+            total:
+              store.authentication.userData.role === "Admin Partner"
+                ? store.product.total_data_partner
+                : store.product.total_data,
+            current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
+            showSizeChanger: true,
+            simple: false,
+          }}
+          onChange={async (page) => {
+            let pageNumber = page.current;
+            store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
+            store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
+            store.product.filterSubCategory = filterSubCategories
+            modalLoader.setLoading(true);
+            store.authentication.userData.role === "Admin Partner"
+              ? await store.product.getProductPartner(
+                filterSubCategories
+              )
+              : await store.product.getData();
+            modalLoader.setLoading(false);
+          }}
+        />
+      )}
+      {store.ui.mediaQuery.isMobile && (
+        <List
+          itemLayout="horizontal"
+          position={"top"}
+          pagination={{
+            onChange: async (page, pageSize) => {
+              store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
+              store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
+              modalLoader.setLoading(true);
+              store.authentication.userData.role === "Admin Partner"
+                ? await store.product.getProductPartner(
+                  filterSubCategories
+                )
+                : await store.product.getData();
+              //await store.product.getData();
+              modalLoader.setLoading(false);
+            },
+            pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
+            total: store.authentication.userData.role === "Admin Partner"
+              ? store.product.total_data_partner
+              : store.product.total_data,
+            current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
+            style: { marginBottom: "1rem", marginRight: "1rem" },
+          }}
+          dataSource={
+            store.authentication.userData.role === "Admin Partner"
+              ? store.product.dataProductPartner
+              : store.product.data
+          }
+          style={{ padding: 0 }}
+          renderItem={(item) => {
+            return (
+              <div>
+                <List.Item
+                  key={item.id}
+                  style={{
+                    backgroundColor: "#ffffff",
+                    paddingTop: 0,
+                    paddingBottom: 0,
+                    display: "flex",
+                    flexDirection: "row",
+                    alignItems: "center",
+                    justifyContent: "center",
+                  }}
+                >
+                  <List.Item.Meta
+                    className={[""].join(" ")}
+                    title={item.product_code}
+                    description={
+                      <div style={{}}>
+                        <p>
+                          <small>{item.product_name}</small> <br />
+                          {/* <small>Harga Beli : {item.current_price_price}</small>
                           <br /> */}
-                                    <small>Harga Jual : {item.mark_up_price}</small>
-                                    <br />
-                                    <Button
-                                        onClick={async () => {
-                                          history.push(
-                                              LINKS.PRODUCT_DETAIL.replace(
-                                                  ":id",
-                                                  item.product_id
-                                              )
-                                          );
-                                        }}
-                                    >
-                                      Detail
-                                    </Button>
-                                  </p>
-                                  <p></p>
-                                </div>
-                              }
-                          />
-                          <div style={{ marginRight: 16 }}>
-                            <p
-                                style={{
-                                  fontSize: 9,
-                                  margin: 0,
-                                }}
-                            >
-                              <Tag
-                                  color={
-                                    item?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"
-                                  }
-                                  style={{ color: "#4F566B" }}
-                              >
-                                {item?.product_status === "ACTIVE"
-                                    ? " Tersedia"
-                                    : "Tidak"}
-                              </Tag>
-                            </p>
-                          </div>
-                        </List.Item>
-                        <Divider plain style={{ margin: 0 }} />
+                          <small>Harga Jual : {item.mark_up_price}</small>
+                          <br />
+                          <Button
+                            onClick={async () => {
+                              history.push(
+                                LINKS.PRODUCT_DETAIL.replace(
+                                  ":id",
+                                  item.product_id
+                                )
+                              );
+                            }}
+                          >
+                            Detail
+                          </Button>
+                        </p>
+                        <p></p>
                       </div>
-                  );
-                }}
-            />
-        )}
-        <Modal
-            visible={store.product.visibleModalProduct}
-            title={idData ? "Edit Product" : "Create a new Product"}
-            okText={idData ? "Edit" : "Create"}
-            cancelText="Batal"
-            onCancel={() => {
-              form.resetFields();
-              handleCancel();
-            }}
-            onOk={() => {
-              form
-                  .validateFields()
-                  .then((values) => {
-                    console.log(values, "isi form");
-                    handleSubmit(values);
-                    form.resetFields();
-                  })
-                  .catch((info) => {
-                    console.error("Validate Failed:", info);
-                  });
-            }}
-        >
-          <Form form={form} layout="vertical">
-            <Form.Item
-                name="name"
-                label="Name"
-                rules={[{ required: true, message: "Please input name!" }]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-                name="price"
-                label="Price"
-                rules={[{ required: true, message: "Please input price!" }]}
-            >
-              <InputNumber
-                  style={{ width: "100%" }}
-                  formatter={(value) =>
-                      `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
-                  }
-                  parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
-              />
-            </Form.Item>
-            <Form.Item
-                name="markUpPrice"
-                label="Mark Up Price"
-                rules={[{ required: true, message: "Please input mark up price!" }]}
-            >
-              <InputNumber
-                  style={{ width: "100%" }}
-                  formatter={(value) =>
-                      `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
-                  }
-                  parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
-              />
-            </Form.Item>
-            <Form.Item
-                name="code"
-                label="Code"
-                rules={[{ required: true, message: "Please input code!" }]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-                name="status"
-                label="Status"
-                rules={[{ required: true, message: "Please select Status!" }]}
-            >
-              <Select placeholder="Select Sub Category" allowClear>
-                <Option value="ACTIVE">AKTIF</Option>
-                <Option value="INACTIVE">INAKTIF</Option>
-              </Select>
-            </Form.Item>
-            <Form.Item
-                name="subCategoriesId"
-                label="Sub categories"
-                rules={[
-                  { required: true, message: "Please select sub categories!" },
-                ]}
-            >
-              <Select placeholder="Select Sub Category" allowClear>
-                {store.category.dataSubCategories.map((item) => (
-                    <Option value={item.id} key={item.id}>
-                      {item.name}
-                    </Option>
-                ))}
-              </Select>
-            </Form.Item>
-          </Form>
-        </Modal>
-        <Modal
-            visible={store.product.visibleModalFilterProduct}
-            title={"Filter"}
-            footer={footerLayoutFilter}
-            onCancel={async () => {
-              // setFilterSupplier([]);
-              // setFilterSubCategories([]);
-              store.product.filterSupplier = null;
-              store.product.filterSubCategory = null;
-              store.product.visibleModalFilterProduct = false;
-              await store.product.getData();
-            }}
-        >
-          <Row>
-            {store.authentication.userData.role === "Admin" && (
-                <Col span={24}>
-                  <Title level={5} type={"secondary"} strong>
-                    Filter Supplier
-                  </Title>
-                  <Select
-                      mode={"multiple"}
-                      placeholder="Choose Supplier"
-                      onChange={(val) => {
-                        setFilterSupplier(val);
+                    }
+                  />
+                  <div style={{ marginRight: 16 }}>
+                    <p
+                      style={{
+                        fontSize: 9,
+                        margin: 0,
                       }}
-                      style={{ marginBottom: "20px", width: "100%" }}
-                      value={filterSupplier}
-                  >
-                    {store.supplier.data.map((item) => (
-                        <Option value={item.id} key={item.id}>
-                          {item.name}
-                        </Option>
-                    ))}
-                  </Select>
-                </Col>
-            )}
+                    >
+                      <Tag
+                        color={
+                          item?.product_status === "ACTIVE" ? "blue" : "#E3E8EE"
+                        }
+                        style={{ color: "#4F566B" }}
+                      >
+                        {item?.product_status === "ACTIVE"
+                          ? " Tersedia"
+                          : "Tidak"}
+                      </Tag>
+                    </p>
+                  </div>
+                </List.Item>
+                <Divider plain style={{ margin: 0 }} />
+              </div>
+            );
+          }}
+        />
+      )}
+      <Modal
+        visible={store.product.visibleModalProduct}
+        title={idData ? "Edit Product" : "Create a new Product"}
+        okText={idData ? "Edit" : "Create"}
+        cancelText="Batal"
+        onCancel={() => {
+          form.resetFields();
+          handleCancel();
+        }}
+        onOk={() => {
+          form
+            .validateFields()
+            .then((values) => {
+              console.log(values, "isi form");
+              handleSubmit(values);
+              form.resetFields();
+            })
+            .catch((info) => {
+              console.error("Validate Failed:", info);
+            });
+        }}
+      >
+        <Form form={form} layout="vertical">
+          <Form.Item
+            name="name"
+            label="Name"
+            rules={[{ required: true, message: "Please input name!" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            name="price"
+            label="Price"
+            rules={[{ required: true, message: "Please input price!" }]}
+          >
+            <InputNumber
+              style={{ width: "100%" }}
+              formatter={(value) =>
+                `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+              }
+              parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
+            />
+          </Form.Item>
+          <Form.Item
+            name="markUpPrice"
+            label="Mark Up Price"
+            rules={[{ required: true, message: "Please input mark up price!" }]}
+          >
+            <InputNumber
+              style={{ width: "100%" }}
+              formatter={(value) =>
+                `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+              }
+              parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
+            />
+          </Form.Item>
+          <Form.Item
+            name="code"
+            label="Code"
+            rules={[{ required: true, message: "Please input code!" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            name="status"
+            label="Status"
+            rules={[{ required: true, message: "Please select Status!" }]}
+          >
+            <Select placeholder="Select Sub Category" allowClear>
+              <Option value="ACTIVE">AKTIF</Option>
+              <Option value="INACTIVE">INAKTIF</Option>
+            </Select>
+          </Form.Item>
+          <Form.Item
+            name="subCategoriesId"
+            label="Sub categories"
+            rules={[
+              { required: true, message: "Please select sub categories!" },
+            ]}
+          >
+            <Select placeholder="Select Sub Category" allowClear>
+              {store.category.dataSubCategories.map((item) => (
+                <Option value={item.id} key={item.id}>
+                  {item.name}
+                </Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </Form>
+      </Modal>
+      <Modal
+        visible={store.product.visibleModalFilterProduct}
+        title={"Filter"}
+        footer={footerLayoutFilter}
+        onCancel={async () => {
+          // setFilterSupplier([]);
+          // setFilterSubCategories([]);
+          store.product.filterSupplier = null;
+          store.product.filterSubCategory = null;
+          store.product.visibleModalFilterProduct = false;
+          await store.product.getData();
+        }}
+      >
+        <Row>
+          {store.authentication.userData.role === "Admin" && (
             <Col span={24}>
               <Title level={5} type={"secondary"} strong>
-                Filter Sub-Categories
+                Filter Supplier
               </Title>
               <Select
-                  mode={"multiple"}
-                  placeholder="Choose Sub-Category"
-                  onChange={(val) => {
-                    setFilterSubCategories(val);
-                  }}
-                  style={{ marginBottom: "20px", width: "100%" }}
-                  value={filterSubCategories}
+                mode={"multiple"}
+                placeholder="Choose Supplier"
+                onChange={(val) => {
+                  setFilterSupplier(val);
+                }}
+                style={{ marginBottom: "20px", width: "100%" }}
+                value={filterSupplier}
               >
-                {store.product.dataSubCategories.map((item) => (
-                    <Option value={item.id} key={item.id}>
-                      {item.name}
-                    </Option>
+                {store.supplier.data.map((item) => (
+                  <Option value={item.id} key={item.id}>
+                    {item.name}
+                  </Option>
                 ))}
               </Select>
             </Col>
-          </Row>
-        </Modal>
-      </div>
+          )}
+          <Col span={24}>
+            <Title level={5} type={"secondary"} strong>
+              Filter Sub-Categories
+            </Title>
+            <Select
+              mode={"multiple"}
+              placeholder="Choose Sub-Category"
+              onChange={(val) => {
+                setFilterSubCategories(val);
+              }}
+              style={{ marginBottom: "20px", width: "100%" }}
+              value={filterSubCategories}
+            >
+              {store.product.dataSubCategories.map((item) => (
+                <Option value={item.id} key={item.id}>
+                  {item.name}
+                </Option>
+              ))}
+            </Select>
+          </Col>
+        </Row>
+      </Modal>
+    </div>
   );
 });
diff --git a/src/store/product.js b/src/store/product.js
index 057db3f..7beeed4 100644
--- a/src/store/product.js
+++ b/src/store/product.js
@@ -101,7 +101,7 @@ export class Product {
     }
 
     async getProductPartner(id) {
-
+        console.log({ id });
         if (id === undefined) {
             try {
                 const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`);

From e8830781039844085cb00a8d0aefef467e9dd7e6 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Thu, 12 May 2022 17:00:53 +0700
Subject: [PATCH 27/36] feat: hide column tindakan admin partner

---
 src/component/ProductComponent.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index ccc771b..55ad0c9 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -140,6 +140,7 @@ export const ProductComponent = observer((props) => {
   ];
   //if (store.authentication.userData.role !== "Admin") columns.pop();
   //if (store.authentication.userData.role === "Admin Partner") delete columns[2];
+  if (store.authentication.userData.role === "Admin Partner") delete columns[9];
   if (store.authentication.userData.role === "Admin Partner") delete columns[3];
   if (store.authentication.userData.role != "Admin Partner") delete columns[4];
   if (store.authentication.userData.role !== "Admin") delete columns[8];

From 77513308a2942db36c9a1638ae66e9b3e308f7e2 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Thu, 12 May 2022 17:10:28 +0700
Subject: [PATCH 28/36] feat: hide column tindakan admin partner

---
 src/component/ProductComponent.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 55ad0c9..7145ab8 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -33,6 +33,7 @@ export const ProductComponent = observer((props) => {
   const [filterSupplier, setFilterSupplier] = useState([]);
   const [filterSubCategories, setFilterSubCategories] = useState([]);
   const modalLoader = useContext(ModalLoaderContext);
+  const role = store.authentication.userData.role
 
   const handleEditButton = (data) => {
     console.log(data, "isi data");
@@ -280,7 +281,7 @@ export const ProductComponent = observer((props) => {
 
   const handleClickRow = (record, index) => ({
     onClick: (event) => {
-      history.push(LINKS.PRODUCT_DETAIL.replace(":id", record.product_id));
+      role === "Admin Partner" ? history.push(LINKS.PRODUCT_DETAIL.replace(":id", record.product_id)) : ''
     },
   });
   return (

From e98914fb86a1de27f30bb22feec675ba31f1d443 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Thu, 12 May 2022 17:19:57 +0700
Subject: [PATCH 29/36] feat: validasi detail product admin partner

---
 src/component/ProductComponent.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 7145ab8..e39f214 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -139,7 +139,6 @@ export const ProductComponent = observer((props) => {
       ),
     },
   ];
-  //if (store.authentication.userData.role !== "Admin") columns.pop();
   //if (store.authentication.userData.role === "Admin Partner") delete columns[2];
   if (store.authentication.userData.role === "Admin Partner") delete columns[9];
   if (store.authentication.userData.role === "Admin Partner") delete columns[3];

From 8737da9da4e87984fdcff7c4e2e360e45565d614 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Thu, 12 May 2022 17:39:15 +0700
Subject: [PATCH 30/36] feat: validasi detail product admin partner

---
 src/component/ProductComponent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index e39f214..2309c9a 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -280,7 +280,7 @@ export const ProductComponent = observer((props) => {
 
   const handleClickRow = (record, index) => ({
     onClick: (event) => {
-      role === "Admin Partner" ? history.push(LINKS.PRODUCT_DETAIL.replace(":id", record.product_id)) : ''
+      history.push(LINKS.PRODUCT_DETAIL.replace(":id", record.product_id))
     },
   });
   return (
@@ -298,7 +298,7 @@ export const ProductComponent = observer((props) => {
               ? store.product.dataProductPartner
               : store.product.data
           }
-          onRow={handleClickRow}
+          onRow={role === "Admin Partner" ? false : handleClickRow}
           pagination={{
             pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
             total:

From 6c4a78f87128ed7d6ac3e204a4e39e0e3a648b42 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Mon, 23 May 2022 21:36:27 +0700
Subject: [PATCH 31/36] feat: add column partner fee in list product role admin

---
 src/component/ProductComponent.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 2309c9a..a371bf5 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -62,8 +62,8 @@ export const ProductComponent = observer((props) => {
     },
     {
       title: "Harga Beli",
-      dataIndex: "current_price_price",
-      key: "current_price_price",
+      dataIndex: "price",
+      key: "price",
       render: (text) =>
         new Intl.NumberFormat("id-ID", {
           style: "currency",
@@ -100,6 +100,16 @@ export const ProductComponent = observer((props) => {
           currency: "IDR",
         }).format(text),
     },
+    {
+      title: "Partner fee",
+      dataIndex: "partner_fee",
+      key: "partner_fee",
+      render: (text) =>
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
+    },
     {
       title: "Supplier",
       dataIndex: "supplier_name",
@@ -140,13 +150,14 @@ export const ProductComponent = observer((props) => {
     },
   ];
   //if (store.authentication.userData.role === "Admin Partner") delete columns[2];
-  if (store.authentication.userData.role === "Admin Partner") delete columns[9];
+  if (store.authentication.userData.role === "Admin Partner") delete columns[10];
   if (store.authentication.userData.role === "Admin Partner") delete columns[3];
-  if (store.authentication.userData.role != "Admin Partner") delete columns[4];
-  if (store.authentication.userData.role !== "Admin") delete columns[8];
+  if (store.authentication.userData.role !== "Admin Partner") delete columns[4];
+  if (store.authentication.userData.role !== "Admin") delete columns[9];
   if (store.authentication.userData.role !== "Admin") delete columns[6];
+  if (store.authentication.userData.role !== "Admin") delete columns[7];
   if (store.authentication.userData.role !== "Admin") delete columns[2];
-  if (store.authentication.userData.role === "Admin Partner") delete columns[7];
+  if (store.authentication.userData.role === "Admin Partner") delete columns[8];
   //if (store.authentication.userData.role !== "Admin") delete columns[8];
   //if (store.authentication.userData.role === "Admin Partner") delete columns[5];
 

From cd3d61d5f5a61cb7fe9dc05f315f99d0a1c34828 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Tue, 24 May 2022 00:59:01 +0700
Subject: [PATCH 32/36] feat: add column partner fee in detail product role
 admin

---
 src/component/ProductComponent.js  |   2 +
 src/pages/Product/ProductDetail.js | 379 +++++++++++++++--------------
 2 files changed, 196 insertions(+), 185 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index a371bf5..550485b 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -136,6 +136,7 @@ export const ProductComponent = observer((props) => {
     {
       title: "Tindakan",
       key: "action",
+      fixed: 'right',
       render: (text, record) => (
         <Button
           onClick={async () => {
@@ -303,6 +304,7 @@ export const ProductComponent = observer((props) => {
             textAlign: "center",
             width: store.ui.mediaQuery.isMobile ? 250 : "",
           }}
+          scroll={role === "Admin Partner" ? false : { x: 1300 }}
           columns={columns}
           dataSource={
             store.authentication.userData.role === "Admin Partner"
diff --git a/src/pages/Product/ProductDetail.js b/src/pages/Product/ProductDetail.js
index caa71a8..17fceea 100644
--- a/src/pages/Product/ProductDetail.js
+++ b/src/pages/Product/ProductDetail.js
@@ -57,30 +57,39 @@ export const ProductDetail = observer(() => {
       dataIndex: "mark_up_price",
       key: "mark_up_price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Price",
       dataIndex: "price",
       key: "price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Biaya Admin",
       dataIndex: "admin_price",
       key: "admin_price",
       render: (text) =>
-          new Intl.NumberFormat("id-ID", {
-            style: "currency",
-            currency: "IDR",
-          }).format(text),
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
+    }, {
+      title: "Partner fee",
+      dataIndex: "partner_fee",
+      key: "partner_fee",
+      render: (text) =>
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Tanggal Berlaku",
@@ -88,7 +97,7 @@ export const ProductDetail = observer(() => {
       key: "startDate",
       render: (text) => {
         return (
-            <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "-"}</Text>
+          <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "-"}</Text>
         );
       },
     },
@@ -98,174 +107,174 @@ export const ProductDetail = observer(() => {
       key: "endDate",
       render: (text) => {
         return (
-            <Text>
-              {text ? format(parseISO(text), "dd MMMM yyyy") : "Sampai Sekarang"}
-            </Text>
+          <Text>
+            {text ? format(parseISO(text), "dd MMMM yyyy") : "Sampai Sekarang"}
+          </Text>
         );
       },
     },
   ];
 
   const styleSaldoTitle = store.ui.mediaQuery.isDesktop
-      ? {
-        display: "flex",
-        justifyContent: "center",
-      }
-      : { fontSize: "0.75rem" };
+    ? {
+      display: "flex",
+      justifyContent: "center",
+    }
+    : { fontSize: "0.75rem" };
   const styleSaldoContent = store.ui.mediaQuery.isDesktop
-      ? {
-        fontSize: "1.25rem",
-        display: "flex",
-        justifyContent: "center",
-      }
-      : null;
+    ? {
+      fontSize: "1.25rem",
+      display: "flex",
+      justifyContent: "center",
+    }
+    : null;
 
   return (
-      <div className={["ppob-container"].join(" ")}>
-        <BreadcumbComponent data={routeData} />
-        <Card>
-          <Title strong>Product Detail</Title>
-          <Row style={{ marginBottom: 20 }}>
-            <Col lg={12} xs={24}>
-              <Row>
-                <Col span={12}>
-                  <Text strong>Kode</Text>
-                </Col>
-                <Col span={12}>
-                  <Text>{store.product?.dataDetailProduct?.code}</Text>
-                </Col>
-                <Col span={12}>
-                  <Text strong>Nama Produk</Text>
-                </Col>
-                <Col span={10}>
-                  <Text>{store.product?.dataDetailProduct?.name}</Text>
-                </Col>
-                <Col span={12}>
-                  <Text strong>Supplier</Text>
-                </Col>
-                <Col span={12}>
-                  <Text>{store.product?.dataDetailProduct?.supplier?.name}</Text>
-                </Col>
-                <Col span={12}>
-                  <Text strong>Status</Text>
-                </Col>
-                <Col span={12}>
-                  <Text>{store.product?.dataDetailProduct?.status}</Text>
-                </Col>
-              </Row>
-            </Col>
-          </Row>
-          <Row>
-            <Col span={24}>
-              <div>
-                <Title strong level={3}>
-                  Product Price History
-                </Title>
-                {store.ui.mediaQuery.isDesktop && (
-                    <Table
-                        columns={columns}
-                        dataSource={store.product.dataPriceHistory}
-                        bordered
-                        pagination={{
-                          pageSize: store.product.pageSizePriceHistory,
-                          total: store.product.totalDataPriceHistory,
-                          current: store.product.pagePriceHistory + 1,
-                          showSizeChanger: true,
-                          simple: false,
-                        }}
-                        onChange={async (page) => {
-                          let pageNumber = page.current;
-                          store.product.pageSizePriceHistory = page.pageSize;
-                          store.product.pagePriceHistory = pageNumber - 1;
-                          modalLoader.setLoading(true);
-                          await store.product.getPriceHistoryByProduct(id);
-                          modalLoader.setLoading(false);
-                        }}
-                    />
-                )}
-                {store.ui.mediaQuery.isMobile && (
-                    <List
-                        itemLayout="horizontal"
-                        position={"top"}
-                        pagination={{
-                          onChange: async (page, pageSize) => {
-                            store.product.pageSizePriceHistory = pageSize;
-                            store.product.pagePriceHistory = page - 1;
-                            modalLoader.setLoading(true);
-                            await store.product.getPriceHistoryByProduct(id);
-                            modalLoader.setLoading(false);
-                          },
-                          pageSize: store.product.pageSizePriceHistory,
-                          total: store.product.totalDataPriceHistory,
-                          current: store.product.pagePriceHistory + 1,
-                          style: { marginBottom: "1rem", marginRight: "1rem" },
-                        }}
-                        dataSource={store.product.dataPriceHistory}
-                        style={{ padding: 0 }}
-                        renderItem={(item) => {
-                          return (
-                              <div>
-                                <List.Item
-                                    key={item.id}
-                                    style={{
-                                      backgroundColor: "#ffffff",
-                                      paddingTop: 0,
-                                      paddingBottom: 0,
-                                      display: "flex",
-                                      flexDirection: "row",
-                                      alignItems: "center",
-                                      justifyContent: "center",
-                                    }}
-                                >
-                                  <List.Item.Meta
-                                      className={[""].join(" ")}
-                                      //title={item.mark_up_price}
-                                      description={
-                                        <div style={{}}>
-                                          <p>
-                                            <small>
-                                              Markup Price :{" "}
-                                              {new Intl.NumberFormat("id-ID", {
-                                                style: "currency",
-                                                currency: "IDR",
-                                              }).format(item.mark_up_price)}
-                                            </small>{" "}
-                                            <br />
-                                            <small>
-                                              Price:{" "}
-                                              {new Intl.NumberFormat("id-ID", {
-                                                style: "currency",
-                                                currency: "IDR",
-                                              }).format(item.price)}
-                                            </small>{" "}
-                                            <br />
-                                            <small>
-                                              {" "}
-                                              Tanggal Berlaku :
-                                              {item.startDate
-                                                  ? format(
-                                                      parseISO(item.startDate),
-                                                      "dd MMMM yyyy"
-                                                  )
-                                                  : "-"}
-                                            </small>{" "}
-                                            <br />
-                                            <small>
-                                              Tanggal Berakhir :{" "}
-                                              {item.endDate
-                                                  ? format(
-                                                      parseISO(item.endDate),
-                                                      "dd MMMM yyyy"
-                                                  )
-                                                  : "Sampai Sekarang"}
-                                            </small>{" "}
-                                            <br />
-                                          </p>
-                                          <p></p>
-                                        </div>
-                                      }
-                                  />
-                                  {/* <div style={{ marginRight: 16 }}>
+    <div className={["ppob-container"].join(" ")}>
+      <BreadcumbComponent data={routeData} />
+      <Card>
+        <Title strong>Product Detail</Title>
+        <Row style={{ marginBottom: 20 }}>
+          <Col lg={12} xs={24}>
+            <Row>
+              <Col span={12}>
+                <Text strong>Kode</Text>
+              </Col>
+              <Col span={12}>
+                <Text>{store.product?.dataDetailProduct?.code}</Text>
+              </Col>
+              <Col span={12}>
+                <Text strong>Nama Produk</Text>
+              </Col>
+              <Col span={10}>
+                <Text>{store.product?.dataDetailProduct?.name}</Text>
+              </Col>
+              <Col span={12}>
+                <Text strong>Supplier</Text>
+              </Col>
+              <Col span={12}>
+                <Text>{store.product?.dataDetailProduct?.supplier?.name}</Text>
+              </Col>
+              <Col span={12}>
+                <Text strong>Status</Text>
+              </Col>
+              <Col span={12}>
+                <Text>{store.product?.dataDetailProduct?.status}</Text>
+              </Col>
+            </Row>
+          </Col>
+        </Row>
+        <Row>
+          <Col span={24}>
+            <div>
+              <Title strong level={3}>
+                Product Price History
+              </Title>
+              {store.ui.mediaQuery.isDesktop && (
+                <Table
+                  columns={columns}
+                  dataSource={store.product.dataPriceHistory}
+                  bordered
+                  pagination={{
+                    pageSize: store.product.pageSizePriceHistory,
+                    total: store.product.totalDataPriceHistory,
+                    current: store.product.pagePriceHistory + 1,
+                    showSizeChanger: true,
+                    simple: false,
+                  }}
+                  onChange={async (page) => {
+                    let pageNumber = page.current;
+                    store.product.pageSizePriceHistory = page.pageSize;
+                    store.product.pagePriceHistory = pageNumber - 1;
+                    modalLoader.setLoading(true);
+                    await store.product.getPriceHistoryByProduct(id);
+                    modalLoader.setLoading(false);
+                  }}
+                />
+              )}
+              {store.ui.mediaQuery.isMobile && (
+                <List
+                  itemLayout="horizontal"
+                  position={"top"}
+                  pagination={{
+                    onChange: async (page, pageSize) => {
+                      store.product.pageSizePriceHistory = pageSize;
+                      store.product.pagePriceHistory = page - 1;
+                      modalLoader.setLoading(true);
+                      await store.product.getPriceHistoryByProduct(id);
+                      modalLoader.setLoading(false);
+                    },
+                    pageSize: store.product.pageSizePriceHistory,
+                    total: store.product.totalDataPriceHistory,
+                    current: store.product.pagePriceHistory + 1,
+                    style: { marginBottom: "1rem", marginRight: "1rem" },
+                  }}
+                  dataSource={store.product.dataPriceHistory}
+                  style={{ padding: 0 }}
+                  renderItem={(item) => {
+                    return (
+                      <div>
+                        <List.Item
+                          key={item.id}
+                          style={{
+                            backgroundColor: "#ffffff",
+                            paddingTop: 0,
+                            paddingBottom: 0,
+                            display: "flex",
+                            flexDirection: "row",
+                            alignItems: "center",
+                            justifyContent: "center",
+                          }}
+                        >
+                          <List.Item.Meta
+                            className={[""].join(" ")}
+                            //title={item.mark_up_price}
+                            description={
+                              <div style={{}}>
+                                <p>
+                                  <small>
+                                    Markup Price :{" "}
+                                    {new Intl.NumberFormat("id-ID", {
+                                      style: "currency",
+                                      currency: "IDR",
+                                    }).format(item.mark_up_price)}
+                                  </small>{" "}
+                                  <br />
+                                  <small>
+                                    Price:{" "}
+                                    {new Intl.NumberFormat("id-ID", {
+                                      style: "currency",
+                                      currency: "IDR",
+                                    }).format(item.price)}
+                                  </small>{" "}
+                                  <br />
+                                  <small>
+                                    {" "}
+                                    Tanggal Berlaku :
+                                    {item.startDate
+                                      ? format(
+                                        parseISO(item.startDate),
+                                        "dd MMMM yyyy"
+                                      )
+                                      : "-"}
+                                  </small>{" "}
+                                  <br />
+                                  <small>
+                                    Tanggal Berakhir :{" "}
+                                    {item.endDate
+                                      ? format(
+                                        parseISO(item.endDate),
+                                        "dd MMMM yyyy"
+                                      )
+                                      : "Sampai Sekarang"}
+                                  </small>{" "}
+                                  <br />
+                                </p>
+                                <p></p>
+                              </div>
+                            }
+                          />
+                          {/* <div style={{ marginRight: 16 }}>
                             <p
                               style={{
                                 fontSize: 9,
@@ -286,18 +295,18 @@ export const ProductDetail = observer(() => {
                               </Tag>
                             </p>
                           </div> */}
-                                </List.Item>
-                                <Divider plain style={{ margin: 0 }} />
-                              </div>
-                          );
-                        }}
-                    />
-                )}
-              </div>
-            </Col>
-          </Row>
-          <div />
-        </Card>
-      </div>
+                        </List.Item>
+                        <Divider plain style={{ margin: 0 }} />
+                      </div>
+                    );
+                  }}
+                />
+              )}
+            </div>
+          </Col>
+        </Row>
+        <div />
+      </Card>
+    </div>
   );
 });

From c330f65612935a9d1f74216e6977dbe1fae63869 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Tue, 24 May 2022 16:39:54 +0700
Subject: [PATCH 33/36] feat: wording fee jual in product list

---
 src/component/ProductComponent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 550485b..311d64a 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -101,7 +101,7 @@ export const ProductComponent = observer((props) => {
         }).format(text),
     },
     {
-      title: "Partner fee",
+      title: "Fee Jual",
       dataIndex: "partner_fee",
       key: "partner_fee",
       render: (text) =>

From 5fea6f568d56c4ebb4ea550f21978605caad8d11 Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Tue, 24 May 2022 21:06:34 +0700
Subject: [PATCH 34/36] feat: create table in profile

---
 src/pages/Profile/Profile.js | 264 +++++++++++++++++++++++++++++------
 src/store/transaction.js     |  41 ++++--
 2 files changed, 255 insertions(+), 50 deletions(-)

diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 2f860b3..4ff74d0 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -66,13 +66,14 @@ export const Profile = observer(() => {
       await Promise.allSettled([
         store.authentication.getProfile(),
         store.transaction.getDataHistoryTransaction(),
+        store.transaction.getDataHistoryCheckBill(),
       ]);
       await store.transaction.getDataHistoryTopUpProfile(
         store.authentication.profileData?.id
       );
       modalLoader.setLoading(false);
     })();
-  }, []);
+  }, [store.transaction.filterStart, store.transaction.filterEnd]);
 
   const handleRemoveFilter = async () => {
     store.transaction.filterStart = null;
@@ -81,11 +82,11 @@ export const Profile = observer(() => {
     setFilterStart([]);
     setFilterEnd([]);
     //await store.transaction.getDataHistoryTransaction();
-    actionFilter === true
-      ? await store.transaction.getDataHistoryTopUpProfile(
-          store.authentication.profileData?.id
-        )
-      : await store.transaction.getDataHistoryTransaction();
+    // actionFilter === true
+    //   ? await store.transaction.getDataHistoryTopUpProfile(
+    //     store.authentication.profileData?.id
+    //   )
+    //   : await store.transaction.getDataHistoryTransaction();
     store.transaction.visibleModalFilterTransaction = false;
     setAction(false);
   };
@@ -95,11 +96,11 @@ export const Profile = observer(() => {
     //form.resetFields();
     store.transaction.filterEnd = null;
     store.transaction.visibleModalFilterTransaction = false;
-    actionFilter === true
-      ? await store.transaction.getDataHistoryTopUpProfile(
-          store.authentication.profileData?.id
-        )
-      : await store.transaction.getDataHistoryTransaction();
+    // actionFilter === true
+    //   ? await store.transaction.getDataHistoryTopUpProfile(
+    //     store.authentication.profileData?.id
+    //   )
+    //   : await store.transaction.getDataHistoryTransaction();
     setAction(false);
     //await store.transaction.getDataHistoryTransaction();
   };
@@ -113,14 +114,14 @@ export const Profile = observer(() => {
       "YYYY-MM-DD HH:mm:ss"
     );
     modalLoader.setLoading(true);
-    actionFilter === true
-      ? await store.transaction.getDataHistoryTopUpProfile(
-          store.authentication.profileData?.id
-        )
-      : await store.transaction.getDataHistoryTransaction();
+    // actionFilter === true
+    //   ? await store.transaction.getDataHistoryTopUpProfile(
+    //     store.authentication.profileData?.id
+    //   )
+    //   : await store.transaction.getDataHistoryTransaction();
     modalLoader.setLoading(false);
-    store.transaction.filterStart = null;
-    store.transaction.filterEnd = null;
+    // store.transaction.filterStart = null;
+    // store.transaction.filterEnd = null;
     //form.resetFields();
     store.transaction.visibleModalFilterTransaction = false;
     setAction(false);
@@ -194,15 +195,15 @@ export const Profile = observer(() => {
               record.status === 1
                 ? "success"
                 : record.status === 0
-                ? "warning"
-                : "processing"
+                  ? "warning"
+                  : "processing"
             }
           >
             {record.status === 1
               ? "Sukses"
               : record.status === 0
-              ? "Dalam Proses"
-              : "Gagal"}
+                ? "Dalam Proses"
+                : "Gagal"}
           </Tag>
         );
       },
@@ -266,18 +267,93 @@ export const Profile = observer(() => {
       },
     },
   ];
+
+  const columnBill = [
+    {
+      title: "Code Product",
+      dataIndex: "product_code",
+      key: "product_code",
+    },
+    {
+      title: "Admin Price",
+      dataIndex: "admin_price",
+      key: "admin_price",
+      render: (text) =>
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
+    },
+    {
+      title: "Tagihan BPJS",
+      dataIndex: "amount",
+      key: "amount",
+    },
+    {
+      title: "Nomor tujuan",
+      dataIndex: "destination",
+      key: "destination",
+    },
+    {
+      title: "Transaction Id",
+      dataIndex: "trx_id",
+      key: "trx_id",
+    },
+    {
+      title: "Partner Transaction Id",
+      dataIndex: "partner_trx_id",
+      key: "partner_trx_id",
+    },
+    {
+      title: "Tanggal Transaksi",
+      dataIndex: "createdAt",
+      key: "createdAt",
+      render: (text, record) => {
+        return (
+          <Text>
+            {format(parseISO(record.createdAt), "dd MMMM yyyy HH:mm:ss")}
+          </Text>
+        );
+      },
+    },
+    {
+      title: "Status",
+      dataIndex: "status",
+      key: "status",
+      render: (text, record) => {
+        console.log("status", record)
+        return (
+          <Tag
+            color={
+              record.status === "SUCCESS"
+                ? "success"
+                : record.status === 0
+                  ? "warning"
+                  : "processing"
+            }
+          >
+            {record.status === "SUCCESS"
+              ? "Sukses"
+              : record.status === 0
+                ? "Dalam Proses"
+                : "Gagal"}
+          </Tag>
+        );
+      },
+    },
+  ];
   const styleSaldoTitle = store.ui.mediaQuery.isDesktop
     ? {
-        display: "flex",
-        justifyContent: "center",
-      }
+      display: "flex",
+      justifyContent: "center",
+    }
     : { fontSize: "0.75rem" };
   const styleSaldoContent = store.ui.mediaQuery.isDesktop
     ? {
-        fontSize: "1.25rem",
-        display: "flex",
-        justifyContent: "center",
-      }
+      fontSize: "1.25rem",
+      display: "flex",
+      justifyContent: "center",
+    }
     : null;
 
   const handleSubmit = async (id, data) => {
@@ -301,8 +377,8 @@ export const Profile = observer(() => {
       <BreadcumbComponent
         data={
           store.authentication.userData.role === "Admin" ||
-          store.authentication.userData.role === "Admin Partner" ||
-          store.authentication.userData.role === "Customer Service"
+            store.authentication.userData.role === "Admin Partner" ||
+            store.authentication.userData.role === "Customer Service"
             ? routeData
             : dataRoute
         }
@@ -605,8 +681,6 @@ export const Profile = observer(() => {
                       dataSource={store.transaction.dataHistoryTransaction}
                       pagination={{
                         onChange: async (page, pageSize) => {
-                          console.log(page, "Page");
-                          console.log(pageSize, "Page size");
                           store.transaction.page = pageSize;
                           store.transaction.page = page - 1;
                           modalLoader.setLoading(true);
@@ -657,15 +731,15 @@ export const Profile = observer(() => {
                                               item.status === 1
                                                 ? "success"
                                                 : item.status === 0
-                                                ? "warning"
-                                                : "processing"
+                                                  ? "warning"
+                                                  : "processing"
                                             }
                                           >
                                             {item.status === 1
                                               ? "Sukses"
                                               : item.status === 0
-                                              ? "Dalam Proses"
-                                              : "Gagal"}
+                                                ? "Dalam Proses"
+                                                : "Gagal"}
                                           </Tag>
                                         }
                                       </small>{" "}
@@ -704,6 +778,118 @@ export const Profile = observer(() => {
                   </div>
                 )}
               </TabPane>
+              <TabPane tab="Riwayat Check Bill" key="3">
+                <Button
+                  style={{ marginBottom: "1rem", marginLeft: 5 }}
+                  onClick={() => {
+                    store.transaction.visibleModalFilterTransaction = true;
+                    store.transaction.page = 0;
+                    setAction(true);
+                  }}
+                >
+                  <FilterOutlined />
+                  Filter
+                </Button>
+                {store.ui.mediaQuery.isDesktop && (
+                  <Table
+                    key="1"
+                    hasEmpty
+                    columns={columnBill}
+                    dataSource={store.transaction.dataHistorybillProfile}
+                    bordered
+                    pagination={{
+                      pageSize: store.transaction.pageSize,
+                      total: store.transaction.total_dataHistorybillProfile,
+                      current: store.transaction.page + 1,
+                      showSizeChanger: true,
+                      simple: false,
+                    }}
+                    onChange={async (page) => {
+                      let pageNumber = page.current;
+                      store.transaction.pageSize = page.pageSize;
+                      store.transaction.page = pageNumber - 1;
+                      modalLoader.setLoading(true);
+                      await store.transaction.getDataHistoryCheckBill();
+                      modalLoader.setLoading(false);
+                    }}
+                  />
+                )}
+                {store.ui.mediaQuery.isMobile && (
+                  <div>
+                    <List
+                      itemLayout="horizontal"
+                      position={"top"}
+                      dataSource={store.transaction.dataHistorybillProfile}
+                      pagination={{
+                        onChange: async (page, pageSize) => {
+                          console.log(page, "Page");
+                          console.log(pageSize, "Page size");
+                          store.transaction.pageSize = pageSize;
+                          store.transaction.page = page - 1;
+                          modalLoader.setLoading(true);
+                          await store.transaction.getDataHistoryCheckBill();
+                          modalLoader.setLoading(false);
+                        },
+                        pageSize: store.transaction.pageSize,
+                        total: store.transaction.total_dataHistorybillProfile,
+                        current: store.transaction.page + 1,
+                        style: { marginBottom: "1rem", marginRight: "1rem" },
+                      }}
+                      style={{ padding: 0 }}
+                      renderItem={(item) => {
+                        return (
+                          <div>
+                            <List.Item
+                              key={item.id}
+                              style={{
+                                backgroundColor: "#ffffff",
+                                paddingTop: 0,
+                                paddingBottom: 0,
+                                display: "flex",
+                                flexDirection: "row",
+                                alignItems: "center",
+                                justifyContent: "center",
+                              }}
+                            >
+                              <List.Item.Meta
+                                className={["cariparkir-container"].join(" ")}
+                                title={item.id}
+                                description={
+                                  <div style={{}}>
+                                    <p>
+                                      <small>
+                                        Pengirim : {item.sender_name}
+                                      </small>{" "}
+                                      <br />
+                                      <small>
+                                        Amount :{" "}
+                                        {new Intl.NumberFormat("id-ID", {
+                                          style: "currency",
+                                          currency: "IDR",
+                                        }).format(item.amount || 0)}
+                                      </small>{" "}
+                                      <br />
+                                      <small>
+                                        Transaction Date :{" "}
+                                        {format(
+                                          parseISO(item.transaction_date),
+                                          "dd-MM-yyyy"
+                                        )}
+                                      </small>{" "}
+                                      <br />
+                                    </p>
+                                  </div>
+                                }
+                              />
+                            </List.Item>
+                            <Divider plain style={{ margin: 0 }} />
+                          </div>
+                        );
+                      }}
+                    />
+                  </div>
+                )}
+              </TabPane>
             </Tabs>
           </Col>
         </Row>
@@ -719,8 +905,8 @@ export const Profile = observer(() => {
           store.transaction.visibleModalFilterTransaction = false;
           actionFilter === true
             ? await store.transaction.getDataHistoryTopUpProfile(
-                store.authentication.profileData?.id
-              )
+              store.authentication.profileData?.id
+            )
             : await store.transaction.getDataHistoryTransaction();
         }}
       >
diff --git a/src/store/transaction.js b/src/store/transaction.js
index da74f34..25f3910 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -11,8 +11,8 @@ export class Transaction {
   filterSubCategory = null;
   visibleModalProduct = false;
   visibleModalTransaction = false;
-  pageSizeDetail=10;
-  pageDetail=0
+  pageSizeDetail = 10;
+  pageDetail = 0
 
   pageCategories = 0;
   pageSizeCategories = 10;
@@ -40,15 +40,18 @@ export class Transaction {
   dataHistoryTopUp = [];
   total_dataHistoryTopUp = 0;
 
+  dataHistorybillProfile = [];
+  total_dataHistorybillProfile = 0;
+
   dataHistoryTopUpProfile = [];
   total_dataHistoryTopUpProfile = 0;
 
   dataTransaction = [];
   dataTransactionB2B = [];
   dataTransactionPartner = [];
-  total_dataDetailHistoryTransactionDetailUser=0;
+  total_dataDetailHistoryTransactionDetailUser = 0;
+
 
-  
   //filter
   visibleModalFilterTransaction = false;
   filterStart = null;
@@ -130,6 +133,23 @@ export class Transaction {
     }
   }
 
+  async getDataHistoryCheckBill() {
+    try {
+      const response = await http.get(
+        `/transaction/check-bill-history`
+      );
+      // const response = await http.get(
+      //   `/transaction/check-bill-history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}`
+      // );
+      console.log("bill", response);
+      this.dataHistorybillProfile = response.body.data ?? [];
+      this.total_dataHistorybillProfile = response?.body?.count ?? 0;
+      console.log(this.total_dataHistorybillProfile)
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
   async getDataHistoryTransaction() {
     try {
       const response = await http.get(
@@ -138,7 +158,6 @@ export class Transaction {
       console.log(response);
       this.dataHistoryTransaction = response.body.data ?? [];
       this.total_dataHistoryTransaction = response?.body?.count ?? 0;
-      console.log(this.total_dataHistoryTransaction)
     } catch (e) {
       console.error(e);
     }
@@ -147,7 +166,7 @@ export class Transaction {
   async getDetailHistoryTransaction(id) {
     try {
       const response = await http.get(`/transaction/history-user/${id}?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}`);
-      console.log(response,'Data Trans');
+      console.log(response, 'Data Trans');
       this.dataDetailHistoryTransactionDetailUser = response.body.data ?? [];
       this.total_data = response?.body?.count ?? 0;
     } catch (e) {
@@ -160,7 +179,7 @@ export class Transaction {
       const response = await http.get(
         `/transaction/history-deposit?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
       );
-      console.log(response,'get data history')
+      console.log(response, 'get data history')
       this.dataHistoryTopUp = response.body.data ?? [];
       this.total_dataHistoryTopUp = response?.body?.count ?? 0;
     } catch (e) {
@@ -173,7 +192,7 @@ export class Transaction {
       const response = await http.get(
         `/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
       );
-      console.log(response,'get data history Profile')
+      console.log(response, 'get data history Profile')
       this.dataHistoryTopUpProfile = response.body.data ?? [];
       this.total_dataHistoryTopUpProfile = response?.body?.count ?? 0;
     } catch (e) {
@@ -192,9 +211,9 @@ export class Transaction {
   }
 
   async buyProduct(data) {
-      const response = await http.post("/transaction/order").send(data);
-      console.log(response,'dari store')
-      return response;
+    const response = await http.post("/transaction/order").send(data);
+    console.log(response, 'dari store')
+    return response;
   }
 
   async buyProd(data) {

From 166e8ecde5f00107391dacbcef64606ca1ec775f Mon Sep 17 00:00:00 2001
From: rahman <ronierahman17@gmail.com>
Date: Wed, 25 May 2022 01:24:18 +0700
Subject: [PATCH 35/36] fixing wording

---
 src/pages/Profile/Profile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 4ff74d0..28614d4 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -285,7 +285,7 @@ export const Profile = observer(() => {
         }).format(text),
     },
     {
-      title: "Tagihan BPJS",
+      title: "Tagihan Postpaid",
       dataIndex: "amount",
       key: "amount",
     },

From e12b530e7dba7dd9a1dcd0edeeab0460f7c592c2 Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Mon, 20 Jun 2022 13:53:14 +0700
Subject: [PATCH 36/36] - add code in detail user in role admin

---
 src/pages/Membership/DetailUser.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index cb08660..98ff298 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -445,6 +445,7 @@ export const DetailUser = observer(() => {
                     onClick={() => {
                       setInitialData({
                         id: store.membership.dataDetail.id,
+                        code: store.membership.dataDetail.partner.code,
                         name: store.membership.dataDetail.userDetail.name,
                         username: store.membership.dataDetail.username,
                         identity_number:
@@ -558,6 +559,14 @@ export const DetailUser = observer(() => {
                   {store.authentication.dataProfit.userDetail?.identity_number}
                 </Text>
               </Col>
+              <Col span={12}>
+                <Text strong>Code</Text>
+              </Col>
+              <Col span={12}>
+                <Text>
+                  {store.authentication.dataProfit.partner?.code}
+                </Text>
+              </Col>
               <Col span={12}>
                 <Text strong>Status</Text>
               </Col>