diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js
index c9f6a3e..70fc4f1 100644
--- a/src/component/CategoryComponent.js
+++ b/src/component/CategoryComponent.js
@@ -40,7 +40,7 @@ export const CategoryComponent = observer((props) => {
       key: "code",
     },
     {
-      title: "Category Name",
+      title: "Kategori",
       dataIndex: "name",
       key: "name",
     },
diff --git a/src/component/CommissionComponent.js b/src/component/CommissionComponent.js
index 94d7abf..d4c7584 100644
--- a/src/component/CommissionComponent.js
+++ b/src/component/CommissionComponent.js
@@ -23,7 +23,7 @@ export const CommissionComponent = observer((props) => {
 
   const columns = [
     {
-      title: "Name",
+      title: "Nama",
       dataIndex: "name",
       key: "name",
     },
@@ -45,7 +45,7 @@ export const CommissionComponent = observer((props) => {
   ];
 
   if (store.authentication.userData.role === "Customer Service") columns.pop();
-  
+
   const handleCancel = () => {
     setIdData("");
     store.commission.visibleModalCommission = false;
diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js
index ed31f0a..b4ea10f 100644
--- a/src/component/PartnerComponent.js
+++ b/src/component/PartnerComponent.js
@@ -71,7 +71,7 @@ export const PartnerComponent = observer((props) => {
 
   const columns = [
     {
-      title: "Name",
+      title: "Nama",
       dataIndex: "name",
       key: "name",
     },
@@ -123,7 +123,7 @@ export const PartnerComponent = observer((props) => {
       ),
     },
   ];
-  
+
   if (store.authentication.userData.role === "Customer Service") columns.pop();
 
   const deleteData = async (id) => {
diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index ccbab36..9b21bda 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -241,10 +241,10 @@ export const ProductComponent = observer((props) => {
         color: "#fff",
       }}
     >
-      Remove Filter
+      Hapus Filter
     </Button>,
     <Button key={"cancel"} onClick={handleCancelFilter}>
-      Cancel
+      Batal
     </Button>,
     <Button
       key={"submit"}
@@ -254,7 +254,7 @@ export const ProductComponent = observer((props) => {
         color: "#fff",
       }}
     >
-      Apply
+      Terapkan
     </Button>,
   ];
 
diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js
index 1feca78..1abbf07 100644
--- a/src/component/SubcategoryComponent.js
+++ b/src/component/SubcategoryComponent.js
@@ -42,17 +42,17 @@ export const SubcategoryComponent = observer((props) => {
 
   const columns = [
     {
-      title: "Code",
+      title: "Kode",
       dataIndex: "code",
       key: "code",
     },
     {
-      title: "Sub Category Name",
+      title: "Sub Kategori",
       dataIndex: "name",
       key: "name",
     },
     {
-      title: "Category",
+      title: "Kategori",
       dataIndex: "categoryName",
       key: "categoryName",
     },
diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js
index 874539d..a715ef8 100644
--- a/src/component/SupplierComponent.js
+++ b/src/component/SupplierComponent.js
@@ -65,7 +65,7 @@ export const SupplierComponent = observer((props) => {
 
   const columns = [
     {
-      title: "Name",
+      title: "Nama",
       dataIndex: "name",
       key: "name",
     },
@@ -131,7 +131,7 @@ export const SupplierComponent = observer((props) => {
   ];
 
   if (store.authentication.userData.role === "Customer Service") columns.pop();
-  
+
   const deleteData = async (id) => {
     try {
       console.log(id);
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 49882b5..a77fe6c 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -177,7 +177,7 @@ export const DetailUser = observer(() => {
         }).format(text),
     },
     {
-      title: "Transaction Date",
+      title: "Tanggal Transaksi",
       dataIndex: "transaction_date",
       key: "transaction_date",
       render: (text, record) => {
@@ -197,7 +197,7 @@ export const DetailUser = observer(() => {
       key: "name",
     },
     {
-      title: "Price",
+      title: "Harga",
       dataIndex: "price",
       key: "price",
       render: (text) =>
@@ -383,10 +383,10 @@ export const DetailUser = observer(() => {
         color: "#fff",
       }}
     >
-      Remove Filter
+      Hapus Filter
     </Button>,
     <Button key={"cancel"} onClick={handleCancelFilter}>
-      Cancel
+      Batal
     </Button>,
     <Button
       key={"submit"}
@@ -396,7 +396,7 @@ export const DetailUser = observer(() => {
         color: "#fff",
       }}
     >
-      Apply
+      Terapkan
     </Button>,
   ];
   return (
@@ -536,12 +536,12 @@ export const DetailUser = observer(() => {
               <Col span={12}>
                 <Text>{store.authentication.dataProfit.username}</Text>
               </Col>
-              <Col span={12}>
+              {/* <Col span={12}>
                 <Text strong>Role</Text>
               </Col>
               <Col span={12}>
                 <Text>{store.authentication.dataProfit.roles?.name}</Text>
-              </Col>
+              </Col> */}
               <Col span={12}>
                 <Text strong>Phone Number</Text>
               </Col>
@@ -585,7 +585,7 @@ export const DetailUser = observer(() => {
                               ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}`
                               : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
                           }
-                          style={{ width: "10vw" }}
+                          style={{ width: "8vw" }}
                         />
                       </Text>
                     </Col>
@@ -605,7 +605,7 @@ export const DetailUser = observer(() => {
                                           ? `${appConfig.apiUrl}/config/image/${item}`
                                           : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
                                       }
-                                      style={{ width: "10vw", marginRight: 15 }}
+                                      style={{ width: "8vw", marginRight: 10 }}
                                     />
                                   )
                                 )
@@ -734,7 +734,7 @@ export const DetailUser = observer(() => {
         <Row>
           <Col span={24}>
             <Tabs defaultActiveKey="1">
-              <TabPane tab="History Top Up" key="1">
+              <TabPane tab="Riwayat Top Up" key="1">
                 {store.ui.mediaQuery.isDesktop && (
                   <div>
                     <Button
@@ -851,7 +851,7 @@ export const DetailUser = observer(() => {
                   </div>
                 )}
               </TabPane>
-              <TabPane tab="History Transaction" key="2">
+              <TabPane tab="Riwayat Transaksi" key="2">
                 {store.ui.mediaQuery.isDesktop && (
                   <div>
                     <Button
diff --git a/src/pages/Membership/Konfirmasi.js b/src/pages/Membership/Konfirmasi.js
index 6e4f80e..b0cdc78 100644
--- a/src/pages/Membership/Konfirmasi.js
+++ b/src/pages/Membership/Konfirmasi.js
@@ -72,7 +72,7 @@ export const Konfirmasi = observer(() => {
 
   const columns = [
     {
-      title: "Name",
+      title: "Nama",
       dataIndex: "username",
       key: "username",
     },
@@ -98,8 +98,8 @@ export const Konfirmasi = observer(() => {
       title: "Foto Toko",
       render: (text, record) =>
         record.roles?.name !== "Sales" &&
-        record.user_detail?.image_store !== "[]" &&
-        record.user_detail?.image_store !== '""' ? (
+        (record.user_detail?.image_store !== "[]" ||
+        record.user_detail?.image_store !== '""') ? (
           <Button
             onClick={async () => {
               setToko(record);
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 219449d..edab4a2 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -71,7 +71,8 @@ export const Membership = observer(() => {
   }, []);
 
   const getData = async () => {
-    store.authentication.userData.role === "Admin"
+    store.authentication.userData.role === "Admin" ||
+    store.authentication.userData.role === "Customer Service"
       ? await store.membership.getData()
       : await store.membership.getDataBySuperior();
   };
@@ -111,10 +112,10 @@ export const Membership = observer(() => {
         color: "#fff",
       }}
     >
-      Remove Filter
+      Hapus Filter
     </Button>,
     <Button key={"cancel"} onClick={handleCancelFilter}>
-      Cancel
+      Batal
     </Button>,
     <Button
       key={"submit"}
@@ -124,7 +125,7 @@ export const Membership = observer(() => {
         color: "#fff",
       }}
     >
-      Apply
+      Terapkan
     </Button>,
   ];
   const handleCancelTransaction = () => {
@@ -225,6 +226,7 @@ export const Membership = observer(() => {
     },
   ];
 
+  if (store.authentication.userData.role === "Customer Service") columns.pop();
   const routeData = [
     {
       route: LINKS.HOME,
@@ -362,16 +364,18 @@ export const Membership = observer(() => {
               key="1"
               hasEmpty
               columns={columns}
-              style={{ cursor: "pointer" }}
+              //style={{ cursor: "pointer" }}
               dataSource={
-                store.authentication.userData.role === "Admin"
+                store.authentication.userData.role === "Admin" ||
+                store.authentication.userData.role === "Customer Service"
                   ? store.membership.dataMember
                   : store.membership.data
               }
               pagination={{
                 pageSize: store.membership.pageSize,
                 total:
-                  store.authentication.userData.role === "Admin"
+                  store.authentication.userData.role === "Admin" ||
+                  store.authentication.userData.role === "Customer Service"
                     ? store.membership.dataTotal
                     : store.membership.total_data,
                 current: store.membership.page + 1,
@@ -404,14 +408,16 @@ export const Membership = observer(() => {
                 },
                 pageSize: store.membership.pageSize,
                 total:
-                  store.authentication.userData.role === "Admin"
+                  store.authentication.userData.role === "Admin" ||
+                  store.authentication.userData.role === "Customer Service"
                     ? store.membership.dataTotal
                     : store.membership.total_data,
                 current: store.membership.page + 1,
                 style: { marginBottom: "1rem", marginRight: "1rem" },
               }}
               dataSource={
-                store.authentication.userData.role === "Admin"
+                store.authentication.userData.role === "Admin" ||
+                store.authentication.userData.role === "Customer Service"
                   ? store.membership.dataMember
                   : store.membership.data
               }
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index f3fb240..1c0d954 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -67,7 +67,7 @@ export const Payback = observer(() => {
 
   const columns = [
     {
-      title: "Name",
+      title: "Nama",
       dataIndex: "userData_name",
       key: "userData_name",
     },
@@ -254,10 +254,10 @@ export const Payback = observer(() => {
         color: "#fff",
       }}
     >
-      Remove Filter
+      Hapus Filter
     </Button>,
     <Button key={"cancel"} onClick={handleCancelFilter}>
-      Cancel
+      Batal
     </Button>,
     <Button
       key={"submit"}
@@ -267,7 +267,7 @@ export const Payback = observer(() => {
         color: "#fff",
       }}
     >
-      Apply
+      Terapkan
     </Button>,
   ];
   return (
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 1791a57..cc6a0cf 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -84,7 +84,7 @@ export const Profile = observer(() => {
         )
       : await store.transaction.getDataHistoryTransaction();
     store.transaction.visibleModalFilterTransaction = false;
-    setAction(false)
+    setAction(false);
   };
 
   const handleCancelFilter = async () => {
@@ -97,18 +97,18 @@ export const Profile = observer(() => {
           store.authentication.profileData?.id
         )
       : await store.transaction.getDataHistoryTransaction();
-      setAction(false)
+    setAction(false);
     //await store.transaction.getDataHistoryTransaction();
   };
 
   const handleSubmitFilter = async () => {
     const data = form.getFieldsValue();
-    const awal = (store.transaction.filterStart = moment(
-      data.start_date
-    ).format("YYYY-MM-DD HH:mm:ss"));
-    const akhir = (store.transaction.filterEnd = moment(data.end_date).format(
+    store.transaction.filterStart = moment(data.start_date).format(
       "YYYY-MM-DD HH:mm:ss"
-    ));
+    );
+    store.transaction.filterEnd = moment(data.end_date).format(
+      "YYYY-MM-DD HH:mm:ss"
+    );
     modalLoader.setLoading(true);
     actionFilter === true
       ? await store.transaction.getDataHistoryTopUpProfile(
@@ -120,7 +120,7 @@ export const Profile = observer(() => {
     store.transaction.filterEnd = null;
     //form.resetFields();
     store.transaction.visibleModalFilterTransaction = false;
-    setAction(false)
+    setAction(false);
   };
 
   const footerLayoutFilter = [
@@ -132,10 +132,10 @@ export const Profile = observer(() => {
         color: "#fff",
       }}
     >
-      Remove Filter
+      Hapus Filter
     </Button>,
     <Button key={"cancel"} onClick={handleCancelFilter}>
-      Cancel
+      Batal
     </Button>,
     <Button
       key={"submit"}
@@ -145,17 +145,17 @@ export const Profile = observer(() => {
         color: "#fff",
       }}
     >
-      Apply
+      Terapkan
     </Button>,
   ];
   const columns = [
     {
-      title: "Name Produk",
+      title: "Nama Produk",
       dataIndex: "name",
       key: "name",
     },
     {
-      title: "Price",
+      title: "Harga",
       dataIndex: "price",
       key: "price",
       render: (text) =>
@@ -251,7 +251,7 @@ export const Profile = observer(() => {
         }).format(text),
     },
     {
-      title: "Transaction Date",
+      title: "Tanggal Transaksi",
       dataIndex: "transaction_date",
       key: "transaction_date",
       render: (text, record) => {
@@ -314,12 +314,12 @@ export const Profile = observer(() => {
               <Col span={12}>
                 <Text>{store.authentication.profileData?.username}</Text>
               </Col>
-              <Col span={12}>
+              {/* <Col span={12}>
                 <Text strong>Role</Text>
               </Col>
               <Col span={12}>
                 <Text>{store.authentication.profileData.roles?.name}</Text>
-              </Col>
+              </Col> */}
               <Col span={12}>
                 <Text strong>Upline</Text>
               </Col>
@@ -411,7 +411,7 @@ export const Profile = observer(() => {
         <Row>
           <Col span={24}>
             <Tabs defaultActiveKey="1">
-              <TabPane tab="History Top Up" key="1">
+              <TabPane tab="Riwayat Top Up" key="1">
                 <Button
                   style={{ marginBottom: "1rem", marginLeft: 5 }}
                   onClick={() => {
@@ -526,7 +526,7 @@ export const Profile = observer(() => {
                   </div>
                 )}
               </TabPane>
-              <TabPane tab="History Transaction" key="2">
+              <TabPane tab="Riwayat Transaksi" key="2">
                 <Button
                   style={{ marginBottom: "1rem", marginLeft: 5 }}
                   onClick={() => {