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

remove square brackets from membership plan name before comparing

Browse Source
This commit is contained in:
Bilal Catic
2019-09-02 23:28:31 +02:00
parent 1509559825
commit 38f0f03736
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/integration/invoiceIntegration.js
View File

@@ -242,7 +242,8 @@ const createNegativeFeeForDiscount = (memberData, dateRange) => {
let membershipFeeForDiscount = 0; let membershipFeeForDiscount = 0;
membershipFees.forEach((membershipFee) => { membershipFees.forEach((membershipFee) => {
const {name, price} = membershipFee; const {name, price} = membershipFee;
if (DISCOUNT_PLANS.indexOf(name) !== -1){ const cleanName = name.replace('[', '').replace(']', '').trim();
if (DISCOUNT_PLANS.indexOf(cleanName) !== -1){
membershipFeeForDiscount = price; membershipFeeForDiscount = price;
} }
}); });
@@ -310,6 +311,7 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
} }
}); });
const memberIdTeamMappings = {};
const membersMap = {}; const membersMap = {};
const oneMemberObject = { const oneMemberObject = {
totalBookedHours: 0, totalBookedHours: 0,
@@ -323,13 +325,12 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
bookingData: Object.assign({}, oneMemberObject), bookingData: Object.assign({}, oneMemberObject),
membershipFees: membershipsMap[member.memberId] || [], membershipFees: membershipsMap[member.memberId] || [],
}; };
});
const memberIdTeamMappings = {};
membersList.forEach((member) => {
memberIdTeamMappings[member.memberId] = member.teamId; memberIdTeamMappings[member.memberId] = member.teamId;
}); });
const memberIdsToUse = memberIds.length > 0 ? memberIds : Object.keys(membersMap);
const allFees = []; const allFees = [];
allIncidents.forEach((incident) => { allIncidents.forEach((incident) => {
@@ -440,7 +441,7 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
}); });
//add discount //add discount
memberIds.forEach((memberId) => { memberIdsToUse.forEach((memberId) => {
const discountFee = createNegativeFeeForDiscount(membersMap[memberId], dateRange); const discountFee = createNegativeFeeForDiscount(membersMap[memberId], dateRange);
if (discountFee){ if (discountFee){
allFees.push(discountFee); allFees.push(discountFee);

8
services/officeRnD/memberships.js
View File

@@ -39,12 +39,8 @@ const reformatMembershipsName = (memberships) => {
memberships.forEach((membership) => { memberships.forEach((membership) => {
const { name, _id } = membership; const { name, _id } = membership;
if (name && name.length > 0 && name[0] !== '['){ if (name && name.length > 0 && name[0] !== '[' && DISCOUNT_PLANS.indexOf(name) !== -1){
DISCOUNT_PLANS.forEach((discountPlan) => { asyncMembershipUpdates.push(API.put(`memberships/${_id}`, {name: `[${name}]`}));
if (name === discountPlan){
asyncMembershipUpdates.push(API.put(`memberships/${_id}`, {name: `[${name}]`}));
}
});
} }
}); });