Charges/invoices update

This commit is contained in:
Senad Uka
2019-07-19 09:46:15 +02:00
parent e2dcb246f0
commit 4389aaa8da
16 changed files with 253 additions and 62 deletions

View File

@@ -116,7 +116,8 @@ const getBookingChangeIncidents = (startDate, endDate, memberId) => {
'id',
'reservationId',
'memberId',
'resourceId',
'oldResourceId',
'newResourceId',
'oldBookingStart',
'oldBookingEnd',
'newBookingStart',
@@ -251,7 +252,8 @@ const getAllIncidents = (dateRange, memberId) => {
const {
id,
memberId,
resourceId,
oldResourceId,
newResourceId,
oldBookingStart,
oldBookingEnd,
newBookingStart,
@@ -261,14 +263,17 @@ const getAllIncidents = (dateRange, memberId) => {
createdAt,
} = bookingChangeIncident;
const memberName = membersMap[memberId].name;
const resource = resourcesMap[resourceId];
const resourceName = resource.resourceName;
const officeName = officesMap[resource.officeId].officeName;
const oldResource = resourcesMap[oldResourceId];
const newResource = newResourceId ? resourcesMap[newResourceId] : null;
const oldResourceName = oldResource.resourceName;
const newResourceName = newResource ? newResource.resourceName : null;
const officeName = officesMap[oldResource.officeId].officeName;
allIncidents.push({
incidentId: id,
memberId,
memberName,
resourceName,
oldResourceName,
newResourceName,
officeName,
oldBookingStart: formatTime(oldBookingStart),
oldBookingEnd: formatTime(oldBookingEnd),