Merge branch 'develop' into 'devops-staging'

feat: add column partner fee in detail product role admin

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

src/component/ProductComponent.js

@@ -136,6 +136,7 @@ export const ProductComponent = observer((props) => {
     {
       title: "Tindakan",
       key: "action",
+      fixed: 'right',
       render: (text, record) => (
         <Button
           onClick={async () => {
@@ -303,6 +304,7 @@ export const ProductComponent = observer((props) => {
             textAlign: "center",
             width: store.ui.mediaQuery.isMobile ? 250 : "",
           }}
+          scroll={role === "Admin Partner" ? false : { x: 1300 }}
           columns={columns}
           dataSource={
             store.authentication.userData.role === "Admin Partner"

src/pages/Product/ProductDetail.js

@@ -81,6 +81,15 @@ export const ProductDetail = observer(() => {
           style: "currency",
           currency: "IDR",
         }).format(text),
+    }, {
+      title: "Partner fee",
+      dataIndex: "partner_fee",
+      key: "partner_fee",
+      render: (text) =>
+        new Intl.NumberFormat("id-ID", {
+          style: "currency",
+          currency: "IDR",
+        }).format(text),
     },
     {
       title: "Tanggal Berlaku",