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

do not delete fees with selected product

Browse Source
This commit is contained in:
Bilal Catic
2019-12-09 10:37:58 +01:00
parent b16d2c78da
commit f0b4a069e8
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/officeRnD/fees.js
View File

@@ -22,9 +22,14 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const fetchedFees = feesResponse.data ? feesResponse.data : []; const fetchedFees = feesResponse.data ? feesResponse.data : [];
const fetchedPlans = plansResponse.data ? plansResponse.data : []; const fetchedPlans = plansResponse.data ? plansResponse.data : [];
const planIsRateMap = {};
const manualFeeNames = []; const manualFeeNames = [];
fetchedPlans.forEach((plan) => { fetchedPlans.forEach((plan) => {
const { name } = plan; const { name, _id, isRate } = plan;
planIsRateMap[_id] = !!isRate;
if (name && name.length > 0){ if (name && name.length > 0){
manualFeeNames.push(name); manualFeeNames.push(name);
} }
@@ -40,18 +45,24 @@ const deleteFeesFromORD = (dateRange, memberIds) => {
const feeIdsToRemove = []; const feeIdsToRemove = [];
fetchedFees.forEach((fee) => { fetchedFees.forEach((fee) => {
const { member, date, invoice, name } = fee; const { member, date, invoice, name, plan } = fee;
const { status } = invoice; const { status } = invoice;
const feeId = fee['_id']; const feeId = fee['_id'];
const feePlanIsRate = plan ? planIsRateMap[plan] : null;
const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date); const isDateInDateRange = startDate.isSameOrBefore(date) && endDate.isSameOrAfter(date);
let manuallyAddedFee = false; let manuallyAddedFee = false;
if (manualFeeNames.indexOf(name) === -1){
if (name && name[0] && CUSTOM_FEES_PREFIXES.indexOf(name[0]) !== -1){ if (plan && !feePlanIsRate){
manuallyAddedFee = true;
}else{
if (manualFeeNames.indexOf(name) === -1){
if (name && name[0] && CUSTOM_FEES_PREFIXES.indexOf(name[0]) !== -1){
manuallyAddedFee = true;
}
}else{
manuallyAddedFee = true; manuallyAddedFee = true;
} }
}else{
manuallyAddedFee = true;
} }
const memberFeesShouldBeDeleted = filterByMemberIds ? memberIdsMap[member] : true; const memberFeesShouldBeDeleted = filterByMemberIds ? memberIdsMap[member] : true;