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

Bug fix for bookings

Browse Source
This commit is contained in:
Senad Uka
2019-07-19 22:25:22 +02:00
parent 4389aaa8da
commit 0c92febe52
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
constants/constants.js
View File

@@ -81,6 +81,8 @@ const UNSCHEDULED_CHARGE_PRICE = parseFloat(process.env.UNSCHEDULED_USE_CHARGE_P
const BOOKING_CHANGE_PERCENTAGE_CHARGE = parseInt(process.env.BOOKING_CHANGE_PERCENTAGE_CHARGE) || 100;
const ALLOWED_BOOKING_CANCELLATION_TIME= parseInt(process.env.ALLOWED_BOOKING_CANCELLATION_TIME) || 30;
module.exports = {
VALID_CSV_HEADERS,
USER_ENTRY_EVENT,
@@ -98,4 +100,5 @@ module.exports = {
UNSCHEDULED_TIME_RESOLUTION,
UNSCHEDULED_CHARGE_PRICE,
BOOKING_CHANGE_PERCENTAGE_CHARGE,
ALLOWED_BOOKING_CANCELLATION_TIME,
};

2
environment.env
View File

@@ -20,3 +20,5 @@ UNLOCK_5=Price for unlocked door, sixth month
UNLOCK_STREAK_REPAIR_AFTER=Number of months without incidents to reset user incident level
BOOKING_CHANGE_PERCENTAGE_CHARGE=Percentage of hourly reate to apply for cancellation-like charges
ALLOWED_BOOKING_CANCELLATION_TIME=Time from creation (in minutes) in which cancellation is not charged

37
services/integration/bookingChangeCharges.js
View File

@@ -3,7 +3,7 @@
const moment = require('moment-timezone');
const db = require('../../models/index');
const { UI_TIMEZONE, BOOKING_CHANGE_PERCENTAGE_CHARGE, incidentType } = require('../../constants/constants');
const { UI_TIMEZONE, BOOKING_CHANGE_PERCENTAGE_CHARGE, ALLOWED_BOOKING_CANCELLATION_TIME, incidentType } = require('../../constants/constants');
const bulkWriteBookingChangeIncidents = (incidents) => {
return new Promise((resolve, reject) => {
@@ -33,9 +33,10 @@ const chargeBookingChanges = (changes) => {
const newStart = newReservation.start ? moment.utc(newReservation.start) : null;
const newEnd = newReservation.end ? moment.utc(newReservation.end) : null;
const reservationCreationTimestamp = newReservation.createdAt ? moment.utc(newReservation.createdAt) : null;
const reservationTimezone = newReservation.timezone ? newReservation.timezone : UI_TIMEZONE;
const reservationHourlyRate = oldReservation.hourlyRate ? oldReservation.hourlyRate : undefined;
const reservationHourlyRate = oldReservation.hourlyRate ? oldReservation.hourlyRate : newReservation.hourlyRate;
const canceled = newReservation.canceled;
if (oldStart && oldEnd && newStart && newEnd && reservationHourlyRate){
@@ -96,21 +97,25 @@ const chargeBookingChanges = (changes) => {
incidents.push(incident);
}
}else{
const chargeFee = 2 * reservationHourlyRate * oldReservationLength * BOOKING_CHANGE_PERCENTAGE_CHARGE / 100;
const incident = {
reservationId,
memberId,
oldResourceId: oldResourceId || resourceId,
newResourceId: null,
oldBookingStart: oldReservation.start,
oldBookingEnd: oldReservation.end,
newBookingStart: null,
newBookingEnd: null,
incidentType: incidentType.BOOKING_CANCELED_LATE,
chargeFee,
};
const differenceFromCreation = reservationCreationTimestamp.diff(moment.utc(), 'minutes');
incidents.push(incident);
if (differenceFromCreation > ALLOWED_BOOKING_CANCELLATION_TIME){
const chargeFee = 2 * reservationHourlyRate * oldReservationLength * BOOKING_CHANGE_PERCENTAGE_CHARGE / 100;
const incident = {
reservationId,
memberId,
oldResourceId: oldResourceId || resourceId,
newResourceId: null,
oldBookingStart: oldReservation.start,
oldBookingEnd: oldReservation.end,
newBookingStart: null,
newBookingEnd: null,
incidentType: incidentType.BOOKING_CANCELED_LATE,
chargeFee,
};
incidents.push(incident);
}
}
}
}

2
services/officeRnD/bookings.js
View File

@@ -184,7 +184,7 @@ const bulkWriteReservationsWithChangesTracking = (reservations) => {
}
});
instance.setDataValue('hourlyRate', previous.hourlyRate);
instance.setDataValue('hourlyRate', instance.previous('hourlyRate'));
if (realChange){
changes.push({