PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'devops-staging'

Browse Source 
Perbaikan Page Konfirmasi

See merge request empatnusabangsa/ppob/ppob-frontend!92
This commit is contained in:
ajat sudrajat 2022-01-26 11:19:00 +00:00
commit a588d76f3e
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pages/Membership/Konfirmasi.js
View File

@ -90,18 +90,19 @@ export const Konfirmasi = observer(() => {
}, },
{ {
title: "Foto Toko", title: "Foto Toko",
dataIndex: "image_prove", render: (text, record) =>
key: "image_prove", record.user_detail?.image_store !== "\"\"" ? (
render: (text, record) => ( <Button
<Button onClick={async () => {
onClick={async () => { setToko(record);
setToko(record); setVisibleModalToko(true);
setVisibleModalToko(true); }}
}} >
> Lihat Foto
Lihat Foto </Button>
</Button> ) : (
), ""
),
}, },
{ {
title: "Action", title: "Action",
@ -173,7 +174,6 @@ export const Konfirmasi = observer(() => {
), ),
}, },
]; ];
if (store.authentication.userData.role === "Retail") columns.pop();
const routeData = [ const routeData = [
{ {

19
src/pages/Profile/Profile.js
View File

@ -84,21 +84,18 @@ export const Profile = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
console.log(data.start_date);
console.log(data.end_date);
const awal = (store.transaction.filterStart = moment( const awal = (store.transaction.filterStart = moment(
data.start_date data.start_date
).format("YYYY-MM-DD HH:mm:ss")); ).format("YYYY-MM-DD HH:mm:ss"));
const akhir = (store.transaction.filterEnd = moment(data.end_date).format( const akhir = (store.transaction.filterEnd = moment(data.end_date).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD HH:mm:ss"
)); ));
console.log(awal);
console.log(akhir);
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false); modalLoader.setLoading(false);
form.resetFields(); store.transaction.filterStart = null;
store.transaction.filterEnd = null;
//form.resetFields();
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
}; };
@ -193,11 +190,6 @@ export const Profile = observer(() => {
dataIndex: "partner_transaction_code", dataIndex: "partner_transaction_code",
key: "partner_transaction_code", key: "partner_transaction_code",
}, },
{
title: "Alasan Gagal",
dataIndex: "failed_reason",
key: "failed_reason",
},
{ {
title: "Tanggal Transaksi", title: "Tanggal Transaksi",
dataIndex: "created_at", 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 const styleSaldoTitle = store.ui.mediaQuery.isDesktop

2
src/store/approval.js
View File

@ -16,7 +16,7 @@ export class Approval {
async getData() { async getData() {
try { try {
const response = await http.get(`/users/find-by-approval?page=${this.page}&pageSize=${this.pageSize}`); 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.data = response.body.data ?? []
this.listImage= this.data.user_detail?.image_store ? JSON.parse(this.data.user_detail?.image_store) : [] this.listImage= this.data.user_detail?.image_store ? JSON.parse(this.data.user_detail?.image_store) : []
this.total_data = response.body.count ?? 0 this.total_data = response.body.count ?? 0