diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index c4d28b5..ccc771b 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -64,40 +64,40 @@ export const ProductComponent = observer((props) => {
dataIndex: "current_price_price",
key: "current_price_price",
render: (text) =>
- new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(text),
+ new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(text),
},
{
title: "Harga Jual",
dataIndex: "mark_up_price",
key: "mark_up_price",
render: (text) =>
- new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(text),
+ new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(text),
},
{
title: "Harga",
dataIndex: "price",
key: "price",
render: (text) =>
- new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(text),
+ new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ 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),
+ new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(text),
},
{
title: "Supplier",
@@ -114,27 +114,27 @@ export const ProductComponent = observer((props) => {
dataIndex: "tersedia",
key: "tersedia",
render: (text, record) => (
-
- {record?.product_status === "ACTIVE" ? " Tersedia" : "Tidak"}
-
+
+ {record?.product_status === "ACTIVE" ? " Tersedia" : "Tidak"}
+
),
},
{
title: "Tindakan",
key: "action",
render: (text, record) => (
-
+
),
},
];
@@ -145,7 +145,6 @@ export const ProductComponent = observer((props) => {
if (store.authentication.userData.role !== "Admin") delete columns[8];
if (store.authentication.userData.role !== "Admin") delete columns[6];
if (store.authentication.userData.role !== "Admin") delete columns[2];
- if (store.authentication.userData.role !== "Admin") delete columns[5];
if (store.authentication.userData.role === "Admin Partner") delete columns[7];
//if (store.authentication.userData.role !== "Admin") delete columns[8];
//if (store.authentication.userData.role === "Admin Partner") delete columns[5];
@@ -190,10 +189,10 @@ export const ProductComponent = observer((props) => {
try {
const response = await store.product.update(idData, data);
response?.body?.statusCode === 201 || response?.body?.statusCode === 200
- ? message.success(
- response?.body?.message || "Berhasil Ubah Data Produk"
- )
- : message.error(response?.body?.message || "Gagal Ubah Data Produk");
+ ? message.success(
+ response?.body?.message || "Berhasil Ubah Data Produk"
+ )
+ : message.error(response?.body?.message || "Gagal Ubah Data Produk");
} catch (e) {
message.error(e.response?.body?.message || "Gagal Ubah Data Produk");
}
@@ -206,8 +205,8 @@ export const ProductComponent = observer((props) => {
try {
const response = await store.product.create(data);
response?.body?.statusCode === 201 || response?.body?.statusCode === 200
- ? message.success(response?.body?.message || "Berhasil Tambah Produk")
- : message.error(response?.body?.message || "Gagal Tambah Produk");
+ ? message.success(response?.body?.message || "Berhasil Tambah Produk")
+ : message.error(response?.body?.message || "Gagal Tambah Produk");
} catch (e) {
console.log(e, "apa errornya");
message.error(e.response?.body?.message || "Gagal Tambah Produk");
@@ -227,8 +226,8 @@ export const ProductComponent = observer((props) => {
setFilterSupplier([]);
setFilterSubCategories([]);
store.authentication.userData.role === "Admin Partner"
- ? await store.product.getProductPartner()
- : await store.product.getData();
+ ? await store.product.getProductPartner()
+ : await store.product.getData();
//await store.product.getData();
modalLoader.setLoading(false);
};
@@ -245,8 +244,8 @@ export const ProductComponent = observer((props) => {
store.product.filterSubCategory = filterSubCategories;
modalLoader.setLoading(true);
store.authentication.userData.role === "Admin Partner"
- ? await store.product.getProductPartner(filterSubCategories)
- : await store.product.getData();
+ ? await store.product.getProductPartner(filterSubCategories)
+ : await store.product.getData();
//await store.product.getData();
modalLoader.setLoading(false);
//store.product.page=1
@@ -254,12 +253,12 @@ export const ProductComponent = observer((props) => {
const footerLayoutFilter = [
,
@@ -267,12 +266,12 @@ export const ProductComponent = observer((props) => {
Batal
,
,
@@ -284,293 +283,293 @@ export const ProductComponent = observer((props) => {
},
});
return (
-
- {store.ui.mediaQuery.isDesktop && (
-
{
- 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(
- // store.authentication.profileData.id
- )
- : await store.product.getData();
- modalLoader.setLoading(false);
- }}
- />
- )}
- {store.ui.mediaQuery.isMobile && (
- {
- store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
- store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
- modalLoader.setLoading(true);
- store.authentication.userData.role === "Admin Partner"
- ? await store.product.getProductPartner(
- // store.authentication.profileData.id
- )
- : await store.product.getData();
- //await store.product.getData();
- modalLoader.setLoading(false);
- },
- pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
- total: store.authentication.userData.role === "Admin Partner"
- ? store.product.total_data_partner
- : store.product.total_data,
- current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
- style: { marginBottom: "1rem", marginRight: "1rem" },
- }}
- dataSource={
- store.authentication.userData.role === "Admin Partner"
- ? store.product.dataProductPartner
- : store.product.data
- }
- style={{ padding: 0 }}
- renderItem={(item) => {
- return (
-
-
-
-
- {item.product_name}
- {/* Harga Beli : {item.current_price_price}
+
+ {store.ui.mediaQuery.isDesktop && (
+
{
+ 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(
+ filterSubCategories
+ )
+ : await store.product.getData();
+ modalLoader.setLoading(false);
+ }}
+ />
+ )}
+ {store.ui.mediaQuery.isMobile && (
+ {
+ store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize;
+ store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1
+ modalLoader.setLoading(true);
+ store.authentication.userData.role === "Admin Partner"
+ ? await store.product.getProductPartner(
+ filterSubCategories
+ )
+ : await store.product.getData();
+ //await store.product.getData();
+ modalLoader.setLoading(false);
+ },
+ pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner,
+ total: store.authentication.userData.role === "Admin Partner"
+ ? store.product.total_data_partner
+ : store.product.total_data,
+ current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1,
+ style: { marginBottom: "1rem", marginRight: "1rem" },
+ }}
+ dataSource={
+ store.authentication.userData.role === "Admin Partner"
+ ? store.product.dataProductPartner
+ : store.product.data
+ }
+ style={{ padding: 0 }}
+ renderItem={(item) => {
+ return (
+
+
+
+
+ {item.product_name}
+ {/* Harga Beli : {item.current_price_price}
*/}
- Harga Jual : {item.mark_up_price}
-
-
-
-
-
- }
- />
-
-
-
- {item?.product_status === "ACTIVE"
- ? " Tersedia"
- : "Tidak"}
-
-
-
-
-
+ Harga Jual : {item.mark_up_price}
+
+
+
+
- );
- }}
- />
- )}
- {
- form.resetFields();
- handleCancel();
- }}
- onOk={() => {
- form
- .validateFields()
- .then((values) => {
- console.log(values, "isi form");
- handleSubmit(values);
- form.resetFields();
- })
- .catch((info) => {
- console.error("Validate Failed:", info);
- });
- }}
- >
-
-
-
-
-
- `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
- }
- parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
- />
-
-
-
- `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
- }
- parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
- />
-
-
-
-
-
-
-
-
-
-
-
-
- {
- // setFilterSupplier([]);
- // setFilterSubCategories([]);
- store.product.filterSupplier = null;
- store.product.filterSubCategory = null;
- store.product.visibleModalFilterProduct = false;
- await store.product.getData();
- }}
- >
-
- {store.authentication.userData.role === "Admin" && (
-
-
- Filter Supplier
-
-
+
+
);
});
diff --git a/src/store/product.js b/src/store/product.js
index 057db3f..7beeed4 100644
--- a/src/store/product.js
+++ b/src/store/product.js
@@ -101,7 +101,7 @@ export class Product {
}
async getProductPartner(id) {
-
+ console.log({ id });
if (id === undefined) {
try {
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`);