diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js
index 3c61c29..a11c45c 100644
--- a/src/pages/Home/Home.js
+++ b/src/pages/Home/Home.js
@@ -20,7 +20,13 @@ export const Home = observer(() => {
         await getData();
         await store.membership.getDataBySuperior();
         await store.partner.getData();
-        await store.transaction.getDataTransaction();
+        if(isAdmin){
+          await store.transaction.getDataTransaction();
+          await store.transaction.getDataTransactionB2B();
+        } else {
+          await store.transaction.getDataTransactionPartner();
+        }
+
         await store.role.getData(isAdmin);
         modalLoader.setLoading(false);
       } catch (e) {
@@ -93,7 +99,7 @@ export const Home = observer(() => {
   ];
   return (
     <div>
-      {store.ui.mediaQuery.isDesktop && (
+      {store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin" && (
         <Row
           style={{
             marginTop: 30,
@@ -108,15 +114,33 @@ export const Home = observer(() => {
               height: 200,
               marginBottom: 10,
               borderColor: "salmon",
-              width: "30%",
+              width: "45%",
             }}
           >
             <Row>
-              <BarChartOutlined style={{ fontSize: 25 ,marginRight:80}} />
+              {/*<BarChartOutlined style={{ fontSize: 25 ,marginRight:80}} />*/}
               
-              <PageHeader title={<span>Total Transaksi</span>}>
+              <PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2C</span>}>
                 <p>
-                  <h4>{store.transaction.dataTransaction} Transaksi</h4>
+                  <h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.transaction.dataTransaction.total_amount)}</h4>
+
+                  <h4>Total Modal : { new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.transaction.dataTransaction.total_modal)}</h4>
+
+                  <h4>Total Profit : { new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.transaction.dataTransaction.total_profit)}</h4>
+
+                  <h4>Total Komisi : { new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.transaction.dataTransaction.total_commission)}</h4>
                 </p>
               </PageHeader>
             </Row>
@@ -129,257 +153,337 @@ export const Home = observer(() => {
               height: 200,
               marginBottom: 10,
               borderColor: "salmon",
-              width: "30%",
+              width: "45%",
             }}
           >
             <Row>
-              <DropboxOutlined style={{ fontSize: 25 }} />
-              <PageHeader title={<span>Total Keuntungan B2B</span>}>
-                <span>
-                  {new Intl.NumberFormat("id-ID", {
+              <PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2B</span>}>
+              <p>
+                  <h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
                     style: "currency",
                     currency: "IDR",
-                  }).format(store.authentication.profileData?.wallet || 0)}
-                </span>
-              </PageHeader>
-            </Row>
-          </Card>
-          <Card
-            className={"shadow"}
-            hoverable
-            style={{
-              marginLeft: 20,
-              height: 200,
-              marginBottom: 10,
-              borderColor: "salmon",
-              width: "30%",
-            }}
-          >
-            <Row>
-              <DollarCircleOutlined style={{ fontSize: 25 }} />
-              <PageHeader title={<span>Total Keuntungan B2C</span>}>
-                <span>
-                  {new Intl.NumberFormat("id-ID", {
-                    style: "currency",
-                    currency: "IDR",
-                  }).format(store.authentication.profileData?.wallet || 0)}
-                </span>
+                  }).format(store.transaction.dataTransactionB2B.total_amount)}</h4>
+
+                  <h4>Total Modal : { new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.transaction.dataTransactionB2B.total_modal)}</h4>
+
+                  <h4>Total Profit : { new Intl.NumberFormat("id-ID", {
+                    style: "currency",
+                    currency: "IDR",
+                  }).format(store.transaction.dataTransactionB2B.total_profit)}</h4>
+                </p>
               </PageHeader>
             </Row>
           </Card>
+          {/*<Card*/}
+          {/*  className={"shadow"}*/}
+          {/*  hoverable*/}
+          {/*  style={{*/}
+          {/*    marginLeft: 20,*/}
+          {/*    height: 200,*/}
+          {/*    marginBottom: 10,*/}
+          {/*    borderColor: "salmon",*/}
+          {/*    width: "30%",*/}
+          {/*  }}*/}
+          {/*>*/}
+          {/*  <Row>*/}
+          {/*    <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
+          {/*      <span>*/}
+          {/*        {new Intl.NumberFormat("id-ID", {*/}
+          {/*          style: "currency",*/}
+          {/*          currency: "IDR",*/}
+          {/*        }).format(store.authentication.profileData?.wallet || 0)}*/}
+          {/*      </span>*/}
+          {/*    </PageHeader>*/}
+          {/*  </Row>*/}
+          {/*</Card>*/}
         </Row>
       )}
-      {store.authentication.userData.role === "Admin" &&
-        store.ui.mediaQuery.isDesktop && (
-          <Row style={{ marginLeft: 50, marginTop: 10 }}>
-            <Card
-              className={"shadow"}
-              title="List Transaksi B2B"
+      {store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin Partner" && (
+          <Row
               style={{
-                marginBottom: 30,
-                marginRight: 20,
-                borderColor: "salmon",
-                width: "47%",
+                marginTop: 30,
+                marginLeft: 30,
               }}
+          >
+            <Card
+                className={"shadow"}
+                hoverable
+                style={{
+                  marginLeft: 20,
+                  height: 200,
+                  marginBottom: 10,
+                  borderColor: "salmon",
+                  width: "45%",
+                }}
             >
-              <Table
-                key="1"
-                hasEmpty
-                size="large"
-                columns={columns}
-                dataSource={store.membership.data}
-                bordered
-                pagination={{
-                  pageSize: store.membership.pageSize,
-                  total: store.membership.totalData,
-                  current: store.membership.page + 1,
-                  showSizeChanger: true,
-                  simple: false,
-                }}
-                onChange={async (page) => {
-                  let pageNumber = page.current;
-                  store.membership.pageSize = page.pageSize;
-                  store.membership.page = pageNumber - 1;
-                  modalLoader.setLoading(true);
-                  await getData();
-                  modalLoader.setLoading(false);
-                }}
-              />
+              <Row>
+                <PageHeader title={<span>Total Transaksi</span>}>
+                  <p>
+                    <h4>{store.transaction.dataTransactionPartner.total_transaction}</h4>
+                  </p>
+                </PageHeader>
+              </Row>
             </Card>
             <Card
-              className={"shadow"}
-              title="List Transaksi B2C"
-              style={{
-                marginBottom: 30,
-                borderColor: "salmon",
-                width: "47%",
-              }}
+                className={"shadow"}
+                hoverable
+                style={{
+                  marginLeft: 20,
+                  height: 200,
+                  marginBottom: 10,
+                  borderColor: "salmon",
+                  width: "45%",
+                }}
             >
-              <Table
-                key="1"
-                hasEmpty
-                size="large"
-                columns={columns}
-                dataSource={store.membership.data}
-                bordered
-                pagination={{
-                  pageSize: store.membership.pageSize,
-                  total: store.membership.totalData,
-                  current: store.membership.page + 1,
-                  showSizeChanger: true,
-                  simple: false,
-                }}
-                onChange={async (page) => {
-                  let pageNumber = page.current;
-                  store.membership.pageSize = page.pageSize;
-                  store.membership.page = pageNumber - 1;
-                  modalLoader.setLoading(true);
-                  await getData();
-                  modalLoader.setLoading(false);
-                }}
-              />
+              <Row>
+                <PageHeader title={<span>Total Penjualan</span>}>
+                  <p>
+                    <h4>{ new Intl.NumberFormat("id-ID", {
+                      style: "currency",
+                      currency: "IDR",
+                    }).format(store.transaction.dataTransactionPartner.total_amount)}</h4>
+                  </p>
+                </PageHeader>
+              </Row>
             </Card>
+            {/*<Card*/}
+            {/*  className={"shadow"}*/}
+            {/*  hoverable*/}
+            {/*  style={{*/}
+            {/*    marginLeft: 20,*/}
+            {/*    height: 200,*/}
+            {/*    marginBottom: 10,*/}
+            {/*    borderColor: "salmon",*/}
+            {/*    width: "30%",*/}
+            {/*  }}*/}
+            {/*>*/}
+            {/*  <Row>*/}
+            {/*    <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
+            {/*      <span>*/}
+            {/*        {new Intl.NumberFormat("id-ID", {*/}
+            {/*          style: "currency",*/}
+            {/*          currency: "IDR",*/}
+            {/*        }).format(store.authentication.profileData?.wallet || 0)}*/}
+            {/*      </span>*/}
+            {/*    </PageHeader>*/}
+            {/*  </Row>*/}
+            {/*</Card>*/}
           </Row>
-        )}
-      {store.ui.mediaQuery.isMobile && (
-        <div style={{ marginTop: 10 }}>
-          <Card
-            className={"shadow"}
-            hoverable
-            style={{
-              marginLeft: 20,
-              height: 200,
-              marginBottom: 10,
-              marginRight: 20,
-              borderColor: "salmon",
-            }}
-          >
-            <Row>
-              <BarChartOutlined style={{ fontSize: 25,marginRight:80 }} />
-              <PageHeader title={<span>Total Transaksi</span>}>
-                <p>
-                  <h4>{store.transaction.dataTransaction} Transaksi</h4>
-                </p>
-              </PageHeader>
-            </Row>
-          </Card>
-          <Card
-            className={"shadow"}
-            hoverable
-            style={{
-              marginLeft: 20,
-              height: 200,
-              marginBottom: 10,
-              marginRight: 20,
-              borderColor: "salmon",
-            }}
-          >
-            <Row>
-              <DropboxOutlined style={{ fontSize: 25 }} />
-              <PageHeader title={<span>Total Keuntungan B2B</span>}>
-                <span>
-                  {new Intl.NumberFormat("id-ID", {
-                    style: "currency",
-                    currency: "IDR",
-                  }).format(store.authentication.profileData?.wallet || 0)}
-                </span>
-              </PageHeader>
-            </Row>
-          </Card>
-          <Card
-            className={"shadow"}
-            hoverable
-            style={{
-              marginLeft: 20,
-              height: 200,
-              marginBottom: 10,
-              marginRight: 20,
-              borderColor: "salmon",
-            }}
-          >
-            <Row>
-              <DollarCircleOutlined style={{ fontSize: 25 }} />
-              <PageHeader title={<span>Total Keuntungan B2C</span>}>
-                <span>
-                  {new Intl.NumberFormat("id-ID", {
-                    style: "currency",
-                    currency: "IDR",
-                  }).format(store.authentication.profileData?.wallet || 0)}
-                </span>
-              </PageHeader>
-            </Row>
-          </Card>
-        </div>
       )}
-      {store.authentication.userData.role === "Admin" &&
-        store.ui.mediaQuery.isMobile && (
-          <Row style={{ marginLeft: 20, marginRight: 20, marginTop: 10 }}>
-            <Card
-              className={"shadow"}
-              title="List Transaksi B2B"
-              style={{
-                marginBottom: 10,
-                borderColor: "salmon",
-              }}
-            >
-              <Table
-                key="1"
-                hasEmpty
-                size="small"
-                columns={columns}
-                dataSource={store.membership.data}
-                bordered
-                pagination={{
-                  pageSize: store.membership.pageSize,
-                  total: store.membership.totalData,
-                  current: store.membership.page + 1,
-                  showSizeChanger: true,
-                  simple: false,
-                }}
-                onChange={async (page) => {
-                  let pageNumber = page.current;
-                  store.membership.pageSize = page.pageSize;
-                  store.membership.page = pageNumber - 1;
-                  modalLoader.setLoading(true);
-                  await getData();
-                  modalLoader.setLoading(false);
-                }}
-              />
-            </Card>
-            <Card
-              className={"shadow"}
-              title="List Transaksi B2C"
-              style={{
-                marginBottom: 30,
-                borderColor: "salmon",
-              }}
-            >
-              <Table
-                key="1"
-                hasEmpty
-                size="small"
-                columns={columns}
-                dataSource={store.membership.data}
-                bordered
-                pagination={{
-                  pageSize: store.membership.pageSize,
-                  total: store.membership.totalData,
-                  current: store.membership.page + 1,
-                  showSizeChanger: true,
-                  simple: false,
-                }}
-                onChange={async (page) => {
-                  let pageNumber = page.current;
-                  store.membership.pageSize = page.pageSize;
-                  store.membership.page = pageNumber - 1;
-                  modalLoader.setLoading(true);
-                  await getData();
-                  modalLoader.setLoading(false);
-                }}
-              />
-            </Card>
-          </Row>
-        )}
+      {/*{store.authentication.userData.role === "Admin" &&*/}
+      {/*  store.ui.mediaQuery.isDesktop && (*/}
+      {/*    <Row style={{ marginLeft: 50, marginTop: 10 }}>*/}
+      {/*      <Card*/}
+      {/*        className={"shadow"}*/}
+      {/*        title="List Transaksi B2B"*/}
+      {/*        style={{*/}
+      {/*          marginBottom: 30,*/}
+      {/*          marginRight: 20,*/}
+      {/*          borderColor: "salmon",*/}
+      {/*          width: "47%",*/}
+      {/*        }}*/}
+      {/*      >*/}
+      {/*        <Table*/}
+      {/*          key="1"*/}
+      {/*          hasEmpty*/}
+      {/*          size="large"*/}
+      {/*          columns={columns}*/}
+      {/*          dataSource={store.membership.data}*/}
+      {/*          bordered*/}
+      {/*          pagination={{*/}
+      {/*            pageSize: store.membership.pageSize,*/}
+      {/*            total: store.membership.totalData,*/}
+      {/*            current: store.membership.page + 1,*/}
+      {/*            showSizeChanger: true,*/}
+      {/*            simple: false,*/}
+      {/*          }}*/}
+      {/*          onChange={async (page) => {*/}
+      {/*            let pageNumber = page.current;*/}
+      {/*            store.membership.pageSize = page.pageSize;*/}
+      {/*            store.membership.page = pageNumber - 1;*/}
+      {/*            modalLoader.setLoading(true);*/}
+      {/*            await getData();*/}
+      {/*            modalLoader.setLoading(false);*/}
+      {/*          }}*/}
+      {/*        />*/}
+      {/*      </Card>*/}
+      {/*      <Card*/}
+      {/*        className={"shadow"}*/}
+      {/*        title="List Transaksi B2C"*/}
+      {/*        style={{*/}
+      {/*          marginBottom: 30,*/}
+      {/*          borderColor: "salmon",*/}
+      {/*          width: "47%",*/}
+      {/*        }}*/}
+      {/*      >*/}
+      {/*        <Table*/}
+      {/*          key="1"*/}
+      {/*          hasEmpty*/}
+      {/*          size="large"*/}
+      {/*          columns={columns}*/}
+      {/*          dataSource={store.membership.data}*/}
+      {/*          bordered*/}
+      {/*          pagination={{*/}
+      {/*            pageSize: store.membership.pageSize,*/}
+      {/*            total: store.membership.totalData,*/}
+      {/*            current: store.membership.page + 1,*/}
+      {/*            showSizeChanger: true,*/}
+      {/*            simple: false,*/}
+      {/*          }}*/}
+      {/*          onChange={async (page) => {*/}
+      {/*            let pageNumber = page.current;*/}
+      {/*            store.membership.pageSize = page.pageSize;*/}
+      {/*            store.membership.page = pageNumber - 1;*/}
+      {/*            modalLoader.setLoading(true);*/}
+      {/*            await getData();*/}
+      {/*            modalLoader.setLoading(false);*/}
+      {/*          }}*/}
+      {/*        />*/}
+      {/*      </Card>*/}
+      {/*    </Row>*/}
+      {/*  )}*/}
+      {/*{store.ui.mediaQuery.isMobile && (*/}
+      {/*  <div style={{ marginTop: 10 }}>*/}
+      {/*    <Card*/}
+      {/*      className={"shadow"}*/}
+      {/*      hoverable*/}
+      {/*      style={{*/}
+      {/*        marginLeft: 20,*/}
+      {/*        height: 200,*/}
+      {/*        marginBottom: 10,*/}
+      {/*        marginRight: 20,*/}
+      {/*        borderColor: "salmon",*/}
+      {/*      }}*/}
+      {/*    >*/}
+      {/*      <Row>*/}
+      {/*        <BarChartOutlined style={{ fontSize: 25,marginRight:80 }} />*/}
+      {/*        <PageHeader title={<span>Total Transaksi</span>}>*/}
+      {/*          <p>*/}
+      {/*            <h4>{store.transaction.dataTransaction} Transaksi</h4>*/}
+      {/*          </p>*/}
+      {/*        </PageHeader>*/}
+      {/*      </Row>*/}
+      {/*    </Card>*/}
+      {/*    <Card*/}
+      {/*      className={"shadow"}*/}
+      {/*      hoverable*/}
+      {/*      style={{*/}
+      {/*        marginLeft: 20,*/}
+      {/*        height: 200,*/}
+      {/*        marginBottom: 10,*/}
+      {/*        marginRight: 20,*/}
+      {/*        borderColor: "salmon",*/}
+      {/*      }}*/}
+      {/*    >*/}
+      {/*      <Row>*/}
+      {/*        <DropboxOutlined style={{ fontSize: 25 }} />*/}
+      {/*        <PageHeader title={<span>Total Keuntungan B2B</span>}>*/}
+      {/*          <span>*/}
+      {/*            {new Intl.NumberFormat("id-ID", {*/}
+      {/*              style: "currency",*/}
+      {/*              currency: "IDR",*/}
+      {/*            }).format(store.authentication.profileData?.wallet || 0)}*/}
+      {/*          </span>*/}
+      {/*        </PageHeader>*/}
+      {/*      </Row>*/}
+      {/*    </Card>*/}
+      {/*    <Card*/}
+      {/*      className={"shadow"}*/}
+      {/*      hoverable*/}
+      {/*      style={{*/}
+      {/*        marginLeft: 20,*/}
+      {/*        height: 200,*/}
+      {/*        marginBottom: 10,*/}
+      {/*        marginRight: 20,*/}
+      {/*        borderColor: "salmon",*/}
+      {/*      }}*/}
+      {/*    >*/}
+      {/*      <Row>*/}
+      {/*        <DollarCircleOutlined style={{ fontSize: 25 }} />*/}
+      {/*        <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
+      {/*          <span>*/}
+      {/*            {new Intl.NumberFormat("id-ID", {*/}
+      {/*              style: "currency",*/}
+      {/*              currency: "IDR",*/}
+      {/*            }).format(store.authentication.profileData?.wallet || 0)}*/}
+      {/*          </span>*/}
+      {/*        </PageHeader>*/}
+      {/*      </Row>*/}
+      {/*    </Card>*/}
+      {/*  </div>*/}
+      {/*)}*/}
+      {/*{store.authentication.userData.role === "Admin" &&*/}
+      {/*  store.ui.mediaQuery.isMobile && (*/}
+      {/*    <Row style={{ marginLeft: 20, marginRight: 20, marginTop: 10 }}>*/}
+      {/*      <Card*/}
+      {/*        className={"shadow"}*/}
+      {/*        title="List Transaksi B2B"*/}
+      {/*        style={{*/}
+      {/*          marginBottom: 10,*/}
+      {/*          borderColor: "salmon",*/}
+      {/*        }}*/}
+      {/*      >*/}
+      {/*        <Table*/}
+      {/*          key="1"*/}
+      {/*          hasEmpty*/}
+      {/*          size="small"*/}
+      {/*          columns={columns}*/}
+      {/*          dataSource={store.membership.data}*/}
+      {/*          bordered*/}
+      {/*          pagination={{*/}
+      {/*            pageSize: store.membership.pageSize,*/}
+      {/*            total: store.membership.totalData,*/}
+      {/*            current: store.membership.page + 1,*/}
+      {/*            showSizeChanger: true,*/}
+      {/*            simple: false,*/}
+      {/*          }}*/}
+      {/*          onChange={async (page) => {*/}
+      {/*            let pageNumber = page.current;*/}
+      {/*            store.membership.pageSize = page.pageSize;*/}
+      {/*            store.membership.page = pageNumber - 1;*/}
+      {/*            modalLoader.setLoading(true);*/}
+      {/*            await getData();*/}
+      {/*            modalLoader.setLoading(false);*/}
+      {/*          }}*/}
+      {/*        />*/}
+      {/*      </Card>*/}
+      {/*      <Card*/}
+      {/*        className={"shadow"}*/}
+      {/*        title="List Transaksi B2C"*/}
+      {/*        style={{*/}
+      {/*          marginBottom: 30,*/}
+      {/*          borderColor: "salmon",*/}
+      {/*        }}*/}
+      {/*      >*/}
+      {/*        <Table*/}
+      {/*          key="1"*/}
+      {/*          hasEmpty*/}
+      {/*          size="small"*/}
+      {/*          columns={columns}*/}
+      {/*          dataSource={store.membership.data}*/}
+      {/*          bordered*/}
+      {/*          pagination={{*/}
+      {/*            pageSize: store.membership.pageSize,*/}
+      {/*            total: store.membership.totalData,*/}
+      {/*            current: store.membership.page + 1,*/}
+      {/*            showSizeChanger: true,*/}
+      {/*            simple: false,*/}
+      {/*          }}*/}
+      {/*          onChange={async (page) => {*/}
+      {/*            let pageNumber = page.current;*/}
+      {/*            store.membership.pageSize = page.pageSize;*/}
+      {/*            store.membership.page = pageNumber - 1;*/}
+      {/*            modalLoader.setLoading(true);*/}
+      {/*            await getData();*/}
+      {/*            modalLoader.setLoading(false);*/}
+      {/*          }}*/}
+      {/*        />*/}
+      {/*      </Card>*/}
+      {/*    </Row>*/}
+      {/*  )}*/}
     </div>
   );
 });
diff --git a/src/store/transaction.js b/src/store/transaction.js
index 8ae9455..50d8274 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -31,6 +31,8 @@ export class Transaction {
   dataHistoryTopUp = [];
   total_dataHistoryTopUp = 0;
   dataTransaction = [];
+  dataTransactionB2B = [];
+  dataTransactionPartner = [];
   dataDetailHistoryTransaction = [];
   total_dataDetailHistoryTransaction=0;
 
@@ -59,8 +61,27 @@ export class Transaction {
     try {
       const response = await http.get(`/transaction/total-order`);
       //console.log(response)
-      this.dataTransaction = response.body.data ?? [];
-      this.total_data = response?.body?.count ?? 0;
+      this.dataTransaction = response.body.data;
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  async getDataTransactionB2B() {
+    try {
+      const response = await http.get(`/transaction/total-order-b2b`);
+      //console.log(response)
+      this.dataTransactionB2B = response.body.data;
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  async getDataTransactionPartner() {
+    try {
+      const response = await http.get(`/transaction/total-order-partner`);
+      //console.log(response)
+      this.dataTransactionPartner = response.body.data;
     } catch (e) {
       console.error(e);
     }