diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 3097534..ce05945 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -13,7 +13,9 @@ import {
Tag,
Divider,
Image,
+ Avatar,
} from "antd";
+import { UserOutlined } from "@ant-design/icons";
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
import { LINKS } from "../../routes/app";
import { useStore } from "../../utils/useStore";
@@ -346,69 +348,71 @@ export const DetailUser = observer(() => {
-
+
Name
-
+
{store.authentication.dataProfit.userDetail?.name}
-
+
Username
-
+
{store.authentication.dataProfit.username}
-
+
Role
-
+
{store.authentication.dataProfit.roles?.name}
-
+
Phone Number
-
+
{store.authentication.dataProfit.userDetail?.phone_number}
-
+
Id Number
-
+
{store.authentication.dataProfit.userDetail?.identity_number}
-
+
Status
-
+
{store.authentication.dataProfit.isActive === true
? "Aktif"
: "Inaktif"}
-
- Image identity
+
+ Foto Identitas
-
- Image Store
+
+ Foto Toko
-
+
+
+ src={`${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}`}
+ style={{ width: "10vw" }}
+ />
+
-
-
+
+
+
+
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index eb02367..47a2556 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -12,6 +12,7 @@ import {
Input,
Divider,
List,
+ Image,
Tag,
} from "antd";
import moment from "moment";
@@ -21,6 +22,8 @@ import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite";
import { FilterOutlined } from "@ant-design/icons";
import { format, parseISO } from "date-fns";
+import { appConfig } from "../../config/app";
+
import { ModalLoaderContext } from "../../utils/modal";
const { Title, Text } = Typography;
@@ -64,7 +67,7 @@ export const Profile = observer(() => {
store.transaction.visibleModalFilterTransaction = false;
};
- const handleCancelFilter = async() => {
+ const handleCancelFilter = async () => {
store.transaction.filterStart = null;
//form.resetFields();
store.transaction.filterEnd = null;
@@ -74,13 +77,17 @@ export const Profile = observer(() => {
const handleSubmitFilter = async () => {
const data = form.getFieldsValue();
- console.log(data.start_date)
- console.log(data.end_date)
-
- 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('YYYY-MM-DD HH:mm:ss');
- console.log(awal)
- console.log(akhir)
+ console.log(data.start_date);
+ console.log(data.end_date);
+
+ 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(
+ "YYYY-MM-DD HH:mm:ss"
+ ));
+ console.log(awal);
+ console.log(akhir);
// store.transaction.filterStart = data.start_date;
// store.transaction.filterEnd = data.end_date;
modalLoader.setLoading(true);
@@ -120,7 +127,6 @@ export const Profile = observer(() => {
title: "Price",
dataIndex: "price",
key: "price",
-
render: (text) =>
new Intl.NumberFormat("id-ID", {
style: "currency",
@@ -176,19 +182,20 @@ export const Profile = observer(() => {
dataIndex: "partner_transaction_code",
key: "partner_transaction_code",
},
- {
- title: "Tanggal Transaksi",
- dataIndex: "created_at",
- key: "created_at",
- render: (text, record) => {
- return {format(parseISO(record.created_at), "dd-MM-yyyy")};
- },
- },
{
title: "Alasan Gagal",
dataIndex: "failed_reason",
key: "failed_reason",
},
+ {
+ title: "Tanggal Transaksi",
+ dataIndex: "created_at",
+ key: "created_at",
+
+ render: (text, record) => {
+ return {format(parseISO(record.created_at), "dd-MM-yyyy")};
+ },
+ },
];
const styleSaldoTitle = store.ui.mediaQuery.isDesktop
@@ -249,6 +256,24 @@ export const Profile = observer(() => {
{store.authentication.profileData.superior?.username}
+
+ Foto Identitas
+
+
+ Foto Toko
+
+
+
+
+
+
+
@@ -310,6 +335,8 @@ export const Profile = observer(() => {
{
visible={store.transaction.visibleModalFilterTransaction}
title={"Filter"}
footer={footerLayoutFilter}
- onCancel={async() => {
+ onCancel={async () => {
//form.resetFields();
store.transaction.filterStart = null;
store.transaction.filterEnd = null;