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

Merge branch 'reformat-reservation-fee-description' into 'master'

Browse Source 
Reformat reservation fee description

See merge request saburly/psihologija!51
This commit was merged in pull request #51.
This commit is contained in:
Bilal Catic
2019-08-30 09:05:39 +00:00
parent a9668cae71 fe6963b2cd
commit 4bf6d5f55d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js
View File

@@ -22,7 +22,7 @@ class MemberSelector extends Component {
} }
render(){ render(){
const { members, defaultMemberId } = this.props; const { members, defaultMemberId, loadingMembers } = this.props;
const dropdownOptions = members && Array.isArray(members) ? members.map(member => ({ const dropdownOptions = members && Array.isArray(members) ? members.map(member => ({
key: member.memberId, key: member.memberId,
@@ -35,6 +35,7 @@ class MemberSelector extends Component {
<Form> <Form>
<label>{'Member name'}</label> <label>{'Member name'}</label>
<Dropdown <Dropdown
loading={loadingMembers}
options={dropdownOptions} options={dropdownOptions}
placeholder="Select Member" placeholder="Select Member"
selection selection
@@ -50,6 +51,7 @@ class MemberSelector extends Component {
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
members: state.membersList.result, members: state.membersList.result,
loadingMembers: state.membersList.pending,
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({

6
services/integration/invoiceIntegration.js
View File

@@ -212,10 +212,10 @@ const createFeeFromBooking = (booking, resourceMappings) => {
const resourceName = resourcesMap[resourceId].resourceName || 'Unknown'; const resourceName = resourcesMap[resourceId].resourceName || 'Unknown';
const formattedDate = startMoment.clone().startOf('day').format('MMM DD'); const formattedDate = startMoment.clone().startOf('day').format('MMM DD');
const formattedStartTime = startMoment.format('HH:mm a'); const formattedStartTime = startMoment.format('HH:mm');
const formattedEndTime = endMoment.format('HH:mm a'); const formattedEndTime = endMoment.format('HH:mm');
const formattedName = `${officeName}, ${resourceName}, ${formattedDate} [${formattedStartTime} - ${formattedEndTime}]`; const formattedName = `${formattedDate} [${formattedStartTime} to ${formattedEndTime}] ${resourceName}, ${officeName}`;
return { return {
name: formattedName, name: formattedName,