diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 4a37738..b01aca2 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -228,9 +228,13 @@ export const ProductComponent = observer((props) => { store.product.filterSupplier = filterSupplier; store.product.filterSubCategory = filterSubCategories; modalLoader.setLoading(true); + // store.authentication.userData.role === "Admin Partner" + // ? await store.product.getData() + // : await store.product.getData() await store.product.getData(); modalLoader.setLoading(false); store.product.visibleModalFilterProduct = false; + //store.product.page=1 }; const footerLayoutFilter = [ @@ -478,6 +482,7 @@ export const ProductComponent = observer((props) => { visible={store.product.visibleModalFilterProduct} title={"Filter"} footer={footerLayoutFilter} + onCancel={async () => { // setFilterSupplier([]); // setFilterSubCategories([]); diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js index 3cadd9c..1ff75cf 100644 --- a/src/pages/Product/Product.js +++ b/src/pages/Product/Product.js @@ -195,6 +195,7 @@ export const Product = observer(() => { , - , + // , ]} >
diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js index 3a8ec96..69468dc 100644 --- a/src/pages/Transaction/Transaction.js +++ b/src/pages/Transaction/Transaction.js @@ -294,6 +294,7 @@ export const Transaction = observer(() => { style={{ backgroundColor: "#4e79e7", color: "#fff", + marginRight:10 }} onClick={() => { form @@ -310,24 +311,24 @@ export const Transaction = observer(() => { > Beli , - , + // , ]} >