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

Merge branch 'develop' into 'devops-production'

Browse Source 
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!121
This commit is contained in:
ajat sudrajat 2022-02-03 07:54:17 +00:00
commit 9d668994c0
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/App/DesktopLayout.js
View File

@ -312,16 +312,14 @@ export const DesktopLayout = observer(() => {
</Link>
</Menu.Item>
)}
{store.authentication.userData.role !== "Admin" ||
(store.authentication.userData.role !==
"Customer Service" && (
{store.authentication.userData.role !== "Admin" && (
<Menu.Item key="payback-from-user">
<Link to={LINKS.PAYBACK_CREATED}>
<AlipayOutlined />
<span>Dibuat oleh Saya</span>
</Link>
</Menu.Item>
))}
)}
</SubMenu>
)}
{store.authentication.userData.role !== "Admin" && (

5
src/pages/App/MenuList.js
View File

@ -242,15 +242,14 @@ export const MenuList = observer((props) => {
</Link>
</Menu.Item>
)}
{store.authentication.userData.role !== "Admin" ||
(store.authentication.userData.role !== "Customer Service" && (
{store.authentication.userData.role !== "Admin" && (
<Menu.Item key="payback-from-user">
<Link to={LINKS.PAYBACK_CREATED}>
<FileProtectOutlined />
<span>Dibuat oleh Saya</span>
</Link>
</Menu.Item>
))}
)}
</SubMenu>
)}
{store.authentication.userData.role !== "Admin" && (

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

@ -36,6 +36,7 @@ export const Profile = observer(() => {
const modalLoader = useContext(ModalLoaderContext);
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
const [action, setAction] = useState(false);
const routeData = [
{
@ -58,19 +59,18 @@ export const Profile = observer(() => {
useEffect(() => {
(async () => {
modalLoader.setLoading(true);
await Promise.allSettled([
store.authentication.getProfile(),
store.transaction.getDataHistoryTransaction(),
store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id
),
]);
await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.userDetail?.id
);
modalLoader.setLoading(false);
})();
}, []);
const handleRemoveFilter = async () => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
@ -399,6 +399,7 @@ export const Profile = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => {
store.transaction.visibleModalFilterTransaction = true;
setAction(true);
}}
>
<FilterOutlined />