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

Skip custom fees with defined prefix when deleting #57

Merged
bilal.catic merged 3 commits from skip-custom-fees-with-defined-prefix-when-deleting into master 2019-09-05 10:51:29 +02:00
Conversation 2 Commits 3 Files Changed 3 +13 -5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3a5e7c244 - Show all commits

18
services/officeRnD/fees.js
View File

@@ -3,7 +3,7 @@
const moment = require('moment-timezone');
const { API } = require('../../helpers/api');
const { officeRnDAPIErrors, DEFAULT_DATE_FORMAT, UNPAID_FEE_STATUS } = require('../../constants/constants');
const { officeRnDAPIErrors, DEFAULT_DATE_FORMAT, UNPAID_FEE_STATUS, CUSTOM_FEES_PREFIXES } = require('../../constants/constants');
const deleteFeesFromORD = (dateRange, memberIds) => {
return new Promise((resolve, reject) => {
@@ -12,7 +12,7 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const asyncDataFetch = [API.get('fees'), API.get('plans')];
const invoicedFees = [];
const feesToSkip = [];
Promise.all(asyncDataFetch)
.then((responses) => {
@@ -45,19 +45,27 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const feeId = fee['_id'];
const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date);
const manuallyAddedFee = manualFeeNames.indexOf(name) !== -1;
let manuallyAddedFee = false;
if (manualFeeNames.indexOf(name) === -1){
if (name && name[0] && CUSTOM_FEES_PREFIXES.indexOf(name[0]) !== -1){
manuallyAddedFee = true;
}
}else{
manuallyAddedFee = true;
}
const memberFeesShouldBeDeleted = filterByMemberIds ? memberIdsMap[member] : true;
if (memberFeesShouldBeDeleted && isDateInDateRange && (status === UNPAID_FEE_STATUS) && !manuallyAddedFee) {
feeIdsToRemove.push(feeId);
}else{
invoicedFees.push(fee);
feesToSkip.push(fee);
}
});
API.delete('fees', { data: feeIdsToRemove })
.then(() => {
resolve(invoicedFees);
resolve(feesToSkip);
})
.catch((error) => {
console.log('error : ', error);