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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Hide Fitur

See merge request empatnusabangsa/ppob/ppob-frontend!118
This commit is contained in:
ajat sudrajat 2022-02-03 06:59:30 +00:00
commit 116a5d67dd
2 changed files with 77 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ export const DetailUser = observer(() => {
{ {
title: "Pengirim", title: "Pengirim",
dataIndex: "sender_name", dataIndex: "sender_name",
key: "sender_name" key: "sender_name",
}, },
{ {
title: "Nominal", title: "Nominal",
@ -396,8 +396,8 @@ export const DetailUser = observer(() => {
Detail User Detail User
</Title> </Title>
<Col <Col
lg={store.authentication.userData.role === "Admin" ? 18 : 17} lg={store.authentication.userData.role === "Admin" ? 18 : 13}
xs={store.authentication.userData.role === "Admin" ? 18 : 17} xs={store.authentication.userData.role === "Admin" ? 18 : 13}
style={{ textAlign: "right" }} style={{ textAlign: "right" }}
> >
<Space <Space
@ -406,73 +406,79 @@ export const DetailUser = observer(() => {
wrap={true} wrap={true}
style={{ textAlign: "center" }} style={{ textAlign: "center" }}
> >
<Button {store.authentication.userData.role === "Admin" && (
type={ <Space>
store.membership.dataDetail.is_active === true <Button
? "danger" type={
: "primary" store.membership.dataDetail.is_active === true
} ? "danger"
onClick={() => : "primary"
changeStatus( }
store.membership.dataDetail.id, onClick={() =>
store.membership.dataDetail.is_active changeStatus(
) store.membership.dataDetail.id,
} store.membership.dataDetail.is_active
> )
{store.membership.dataDetail.is_active === true }
? "Inactive" >
: "Active"} {store.membership.dataDetail.is_active === true
</Button> ? "Inactive"
<Button : "Active"}
onClick={() => { </Button>
setInitialData({ <Button
id: store.membership.dataDetail.id, onClick={() => {
name: store.membership.dataDetail.userDetail.name, setInitialData({
username: store.membership.dataDetail.username, id: store.membership.dataDetail.id,
identity_number: name: store.membership.dataDetail.userDetail.name,
store.membership.dataDetail.userDetail.identity_number, username: store.membership.dataDetail.username,
image_identity: identity_number:
store.membership.dataDetail?.userDetail.image_identity, store.membership.dataDetail.userDetail
image_store: .identity_number,
store.membership.dataDetail?.userDetail.image_store, image_identity:
phone_number: store.membership.dataDetail?.userDetail
store.membership.dataDetail.userDetail.phone_number, .image_identity,
roleId: store.membership.dataDetail.roles.id, image_store:
isChangePassword: false, store.membership.dataDetail?.userDetail.image_store,
}); phone_number:
console.log( store.membership.dataDetail.userDetail.phone_number,
store.membership.dataDetail.userDetail.identity_number roleId: store.membership.dataDetail.roles.id,
); isChangePassword: false,
console.log(store.membership.dataDetail.userDetail.id); });
console.log( console.log(
store.membership.dataDetail.userDetail.image_identity store.membership.dataDetail.userDetail.identity_number
); );
console.log( console.log(store.membership.dataDetail.userDetail.id);
store.membership.dataDetail.userDetail.image_store, console.log(
"ini store" store.membership.dataDetail.userDetail.image_identity
); );
console.log(store.membership.dataDetail.username); console.log(
setVisibleModal(true); store.membership.dataDetail.userDetail.image_store,
}} "ini store"
> );
Edit console.log(store.membership.dataDetail.username);
</Button> setVisibleModal(true);
<Button }}
onClick={() => { >
setInitialData({ Edit
id: store.membership.dataDetail.id, </Button>
name: store.membership.dataDetail.userDetail.name, <Button
username: store.membership.dataDetail.username, onClick={() => {
phone_number: setInitialData({
store.membership.dataDetail.userDetail.phone_number, id: store.membership.dataDetail.id,
roleId: store.membership.dataDetail.roles.id, name: store.membership.dataDetail.userDetail.name,
isChangePassword: true, username: store.membership.dataDetail.username,
}); phone_number:
setVisibleModal(true); store.membership.dataDetail.userDetail.phone_number,
}} roleId: store.membership.dataDetail.roles.id,
> isChangePassword: true,
Ganti Password });
</Button> setVisibleModal(true);
}}
>
Ganti Password
</Button>
</Space>
)}
{((store.authentication.userData.role === "Sales" && {((store.authentication.userData.role === "Sales" &&
store.membership.dataDetail.is_rejected === true && store.membership.dataDetail.is_rejected === true &&
store.membership.dataDetail.is_active === false) || store.membership.dataDetail.is_active === false) ||

2
src/store/transaction.js
View File

@ -171,7 +171,7 @@ export class Transaction {
async getDataHistoryTopUpProfile(id) { async getDataHistoryTopUpProfile(id) {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}` `/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
); );
console.log(response,'get data history Profile') console.log(response,'get data history Profile')
this.dataHistoryTopUpProfile = response.body.data ?? []; this.dataHistoryTopUpProfile = response.body.data ?? [];