PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'devops-staging'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!134
This commit is contained in:
ajat sudrajat 2022-02-04 12:53:02 +00:00
commit a2e19c448a
4 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/component/ProductComponent.js
View File

@ -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([]);

1
src/pages/Product/Product.js
View File

@ -195,6 +195,7 @@ export const Product = observer(() => {
<Button
onClick={() => {
store.product.visibleModalFilterProduct = true;
store.product.page=0
}}
>
<FilterOutlined />

37
src/pages/Transaction/Product.js
View File

@ -215,6 +215,7 @@ export const Product = observer(() => {
style={{
backgroundColor: "#4e79e7",
color: "#fff",
marginRight:10
}}
onClick={() => {
form
@ -231,24 +232,24 @@ export const Product = observer(() => {
>
Beli
</Button>,
<Button
key="Beli Stag"
type="primary"
onClick={() => {
form
.validateFields()
.then((values) => {
console.log(values, "isi form");
handleBuyStag(values, barang.product_code);
form.resetFields();
})
.catch((info) => {
console.error("Validate Failed:", info);
});
}}
>
Beli Staging
</Button>,
// <Button
// key="Beli Stag"
// type="primary"
// onClick={() => {
// form
// .validateFields()
// .then((values) => {
// console.log(values, "isi form");
// handleBuyStag(values, barang.product_code);
// form.resetFields();
// })
// .catch((info) => {
// console.error("Validate Failed:", info);
// });
// }}
// >
// Beli Staging
// </Button>,
]}
>
<Form form={form} layout="vertical">

37
src/pages/Transaction/Transaction.js
View File

@ -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
</Button>,
<Button
key="Beli Stag"
type="primary"
onClick={() => {
form
.validateFields()
.then((values) => {
console.log(values, "isi form");
handleBuyStag(values, barang.product_code);
form.resetFields();
})
.catch((info) => {
console.error("Validate Failed:", info);
});
}}
>
Beli Staging
</Button>,
// <Button
// key="Beli Stag"
// type="primary"
// onClick={() => {
// form
// .validateFields()
// .then((values) => {
// console.log(values, "isi form");
// handleBuyStag(values, barang.product_code);
// form.resetFields();
// })
// .catch((info) => {
// console.error("Validate Failed:", info);
// });
// }}
// >
// Beli Staging
// </Button>,
]}
>
<Form form={form} layout="vertical">