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

NaN bug fix

Browse Source
This commit is contained in:
Senad Uka
2019-10-03 12:21:16 +02:00
parent dd381db50e
commit 5c5931f3ed
5 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/officeRnD/bookings.js
View File

@@ -165,7 +165,7 @@ const writeBookingReservation = (bookingReservation) => {
return db.bookingReservation.findOrCreate({where: {...bookingReservationForDB}, defaults: {...bookingReservationForDB}});
};
const bulkWriteReservationsWithChangesTracking = (reservations) => {
const bulkWriteReservationsWithChangesTracking = (reservations, resourcesMap) => {
return new Promise ((resolve, reject) => {
const changes = [];
const asyncJobs = [];
@@ -184,8 +184,18 @@ const bulkWriteReservationsWithChangesTracking = (reservations) => {
}
});
if (instance.hourlyRate === 0 && parseFloat(instance.previous('hourlyRate')) > 0){
instance.setDataValue('hourlyRate', instance.previous('hourlyRate'));
const previousResourceId = instance.previous('resourceId');
const currentResourceId = instance.resourceId;
const resourceId = currentResourceId ? currentResourceId : previousResourceId;
if (instance.hourlyRate === 0 || isNaN(instance.hourlyRate)){
if (parseFloat(instance.previous('hourlyRate') > 0)) {
instance.setDataValue('hourlyRate', instance.previous('hourlyRate'));
}else{
const hourlyRate = resourceId ? resourcesMap[resourceId].price : 0;
instance.setDataValue('hourlyRate', hourlyRate);
}
}
if (realChange){