diff --git a/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js b/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js index 589e47b..1e37620 100644 --- a/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js +++ b/client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js @@ -22,7 +22,7 @@ class MemberSelector extends Component { } render(){ - const { members, defaultMemberId } = this.props; + const { members, defaultMemberId, loadingMembers } = this.props; const dropdownOptions = members && Array.isArray(members) ? members.map(member => ({ key: member.memberId, @@ -35,6 +35,7 @@ class MemberSelector extends Component {
({ members: state.membersList.result, + loadingMembers: state.membersList.pending, }); const mapDispatchToProps = (dispatch) => ({ diff --git a/services/integration/invoiceIntegration.js b/services/integration/invoiceIntegration.js index 86cb5ed..077c9c2 100644 --- a/services/integration/invoiceIntegration.js +++ b/services/integration/invoiceIntegration.js @@ -212,10 +212,10 @@ const createFeeFromBooking = (booking, resourceMappings) => { const resourceName = resourcesMap[resourceId].resourceName || 'Unknown'; const formattedDate = startMoment.clone().startOf('day').format('MMM DD'); - const formattedStartTime = startMoment.format('HH:mm a'); - const formattedEndTime = endMoment.format('HH:mm a'); + const formattedStartTime = startMoment.format('HH:mm'); + const formattedEndTime = endMoment.format('HH:mm'); - const formattedName = `${officeName}, ${resourceName}, ${formattedDate} [${formattedStartTime} - ${formattedEndTime}]`; + const formattedName = `${formattedDate} [${formattedStartTime} to ${formattedEndTime}] ${resourceName}, ${officeName}`; return { name: formattedName,