senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-bulk-fees-delete' into 'master'

Browse Source 
implement bulk delete fees

See merge request saburly/psihologija!43
This commit was merged in pull request #43.
This commit is contained in:
Bilal Catic
2019-08-26 11:41:13 +00:00
parent 8307164959 f8fac23980
commit 9b7b2dcb90
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/officeRnD/fees.js
View File

@@ -19,14 +19,7 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
memberIdsMap[memberId] = true; memberIdsMap[memberId] = true;
}); });
const deleteRequests = []; const feeIdsToRemove = [];
const sendDeleteRequestPromise = (feeId) => {
return new Promise((resolve, reject) => {
API.delete(`fees/${feeId}`)
.then(() => resolve(true))
.catch(() => resolve(false));
});
};
fetchedFees.forEach((fee) => { fetchedFees.forEach((fee) => {
const { member, date, invoice } = fee; const { member, date, invoice } = fee;
@@ -35,15 +28,16 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date); const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date);
if (memberIdsMap[member] && isDateInDateRange && (status === UNPAID_FEE_STATUS)) { if (memberIdsMap[member] && isDateInDateRange && (status === UNPAID_FEE_STATUS)) {
deleteRequests.push(sendDeleteRequestPromise(feeId)); feeIdsToRemove.push(feeId);
} }
}); });
Promise.all(deleteRequests) API.delete('fees', { data: feeIdsToRemove })
.then(() => { .then(() => {
resolve(true); resolve(true);
}) })
.catch((error) => { .catch((error) => {
console.log('error : ', error);
reject(error); reject(error);
}); });
}) })