diff --git a/src/index.css b/src/index.css
index 18d9f14..daea40c 100644
--- a/src/index.css
+++ b/src/index.css
@@ -75,4 +75,8 @@ code {
.profile-container .ant-popover-inner-content {
padding: 0 !important;
+}
+
+.ant-menu-item-divider{
+ border-style: transparent !important;
}
\ No newline at end of file
diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js
index 0e7134d..a42cd97 100644
--- a/src/pages/Home/Home.js
+++ b/src/pages/Home/Home.js
@@ -8,6 +8,7 @@ import {
BarChartOutlined,
} from "@ant-design/icons";
import { ModalLoaderContext } from "../../utils/modal";
+import Title from "antd/lib/skeleton/Title";
export const Home = observer(() => {
const modalLoader = useContext(ModalLoaderContext);
@@ -20,7 +21,7 @@ export const Home = observer(() => {
await getData();
await store.membership.getDataBySuperior();
await store.partner.getData();
- if(isAdmin){
+ if (isAdmin) {
await store.transaction.getDataTransaction();
await store.transaction.getDataTransactionB2B();
} else {
@@ -99,152 +100,230 @@ export const Home = observer(() => {
];
return (
- {store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin" && (
-
-
-
- {/**/}
-
- {store.transaction.dataTransaction.total_transaction} Transaksi B2C}>
-
-
Total Penjualan : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransaction.total_amount)}
-
- Total Modal : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransaction.total_modal)}
-
- Total Profit : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransaction.total_profit)}
-
- Total Komisi : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransaction.total_commission)}
-
-
-
-
-
-
- {store.transaction.dataTransactionB2B.total_transaction} Transaksi B2B}>
-
-
Total Penjualan : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransactionB2B.total_amount)}
-
- Total Modal : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransactionB2B.total_modal)}
-
- Total Profit : { new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransactionB2B.total_profit)}
-
-
-
-
- {/**/}
- {/* */}
- {/* Total Keuntungan B2C}>*/}
- {/* */}
- {/* {new Intl.NumberFormat("id-ID", {*/}
- {/* style: "currency",*/}
- {/* currency: "IDR",*/}
- {/* }).format(store.authentication.profileData?.wallet || 0)}*/}
- {/* */}
- {/* */}
- {/*
*/}
- {/**/}
-
- )}
- {store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin Partner" && (
+ {store.ui.mediaQuery.isDesktop &&
+ store.authentication.userData.role === "Admin" && (
+ {store.transaction.dataTransaction.total_transaction}{" "}
+ Transaksi B2C
+
+ }
+ style={{
+ marginLeft: 20,
+ height: 200,
+ marginBottom: 10,
+ borderColor: "salmon",
+ width: "45%",
+ }}
+ >
+
+
+
+
+
+ Total Penjualan :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_amount
+ )}
+
+
+
+ Total Modal :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_modal
+ )}
+
+
+
+
+
+
+ Total Profit :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_profit
+ )}
+
+
+
+ Total Komisi :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_commission
+ )}
+
+
+
+
+
+
+
+ {store.transaction.dataTransactionB2B.total_transaction}{" "}
+ Transaksi B2B
+
+ }
+ style={{
+ marginLeft: 20,
+ height: 200,
+ marginBottom: 10,
+ borderColor: "salmon",
+ width: "45%",
+ }}
+ >
+
+
+
+
+
+ Total Penjualan :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionB2B.total_amount
+ )}
+
+
+
+ Total Modal :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionB2B.total_modal
+ )}
+
+
+
+
+
+
+ Total Profit :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionB2B.total_profit
+ )}
+
+
+
+
+
+
+ {/**/}
+ {/* */}
+ {/* Total Keuntungan B2C}>*/}
+ {/* */}
+ {/* {new Intl.NumberFormat("id-ID", {*/}
+ {/* style: "currency",*/}
+ {/* currency: "IDR",*/}
+ {/* }).format(store.authentication.profileData?.wallet || 0)}*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/**/}
+
+ )}
+ {store.ui.mediaQuery.isDesktop &&
+ store.authentication.userData.role === "Admin Partner" && (
+
+
Total Transaksi}>
-
{store.transaction.dataTransactionPartner.total_transaction}
+
+ {
+ store.transaction.dataTransactionPartner
+ .total_transaction
+ }
+
Total Penjualan}>
-
{ new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(store.transaction.dataTransactionPartner.total_amount)}
+
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionPartner.total_amount
+ )}
+
@@ -272,7 +351,258 @@ export const Home = observer(() => {
{/*
*/}
{/**/}
- )}
+ )}
+ {store.ui.mediaQuery.isMobile &&
+ store.authentication.userData.role === "Admin" && (
+
+
+ {store.transaction.dataTransaction.total_transaction}{" "}
+ Transaksi B2C
+
+ }
+ style={{
+ marginLeft: 10,
+ height: 220,
+ marginBottom: 10,
+ borderColor: "salmon",
+ width: "90%",
+ }}
+ >
+
+
+
+
+
+ Total Penjualan :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_amount
+ )}
+
+
+
+ Total Modal :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_modal
+ )}
+
+
+
+
+
+
+ Total Profit :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_profit
+ )}
+
+
+
+ Total Komisi :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransaction.total_commission
+ )}
+
+
+
+
+
+
+
+ {store.transaction.dataTransactionB2B.total_transaction}{" "}
+ Transaksi B2B
+
+ }
+ style={{
+ marginLeft: 10,
+ height: 200,
+ borderColor: "salmon",
+ width: "90%",
+ }}
+ >
+
+
+
+
+
+ Total Penjualan :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionB2B.total_amount
+ )}
+
+
+
+ Total Modal :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionB2B.total_modal
+ )}
+
+
+
+
+
+
+ Total Profit :{" "}
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionB2B.total_profit
+ )}
+
+
+
+
+
+
+ {/**/}
+ {/* */}
+ {/* Total Keuntungan B2C}>*/}
+ {/* */}
+ {/* {new Intl.NumberFormat("id-ID", {*/}
+ {/* style: "currency",*/}
+ {/* currency: "IDR",*/}
+ {/* }).format(store.authentication.profileData?.wallet || 0)}*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/**/}
+
+ )}
+ {store.ui.mediaQuery.isMobile &&
+ store.authentication.userData.role === "Admin Partner" && (
+
+
+
+ Total Transaksi}>
+
+
+ {
+ store.transaction.dataTransactionPartner
+ .total_transaction
+ }
+
+
+
+
+
+
+
+ Total Penjualan}>
+
+
+ {new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(
+ store.transaction.dataTransactionPartner.total_amount
+ )}
+
+
+
+
+
+ {/**/}
+ {/* */}
+ {/* Total Keuntungan B2C}>*/}
+ {/* */}
+ {/* {new Intl.NumberFormat("id-ID", {*/}
+ {/* style: "currency",*/}
+ {/* currency: "IDR",*/}
+ {/* }).format(store.authentication.profileData?.wallet || 0)}*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/**/}
+
+ )}
{/*{store.authentication.userData.role === "Admin" &&*/}
{/* store.ui.mediaQuery.isDesktop && (*/}
{/*
*/}
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 9f4fb16..b250765 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -224,7 +224,7 @@ export const DetailUser = observer(() => {
Detail User
-
+
{store.authentication.userData.role === "Admin" && (
{
current: store.membership.page + 1,
style: { marginBottom: "1rem", marginRight: "1rem" },
}}
- dataSource={store.membership.data}
+ dataSource={
+ store.authentication.userData.role === "Admin"
+ ? store.membership.dataMember
+ : store.membership.data
+ }
style={{ padding: 0 }}
renderItem={(item) => {
return (