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

Fix wrong date in the charge

Browse Source
This commit is contained in:
Senad Uka
2019-09-11 19:12:39 +02:00
parent 4ca6fd7363
commit dd381db50e
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/integration/bookingChangeCharges.js
View File

@@ -76,7 +76,14 @@ const getIncidentsFromChanges = (changes) => {
const reservationHourlyRate = oldReservation.hourlyRate ? oldReservation.hourlyRate : newReservation.hourlyRate; const reservationHourlyRate = oldReservation.hourlyRate ? oldReservation.hourlyRate : newReservation.hourlyRate;
const canceled = newReservation.canceled; const canceled = newReservation.canceled;
if (oldStart && oldEnd && newStart && newEnd && reservationHourlyRate){ // console.log('oldStart : ', oldStart ? oldStart.format() : 'null');
// console.log('oldEnd : ', oldEnd ? oldEnd.format() : 'null ');
// console.log('newStart : ', newStart ? newStart.format() : 'null');
// console.log('newEnd : ', newEnd ? newEnd.format() : 'null');
// console.log('hourly Rate : old : ', oldReservation ? oldReservation.hourlyRate : ' - ', newReservation ? newReservation.hourlyRate : ' - ');
// console.log('Canceled : ', newReservation.canceled);
if (oldStart && oldEnd && newStart && newEnd){
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);

6
services/integration/invoiceIntegration.js
View File

@@ -128,7 +128,7 @@ const createFeeFromIncident = (incident) => {
roomExplanation = newResourceName; roomExplanation = newResourceName;
// dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')} -> ${newBookingStartMoment.clone().format('ddd, MMM DD')}`; // dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')} -> ${newBookingStartMoment.clone().format('ddd, MMM DD')}`;
dateExplanation = `${incidentTimestampMoment.clone().format('MMM DD')}`; dateExplanation = `${newBookingStartMoment.clone().format('MMM DD')}`;
bookingTimeExplanation = `[${newBookingStartMoment.clone().format('HH:mm')} to ${newBookingEndMoment.clone().format('HH:mm')}]`; bookingTimeExplanation = `[${newBookingStartMoment.clone().format('HH:mm')} to ${newBookingEndMoment.clone().format('HH:mm')}]`;
incidentTimeExplanation = `moved on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`; incidentTimeExplanation = `moved on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`;
incidentExplanation += `, ${incidentTimeExplanation}`; incidentExplanation += `, ${incidentTimeExplanation}`;
@@ -147,7 +147,7 @@ const createFeeFromIncident = (incident) => {
roomExplanation = newResourceName; roomExplanation = newResourceName;
// dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`; // dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`;
dateExplanation = `${incidentTimestampMoment.clone().format('MMM DD')}`; dateExplanation = `${newBookingStartMoment.clone().format('MMM DD')}`;
bookingTimeExplanation = `[${newBookingStartMoment.clone().format('HH:mm')} to ${newBookingEndMoment.clone().format('HH:mm')}]`; bookingTimeExplanation = `[${newBookingStartMoment.clone().format('HH:mm')} to ${newBookingEndMoment.clone().format('HH:mm')}]`;
incidentTimeExplanation = `shortened on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`; incidentTimeExplanation = `shortened on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`;
incidentExplanation += `, ${incidentTimeExplanation}`; incidentExplanation += `, ${incidentTimeExplanation}`;
@@ -160,7 +160,7 @@ const createFeeFromIncident = (incident) => {
case incidentType.BOOKING_CANCELED_LATE: case incidentType.BOOKING_CANCELED_LATE:
roomExplanation = oldResourceName; roomExplanation = oldResourceName;
// dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`; // dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`;
dateExplanation = `${incidentTimestampMoment.clone().format('MMM DD')}`; dateExplanation = `${oldBookingStartMoment.clone().format('MMM DD')}`;
bookingTimeExplanation = `[${oldBookingStartMoment.clone().format('HH:mm')} to ${oldBookingEndMoment.clone().format('HH:mm')}]`; bookingTimeExplanation = `[${oldBookingStartMoment.clone().format('HH:mm')} to ${oldBookingEndMoment.clone().format('HH:mm')}]`;
incidentTimeExplanation = `canceled on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`; incidentTimeExplanation = `canceled on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`;
incidentExplanation += `, ${incidentTimeExplanation}`; incidentExplanation += `, ${incidentTimeExplanation}`;

4
services/officeRnD/bookings.js
View File

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