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

Bug fixes

Browse Source
This commit is contained in:
Senad Uka
2019-08-22 06:02:29 +02:00
parent d788f66e1a
commit 2ac4074d94
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
constants/constants.js
View File

@@ -119,6 +119,8 @@ const discounts = {
}; };
const DISCOUNT_PLANS = process.env.DISCOUNT_PLANS.split(',').map(planName => planName.trim()) || []; const DISCOUNT_PLANS = process.env.DISCOUNT_PLANS.split(',').map(planName => planName.trim()) || [];
const UNPAID_FEE_STATUS = 'not_paid';
module.exports = { module.exports = {
VALID_CSV_HEADERS, VALID_CSV_HEADERS,
USER_ENTRY_EVENT, USER_ENTRY_EVENT,
@@ -141,4 +143,5 @@ module.exports = {
ALLOWED_BOOKING_CANCELLATION_TIME, ALLOWED_BOOKING_CANCELLATION_TIME,
discounts, discounts,
DISCOUNT_PLANS, DISCOUNT_PLANS,
UNPAID_FEE_STATUS,
}; };

7
services/officeRnD/fees.js
View File

@@ -3,7 +3,7 @@
const moment = require('moment-timezone'); const moment = require('moment-timezone');
const { API } = require('../../helpers/api'); const { API } = require('../../helpers/api');
const { officeRnDAPIErrors, DEFAULT_DATE_FORMAT } = require('../../constants/constants'); const { officeRnDAPIErrors, DEFAULT_DATE_FORMAT, UNPAID_FEE_STATUS } = require('../../constants/constants');
const deleteFeesFromORD = (dateRange, memberIds) => { const deleteFeesFromORD = (dateRange, memberIds) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -29,11 +29,12 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
}; };
fetchedFees.forEach((fee) => { fetchedFees.forEach((fee) => {
const { member, date } = fee; const { member, date, invoice } = fee;
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) { if (memberIdsMap[member] && isDateInDateRange && (status === UNPAID_FEE_STATUS)) {
deleteRequests.push(sendDeleteRequestPromise(feeId)); deleteRequests.push(sendDeleteRequestPromise(feeId));
} }
}); });