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

Merge branch 'fix-change-charge-bugs' into 'master'

Browse Source 
Fix change charge bugs

See merge request saburly/psihologija!33
This commit was merged in pull request #33.
This commit is contained in:
Bilal Catic
2019-08-08 12:20:36 +00:00
parent 6805b17c85 2ff584c20b
commit 7a3d49dee7
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/constants.js
View File

@@ -104,7 +104,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 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; const CHARGE_BOOKING_CHANGE_UNDER_TIME = parseInt(process.env.CHARGE_BOOKING_CHANGE_UNDER_TIME) || 1430;
const ALLOWED_BOOKING_CANCELLATION_TIME = parseInt(process.env.ALLOWED_BOOKING_CANCELLATION_TIME) || 30;
module.exports = { module.exports = {
VALID_CSV_HEADERS, VALID_CSV_HEADERS,
@@ -124,5 +125,6 @@ module.exports = {
UNSCHEDULED_TIME_RESOLUTION, UNSCHEDULED_TIME_RESOLUTION,
UNSCHEDULED_CHARGE_PRICE, UNSCHEDULED_CHARGE_PRICE,
BOOKING_CHANGE_PERCENTAGE_CHARGE, BOOKING_CHANGE_PERCENTAGE_CHARGE,
CHARGE_BOOKING_CHANGE_UNDER_TIME,
ALLOWED_BOOKING_CANCELLATION_TIME, ALLOWED_BOOKING_CANCELLATION_TIME,
}; };

1
environment.env
View File

@@ -21,6 +21,7 @@ UNLOCK_STREAK_REPAIR_AFTER=Number of months without incidents to reset user inci
BOOKING_CHANGE_PERCENTAGE_CHARGE=Percentage of hourly reate to apply for cancellation-like charges BOOKING_CHANGE_PERCENTAGE_CHARGE=Percentage of hourly reate to apply for cancellation-like charges
CHARGE_BOOKING_CHANGE_UNDER_TIME=Time to booking start when booking change will be charged (in minutes) [Default is 1430 = 24*60 - 10; that is 24hrs - 10 minutes for booking change tracking cycle]
ALLOWED_BOOKING_CANCELLATION_TIME=Time from creation (in minutes) in which cancellation is not charged ALLOWED_BOOKING_CANCELLATION_TIME=Time from creation (in minutes) in which cancellation is not charged
SEQUELIZE_LOGGING=0 - false, 1 - true (console logging) SEQUELIZE_LOGGING=0 - false, 1 - true (console logging)

15
services/integration/bookingChangeCharges.js
View File

@@ -4,7 +4,13 @@ const moment = require('moment-timezone');
const db = require('../../models/index'); const db = require('../../models/index');
const Op = require('sequelize').Op; const Op = require('sequelize').Op;
const { UI_TIMEZONE, BOOKING_CHANGE_PERCENTAGE_CHARGE, ALLOWED_BOOKING_CANCELLATION_TIME, incidentType } = require('../../constants/constants'); const {
UI_TIMEZONE,
BOOKING_CHANGE_PERCENTAGE_CHARGE,
CHARGE_BOOKING_CHANGE_UNDER_TIME,
ALLOWED_BOOKING_CANCELLATION_TIME,
incidentType
} = require('../../constants/constants');
const bulkWriteBookingChangeIncidents = (incidents) => { const bulkWriteBookingChangeIncidents = (incidents) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -44,10 +50,9 @@ const chargeBookingChanges = (changes) => {
const oldReservationLength = oldEnd.diff(oldStart, 'hours', true); const oldReservationLength = oldEnd.diff(oldStart, 'hours', true);
const newReservationLength = newEnd.diff(newStart, 'hours', true); const newReservationLength = newEnd.diff(newStart, 'hours', true);
const differenceFromNow = oldStart.diff(moment.utc(), 'hours'); const differenceFromNow = oldStart.diff(moment.utc(), 'minutes');
if (differenceFromNow < 24){ if (differenceFromNow < CHARGE_BOOKING_CHANGE_UNDER_TIME){
// Changed reservation that was within 24hrs from now
const { reservationId, memberId, resourceId } = newReservation; const { reservationId, memberId, resourceId } = newReservation;
if (!canceled) { if (!canceled) {
@@ -101,7 +106,7 @@ const chargeBookingChanges = (changes) => {
const differenceFromCreation = moment.utc().diff(reservationCreationTimestamp, 'minutes'); const differenceFromCreation = moment.utc().diff(reservationCreationTimestamp, 'minutes');
if (differenceFromCreation > ALLOWED_BOOKING_CANCELLATION_TIME){ if (differenceFromCreation > ALLOWED_BOOKING_CANCELLATION_TIME){
const chargeFee = 2 * reservationHourlyRate * oldReservationLength * BOOKING_CHANGE_PERCENTAGE_CHARGE / 100; const chargeFee = reservationHourlyRate * oldReservationLength * BOOKING_CHANGE_PERCENTAGE_CHARGE / 100;
const incident = { const incident = {
reservationId, reservationId,
memberId, memberId,