From 1b421d651cc77458d0ce02dd2beda59c21d84980 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Tue, 3 Sep 2019 09:58:23 +0200 Subject: [PATCH] reformat fee descriptions --- services/integration/invoiceIntegration.js | 44 ++++++++-------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/services/integration/invoiceIntegration.js b/services/integration/invoiceIntegration.js index 2328c5f..1af6e79 100644 --- a/services/integration/invoiceIntegration.js +++ b/services/integration/invoiceIntegration.js @@ -41,11 +41,8 @@ const createFeeFromIncident = (incident) => { let date = ''; let price = 0; let quantity = 0; - // let priceExplanation = ''; let bookingTimeExplanation = ''; let incidentTimeExplanation = ''; - let incidentTypeExplanation = ''; - let additionalIncidentExplanation = ''; let roomExplanation = ''; let dateExplanation = ''; @@ -67,68 +64,60 @@ const createFeeFromIncident = (incident) => { roomExplanation = resourceName; 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')}`; - incidentExplanation += ` ${unlockedIncidentLevelsPrices[incidentLevel].description},`; - incidentTypeExplanation = ''; + incidentTimeExplanation = `unlock : ${unlockMoment.clone().format('HH:mm')}`; + incidentExplanation += `, ${unlockedIncidentLevelsPrices[incidentLevel].description}, ${incidentTimeExplanation}`; date = bookingStartMoment.clone().startOf('day').format(); price = +incidentPrice.toFixed(2); quantity = 1.00; - // priceExplanation = `$${price}, 1 x $${price.toFixed(2)}`; break; case incidentType.UNSCHEDULED_INCIDENT_BEFORE_RESERVATION: roomExplanation = resourceName; 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 = ''; + incidentTimeExplanation = `unlock : ${unlockMoment.clone().format('HH:mm')}`; + incidentExplanation += `, ${incidentTimeExplanation}`; date = bookingStartMoment.clone().startOf('day').format(); price = +chargePrice.toFixed(2); quantity = +timeIntervalsToCharge.toFixed(2); - // priceExplanation = `$${totalChargeFee.toFixed(2)}, ${quantity} x $${price.toFixed(2)}`; break; case incidentType.UNSCHEDULED_INCIDENT_AFTER_RESERVATION: roomExplanation = resourceName; 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 = ''; + incidentTimeExplanation = `lock : ${lockMoment.clone().format('HH:mm')}`; + incidentExplanation += `, ${incidentTimeExplanation}`; date = bookingStartMoment.clone().startOf('day').format(); price = +chargePrice.toFixed(2); quantity = +timeIntervalsToCharge.toFixed(2); - // priceExplanation = `$${totalChargeFee.toFixed(2)}, ${quantity} x $${price.toFixed(2)}`; break; case incidentType.UNLOCKED_INCIDENT_STANDALONE: roomExplanation = resourceName; 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')}`; - incidentExplanation += ` ${unlockedIncidentLevelsPrices[incidentLevel].description},`; - incidentTypeExplanation = ''; + incidentTimeExplanation = `unlock : ${unlockMoment.clone().format('HH:mm')}`; + incidentExplanation += `, ${unlockedIncidentLevelsPrices[incidentLevel].description}, ${incidentTimeExplanation}`; date = unlockMoment.clone().startOf('day').format(); price = +incidentPrice.toFixed(2); quantity = 1.00; - // priceExplanation = `$${price.toFixed(2)}, 1 x $${price.toFixed(2)}`; break; case incidentType.UNSCHEDULED_INCIDENT_STANDALONE: roomExplanation = resourceName; 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 = ''; + //incidentTimeExplanation = `unlock : ${unlockMoment.clone().format('HH:mm')}, lock : ${lockMoment.clone().format('HH:mm')}`; date = unlockMoment.clone().startOf('day').format(); price = +chargePrice.toFixed(2); quantity = +timeIntervalsToCharge.toFixed(2); - // priceExplanation = `$${totalChargeFee.toFixed(2)}, ${quantity} x $${price.toFixed(2)}`; break; case incidentType.BOOKING_MOVED_TO_ANOTHER_DAY: // if (oldResourceName !== newResourceName){ @@ -141,14 +130,13 @@ const createFeeFromIncident = (incident) => { // 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]'; + incidentTimeExplanation = `moved on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`; + incidentExplanation += `, ${incidentTimeExplanation}`; date = incidentTimestampMoment.clone().startOf('day').format(); price = +totalChargeFee.toFixed(2); quantity = 1.00; - // priceExplanation = `$${totalChargeFee.toFixed(2)}, 1 x $${price.toFixed(2)}`; break; case incidentType.BOOKING_SHORTENED: // if (oldResourceName !== newResourceName){ @@ -161,28 +149,26 @@ const createFeeFromIncident = (incident) => { // 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]'; + incidentTimeExplanation = `shortened on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`; + incidentExplanation += `, ${incidentTimeExplanation}`; date = incidentTimestampMoment.clone().startOf('day').format(); price = +totalChargeFee.toFixed(2); quantity = 1.00; - // priceExplanation = `$${totalChargeFee.toFixed(2)}, 1 x $${price.toFixed(2)}`; break; case incidentType.BOOKING_CANCELED_LATE: roomExplanation = oldResourceName; // 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]'; + incidentTimeExplanation = `canceled on : ${incidentTimestampMoment.clone().format('MMM DD, HH:mm')}`; + incidentExplanation += `, ${incidentTimeExplanation}`; date = incidentTimestampMoment.clone().startOf('day').format(); price = +totalChargeFee.toFixed(2); quantity = 1.00; - // priceExplanation = `$${totalChargeFee.toFixed(2)}, 1 x $${price.toFixed(2)}`; break; }