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

Not deleting the ORD created fees

Browse Source
This commit is contained in:
Senad Uka
2019-08-27 13:55:01 +02:00
parent ad75ea127c
commit 45e6abdba4
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
constants/constants.js
View File

@@ -58,6 +58,7 @@ const officeRnDAPIErrors = {
FAILED_TO_FETCH_MEMBERS: 'Failed to fetch members', FAILED_TO_FETCH_MEMBERS: 'Failed to fetch members',
FAILED_TO_FETCH_BOOKINGS: 'Failed to fetch booking reservations', FAILED_TO_FETCH_BOOKINGS: 'Failed to fetch booking reservations',
FAILED_TO_FETCH_FEES: 'Failed to fetch existing fees', FAILED_TO_FETCH_FEES: 'Failed to fetch existing fees',
FAILED_TO_FETCH_PLANS: 'Failed to fetch plans',
FAILED_TO_DELETE_FEES: 'Failed to delete fees in ORD', FAILED_TO_DELETE_FEES: 'Failed to delete fees in ORD',
FAILED_TO_ADD_FEES: 'Failed to add fees in ORD', FAILED_TO_ADD_FEES: 'Failed to add fees in ORD',
MEMBERSHIPS_ARE_NOT_LOADED_CORRECTLY: 'Memberships are not loaded correctly', MEMBERSHIPS_ARE_NOT_LOADED_CORRECTLY: 'Memberships are not loaded correctly',

27
services/officeRnD/fees.js
View File

@@ -10,9 +10,23 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const startDate = moment.utc(dateRange.startDate, DEFAULT_DATE_FORMAT).startOf('day'); const startDate = moment.utc(dateRange.startDate, DEFAULT_DATE_FORMAT).startOf('day');
const endDate = moment.utc(dateRange.endDate, DEFAULT_DATE_FORMAT).endOf('day'); const endDate = moment.utc(dateRange.endDate, DEFAULT_DATE_FORMAT).endOf('day');
API.get('fees') const asyncDataFetch = [API.get('fees'), API.get('plans')];
.then((response) => {
const fetchedFees = response.data ? response.data : []; Promise.all(asyncDataFetch)
.then((responses) => {
const feesResponse = responses[0];
const plansResponse = responses[1];
const fetchedFees = feesResponse.data ? feesResponse.data : [];
const fetchedPlans = plansResponse.data ? plansResponse.data : [];
const manualFeeNames = [];
fetchedPlans.forEach((plan) => {
const { name } = plan;
if (name && name.length > 0){
manualFeeNames.push(name);
}
});
const memberIdsMap = {}; const memberIdsMap = {};
memberIds.forEach((memberId) => { memberIds.forEach((memberId) => {
@@ -22,12 +36,13 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const feeIdsToRemove = []; const feeIdsToRemove = [];
fetchedFees.forEach((fee) => { fetchedFees.forEach((fee) => {
const { member, date, invoice } = fee; const { member, date, invoice, name } = fee;
const { status } = invoice; const { status } = invoice;
const feeId = fee['_id']; const feeId = fee['_id'];
const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date); const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date);
if (memberIdsMap[member] && isDateInDateRange && (status === UNPAID_FEE_STATUS)) { const manuallyAddedFee = manualFeeNames.indexOf(name) !== -1;
if (memberIdsMap[member] && isDateInDateRange && (status === UNPAID_FEE_STATUS) && !manuallyAddedFee) {
feeIdsToRemove.push(feeId); feeIdsToRemove.push(feeId);
} }
}); });
@@ -43,7 +58,7 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
}) })
.catch((error) => { .catch((error) => {
console.log(error); console.log(error);
reject(officeRnDAPIErrors.FAILED_TO_FETCH_FEES); reject(`${officeRnDAPIErrors.FAILED_TO_FETCH_FEES} or ${officeRnDAPIErrors.FAILED_TO_FETCH_PLANS}`);
}); });
}); });
}; };