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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Tambah Fitur

See merge request empatnusabangsa/ppob/ppob-frontend!90
This commit is contained in:
ajat sudrajat 2022-01-26 09:11:54 +00:00
commit fe222f48bf
4 changed files with 0 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Membership/DetailUser.js
View File

@ -321,7 +321,6 @@ export const DetailUser = observer(() => {
form.resetFields();
setFilterStart([]);
setFilterEnd([]);
//await store.transaction.getDetailHistoryTransaction();
await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id
);
@ -330,10 +329,8 @@ export const DetailUser = observer(() => {
const handleCancelFilter = async () => {
store.transaction.filterStart = null;
//form.resetFields();
store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false;
//await store.transaction.getDetailHistoryTransaction();
await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id
);
@ -352,7 +349,6 @@ export const DetailUser = observer(() => {
store.authentication.dataProfit.id
);
modalLoader.setLoading(false);
//form.resetFields();
store.transaction.visibleModalFilterTransaction = false;
};
const footerLayoutFilter = [

36
src/pages/Membership/Konfirmasi.js
View File

@ -223,42 +223,6 @@ export const Konfirmasi = observer(() => {
modalLoader.setLoading(false);
};
const handleRemoveFilter = async () => {
store.payback.filterMembership = null;
store.payback.filterStart = null;
store.payback.filterEnd = null;
setFilterMembership([]);
form.resetFields();
await store.payback.getDataConfirmation();
store.payback.visibleModalFilterPayback = false;
};
const handleCancelFilter = async () => {
//setFilterMembership([]);
//form.resetFields();
store.payback.filterMembership = null;
store.payback.filterStart = null;
store.payback.filterEnd = null;
store.payback.visibleModalFilterPayback = false;
await store.payback.getDataConfirmation();
};
const handleSubmitFilter = async () => {
const data = form.getFieldsValue();
//console.log(data);
store.payback.filterMembership = filterMembership;
store.payback.filterStart = data.start_date
? moment(data.start_date).format("YYYY-MM-DD") + " 00:00:00"
: null;
store.payback.filterEnd = data.end_date
? moment(data.end_date).format("YYYY-MM-DD") + " 23:59:59"
: null;
modalLoader.setLoading(true);
await store.payback.getDataConfirmation();
modalLoader.setLoading(false);
store.payback.visibleModalFilterPayback = false;
};
return (
<div className={["ppob-container"].join(" ")}>
<BreadcumbComponent

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

@ -76,40 +76,18 @@ export const Membership = observer(() => {
: await store.membership.getDataBySuperior();
};
const changeStatus = async (id, isActive) => {
const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating";
try {
modalLoader.setLoading(true);
const response = await store.membership.changeStatus(id, status);
modalLoader.setLoading(false);
response?.body?.statusCode === 201
? message.success(`Success ${status2} Membership`)
: message.error(`Failed ${status2} Membership`);
await getData();
} catch (err) {
modalLoader.setLoading(false);
message.error(`Failed ${status2} Membership`);
}
};
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 = async () => {
store.membership.filterMembership = null;
store.membership.filterPartner = null;
// setFilterMembership([]);
// setFilterPartner([]);
store.membership.visibleModalFilterMembership = false;
//await getData();
await store.membership.getData();
};
@ -605,21 +583,14 @@ export const Membership = observer(() => {
<Select
mode={"multiple"}
placeholder="Choose Type"
//onChange={async (val) => handleFilterPartner(val)}
onChange={(val) => {
setFilterPartner(val);
}}
style={{ marginBottom: "20px", width: "100%" }}
value={filterPartner}
// value={store.membership.filterMembership || []}
>
<Option value="partner">Partner</Option>
<Option value="b2c">B2C</Option>
{/* {store.partner.data.map((item) => (
<Option value={item.id} key={item.id}>
{item.name}
</Option>
))} */}
</Select>
</Col>
</Row>

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

@ -250,23 +250,6 @@ export const Product = observer(() => {
Buy Staging
</Button>,
]}
// cancelText="Cancel"
// onCancel={() => {
// form.resetFields();
// handleCancel();
// }}
// onOk={() => {
// form
// .validateFields()
// .then((values) => {
// console.log(values, "isi form");
// handleBuyProduct(values, item.product_code);
// form.resetFields();
// })
// .catch((info) => {
// console.error("Validate Failed:", info);
// });
// }}
>
<Form form={form} layout="vertical">
<Form.Item