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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Perbaikan Project PPOB

See merge request empatnusabangsa/ppob/ppob-frontend!40
This commit is contained in:
ajat sudrajat 2022-01-03 11:41:56 +00:00
commit be6a755aa2
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/component/ProductComponent.js
View File

@ -215,12 +215,13 @@ export const ProductComponent = observer((props) => {
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
}; };
const handleCancelFilter = () => { const handleCancelFilter = async () => {
store.product.filterSubCategory = null; store.product.filterSubCategory = null;
store.product.filterSupplier = null; store.product.filterSupplier = null;
setFilterSubCategories([]); // setFilterSubCategories([]);
setFilterSupplier([]); // setFilterSupplier([]);
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
await store.product.getData();
}; };
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
@ -471,10 +472,13 @@ export const ProductComponent = observer((props) => {
visible={store.product.visibleModalFilterProduct} visible={store.product.visibleModalFilterProduct}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => { onCancel={async () => {
setFilterSupplier([]); // setFilterSupplier([]);
setFilterSubCategories([]); // setFilterSubCategories([]);
store.product.filterSupplier = null;
store.product.filterSubCategory = null;
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
await store.product.getData();
}} }}
> >
<Row> <Row>

25
src/pages/Membership/Membership.js
View File

@ -95,15 +95,22 @@ export const Membership = observer(() => {
}; };
const handleRemoveFilter = async () => { const handleRemoveFilter = async () => {
store.membership.filterMembership = null;
store.membership.filterPartner = null;
setFilterMembership([]); setFilterMembership([]);
setFilterPartner([]); setFilterPartner([]);
store.membership.visibleModalFilterMembership = false; store.membership.visibleModalFilterMembership = false;
//await getData();
await store.membership.getData(); await store.membership.getData();
}; };
const handleCancelFilter = () => { const handleCancelFilter = async () => {
setFilterMembership([]); store.membership.filterMembership = null;
setFilterPartner([]); store.membership.filterPartner = null;
// setFilterMembership([]);
// setFilterPartner([]);
store.membership.visibleModalFilterMembership = false; store.membership.visibleModalFilterMembership = false;
//await getData();
await store.membership.getData();
}; };
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
@ -511,19 +518,23 @@ export const Membership = observer(() => {
onCreate={async (data) => { onCreate={async (data) => {
onSubmit(data); onSubmit(data);
}} }}
onCancel={() => { onCancel={async () => {
setInitialData({}); setInitialData({});
setVisibleModal(false); setVisibleModal(false);
await store.membership.getData();
}} }}
/> />
<Modal <Modal
visible={store.membership.visibleModalFilterMembership} visible={store.membership.visibleModalFilterMembership}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => { onCancel={async() => {
setFilterMembership([]); // setFilterMembership([]);
setFilterPartner([]); // setFilterPartner([]);
store.membership.filterMembership = null;
store.membership.filterPartner = null;
store.membership.visibleModalFilterMembership = false; store.membership.visibleModalFilterMembership = false;
await store.membership.getData();
}} }}
> >
<Row> <Row>

12
src/pages/Profile/Profile.js
View File

@ -64,11 +64,12 @@ export const Profile = observer(() => {
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
}; };
const handleCancelFilter = () => { const handleCancelFilter = async() => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
form.resetFields(); //form.resetFields();
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
await store.transaction.getDataHistoryTransaction();
}; };
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
@ -426,9 +427,12 @@ export const Profile = observer(() => {
visible={store.transaction.visibleModalFilterTransaction} visible={store.transaction.visibleModalFilterTransaction}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => { onCancel={async() => {
form.resetFields(); //form.resetFields();
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
await store.transaction.getDataHistoryTransaction();
}} }}
> >
<Row> <Row>