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

fix "Delete fee" on Member Incidents Report screen

Browse Source
This commit is contained in:
Bilal Catic
2019-11-21 15:12:41 +01:00
parent d4a949aaf0
commit 06a40e98e9
5 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/MemberIncidentsTables/components/SingleIncidentsTable.js
View File

@@ -65,7 +65,7 @@ class SingleIncidentsTable extends Component {
};
deleteSelectedFees = () => {
const { dateRange, deleteIncidentsById } = this.props;
const { dateRange, deleteIncidentsById, memberId } = this.props;
const { selectedUnlockedIncidentIds, selectedUnscheduledIncidentIds, selectedBookingChangeIncidentIds } = this.state;
const incidentsToDelete = {
@@ -74,7 +74,7 @@ class SingleIncidentsTable extends Component {
bookingChangeIncidentIds: selectedBookingChangeIncidentIds
};
deleteIncidentsById(dateRange, incidentsToDelete);
deleteIncidentsById(dateRange, incidentsToDelete, memberId);
this.setState({
selectedUnlockedIncidentIds: [],
selectedUnscheduledIncidentIds: [],
@@ -252,7 +252,7 @@ class SingleIncidentsTable extends Component {
}
const mapDispatchToProps = (dispatch) => ({
deleteIncidentsById: (dateRange, incidentsToDelete) => deleteIncidents(dispatch, {dateRange, incidentsToDelete})
deleteIncidentsById: (dateRange, incidentsToDelete, memberId) => deleteIncidents(dispatch, {dateRange, incidentsToDelete, memberId})
});
export default connect(null, mapDispatchToProps)(SingleIncidentsTable);

5
client/src/components/MemberIncidentsTables/index.js
View File

@@ -8,7 +8,7 @@ import {
} from '../../constants/enums';
export default function MemberIncidentsTables (props) {
const { pendingIncidents, incidents, hideMemberName, dateRange } = props;
const { pendingIncidents, incidents, hideMemberName, dateRange, memberId } = props;
const incidentsRelatedToReservations = [];
const standaloneIncidents = [];
@@ -47,6 +47,7 @@ export default function MemberIncidentsTables (props) {
hideMemberName={hideMemberName}
tableType={incidentTableTypes.INCIDENTS_RELATED_TO_RESERVATIONS}
dateRange={dateRange}
memberId={memberId}
/>
);
@@ -58,6 +59,7 @@ export default function MemberIncidentsTables (props) {
hideMemberName={hideMemberName}
tableType={incidentTableTypes.STANDALONE_INCIDENTS}
dateRange={dateRange}
memberId={memberId}
/>
);
@@ -69,6 +71,7 @@ export default function MemberIncidentsTables (props) {
hideMemberName={hideMemberName}
tableType={incidentTableTypes.BOOKING_CHANGE_INCIDENTS}
dateRange={dateRange}
memberId={memberId}
/>
);