Merge branch 'develop' into 'main'

Develop

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

src/component/ProductComponent.js

@@ -95,7 +95,7 @@ export const ProductComponent = observer((props) => {
       key: "supplier_name",
     },
     {
-      title: "Sub Category",
+      title: "Sub Kategori",
       dataIndex: "sub_categories_name",
       key: "sub_categories_name",
     },
@@ -113,7 +113,7 @@ export const ProductComponent = observer((props) => {
       ),
     },
     {
-      title: "Action",
+      title: "Tindakan",
       key: "action",
       render: (text, record) => (
         <Button
@@ -156,12 +156,12 @@ export const ProductComponent = observer((props) => {
       icon: <ExclamationCircleOutlined />,
       okText: "Yes",
       okType: "primary",
-      cancelText: "Cancel",
+      cancelText: "Batal",
       onOk() {
         return deleteData(id);
       },
       onCancel() {
-        console.log("Cancel");
+        console.log("Batal");
       },
     });
   };
@@ -241,10 +241,10 @@ export const ProductComponent = observer((props) => {
         color: "#fff",
       }}
     >
-      Remove Filter
+      Hapus Filter
     </Button>,
     <Button key={"cancel"} onClick={handleCancelFilter}>
-      Cancel
+      Batal
     </Button>,
     <Button
       key={"submit"}
@@ -254,7 +254,7 @@ export const ProductComponent = observer((props) => {
         color: "#fff",
       }}
     >
-      Apply
+      Terapkan
     </Button>,
   ];
 
@@ -349,8 +349,8 @@ export const ProductComponent = observer((props) => {
                       <div style={{}}>
                         <p>
                           <small>{item.product_name}</small> <br />
-                          <small>Harga Beli : {item.current_price_price}</small>
-                          <br />
+                          {/* <small>Harga Beli : {item.current_price_price}</small>
+                          <br /> */}
                           <small>Harga Jual : {item.mark_up_price}</small>
                         </p>
                         <p></p>
@@ -387,7 +387,7 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalProduct}
         title={idData ? "Edit Product" : "Create a new Product"}
         okText={idData ? "Edit" : "Create"}
-        cancelText="Cancel"
+        cancelText="Batal"
         onCancel={() => {
           form.resetFields();
           handleCancel();