From e26fb13813f185653700aa13918ca2d64de16f8b Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Wed, 2 Feb 2022 10:16:10 +0700 Subject: [PATCH 01/14] Bug fixing --- src/component/ProductComponent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 854f78d..9238976 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -350,8 +350,8 @@ export const ProductComponent = observer((props) => {

{item.product_name}
- Harga Beli : {item.current_price_price} -
+ {/* Harga Beli : {item.current_price_price} +
*/} Harga Jual : {item.mark_up_price}

From e8c4b9a2bf2dbbc1297db365b99580f14bc136f2 Mon Sep 17 00:00:00 2001 From: ilham Date: Thu, 3 Feb 2022 03:14:59 +0700 Subject: [PATCH 02/14] fix some wording --- src/component/CategoryComponent.js | 4 ++-- src/component/CommissionComponent.js | 6 ++--- src/component/PartnerComponent.js | 14 ++++++------ src/component/ProductComponent.js | 8 +++---- src/component/SubcategoryComponent.js | 4 ++-- src/component/SupplierComponent.js | 8 +++---- src/component/TopupsaldoModal.js | 4 ++-- src/constants/payback.js | 6 ++--- src/pages/App/DesktopLayout.js | 4 ++-- src/pages/App/MenuList.js | 6 ++--- src/pages/Membership/DetailUser.js | 2 +- src/pages/Membership/Konfirmasi.js | 18 +++++++-------- src/pages/Membership/Membership.js | 6 ++--- src/pages/Membership/MembershipModal.js | 2 +- src/pages/Payback/Payback.js | 30 ++++++++++++------------- src/pages/Payback/PaybackCreated.js | 12 +++++----- src/pages/Payback/PaybackModal.js | 4 ++-- src/pages/Product/Product.js | 2 +- src/pages/Profile/Profile.js | 20 ++++++++--------- src/pages/Transaction/Product.js | 16 ++++++------- 20 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js index 2866c89..9377b1f 100644 --- a/src/component/CategoryComponent.js +++ b/src/component/CategoryComponent.js @@ -45,7 +45,7 @@ export const CategoryComponent = observer((props) => { key: "name", }, { - title: "Action", + title: "Tindakan", key: "action", render: (text, record) => ( @@ -209,7 +209,7 @@ export const CategoryComponent = observer((props) => { visible={store.category.visibleModalCategory} title={idData ? "Edit Category" : "Create a new Category"} okText={idData ? "Edit" : "Create"} - cancelText="Cancel" + cancelText="Batal" onCancel={() => { form.resetFields(); handleCancel(); diff --git a/src/component/CommissionComponent.js b/src/component/CommissionComponent.js index f63f249..d8ac7d6 100644 --- a/src/component/CommissionComponent.js +++ b/src/component/CommissionComponent.js @@ -28,13 +28,13 @@ export const CommissionComponent = observer((props) => { key: "name", }, { - title: "Amount", + title: "Nominal", dataIndex: "commission", key: "commission", render: (text) => {text}%, }, { - title: "Action", + title: "Tindakan", key: "action", render: (text, record) => ( @@ -93,7 +93,7 @@ export const CommissionComponent = observer((props) => { visible={store.commission.visibleModalCommission} title={"Edit Commission"} okText={"Edit"} - cancelText="Cancel" + cancelText="Batal" onCancel={() => { form.resetFields(); handleCancel(); diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js index a9ca3c1..4f34369 100644 --- a/src/component/PartnerComponent.js +++ b/src/component/PartnerComponent.js @@ -86,7 +86,7 @@ export const PartnerComponent = observer((props) => { key: "npwp", }, { - title: "Address", + title: "Alamat", dataIndex: "address", key: "address", }, @@ -104,7 +104,7 @@ export const PartnerComponent = observer((props) => { ), }, { - title: "Action", + title: "Tindakan", key: "action", render: (text, record) => ( @@ -143,12 +143,12 @@ export const PartnerComponent = observer((props) => { icon: , okText: "Yes", okType: "primary", - cancelText: "Cancel", + cancelText: "Batal", onOk() { return deleteData(id); }, onCancel() { - console.log("Cancel"); + console.log("Batal"); }, }); }; @@ -273,7 +273,7 @@ export const PartnerComponent = observer((props) => {
Nama : {item.name}
Npwp : {item.npwp}
- Address : {item.address} + Alamat : {item.address}
diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js index da2b529..43c597c 100644 --- a/src/pages/Payback/PaybackModal.js +++ b/src/pages/Payback/PaybackModal.js @@ -100,7 +100,7 @@ export const PaybackModal = ({ initialData }) => { visible={store.payback.visibleModalPayback} title={"Create a new Created"} okText={"Create"} - cancelText="Cancel" + cancelText="Batal" onCancel={handleCancel} onOk={() => { form @@ -120,7 +120,7 @@ export const PaybackModal = ({ initialData }) => { name="form_in_modal" initialValues={initialData} > - +
{ visible={visibleModalUpload} title={"Upload Excel Product"} okText={"Create"} - cancelText="Cancel" + cancelText="Batal" onCancel={() => { form.resetFields(); handleCancel(); diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 5096b0b..600130d 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -172,10 +172,10 @@ export const Profile = observer(() => { } > {record.status === 1 - ? "Success" + ? "Sukses" : record.status === 0 - ? "Pending" - : "Failed"} + ? "Dalam Proses" + : "Gagal"} ); }, @@ -240,7 +240,7 @@ export const Profile = observer(() => { - Name + Nama @@ -248,7 +248,7 @@ export const Profile = observer(() => { - Phone Number + No. Telepon @@ -268,7 +268,7 @@ export const Profile = observer(() => { {store.authentication.profileData.roles?.name} - Superior + Upline @@ -359,7 +359,7 @@ export const Profile = observer(() => {
- History Transaction + Riwayat Transaksi , , , ]} > Date: Thu, 3 Feb 2022 03:22:41 +0700 Subject: [PATCH 03/14] fix: detail user --- src/pages/Membership/DetailUser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 417c64d..435ba80 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -160,6 +160,11 @@ export const DetailUser = observer(() => { modalLoader.setLoading(false); }; const columns = [ + { + title: "Pengirim", + dataIndex: "sender_name", + key: "sender_name" + }, { title: "Nominal", dataIndex: "amount", From 238eeb92ceb960d50f6d2f2d4c76879796388181 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 12:14:23 +0700 Subject: [PATCH 04/14] Tambah Role Customer Service --- src/component/CommissionComponent.js | 2 + src/component/PartnerComponent.js | 2 + src/component/SupplierComponent.js | 2 + src/pages/App/DesktopLayout.js | 32 +- src/pages/App/MenuList.js | 139 ++++----- src/pages/Config/Partner.js | 40 +-- src/pages/Config/Supplier.js | 16 +- src/pages/Home/Home.js | 10 +- src/pages/Membership/Membership.js | 19 +- src/pages/Product/Category.js | 31 +- src/pages/Product/Subcategory.js | 14 +- src/pages/Profile/Profile.js | 431 ++++++++++++++++++--------- src/store/transaction.js | 16 + 13 files changed, 476 insertions(+), 278 deletions(-) diff --git a/src/component/CommissionComponent.js b/src/component/CommissionComponent.js index d8ac7d6..94d7abf 100644 --- a/src/component/CommissionComponent.js +++ b/src/component/CommissionComponent.js @@ -44,6 +44,8 @@ export const CommissionComponent = observer((props) => { }, ]; + if (store.authentication.userData.role === "Customer Service") columns.pop(); + const handleCancel = () => { setIdData(""); store.commission.visibleModalCommission = false; diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js index 4f34369..ed31f0a 100644 --- a/src/component/PartnerComponent.js +++ b/src/component/PartnerComponent.js @@ -123,6 +123,8 @@ export const PartnerComponent = observer((props) => { ), }, ]; + + if (store.authentication.userData.role === "Customer Service") columns.pop(); const deleteData = async (id) => { try { diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js index 81f5478..874539d 100644 --- a/src/component/SupplierComponent.js +++ b/src/component/SupplierComponent.js @@ -130,6 +130,8 @@ export const SupplierComponent = observer((props) => { }, ]; + if (store.authentication.userData.role === "Customer Service") columns.pop(); + const deleteData = async (id) => { try { console.log(id); diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index 5d55b25..884d31b 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -25,7 +25,7 @@ import { DollarCircleOutlined, UsergroupAddOutlined, UnorderedListOutlined, - FormOutlined + FormOutlined, } from "@ant-design/icons"; import { AppRoute, LINKS } from "../../routes/app"; import { useStore } from "../../utils/useStore"; @@ -129,7 +129,8 @@ export const DesktopLayout = observer(() => { }} > - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( @@ -145,7 +146,8 @@ export const DesktopLayout = observer(() => { )} - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( } @@ -201,7 +203,8 @@ export const DesktopLayout = observer(() => { )} */} - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( } @@ -228,7 +231,8 @@ export const DesktopLayout = observer(() => { )} - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( } @@ -308,14 +312,16 @@ export const DesktopLayout = observer(() => { )} - {store.authentication.userData.role !== "Admin" && ( - - - - Dibuat oleh Saya - - - )} + {store.authentication.userData.role !== "Admin" || + (store.authentication.userData.role !== + "Customer Service" && ( + + + + Dibuat oleh Saya + + + ))} )} {store.authentication.userData.role !== "Admin" && ( diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js index 4c21761..031d504 100644 --- a/src/pages/App/MenuList.js +++ b/src/pages/App/MenuList.js @@ -56,7 +56,8 @@ export const MenuList = observer((props) => { overflowedIndicator={0} forceSubMenuRender={true} > - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( @@ -72,47 +73,48 @@ export const MenuList = observer((props) => { )} - {store.authentication.userData.role === "Admin" && ( - } - title="Keanggotaan" - > - - - - Daftar Anggota - - - - - - Konfirm Retail - - - - )} - {store.authentication.userData.role === "Supervisor" && ( - } - title="Keanggotaan" - > - - - - Daftar Anggota - - - - - - Konfirm Retail - - - - )} - {/* {store.authentication.userData.role === "Sales" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( + } + title="Keanggotaan" + > + + + + Daftar Anggota + + + + + + Konfirm Retail + + + + )} + {store.authentication.userData.role === "Supervisor" && ( + } + title="Keanggotaan" + > + + + + Daftar Anggota + + + + + + Konfirm Retail + + + + )} + {/* {store.authentication.userData.role === "Sales" && ( } @@ -142,7 +144,8 @@ export const MenuList = observer((props) => { )} - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( } title="Config"> @@ -164,7 +167,8 @@ export const MenuList = observer((props) => { )} - {store.authentication.userData.role === "Admin" && ( + {(store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( } @@ -176,22 +180,20 @@ export const MenuList = observer((props) => { Produk - {store.authentication.userData.role === "Admin" && ( - - - - Sub Kategori - - - )} - {store.authentication.userData.role === "Admin" && ( - - - - Kategori - - - )} + + + + + Sub Kategori + + + + + + + Kategori + + )} {store.authentication.userData.role === "Admin Partner" && ( @@ -240,14 +242,15 @@ export const MenuList = observer((props) => { )} - {store.authentication.userData.role !== "Admin" && ( - - - - Dibuat oleh Saya - - - )} + {store.authentication.userData.role !== "Admin" || + (store.authentication.userData.role !== "Customer Service" && ( + + + + Dibuat oleh Saya + + + ))} )} {store.authentication.userData.role !== "Admin" && ( diff --git a/src/pages/Config/Partner.js b/src/pages/Config/Partner.js index 9e85a1d..279c0b3 100644 --- a/src/pages/Config/Partner.js +++ b/src/pages/Config/Partner.js @@ -1,14 +1,14 @@ -import React, {useContext, useEffect, useState} from "react"; -import {Button, Card, Col, Input, Row, Tabs,message} from "antd"; -import {FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons"; -import {BreadcumbComponent} from "../../component/BreadcumbComponent"; -import {useStore} from "../../utils/useStore"; -import {observer} from "mobx-react-lite"; -import {PartnerComponent} from "../../component/PartnerComponent"; -import {LINKS} from "../../routes/app"; -import {ModalLoaderContext} from "../../utils/modal"; +import React, { useContext, useEffect, useState } from "react"; +import { Button, Card, Col, Input, Row, Tabs, message } from "antd"; +import { FilterOutlined, PlusSquareOutlined } from "@ant-design/icons"; +import { BreadcumbComponent } from "../../component/BreadcumbComponent"; +import { useStore } from "../../utils/useStore"; +import { observer } from "mobx-react-lite"; +import { PartnerComponent } from "../../component/PartnerComponent"; +import { LINKS } from "../../routes/app"; +import { ModalLoaderContext } from "../../utils/modal"; -const {Search} = Input; +const { Search } = Input; export const Partner = observer(() => { const store = useStore(); @@ -40,22 +40,22 @@ export const Partner = observer(() => { }, { route: LINKS.PARTNER, - name: Rekanan, + name: Rekanan, }, ]; return (
- + - + {/* */} - + {/* { marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0, }} /> */} - + {store.authentication.userData.role !== "Customer Service" && ( + + )} - +
); diff --git a/src/pages/Config/Supplier.js b/src/pages/Config/Supplier.js index 3cd403b..773dcb8 100644 --- a/src/pages/Config/Supplier.js +++ b/src/pages/Config/Supplier.js @@ -1,4 +1,4 @@ -import React, {useContext, useEffect, useState} from "react"; +import React, { useContext, useEffect, useState } from "react"; import { Button, Card, @@ -21,7 +21,7 @@ import { useStore } from "../../utils/useStore"; import { observer } from "mobx-react-lite"; import { SupplierComponent } from "../../component/SupplierComponent"; import { LINKS } from "../../routes/app"; -import {ModalLoaderContext} from "../../utils/modal"; +import { ModalLoaderContext } from "../../utils/modal"; const { Search } = Input; @@ -80,11 +80,13 @@ export const Supplier = observer(() => { }} onSearch={(value) => console.log(value)} /> */} - + {store.authentication.userData.role !== "Customer Service" && ( + + )} diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js index 4d41f87..3d0eea6 100644 --- a/src/pages/Home/Home.js +++ b/src/pages/Home/Home.js @@ -48,11 +48,12 @@ export const Home = observer(() => { ? await store.membership.getData() : await store.membership.getDataBySuperior(); }; - + return (
{store.ui.mediaQuery.isDesktop && - store.authentication.userData.role === "Admin" && ( + (store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( { )} - {store.ui.mediaQuery.isMobile && - store.authentication.userData.role === "Admin" && ( + {store.ui.mediaQuery.isMobile && + (store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service") && ( { marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0, }} /> */} - + + {store.authentication.userData.role !== "Customer Service" && ( + + )} {store.ui.mediaQuery.isDesktop && ( diff --git a/src/pages/Product/Category.js b/src/pages/Product/Category.js index d1ef4ba..5bc0cb6 100644 --- a/src/pages/Product/Category.js +++ b/src/pages/Product/Category.js @@ -1,13 +1,12 @@ -import React, {useContext, useEffect, useState} from "react"; -import {Button, Card, Col, Input, Row, Tabs,message} from "antd"; -import {FilterOutlined, PlusSquareOutlined} from "@ant-design/icons"; -import {BreadcumbComponent} from "../../component/BreadcumbComponent"; -import {useStore} from "../../utils/useStore"; -import {observer} from "mobx-react-lite"; -import {LINKS} from "../../routes/app"; -import {CategoryComponent} from "../../component/CategoryComponent"; -import {ModalLoaderContext} from "../../utils/modal"; - +import React, { useContext, useEffect, useState } from "react"; +import { Button, Card, Col, Input, Row, Tabs, message } from "antd"; +import { FilterOutlined, PlusSquareOutlined } from "@ant-design/icons"; +import { BreadcumbComponent } from "../../component/BreadcumbComponent"; +import { useStore } from "../../utils/useStore"; +import { observer } from "mobx-react-lite"; +import { LINKS } from "../../routes/app"; +import { CategoryComponent } from "../../component/CategoryComponent"; +import { ModalLoaderContext } from "../../utils/modal"; export const Category = observer(() => { const store = useStore(); @@ -49,11 +48,13 @@ export const Category = observer(() => { - + {store.authentication.userData.role !== "Customer Service" && ( + + )} diff --git a/src/pages/Product/Subcategory.js b/src/pages/Product/Subcategory.js index b17dcb1..d435bd5 100644 --- a/src/pages/Product/Subcategory.js +++ b/src/pages/Product/Subcategory.js @@ -55,11 +55,15 @@ export const Subcategory = observer(() => { - + {store.authentication.userData.role !== "Customer Service" && ( + + )} diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 600130d..c5e0e32 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -14,6 +14,7 @@ import { List, Image, Tag, + Tabs, } from "antd"; import moment from "moment"; import { BreadcumbComponent } from "../../component/BreadcumbComponent"; @@ -23,14 +24,15 @@ import { observer } from "mobx-react-lite"; import { FilterOutlined } from "@ant-design/icons"; import { format, parseISO } from "date-fns"; import { appConfig } from "../../config/app"; - import { ModalLoaderContext } from "../../utils/modal"; - +import { useParams } from "react-router-dom"; +const { TabPane } = Tabs; const { Title, Text } = Typography; const { RangePicker } = DatePicker; export const Profile = observer(() => { const store = useStore(); const [form] = Form.useForm(); + const { id } = useParams(); const modalLoader = useContext(ModalLoaderContext); const [filterStart, setFilterStart] = useState([]); const [filterEnd, setFilterEnd] = useState([]); @@ -59,11 +61,16 @@ export const Profile = observer(() => { await Promise.allSettled([ store.authentication.getProfile(), store.transaction.getDataHistoryTransaction(), + store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + + ), ]); modalLoader.setLoading(false); })(); }, []); + const handleRemoveFilter = async () => { store.transaction.filterStart = null; store.transaction.filterEnd = null; @@ -210,6 +217,35 @@ export const Profile = observer(() => { }, ]; + const column = [ + { + title: "Pengirim", + dataIndex: "sender_name", + key: "sender_name", + }, + { + title: "Nominal", + dataIndex: "amount", + key: "amount", + render: (text) => + new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR", + }).format(text), + }, + { + title: "Transaction Date", + dataIndex: "transaction_date", + key: "transaction_date", + render: (text, record) => { + return ( + + {format(parseISO(record.transaction_date), "dd MMMM yyyy")} + + ); + }, + }, + ]; const styleSaldoTitle = store.ui.mediaQuery.isDesktop ? { display: "flex", @@ -357,152 +393,267 @@ export const Profile = observer(() => { -
- - Riwayat Transaksi - - - {store.ui.mediaQuery.isDesktop && ( - + + + {store.ui.mediaQuery.isDesktop && ( +
{ + let pageNumber = page.current; + store.transaction.pageSize = page.pageSize; + store.transaction.page = pageNumber - 1; + modalLoader.setLoading(true); + await store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + ); + modalLoader.setLoading(false); + }} + /> + )} + {store.ui.mediaQuery.isMobile && ( +
+ { + console.log(page, "Page"); + console.log(pageSize, "Page size"); + store.transaction.pageSize = pageSize; + store.transaction.page = page - 1; + modalLoader.setLoading(true); + await store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + ); + modalLoader.setLoading(false); + }, + pageSize: store.transaction.pageSize, + total: store.transaction.total_dataHistoryTopUpProfile, + current: store.transaction.page + 1, + style: { marginBottom: "1rem", marginRight: "1rem" }, + }} + style={{ padding: 0 }} + renderItem={(item) => { + return ( +
+ + +

+ + Pengirim : {item.sender_name} + {" "} +
+ + Amount :{" "} + {new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR", + }).format(item.amount || 0)} + {" "} +
+ + Transaction Date :{" "} + {format( + parseISO(item.transaction_date), + "dd-MM-yyyy" + )} + {" "} +
+

+
+ } + /> + + +
+ ); + }} + /> + + )} + + + + {store.ui.mediaQuery.isDesktop && ( +
{ + let pageNumber = page.current; + store.transaction.pageSizeHistoryTransaction = + page.pageSize; + store.transaction.pageHistoryTransaction = pageNumber - 1; modalLoader.setLoading(true); await store.transaction.getDataHistoryTransaction(); modalLoader.setLoading(false); - }, - pageSize: store.transaction.pageSizeHistoryTransaction, - total: store.transaction.total_dataHistoryTransaction, - current: store.transaction.pageHistoryTransaction + 1, - style: { marginBottom: "1rem", marginRight: "1rem" }, - }} - style={{ padding: 0 }} - renderItem={(item) => { - return ( -
- - -

- Price : {item.price}
- - Tujuan : {item.transaction_destination} - {" "} -
- - Kode Transaksi : {item.transaction_code} - {" "} -
- - Status :{" "} - { - + )} + {store.ui.mediaQuery.isMobile && ( +

+ { + console.log(page, "Page"); + console.log(pageSize, "Page size"); + store.transaction.pageSizeHistoryTransaction = + pageSize; + store.transaction.pageHistoryTransaction = page - 1; + modalLoader.setLoading(true); + await store.transaction.getDataHistoryTransaction(); + modalLoader.setLoading(false); + }, + pageSize: store.transaction.pageSizeHistoryTransaction, + total: store.transaction.total_dataHistoryTransaction, + current: store.transaction.pageHistoryTransaction + 1, + style: { marginBottom: "1rem", marginRight: "1rem" }, + }} + style={{ padding: 0 }} + renderItem={(item) => { + return ( +
+ + +

+ Price : {item.price}
+ + Tujuan : {item.transaction_destination} + {" "} +
+ + Kode Transaksi : {item.transaction_code} + {" "} +
+ + Status :{" "} + { + + {item.status === 1 + ? "Sukses" + : item.status === 0 + ? "Dalam Proses" + : "Gagal"} + } - > - {item.status === 1 - ? "Sukses" - : item.status === 0 - ? "Dalam Proses" - : "Gagal"} - - } - {" "} -
- - No.Seri : {item.seri_number} - {" "} -
- - Alasan Gagal : {item.failed_reason} - {" "} -
- - IDTrx Mitra :{" "} - {item.partner_transaction_code} - {" "} -
- - Transaction Date :{" "} - {format( - parseISO(item.created_at), - "dd-MM-yyyy" - )} - {" "} -
-

-
- } - /> - - -
- ); - }} - /> - )} -
+ {" "} +
+ + No.Seri : {item.seri_number} + {" "} +
+ + Alasan Gagal : {item.failed_reason} + {" "} +
+ + IDTrx Mitra :{" "} + {item.partner_transaction_code} + {" "} +
+ + Transaction Date :{" "} + {format( + parseISO(item.created_at), + "dd-MM-yyyy" + )} + {" "} +
+

+ + } + /> + + + + ); + }} + /> + + )} + + -
Date: Thu, 3 Feb 2022 13:28:50 +0700 Subject: [PATCH 05/14] Perbaikan Tampilan Mobile Menu Transaksi --- src/pages/Transaction/Transaction.js | 303 +++++++++++++++++++++++++-- src/store/transaction.js | 2 +- 2 files changed, 289 insertions(+), 16 deletions(-) diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js index cb902a5..a1f9567 100644 --- a/src/pages/Transaction/Transaction.js +++ b/src/pages/Transaction/Transaction.js @@ -10,6 +10,8 @@ import { Modal, Row, DatePicker, + Form, + Input, } from "antd"; import { BreadcumbComponent } from "../../component/BreadcumbComponent"; import { Product } from "./Product"; @@ -24,12 +26,16 @@ export const Transaction = observer(() => { const { Title } = Typography; const { Option } = Select; const modalLoader = useContext(ModalLoaderContext); + const [form] = Form.useForm(); + const [visibleModalBuy, setVisibleModalBuy] = useState(false); + const [barang, setBarang] = useState({}); useEffect(() => { const init = async () => { try { modalLoader.setLoading(true); await store.transaction.getDataCategories(); + await store.transaction.getDataSubCategories(); modalLoader.setLoading(false); } catch (e) { modalLoader.setLoading(false); @@ -44,22 +50,96 @@ export const Transaction = observer(() => { init(); }, []); - const handleChangeTabs = async (key) => { + const routeData = [ + { + route: LINKS.TRANSACTION, + name: "Transaksi", + }, + ]; + + + const handleChangeTabs = async (item) => { modalLoader.setLoading(true); store.transaction.dataSubCategories = []; store.transaction.data = []; store.transaction.filterSubCategory = null; - store.transaction.filterCategory = key; + store.transaction.filterCategory = item; await store.transaction.getDataSubCategories(); modalLoader.setLoading(false); }; - const routeData = [ - { - route: LINKS.TRANSACTION, - name: "Transaksi" - }, - ]; + const handleChangeSubcategory = async (item) => { + store.transaction.filterSubCategory = item; + modalLoader.setLoading(true); + await store.transaction.getData(); + modalLoader.setLoading(false); + }; + + + const handleBuyProduct = async (data, productCode) => { + modalLoader.setLoading(true); + try { + const response = await store.transaction.buyProd({ + ...data, + productCode: productCode, + }); + + if (response.status === 201) { + message.success(response?.body?.message || "Berhasil Beli Produk"); + } else { + message.error(response?.body?.error || "Gagal Beli Produk", 3); + } + } catch (e) { + console.log("testingan"); + console.log(e.response, "testingan"); + console.log(e.result, "testingan1"); + if (e.response?.body?.error) { + message.error(e.response.body.error); + setVisibleModalBuy(false); + modalLoader.setLoading(false); + return; + } + console.log(e, "apa errornya"); + message.error("Gagal Beli Product"); + } + setVisibleModalBuy(false); + modalLoader.setLoading(false); + }; + + const handleBuyStag = async (data, productCode) => { + modalLoader.setLoading(true); + try { + const response = await store.transaction.buyProduct({ + ...data, + productCode: productCode, + }); + if (response.status === 201) { + message.success(response?.body?.message || "Berhasil Beli Produk"); + } else { + message.error(response?.body?.error || "Gagal Beli Produk", 3); + } + } catch (e) { + console.log("testingan"); + console.log(e.response, "testingan"); + console.log(e.result, "testingan1"); + if (e.response?.body?.error) { + message.error(e.response.body.error); + setVisibleModalBuy(false); + modalLoader.setLoading(false); + return; + } + console.log(e, "apa errornya"); + message.error("Gagal Beli Product"); + } + // setDataProd(false); + // setDataStag(false); + setVisibleModalBuy(false); + modalLoader.setLoading(false); + }; + const handleCancel = () => { + form.resetFields(); + setVisibleModalBuy(false); + }; return (
@@ -75,13 +155,206 @@ export const Transaction = observer(() => { Filter */} - - {store.transaction.dataCategories.map((item, index) => ( - - - - ))} - + {store.ui.mediaQuery.isDesktop && ( + + {store.transaction.dataCategories.map((item, index) => ( + + + + ))} + + )} + + {store.ui.mediaQuery.isMobile && ( +
+ + + Kategori + + + +
+ + + + + + + Sub Category + + + + + + + + + + Produk & Nominal + + + {/* */} + + + {store.transaction.data.length != 0 && ( + + {store.transaction.data.map((item, index) => ( + + { + setVisibleModalBuy(true); + setBarang(item); + }} + hoverable + style={{ + cursor: "pointer", + marginLeft: 10, + borderColor: "salmon", + height: 100, + marginBottom: 10, + }} + > + + {item?.product_name} + +
+ + {new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR", + }).format(item?.price)} + + + + ))} + + )} + { + form.resetFields(); + setVisibleModalBuy(false); + }} + // footer={footerLayoutFilter} + footer={[ + , + , + , + ]} + > + + + + + + + + )} ); diff --git a/src/store/transaction.js b/src/store/transaction.js index 145b6c8..4c481de 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -23,7 +23,7 @@ export class Transaction { pageSizeSubCategories = 10; dataSubCategories = []; total_dataSubCategories = 0; - filterSubCategory = null; + //filterSubCategory = null; pageHistoryTransaction = 0; pageSizeHistoryTransaction = 10; From b18e2dc61984c47bc1f90ab0a3ee936d7492e8e0 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 13:58:51 +0700 Subject: [PATCH 06/14] Hide Fitur --- src/pages/Membership/DetailUser.js | 146 +++++++++++++++-------------- src/store/transaction.js | 2 +- 2 files changed, 77 insertions(+), 71 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 435ba80..d3eed8f 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -163,7 +163,7 @@ export const DetailUser = observer(() => { { title: "Pengirim", dataIndex: "sender_name", - key: "sender_name" + key: "sender_name", }, { title: "Nominal", @@ -396,8 +396,8 @@ export const DetailUser = observer(() => { Detail User { wrap={true} style={{ textAlign: "center" }} > - - - + {store.authentication.userData.role === "Admin" && ( + + + + + + )} {((store.authentication.userData.role === "Sales" && store.membership.dataDetail.is_rejected === true && store.membership.dataDetail.is_active === false) || diff --git a/src/store/transaction.js b/src/store/transaction.js index 4c481de..a934936 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -171,7 +171,7 @@ export class Transaction { async getDataHistoryTopUpProfile(id) { try { 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') this.dataHistoryTopUpProfile = response.body.data ?? []; From c0fdb7c2328c8a04e8772591e6c88a14f621285c Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 14:52:56 +0700 Subject: [PATCH 07/14] Bug Fixing --- src/pages/App/DesktopLayout.js | 6 ++---- src/pages/App/MenuList.js | 5 ++--- src/pages/Profile/Profile.js | 11 ++++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index 884d31b..6a7332b 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -312,16 +312,14 @@ export const DesktopLayout = observer(() => { )} - {store.authentication.userData.role !== "Admin" || - (store.authentication.userData.role !== - "Customer Service" && ( + {store.authentication.userData.role !== "Admin" && ( Dibuat oleh Saya - ))} + )} )} {store.authentication.userData.role !== "Admin" && ( diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js index 031d504..8cec5e6 100644 --- a/src/pages/App/MenuList.js +++ b/src/pages/App/MenuList.js @@ -242,15 +242,14 @@ export const MenuList = observer((props) => { )} - {store.authentication.userData.role !== "Admin" || - (store.authentication.userData.role !== "Customer Service" && ( + {store.authentication.userData.role !== "Admin" && ( Dibuat oleh Saya - ))} + )} )} {store.authentication.userData.role !== "Admin" && ( diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index c5e0e32..eab0725 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -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); }} > From c63c1b961d9a3127474ec95da8f42c2e9312d932 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 15:39:06 +0700 Subject: [PATCH 08/14] Bug Fixing --- src/pages/Profile/Profile.js | 2 +- src/pages/Transaction/Transaction.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index eab0725..cf8f514 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -65,7 +65,7 @@ export const Profile = observer(() => { store.transaction.getDataHistoryTransaction(), ]); await store.transaction.getDataHistoryTopUpProfile( - store.authentication.profileData?.userDetail?.id + store.authentication.profileData?.id ); modalLoader.setLoading(false); })(); diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js index a1f9567..b10f4c4 100644 --- a/src/pages/Transaction/Transaction.js +++ b/src/pages/Transaction/Transaction.js @@ -175,7 +175,7 @@ export const Transaction = observer(() => { handleChangeSubcategory(val)} style={{ marginBottom: "10px", width: "100%" }} From 32f33e6102af2bbf6b7ed2d3d18d21f101e07c26 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 16:39:05 +0700 Subject: [PATCH 09/14] Bug Fixing --- src/component/CategoryComponent.js | 4 ++- src/component/SubcategoryComponent.js | 2 ++ src/pages/Membership/DetailUser.js | 51 +++++++++++++++++++++------ src/pages/Membership/Membership.js | 2 +- src/pages/Profile/Profile.js | 31 +++++++++++++--- src/store/transaction.js | 2 +- 6 files changed, 74 insertions(+), 18 deletions(-) diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js index 9377b1f..c9f6a3e 100644 --- a/src/component/CategoryComponent.js +++ b/src/component/CategoryComponent.js @@ -8,7 +8,7 @@ import { Space, Table, List, - Divider + Divider, } from "antd"; import { observer } from "mobx-react-lite"; import { useHistory } from "react-router-dom"; @@ -55,6 +55,8 @@ export const CategoryComponent = observer((props) => { }, ]; + if (store.authentication.userData.role === "Customer Service") columns.pop(); + const deleteData = async (id) => { try { console.log(id); diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js index 3400dba..1feca78 100644 --- a/src/component/SubcategoryComponent.js +++ b/src/component/SubcategoryComponent.js @@ -67,6 +67,8 @@ export const SubcategoryComponent = observer((props) => { }, ]; + if (store.authentication.userData.role === "Customer Service") columns.pop(); + const handleCancel = () => { setIdData(""); store.subcategory.visibleModalSubcategory = false; diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index d3eed8f..5e6fc4c 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -42,6 +42,7 @@ export const DetailUser = observer(() => { const [filterStart, setFilterStart] = useState([]); const [filterEnd, setFilterEnd] = useState([]); const [visibleHis, setVisibleHis] = useState(true); + const [actionFilter, setAction] = useState(false); useEffect(() => { (async () => { @@ -326,19 +327,31 @@ export const DetailUser = observer(() => { form.resetFields(); setFilterStart([]); setFilterEnd([]); - await store.transaction.getDetailHistoryTransaction( - store.authentication.dataProfit.id - ); + actionFilter === true + ? await store.transaction.getDataHistoryTopUp(id) + : await store.transaction.getDetailHistoryTransaction( + store.authentication.dataProfit.id + ); + // await store.transaction.getDetailHistoryTransaction( + // store.authentication.dataProfit.id + // ); store.transaction.visibleModalFilterTransaction = false; + setAction(false) }; const handleCancelFilter = async () => { store.transaction.filterStart = null; store.transaction.filterEnd = null; store.transaction.visibleModalFilterTransaction = false; - await store.transaction.getDetailHistoryTransaction( - store.authentication.dataProfit.id - ); + actionFilter === true + ? await store.transaction.getDataHistoryTopUp(id) + : await store.transaction.getDetailHistoryTransaction( + store.authentication.dataProfit.id + ); + // await store.transaction.getDetailHistoryTransaction( + // store.authentication.dataProfit.id + // ); + setAction(false) }; const handleSubmitFilter = async () => { @@ -350,13 +363,16 @@ export const DetailUser = observer(() => { "YYYY-MM-DD HH:mm:ss" ); modalLoader.setLoading(true); - await store.transaction.getDetailHistoryTransaction( - store.authentication.dataProfit.id - ); + actionFilter === true + ? await store.transaction.getDataHistoryTopUp(id) + : await store.transaction.getDetailHistoryTransaction( + store.authentication.dataProfit.id + ); modalLoader.setLoading(false); store.transaction.filterStart = null; store.transaction.filterEnd = null; store.transaction.visibleModalFilterTransaction = false; + setAction(false) }; const footerLayoutFilter = [ +
{ store.transaction.filterStart = null; store.transaction.filterEnd = null; store.transaction.visibleModalFilterTransaction = false; - await store.transaction.getDetailHistoryTransaction(); + actionFilter === true + ? await store.transaction.getDataHistoryTopUp(id) + : await store.transaction.getDetailHistoryTransaction( + store.authentication.dataProfit.id + ); + //await store.transaction.getDetailHistoryTransaction(); }} > diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index 13f13fa..219449d 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -168,7 +168,7 @@ export const Membership = observer(() => { const columns = [ { - title: "Name", + title: "Nama", dataIndex: "name", key: "name", render: (text, record) => record?.name ?? record?.username, diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index cf8f514..1791a57 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -36,7 +36,7 @@ export const Profile = observer(() => { const modalLoader = useContext(ModalLoaderContext); const [filterStart, setFilterStart] = useState([]); const [filterEnd, setFilterEnd] = useState([]); - const [action, setAction] = useState(false); + const [actionFilter, setAction] = useState(false); const routeData = [ { @@ -77,8 +77,14 @@ export const Profile = observer(() => { form.resetFields(); setFilterStart([]); setFilterEnd([]); - await store.transaction.getDataHistoryTransaction(); + //await store.transaction.getDataHistoryTransaction(); + actionFilter === true + ? await store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + ) + : await store.transaction.getDataHistoryTransaction(); store.transaction.visibleModalFilterTransaction = false; + setAction(false) }; const handleCancelFilter = async () => { @@ -86,7 +92,13 @@ export const Profile = observer(() => { //form.resetFields(); store.transaction.filterEnd = null; store.transaction.visibleModalFilterTransaction = false; - await store.transaction.getDataHistoryTransaction(); + actionFilter === true + ? await store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + ) + : await store.transaction.getDataHistoryTransaction(); + setAction(false) + //await store.transaction.getDataHistoryTransaction(); }; const handleSubmitFilter = async () => { @@ -98,12 +110,17 @@ export const Profile = observer(() => { "YYYY-MM-DD HH:mm:ss" )); modalLoader.setLoading(true); - await store.transaction.getDataHistoryTransaction(); + actionFilter === true + ? await store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + ) + : await store.transaction.getDataHistoryTransaction(); modalLoader.setLoading(false); store.transaction.filterStart = null; store.transaction.filterEnd = null; //form.resetFields(); store.transaction.visibleModalFilterTransaction = false; + setAction(false) }; const footerLayoutFilter = [ @@ -665,7 +682,11 @@ export const Profile = observer(() => { store.transaction.filterStart = null; store.transaction.filterEnd = null; store.transaction.visibleModalFilterTransaction = false; - await store.transaction.getDataHistoryTransaction(); + actionFilter === true + ? await store.transaction.getDataHistoryTopUpProfile( + store.authentication.profileData?.id + ) + : await store.transaction.getDataHistoryTransaction(); }} > diff --git a/src/store/transaction.js b/src/store/transaction.js index a934936..62eefd4 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -158,7 +158,7 @@ export class Transaction { async getDataHistoryTopUp(id) { try { const response = await http.get( - `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}` + `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` ); console.log(response,'get data history') this.dataHistoryTopUp = response.body.data ?? []; From 4ea7e8d632bf95279866ac679796feaf1c77c05f Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 16:56:58 +0700 Subject: [PATCH 10/14] Fixing Tampilan Mobile Menu Detail User --- src/pages/Membership/DetailUser.js | 153 ++++++++++++++++++++++------- 1 file changed, 118 insertions(+), 35 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 5e6fc4c..49882b5 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -336,7 +336,7 @@ export const DetailUser = observer(() => { // store.authentication.dataProfit.id // ); store.transaction.visibleModalFilterTransaction = false; - setAction(false) + setAction(false); }; const handleCancelFilter = async () => { @@ -351,7 +351,7 @@ export const DetailUser = observer(() => { // await store.transaction.getDetailHistoryTransaction( // store.authentication.dataProfit.id // ); - setAction(false) + setAction(false); }; const handleSubmitFilter = async () => { @@ -372,7 +372,7 @@ export const DetailUser = observer(() => { store.transaction.filterStart = null; store.transaction.filterEnd = null; store.transaction.visibleModalFilterTransaction = false; - setAction(false) + setAction(false); }; const footerLayoutFilter = [ - -
{ - let pageNumber = page.current; - store.transaction.pageSize = page.pageSize; - store.transaction.page = pageNumber - 1; - modalLoader.setLoading(true); - await getData(); - modalLoader.setLoading(false); - }} - /> + {store.ui.mediaQuery.isDesktop && ( +
+ +
{ + let pageNumber = page.current; + store.transaction.pageSize = page.pageSize; + store.transaction.page = pageNumber - 1; + modalLoader.setLoading(true); + await getData(); + modalLoader.setLoading(false); + }} + /> + + )} + {store.ui.mediaQuery.isMobile && ( +
+ + { + store.transaction.pageSize = pageSize; + store.transaction.page = page - 1; + modalLoader.setLoading(true); + await getData(); + modalLoader.setLoading(false); + }, + pageSize: store.transaction.pageSize, + total: store.transaction.total_data, + current: store.transaction.page + 1, + style: { marginBottom: "1rem", marginRight: "1rem" }, + }} + dataSource={store.transaction.dataHistoryTopUp} + style={{ padding: 0 }} + renderItem={(item) => { + return ( +
+ + +

+ + Amount :{" "} + {new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR", + }).format(item.amount || 0)} + {" "} +
+ + Transaction Date :{" "} + {format( + parseISO(item.transaction_date), + "dd-MM-yyyy hh:mm:ss" + )} + {" "} +
+

+
+ } + /> + + +
+ ); + }} + /> + + )} {store.ui.mediaQuery.isDesktop && ( From 1346d625f8e9347d7086598ae8519afc1beb115a Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 3 Feb 2022 18:26:58 +0700 Subject: [PATCH 11/14] Bug Fixing --- src/component/CategoryComponent.js | 2 +- src/component/CommissionComponent.js | 4 +-- src/component/PartnerComponent.js | 4 +-- src/component/ProductComponent.js | 6 ++--- src/component/SubcategoryComponent.js | 6 ++--- src/component/SupplierComponent.js | 4 +-- src/pages/Membership/DetailUser.js | 22 ++++++++-------- src/pages/Membership/Konfirmasi.js | 6 ++--- src/pages/Membership/Membership.js | 24 +++++++++++------- src/pages/Payback/Payback.js | 8 +++--- src/pages/Profile/Profile.js | 36 +++++++++++++-------------- 11 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js index c9f6a3e..70fc4f1 100644 --- a/src/component/CategoryComponent.js +++ b/src/component/CategoryComponent.js @@ -40,7 +40,7 @@ export const CategoryComponent = observer((props) => { key: "code", }, { - title: "Category Name", + title: "Kategori", dataIndex: "name", key: "name", }, diff --git a/src/component/CommissionComponent.js b/src/component/CommissionComponent.js index 94d7abf..d4c7584 100644 --- a/src/component/CommissionComponent.js +++ b/src/component/CommissionComponent.js @@ -23,7 +23,7 @@ export const CommissionComponent = observer((props) => { const columns = [ { - title: "Name", + title: "Nama", dataIndex: "name", key: "name", }, @@ -45,7 +45,7 @@ export const CommissionComponent = observer((props) => { ]; if (store.authentication.userData.role === "Customer Service") columns.pop(); - + const handleCancel = () => { setIdData(""); store.commission.visibleModalCommission = false; diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js index ed31f0a..b4ea10f 100644 --- a/src/component/PartnerComponent.js +++ b/src/component/PartnerComponent.js @@ -71,7 +71,7 @@ export const PartnerComponent = observer((props) => { const columns = [ { - title: "Name", + title: "Nama", dataIndex: "name", key: "name", }, @@ -123,7 +123,7 @@ export const PartnerComponent = observer((props) => { ), }, ]; - + if (store.authentication.userData.role === "Customer Service") columns.pop(); const deleteData = async (id) => { diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 2982ee8..6c3f8e5 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -242,10 +242,10 @@ export const ProductComponent = observer((props) => { color: "#fff", }} > - Remove Filter + Hapus Filter , , , ]; diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js index 1feca78..1abbf07 100644 --- a/src/component/SubcategoryComponent.js +++ b/src/component/SubcategoryComponent.js @@ -42,17 +42,17 @@ export const SubcategoryComponent = observer((props) => { const columns = [ { - title: "Code", + title: "Kode", dataIndex: "code", key: "code", }, { - title: "Sub Category Name", + title: "Sub Kategori", dataIndex: "name", key: "name", }, { - title: "Category", + title: "Kategori", dataIndex: "categoryName", key: "categoryName", }, diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js index 874539d..a715ef8 100644 --- a/src/component/SupplierComponent.js +++ b/src/component/SupplierComponent.js @@ -65,7 +65,7 @@ export const SupplierComponent = observer((props) => { const columns = [ { - title: "Name", + title: "Nama", dataIndex: "name", key: "name", }, @@ -131,7 +131,7 @@ export const SupplierComponent = observer((props) => { ]; if (store.authentication.userData.role === "Customer Service") columns.pop(); - + const deleteData = async (id) => { try { console.log(id); diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 49882b5..a77fe6c 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -177,7 +177,7 @@ export const DetailUser = observer(() => { }).format(text), }, { - title: "Transaction Date", + title: "Tanggal Transaksi", dataIndex: "transaction_date", key: "transaction_date", render: (text, record) => { @@ -197,7 +197,7 @@ export const DetailUser = observer(() => { key: "name", }, { - title: "Price", + title: "Harga", dataIndex: "price", key: "price", render: (text) => @@ -383,10 +383,10 @@ export const DetailUser = observer(() => { color: "#fff", }} > - Remove Filter + Hapus Filter , , , ]; return ( @@ -536,12 +536,12 @@ export const DetailUser = observer(() => { {store.authentication.dataProfit.username} - + {/* Role{store.authentication.dataProfit.roles?.name} - + */} Phone Number @@ -585,7 +585,7 @@ export const DetailUser = observer(() => { ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}` : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" } - style={{ width: "10vw" }} + style={{ width: "8vw" }} /> @@ -605,7 +605,7 @@ export const DetailUser = observer(() => { ? `${appConfig.apiUrl}/config/image/${item}` : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" } - style={{ width: "10vw", marginRight: 15 }} + style={{ width: "8vw", marginRight: 10 }} /> ) ) @@ -734,7 +734,7 @@ export const DetailUser = observer(() => { - + {store.ui.mediaQuery.isDesktop && (
)} - + {store.ui.mediaQuery.isDesktop && (
, , , ]; const handleCancelTransaction = () => { @@ -225,6 +226,7 @@ export const Membership = observer(() => { }, ]; + if (store.authentication.userData.role === "Customer Service") columns.pop(); const routeData = [ { route: LINKS.HOME, @@ -362,16 +364,18 @@ export const Membership = observer(() => { key="1" hasEmpty columns={columns} - style={{ cursor: "pointer" }} + //style={{ cursor: "pointer" }} dataSource={ - store.authentication.userData.role === "Admin" + store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service" ? store.membership.dataMember : store.membership.data } pagination={{ pageSize: store.membership.pageSize, total: - store.authentication.userData.role === "Admin" + store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service" ? store.membership.dataTotal : store.membership.total_data, current: store.membership.page + 1, @@ -404,14 +408,16 @@ export const Membership = observer(() => { }, pageSize: store.membership.pageSize, total: - store.authentication.userData.role === "Admin" + store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service" ? store.membership.dataTotal : store.membership.total_data, current: store.membership.page + 1, style: { marginBottom: "1rem", marginRight: "1rem" }, }} dataSource={ - store.authentication.userData.role === "Admin" + store.authentication.userData.role === "Admin" || + store.authentication.userData.role === "Customer Service" ? store.membership.dataMember : store.membership.data } diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index f3fb240..1c0d954 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -67,7 +67,7 @@ export const Payback = observer(() => { const columns = [ { - title: "Name", + title: "Nama", dataIndex: "userData_name", key: "userData_name", }, @@ -254,10 +254,10 @@ export const Payback = observer(() => { color: "#fff", }} > - Remove Filter + Hapus Filter , , , ]; return ( diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 1791a57..cc6a0cf 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -84,7 +84,7 @@ export const Profile = observer(() => { ) : await store.transaction.getDataHistoryTransaction(); store.transaction.visibleModalFilterTransaction = false; - setAction(false) + setAction(false); }; const handleCancelFilter = async () => { @@ -97,18 +97,18 @@ export const Profile = observer(() => { store.authentication.profileData?.id ) : await store.transaction.getDataHistoryTransaction(); - setAction(false) + setAction(false); //await store.transaction.getDataHistoryTransaction(); }; const handleSubmitFilter = async () => { const data = form.getFieldsValue(); - const awal = (store.transaction.filterStart = moment( - data.start_date - ).format("YYYY-MM-DD HH:mm:ss")); - const akhir = (store.transaction.filterEnd = moment(data.end_date).format( + store.transaction.filterStart = moment(data.start_date).format( "YYYY-MM-DD HH:mm:ss" - )); + ); + store.transaction.filterEnd = moment(data.end_date).format( + "YYYY-MM-DD HH:mm:ss" + ); modalLoader.setLoading(true); actionFilter === true ? await store.transaction.getDataHistoryTopUpProfile( @@ -120,7 +120,7 @@ export const Profile = observer(() => { store.transaction.filterEnd = null; //form.resetFields(); store.transaction.visibleModalFilterTransaction = false; - setAction(false) + setAction(false); }; const footerLayoutFilter = [ @@ -132,10 +132,10 @@ export const Profile = observer(() => { color: "#fff", }} > - Remove Filter + Hapus Filter , , , ]; const columns = [ { - title: "Name Produk", + title: "Nama Produk", dataIndex: "name", key: "name", }, { - title: "Price", + title: "Harga", dataIndex: "price", key: "price", render: (text) => @@ -251,7 +251,7 @@ export const Profile = observer(() => { }).format(text), }, { - title: "Transaction Date", + title: "Tanggal Transaksi", dataIndex: "transaction_date", key: "transaction_date", render: (text, record) => { @@ -314,12 +314,12 @@ export const Profile = observer(() => {
{store.authentication.profileData?.username} - + {/* Role{store.authentication.profileData.roles?.name} - + */} Upline @@ -411,7 +411,7 @@ export const Profile = observer(() => { - + {store.authentication.dataProfit.is_active === true - ? "Active" - : "Inactive"} + ? "Aktif" + : "Inaktif"} {store.authentication.userData.role === "Admin" && @@ -710,7 +710,7 @@ export const DetailUser = observer(() => { - Profit + Keuntungan diff --git a/src/pages/Transaction/Product.js b/src/pages/Transaction/Product.js index 12e8c69..ff73f3c 100644 --- a/src/pages/Transaction/Product.js +++ b/src/pages/Transaction/Product.js @@ -122,13 +122,13 @@ export const Product = observer(() => {
- Sub Category + Jenis Produk
handleChangeTabs(val)} style={{ marginBottom: "10px", width: "100%" }} @@ -191,13 +191,13 @@ export const Transaction = observer(() => { - Sub Kategori + Kategori