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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!135
This commit is contained in:
ajat sudrajat 2022-02-04 13:20:41 +00:00
commit 48b7415ea0
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/ProductComponent.js
View File

@ -128,7 +128,7 @@ 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 Partner") 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 Partner") delete columns[4];
@ -136,7 +136,7 @@ export const ProductComponent = observer((props) => {
if (store.authentication.userData.role !== "Admin") delete columns[2]; if (store.authentication.userData.role !== "Admin") delete columns[2];
if (store.authentication.userData.role !== "Admin") delete columns[5]; if (store.authentication.userData.role !== "Admin") delete columns[5];
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[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];
const deleteData = async (id) => { const deleteData = async (id) => {

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

@ -412,8 +412,8 @@ export const DetailUser = observer(() => {
Detail User Detail User
</Title> </Title>
<Col <Col
lg={store.authentication.userData.role === "Admin" ? 18 : 13} lg={store.authentication.userData.role === "Admin" ? 18 : 17}
xs={store.authentication.userData.role === "Admin" ? 18 : 13} xs={store.authentication.userData.role === "Admin" ? 18 : 17}
style={{ textAlign: "right" }} style={{ textAlign: "right" }}
> >
<Space <Space

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

@ -201,15 +201,17 @@ export const Membership = observer(() => {
key: "action", key: "action",
render: (text, record) => ( render: (text, record) => (
<Space size="middle"> <Space size="middle">
<Button {store.authentication.userData.role === "Admin" && (
onClick={() => { <Button
setDestination(record?.id); onClick={() => {
console.log(record?.id); setDestination(record?.id);
setIsVisibleTopUpModal(true); console.log(record?.id);
}} setIsVisibleTopUpModal(true);
> }}
<DownloadOutlined /> Top Up Saldo >
</Button> <DownloadOutlined /> Top Up Saldo
</Button>
)}
<Button <Button
onClick={async () => { onClick={async () => {
await store.transaction.getDataHistoryTopUp(record.id); await store.transaction.getDataHistoryTopUp(record.id);
@ -226,7 +228,7 @@ export const Membership = observer(() => {
}, },
]; ];
if (store.authentication.userData.role === "Customer Service") columns.pop(); //if (store.authentication.userData.role === "Customer Service") columns.pop();
const routeData = [ const routeData = [
{ {
route: LINKS.HOME, route: LINKS.HOME,