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:42:19 +00:00
commit c5f3cadd67
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;
};
const handleCancelFilter = () => {
const handleCancelFilter = async () => {
store.product.filterSubCategory = null;
store.product.filterSupplier = null;
setFilterSubCategories([]);
setFilterSupplier([]);
// setFilterSubCategories([]);
// setFilterSupplier([]);
store.product.visibleModalFilterProduct = false;
await store.product.getData();
};
const handleSubmitFilter = async () => {
@ -471,10 +472,13 @@ export const ProductComponent = observer((props) => {
visible={store.product.visibleModalFilterProduct}
title={"Filter"}
footer={footerLayoutFilter}
onCancel={() => {
setFilterSupplier([]);
setFilterSubCategories([]);
onCancel={async () => {
// setFilterSupplier([]);
// setFilterSubCategories([]);
store.product.filterSupplier = null;
store.product.filterSubCategory = null;
store.product.visibleModalFilterProduct = false;
await store.product.getData();
}}
>
<Row>

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

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

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

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