diff --git a/src/pages/Membership/Konfirmasi.js b/src/pages/Membership/Konfirmasi.js
index 6ffb3e3..ee76999 100644
--- a/src/pages/Membership/Konfirmasi.js
+++ b/src/pages/Membership/Konfirmasi.js
@@ -90,18 +90,19 @@ export const Konfirmasi = observer(() => {
},
{
title: "Foto Toko",
- dataIndex: "image_prove",
- key: "image_prove",
- render: (text, record) => (
-
- ),
+ render: (text, record) =>
+ record.user_detail?.image_store !== "\"\"" ? (
+
+ ) : (
+ ""
+ ),
},
{
title: "Action",
@@ -173,7 +174,6 @@ export const Konfirmasi = observer(() => {
),
},
];
- if (store.authentication.userData.role === "Retail") columns.pop();
const routeData = [
{
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 0eb67f6..5096b0b 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -84,21 +84,18 @@ 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);
modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false);
- form.resetFields();
+ store.transaction.filterStart = null;
+ store.transaction.filterEnd = null;
+ //form.resetFields();
store.transaction.visibleModalFilterTransaction = false;
};
@@ -193,11 +190,6 @@ export const Profile = observer(() => {
dataIndex: "partner_transaction_code",
key: "partner_transaction_code",
},
- {
- title: "Alasan Gagal",
- dataIndex: "failed_reason",
- key: "failed_reason",
- },
{
title: "Tanggal Transaksi",
dataIndex: "created_at",
@@ -211,6 +203,11 @@ export const Profile = observer(() => {
);
},
},
+ {
+ title: "Alasan Gagal",
+ dataIndex: "failed_reason",
+ key: "failed_reason",
+ },
];
const styleSaldoTitle = store.ui.mediaQuery.isDesktop
diff --git a/src/store/approval.js b/src/store/approval.js
index 5192198..e8fefd2 100644
--- a/src/store/approval.js
+++ b/src/store/approval.js
@@ -16,7 +16,7 @@ export class Approval {
async getData() {
try {
const response = await http.get(`/users/find-by-approval?page=${this.page}&pageSize=${this.pageSize}`);
- console.log(response)
+ console.log(response,"data dari store")
this.data = response.body.data ?? []
this.listImage= this.data.user_detail?.image_store ? JSON.parse(this.data.user_detail?.image_store) : []
this.total_data = response.body.count ?? 0