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

Merge branch 'fix-discount-support' into 'master'

Browse Source 
fix bug with date of discount

See merge request saburly/psihologija!36
This commit was merged in pull request #36.
This commit is contained in:
Bilal Catic
2019-08-14 06:36:32 +00:00
parent 0bf41ab0bf 418cfc6549
commit 3403b8e9c4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/integration/invoiceIntegration.js
View File

@@ -225,11 +225,17 @@ const createFeeFromBooking = (booking, resourceMappings) => {
} }
}; };
const createNegativeFeeForDiscount = (memberData) => { const createNegativeFeeForDiscount = (memberData, dateRange) => {
const { bookingData, member, membershipFee } = memberData; const { bookingData, member, membershipFee } = memberData;
const { totalBookedHours, totalChargedHours, totalBookingChargedFee } = bookingData; const { totalBookedHours, totalChargedHours, totalBookingChargedFee } = bookingData;
const { memberId, officeId } = member; const { memberId, officeId } = member;
let endDate = moment.utc().endOf('day').toISOString();
if (dateRange.endDate){
endDate = moment.utc(dateRange.endDate, DEFAULT_DATE_FORMAT).endOf('day').toISOString();
}
const totalChargeFee = membershipFee + totalBookingChargedFee; const totalChargeFee = membershipFee + totalBookingChargedFee;
let discount = 0; let discount = 0;
@@ -255,7 +261,7 @@ const createNegativeFeeForDiscount = (memberData) => {
name: formattedName, name: formattedName,
price: -discount.toFixed(2), price: -discount.toFixed(2),
quantity: 1, quantity: 1,
date: moment.tz(UI_TIMEZONE).format(), date: endDate,
member: memberId, member: memberId,
team: null, team: null,
office: officeId, office: officeId,
@@ -311,6 +317,7 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
if (canceled) { if (canceled) {
reservationIdsForAdditionalData.push(reservationId); reservationIdsForAdditionalData.push(reservationId);
} else { } else {
allActiveBookings.push(booking);
membersMap[memberId].bookingData.totalChargedHours += bookingLength; membersMap[memberId].bookingData.totalChargedHours += bookingLength;
const bookingFee = bookingLength * hourlyRate; const bookingFee = bookingLength * hourlyRate;
@@ -347,7 +354,7 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
//add discount //add discount
memberIds.forEach((memberId) => { memberIds.forEach((memberId) => {
allFees.push(createNegativeFeeForDiscount(membersMap[memberId])); allFees.push(createNegativeFeeForDiscount(membersMap[memberId], dateRange));
}); });
allFees.forEach((fee) => { allFees.forEach((fee) => {