Merge branch 'develop' into 'devops-staging'
fix: add refresh after crd operation in membership contd See merge request empatnusabangsa/ppob/ppob-frontend!11
This commit is contained in:
commit
cfbb6a652c
|
@ -71,13 +71,14 @@ export const Membership = observer(() => {
|
|||
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);
|
||||
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`);
|
||||
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`);
|
||||
|
@ -92,26 +93,26 @@ export const Membership = observer(() => {
|
|||
const handleSubmitTransaction = async (data) => {
|
||||
modalLoader.setLoading(true);
|
||||
try {
|
||||
data.destination = destination;
|
||||
if (data.amount) {
|
||||
data = {
|
||||
...data,
|
||||
amount: Number(data.amount),
|
||||
};
|
||||
}
|
||||
data.destination = destination;
|
||||
if (data.amount) {
|
||||
data = {
|
||||
...data,
|
||||
amount: Number(data.amount),
|
||||
};
|
||||
}
|
||||
|
||||
let response = null;
|
||||
let response = null;
|
||||
|
||||
(await store.authentication.userData.role) === "Admin"
|
||||
? (response = await store.transaction.distributeAdmin(data))
|
||||
: (response = await store.transaction.distribute(data));
|
||||
(await store.authentication.userData.role) === "Admin"
|
||||
? (response = await store.transaction.distributeAdmin(data))
|
||||
: (response = await store.transaction.distribute(data));
|
||||
|
||||
response?.body?.statusCode === 201
|
||||
? message.success("Success Top Up")
|
||||
: message.error("Failed Top Up");
|
||||
response?.body?.statusCode === 201
|
||||
? message.success("Success Top Up")
|
||||
: message.error("Failed Top Up");
|
||||
|
||||
modalLoader.setLoading(false);
|
||||
//await store.supplier.getData()
|
||||
modalLoader.setLoading(false);
|
||||
await getData();
|
||||
} catch (e) {
|
||||
console.log(e, "apa errornya");
|
||||
modalLoader.setLoading(false);
|
||||
|
@ -264,8 +265,9 @@ export const Membership = observer(() => {
|
|||
setConfirmLoading(true);
|
||||
modalLoader.setLoading(true);
|
||||
try {
|
||||
await store.membership.create(data);
|
||||
message.success("Success Add New Member");
|
||||
await store.membership.create(data);
|
||||
message.success("Success Add New Member");
|
||||
await getData();
|
||||
} catch (e) {
|
||||
console.log(e, "apa errornya");
|
||||
message.error("Failed Add Member");
|
||||
|
|
|
@ -49,9 +49,6 @@ export class Membership {
|
|||
async create(data) {
|
||||
try {
|
||||
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;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
|
@ -61,9 +58,6 @@ export class Membership {
|
|||
async update(id, data) {
|
||||
try {
|
||||
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;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
|
@ -73,9 +67,6 @@ export class Membership {
|
|||
async delete(id) {
|
||||
try {
|
||||
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;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
|
|
Loading…
Reference in New Issue
Block a user