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

Perbaikan Project PPOB

Browse Source
This commit is contained in:
ajat91.sudrajat
2022-01-03 13:44:11 +07:00
parent 6201ce4ad0
commit c95bd3eca3
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pages/Membership/DetailUser.js
View File

@@ -41,6 +41,7 @@ export const DetailUser = observer(() => {
return () => {
store.membership.dataDetail = {};
store.transaction.dataHistoryTopUp = [];
store.authentication.dataProfit = [];
store.transaction.dataDetailHistoryTransaction = [];
};
}, []);
@@ -49,6 +50,7 @@ export const DetailUser = observer(() => {
const isAdmin = store.authentication.userData.role === "Admin";
await Promise.allSettled([
store.transaction.getDataHistoryTopUp(id),
store.authentication.getProfit(id),
store.transaction.getDetailHistoryTransaction(id),
store.membership.getDetail(id),
store.role.getData(isAdmin),
@@ -313,26 +315,26 @@ export const DetailUser = observer(() => {
<Text strong>Name</Text>
</Col>
<Col span={12}>
<Text>{store.membership.dataDetail.userDetail?.name}</Text>
<Text>{store.authentication.dataProfit.userDetail?.name}</Text>
</Col>
<Col span={12}>
<Text strong>Username</Text>
</Col>
<Col span={12}>
<Text>{store.membership.dataDetail.username}</Text>
<Text>{store.authentication.dataProfit.username}</Text>
</Col>
<Col span={12}>
<Text strong>Role</Text>
</Col>
<Col span={12}>
<Text>{store.membership.dataDetail.roles?.name}</Text>
<Text>{store.authentication.dataProfit.roles?.name}</Text>
</Col>
<Col span={12}>
<Text strong>Phone Number</Text>
</Col>
<Col span={12}>
<Text>
{store.membership.dataDetail.userDetail?.phone_number}
{store.authentication.dataProfit.userDetail?.phone_number}
</Text>
</Col>
<Col span={12}>
@@ -340,7 +342,7 @@ export const DetailUser = observer(() => {
</Col>
<Col span={12}>
<Text>
{store.membership.dataDetail.isActive === true
{store.authentication.dataProfit.isActive === true
? "Aktif"
: "Inaktif"}
</Text>
@@ -364,7 +366,7 @@ export const DetailUser = observer(() => {
style: "currency",
currency: "IDR",
}).format(
store.authentication.profileData?.wallet || 0
store.authentication.dataProfit.wallet || 0
)}
</Text>
</Col>

1
src/pages/Membership/Membership.js
View File

@@ -222,6 +222,7 @@ export const Membership = observer(() => {
onClick={async () => {
await store.transaction.getDataHistoryTopUp(record.id);
await store.transaction.getDetailHistoryTransaction(record.id);
await store.authentication.getProfit(record.id);
//await store.transaction.getDataHistoryTransaction()
history.push(LINKS.USER_DETAIL.replace(":id", record.id));
console.log(record.id);