From 85b844cd598c89dbeaaab374348779b64b018907 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Mon, 26 Aug 2019 14:32:00 +0200 Subject: [PATCH] change fees name format --- constants/constants.js | 4 +- services/integration/invoiceIntegration.js | 65 ++++++++++++---------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/constants/constants.js b/constants/constants.js index 26c3997..1a4da0c 100644 --- a/constants/constants.js +++ b/constants/constants.js @@ -91,8 +91,8 @@ incidentTypeExplanations[incidentType.UNSCHEDULED_INCIDENT_BEFORE_RESERVATION] incidentTypeExplanations[incidentType.UNSCHEDULED_INCIDENT_AFTER_RESERVATION] = 'Room used after reservation ended'; incidentTypeExplanations[incidentType.UNSCHEDULED_INCIDENT_STANDALONE] = 'Room used without reservation'; incidentTypeExplanations[incidentType.BOOKING_MOVED_TO_ANOTHER_DAY] = 'Reservation moved to another day'; -incidentTypeExplanations[incidentType.BOOKING_SHORTENED] = 'Reservation shortened'; -incidentTypeExplanations[incidentType.BOOKING_CANCELED_LATE] = 'A reservation canceled after the grace period'; +incidentTypeExplanations[incidentType.BOOKING_SHORTENED] = 'Reservation shortened after grace period'; +incidentTypeExplanations[incidentType.BOOKING_CANCELED_LATE] = 'Reservation cancelled after grace period'; const UI_TIMEZONE = process.env.UI_TIMEZONE || 'America/Los_Angeles'; diff --git a/services/integration/invoiceIntegration.js b/services/integration/invoiceIntegration.js index 2a4731a..034529c 100644 --- a/services/integration/invoiceIntegration.js +++ b/services/integration/invoiceIntegration.js @@ -36,7 +36,7 @@ const createFeeFromIncident = (incident) => { } = incident; const incidentTypeNumber = incident.incidentType; - const incidentExplanation = incidentTypeExplanations[incidentTypeNumber]; + let incidentExplanation = incidentTypeExplanations[incidentTypeNumber]; let date = ''; let price = 0; @@ -65,10 +65,10 @@ const createFeeFromIncident = (incident) => { switch (incidentTypeNumber){ case incidentType.UNLOCKED_INCIDENT_RELATED_WITH_RESERVATION: roomExplanation = resourceName; - dateExplanation = bookingStartMoment.clone().startOf('day').format('ddd, MMM DD'); - bookingTimeExplanation = `${bookingStartMoment.clone().format('HH:mm a')} - ${bookingEndMoment.clone().format('HH:mm a')}`; + dateExplanation = bookingStartMoment.clone().startOf('day').format('MMM DD'); + bookingTimeExplanation = `[${bookingStartMoment.clone().format('HH:mm')} to ${bookingEndMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ''; // `UNLOCK : ${unlockMoment.clone().format('HH:mm a')}`; - additionalIncidentExplanation = ` ${unlockedIncidentLevelsPrices[incidentLevel].description},`; + incidentExplanation += ` ${unlockedIncidentLevelsPrices[incidentLevel].description},`; incidentTypeExplanation = ''; date = bookingStartMoment.clone().startOf('day').format(); @@ -79,8 +79,8 @@ const createFeeFromIncident = (incident) => { break; case incidentType.UNSCHEDULED_INCIDENT_BEFORE_RESERVATION: roomExplanation = resourceName; - dateExplanation = bookingStartMoment.clone().startOf('day').format('ddd, MMM DD'); - bookingTimeExplanation = `${bookingStartMoment.clone().format('HH:mm a')} - ${bookingEndMoment.clone().format('HH:mm a')}`; + dateExplanation = bookingStartMoment.clone().startOf('day').format('MMM DD'); + bookingTimeExplanation = `[${bookingStartMoment.clone().format('HH:mm')} to ${bookingEndMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ` Unlock : ${unlockMoment.clone().format('HH:mm a')},`; incidentTypeExplanation = ''; @@ -92,8 +92,8 @@ const createFeeFromIncident = (incident) => { break; case incidentType.UNSCHEDULED_INCIDENT_AFTER_RESERVATION: roomExplanation = resourceName; - dateExplanation = bookingStartMoment.clone().startOf('day').format('ddd, MMM DD'); - bookingTimeExplanation = `${bookingStartMoment.clone().format('HH:mm a')} - ${bookingEndMoment.clone().format('HH:mm a')}`; + dateExplanation = bookingStartMoment.clone().startOf('day').format('MMM DD'); + bookingTimeExplanation = `[${bookingStartMoment.clone().format('HH:mm')} to ${bookingEndMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ` Lock : ${lockMoment.clone().format('HH:mm a')},`; incidentTypeExplanation = ''; @@ -105,10 +105,10 @@ const createFeeFromIncident = (incident) => { break; case incidentType.UNLOCKED_INCIDENT_STANDALONE: roomExplanation = resourceName; - dateExplanation = unlockMoment.clone().startOf('day').format('ddd, MMM DD'); - bookingTimeExplanation = `No reservation`; + dateExplanation = unlockMoment.clone().startOf('day').format('MMM DD'); + bookingTimeExplanation = `[${unlockMoment.clone().format('HH:mm')} to ${lockMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ''; // `UNLOCK : ${unlockMoment.clone().format('HH:mm a')}`; - additionalIncidentExplanation = ` ${unlockedIncidentLevelsPrices[incidentLevel].description},`; + incidentExplanation += ` ${unlockedIncidentLevelsPrices[incidentLevel].description},`; incidentTypeExplanation = ''; date = unlockMoment.clone().startOf('day').format(); @@ -119,8 +119,8 @@ const createFeeFromIncident = (incident) => { break; case incidentType.UNSCHEDULED_INCIDENT_STANDALONE: roomExplanation = resourceName; - dateExplanation = unlockMoment.clone().startOf('day').format('ddd, MMM DD'); - bookingTimeExplanation = `No reservation`; + dateExplanation = unlockMoment.clone().startOf('day').format('MMM DD'); + bookingTimeExplanation = `[${unlockMoment.clone().format('HH:mm')} to ${lockMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ` Unlock : ${unlockMoment.clone().format('HH:mm a')} Lock : ${lockMoment.clone().format('HH:mm a')},`; incidentTypeExplanation = ''; @@ -131,14 +131,16 @@ const createFeeFromIncident = (incident) => { // priceExplanation = `$${totalChargeFee.toFixed(2)}, ${quantity} x $${price.toFixed(2)}`; break; case incidentType.BOOKING_MOVED_TO_ANOTHER_DAY: - if (oldResourceName !== newResourceName){ - roomExplanation = `${oldResourceName} -> ${newResourceName}`; - }else{ - roomExplanation = oldResourceName; - } + // if (oldResourceName !== newResourceName){ + // roomExplanation = `${oldResourceName} -> ${newResourceName}`; + // }else{ + // roomExplanation = oldResourceName; + // } + roomExplanation = newResourceName; - dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')} -> ${newBookingStartMoment.clone().format('ddd, MMM DD')}`; - bookingTimeExplanation = `(${oldBookingStartMoment.clone().format('HH:mm a')} - ${oldBookingEndMoment.clone().format('HH:mm a')}) -> (${newBookingStartMoment.clone().format('HH:mm a')} - ${newBookingEndMoment.clone().format('HH:mm a')})`; + // dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')} -> ${newBookingStartMoment.clone().format('ddd, MMM DD')}`; + dateExplanation = `${incidentTimestampMoment.clone().format('MMM DD')}`; + bookingTimeExplanation = `[${newBookingStartMoment.clone().format('HH:mm')} to ${newBookingEndMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ` Moved on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm a')},`; incidentTypeExplanation = '[Cancellation]'; @@ -149,14 +151,16 @@ const createFeeFromIncident = (incident) => { // priceExplanation = `$${totalChargeFee.toFixed(2)}, 1 x $${price.toFixed(2)}`; break; case incidentType.BOOKING_SHORTENED: - if (oldResourceName !== newResourceName){ - roomExplanation = `${oldResourceName} -> ${newResourceName}`; - }else{ - roomExplanation = oldResourceName; - } + // if (oldResourceName !== newResourceName){ + // roomExplanation = `${oldResourceName} -> ${newResourceName}`; + // }else{ + // roomExplanation = oldResourceName; + // } + roomExplanation = newResourceName; - dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`; - bookingTimeExplanation = `(${oldBookingStartMoment.clone().format('HH:mm a')} - ${oldBookingEndMoment.clone().format('HH:mm a')}) -> (${newBookingStartMoment.clone().format('HH:mm a')} - ${newBookingEndMoment.clone().format('HH:mm a')})`; + // dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`; + dateExplanation = `${incidentTimestampMoment.clone().format('MMM DD')}`; + bookingTimeExplanation = `[${newBookingStartMoment.clone().format('HH:mm')} to ${newBookingEndMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ` Shortened on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm a')},`; incidentTypeExplanation = '[Cancellation]'; @@ -168,8 +172,9 @@ const createFeeFromIncident = (incident) => { break; case incidentType.BOOKING_CANCELED_LATE: roomExplanation = oldResourceName; - dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`; - bookingTimeExplanation = `${oldBookingStartMoment.clone().format('HH:mm a')} - ${oldBookingEndMoment.clone().format('HH:mm a')}`; + // dateExplanation = `${oldBookingStartMoment.clone().format('ddd, MMM DD')}`; + dateExplanation = `${incidentTimestampMoment.clone().format('MMM DD')}`; + bookingTimeExplanation = `[${oldBookingStartMoment.clone().format('HH:mm')} to ${oldBookingEndMoment.clone().format('HH:mm')}]`; incidentTimeExplanation = ` Canceled on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm a')},`; incidentTypeExplanation = '[Cancellation]'; @@ -181,7 +186,7 @@ const createFeeFromIncident = (incident) => { break; } - const formattedName = `${dateExplanation}, ${bookingTimeExplanation}, ${roomExplanation}, ${incidentExplanation}, ${officeName}`; + const formattedName = `${dateExplanation} ${bookingTimeExplanation} ${roomExplanation}, ${officeName}, ${incidentExplanation}`; return { name: formattedName,