Merge branch 'develop' into 'devops-staging'

Develop

See merge request empatnusabangsa/ppob/ppob-frontend!18

src/pages/Membership/DetailUser.js

@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import {Button, Card, Col, message, Row, Space, Table, Tag, Typography,} from "antd";
+import {Button, Card, Col, message, Row, Space, Table, Typography,} from "antd";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {LINKS} from "../../routes/app";
 import {useStore} from "../../utils/useStore";
@@ -104,6 +104,11 @@ export const DetailUser = observer(() => {
       title: "Amount",
       dataIndex: "amount",
       key: "amount",
+      render: (text) =>
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Transaction Date",
@@ -117,19 +122,6 @@ export const DetailUser = observer(() => {
         );
       },
     },
-    {
-      title: "Status",
-      dataIndex: "isActive",
-      key: "isActive",
-      render: (text, record) => (
-          <Tag
-              color={store.membership.dataDetail.isActive === true ? "processing" : "#E3E8EE"}
-              style={{color: "#4F566B"}}
-          >
-            {store.membership.dataDetail.isActive === true ? " ACTIVE" : "INACTIVE"}
-          </Tag>
-      ),
-    },
   ];
 
   const routeData = [
@@ -142,8 +134,8 @@ export const DetailUser = observer(() => {
       name: <span style={{ fontWeight: "bold" }}>Keanggotaan</span>,
     },
     {
-      route: LINKS.USER_DETAIL,
-      name: <span style={{ fontWeight: "bold" }}>Detail Anggota</span>,
+      route: LINKS.USER_DETAIL.replace(":id", id),
+      name: <span style={{fontWeight: "bold"}}>Detail User</span>,
     },
   ];
 
@@ -194,22 +186,19 @@ export const DetailUser = observer(() => {
             </Row>
           </Col>
           <Col lg={12} xs={24}>
-            <Title strong level={3}>Action User Detail</Title>
-            <Space
+            {store.authentication.userData.role === "Admin" && <Title strong level={3}>Action User Detail</Title>}
+            {store.authentication.userData.role === "Admin" && <Space
                 size="middle"
                 align={"center"}
                 wrap={true}
                 style={{textAlign: 'center'}}
             >
-              {store.authentication.userData.role === "Admin" &&
               <Button
                   type={store.membership.dataDetail.isActive === true ? "danger" : "primary"}
                   onClick={() => changeStatus(store.membership.dataDetail.id, store.membership.dataDetail.isActive)}
               >
                 {store.membership.dataDetail.isActive === true ? "Inactive" : "Active"}
               </Button>
-              }
-              {store.authentication.userData.role === "Admin" &&
               <Button
                   onClick={() => {
                     setInitialData({
@@ -225,8 +214,6 @@ export const DetailUser = observer(() => {
               >
                 Edit
               </Button>
-              }
-              {store.authentication.userData.role === "Admin" &&
               <Button
                   onClick={() => {
                     setInitialData({
@@ -242,8 +229,7 @@ export const DetailUser = observer(() => {
               >
                 Ganti Password
               </Button>
-              }
-            </Space>
+            </Space>}
           </Col>
         </Row>
         <Row>

src/pages/Product/ProductDetail.js

@@ -25,7 +25,7 @@ export const ProductDetail = observer(() => {
       name: <span style={{ fontWeight: "bold" }}>Produk</span>,
     },
     {
-      route: LINKS.PRODUCT_DETAIL,
+      route: LINKS.PRODUCT_DETAIL.replace(':id', `${id}`),
       name: <span style={{fontWeight: "bold"}}>Detail Produk</span>,
     },
   ];