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

Merge branch 'develop' into 'devops-staging'

Browse Source 
fix: add refresh after crd operation in membership contd

See merge request empatnusabangsa/ppob/ppob-frontend!11
This commit is contained in:
Catur Bagaskara 2021-12-22 16:44:32 +00:00
commit cfbb6a652c
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,13 +71,14 @@ export const Membership = observer(() => {
const status = isActive ? "inactive" : "active"; const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating"; const status2 = isActive ? "Inactivating" : "Activating";
try { try {
modalLoader.setLoading(true); modalLoader.setLoading(true);
const response = await store.membership.changeStatus(id, status); const response = await store.membership.changeStatus(id, status);
modalLoader.setLoading(false); modalLoader.setLoading(false);
response?.body?.statusCode === 201 response?.body?.statusCode === 201
? message.success(`Success ${status2} Membership`) ? message.success(`Success ${status2} Membership`)
: message.error(`Failed ${status2} Membership`); : message.error(`Failed ${status2} Membership`);
await getData();
} catch (err) { } catch (err) {
modalLoader.setLoading(false); modalLoader.setLoading(false);
message.error(`Failed ${status2} Membership`); message.error(`Failed ${status2} Membership`);
@ -92,26 +93,26 @@ export const Membership = observer(() => {
const handleSubmitTransaction = async (data) => { const handleSubmitTransaction = async (data) => {
modalLoader.setLoading(true); modalLoader.setLoading(true);
try { try {
data.destination = destination; data.destination = destination;
if (data.amount) { if (data.amount) {
data = { data = {
...data, ...data,
amount: Number(data.amount), amount: Number(data.amount),
}; };
} }
let response = null; let response = null;
(await store.authentication.userData.role) === "Admin" (await store.authentication.userData.role) === "Admin"
? (response = await store.transaction.distributeAdmin(data)) ? (response = await store.transaction.distributeAdmin(data))
: (response = await store.transaction.distribute(data)); : (response = await store.transaction.distribute(data));
response?.body?.statusCode === 201 response?.body?.statusCode === 201
? message.success("Success Top Up") ? message.success("Success Top Up")
: message.error("Failed Top Up"); : message.error("Failed Top Up");
modalLoader.setLoading(false); modalLoader.setLoading(false);
//await store.supplier.getData() await getData();
} catch (e) { } catch (e) {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -264,8 +265,9 @@ export const Membership = observer(() => {
setConfirmLoading(true); setConfirmLoading(true);
modalLoader.setLoading(true); modalLoader.setLoading(true);
try { try {
await store.membership.create(data); await store.membership.create(data);
message.success("Success Add New Member"); message.success("Success Add New Member");
await getData();
} catch (e) { } catch (e) {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Add Member"); message.error("Failed Add Member");

9
src/store/membership.js
View File

@ -49,9 +49,6 @@ export class Membership {
async create(data) { async create(data) {
try { try {
const response = await http.post('/users').send(data); const response = await http.post('/users').send(data);
this.ctx.authentication.userData.role === "Admin"
? await this.ctx.membership.getData()
: await this.ctx.membership.getDataBySuperior();
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
@ -61,9 +58,6 @@ export class Membership {
async update(id, data) { async update(id, data) {
try { try {
const response = await http.put('/users/' + id).send(data); const response = await http.put('/users/' + id).send(data);
this.ctx.authentication.userData.role === "Admin"
? await this.ctx.membership.getData()
: await this.ctx.membership.getDataBySuperior();
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
@ -73,9 +67,6 @@ export class Membership {
async delete(id) { async delete(id) {
try { try {
const response = await http.del('/users/' + id); const response = await http.del('/users/' + id);
this.ctx.authentication.userData.role === "Admin"
? await this.ctx.membership.getData()
: await this.ctx.membership.getDataBySuperior();
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);