Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging

src/component/ProductComponent.js

@@ -89,6 +89,16 @@ export const ProductComponent = observer((props) => {
             currency: "IDR",
           }).format(text),
     },
+    {
+      title: "Biaya Admin",
+      dataIndex: "admin_price",
+      key: "admin_price",
+      render: (text) =>
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
+    },
     {
       title: "Supplier",
       dataIndex: "supplier_name",
@@ -303,6 +313,7 @@ export const ProductComponent = observer((props) => {
                   let pageNumber = page.current;
                   store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize;
                   store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1
+                  store.product.filterSubCategory = filterSubCategories
                   modalLoader.setLoading(true);
                   store.authentication.userData.role === "Admin Partner"
                       ? await store.product.getProductPartner(

src/pages/Product/ProductDetail.js

@@ -72,6 +72,16 @@ export const ProductDetail = observer(() => {
             currency: "IDR",
           }).format(text),
     },
+    {
+      title: "Biaya Admin",
+      dataIndex: "admin_price",
+      key: "admin_price",
+      render: (text) =>
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
+    },
     {
       title: "Tanggal Berlaku",
       dataIndex: "startDate",