Merge branch 'main' into 'devops-production'

Revert "fix product filter when page 2 and then filter didn't detect list item < 10"

See merge request empatnusabangsa/ppob/ppob-frontend!184

src/pages/Membership/DetailUser.js

@@ -196,6 +196,18 @@ export const DetailUser = observer(() => {
       dataIndex: "name",
       key: "name",
     },
+    {
+      title: "Supplier",
+      dataIndex: "supplier_name",
+      key: "supplier_name",
+    },
+    {
+      title: "Profit Produk",
+      dataIndex: "profit_produk",
+      key: "",
+      render: (text, record) =>
+        record.price - record.product_price
+    },
     {
       title: "Harga",
       dataIndex: "price",
@@ -274,6 +286,8 @@ export const DetailUser = observer(() => {
       key: "failed_reason",
     },
   ];
+  if (store.authentication.userData.role !== "Admin") delete column[1];
+  if (store.authentication.userData.role !== "Admin") delete column[2];
 
   const routeData = [
     {