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

Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop

Browse Source
This commit is contained in:
ajat91.sudrajat 2021-12-31 07:33:08 +07:00
commit f01740f3c7
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/PartnerComponent.js
View File

@ -391,7 +391,7 @@ export const PartnerComponent = observer((props) => {
)} )}
{((idData && isChangePassword) || !idData) && ( {((idData && isChangePassword) || !idData) && (
<Form.Item <Form.Item
name="password_account" name="password"
label="Password Account" label="Password Account"
rules={[ rules={[
idData idData

4
src/component/ProductComponent.js
View File

@ -129,11 +129,11 @@ export const ProductComponent = observer((props) => {
}, },
]; ];
if (store.authentication.userData.role !== "Admin") columns.pop(); if (store.authentication.userData.role !== "Admin") columns.pop();
if (store.authentication.userData.role !== "Admin") delete columns[2]; if (store.authentication.userData.role === "Admin Partner") delete columns[2];
if (store.authentication.userData.role === "Admin Partner") delete columns[3]; if (store.authentication.userData.role === "Admin Partner") delete columns[3];
if (store.authentication.userData.role != "Admin Partner") delete columns[4];
if (store.authentication.userData.role !== "Admin") delete columns[6]; if (store.authentication.userData.role !== "Admin") delete columns[6];
if (store.authentication.userData.role === "Admin Partner") delete columns[7]; if (store.authentication.userData.role === "Admin Partner") delete columns[7];
if (store.authentication.userData.role === "Admin") delete columns[4];
if (store.authentication.userData.role !== "Admin") delete columns[8]; if (store.authentication.userData.role !== "Admin") delete columns[8];
if (store.authentication.userData.role === "Admin Partner") delete columns[5]; if (store.authentication.userData.role === "Admin Partner") delete columns[5];

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

@ -537,7 +537,7 @@ export const Membership = observer(() => {
value={filterMembership} value={filterMembership}
> >
{store.membership.data.map((item) => ( {store.membership.data.map((item) => (
<Option value={item.name} key={item.name}> <Option value={item.id} key={item.id}>
{item.name} {item.name}
</Option> </Option>
))} ))}

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

@ -131,13 +131,13 @@ export const Profile = observer(() => {
}, },
{ {
title: "Tujuan", title: "Tujuan",
dataIndex: "tujuan", dataIndex: "transaction_destination",
key: "tujuan", key: "transaction_destination",
}, },
{ {
title: "ID Transaksi", title: "Kode Transaksi",
dataIndex: "id_transaksi", dataIndex: "transaction_code",
key: "id_transaksi", key: "transaction_code",
}, },
{ {
title: "Status", title: "Status",
@ -146,13 +146,13 @@ export const Profile = observer(() => {
}, },
{ {
title: "No Seri", title: "No Seri",
dataIndex: "no_seri", dataIndex: "seri_number",
key: "no_seri", key: "seri_number",
}, },
{ {
title: "IDTrx Mitra", title: "IDTrx Mitra",
dataIndex: "idtrx_mitra", dataIndex: "partner_transaction_code",
key: "idtrx_mitra", key: "partner_transaction_code",
}, },
{ {
title: "Transaction Date", title: "Transaction Date",
@ -256,7 +256,7 @@ export const Profile = observer(() => {
{new Intl.NumberFormat("id-ID", { {new Intl.NumberFormat("id-ID", {
style: "currency", style: "currency",
currency: "IDR", currency: "IDR",
}).format(store.authentication.profileData?.wallet || 0)} }).format(store.authentication.profileData?.profit || 0)}
</Text> </Text>
</Col> </Col>
<Col></Col> <Col></Col>

2
src/store/membership.js
View File

@ -21,7 +21,7 @@ export class Membership {
async getData() { async getData() {
try { try {
const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superrior=${this.filterMembership}&type=${this.filterPartner}`); const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superior=${this.filterMembership}&type=${this.filterPartner}`);
// console.log(this.filterMembership) // console.log(this.filterMembership)
// console.log(this.filterPartner) // console.log(this.filterPartner)
// console.log(response) // console.log(response)