Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unable to open fulfill order action view #2530

Merged
merged 4 commits into from
Jul 7, 2017
Merged

Fix unable to open fulfill order action view #2530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c66eae4
Fix hard refresh when clicking View All notifications
Jul 6, 2017
43c53d6
Fix click action for rendering orders on dashboard
Jul 6, 2017
68bcaeb
Add click handler to render action panel
Jul 6, 2017
8b6998d
Merge branch 'development' into awa-fix-2142-fulfil-order
brent-hoover Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion imports/plugins/core/orders/client/components/ordersList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ class OrdersList extends Component {
});

return (
<button className={classes} data-event-action="startProcessingOrder"><Icon icon="fa fa-chevron-right" /></button>
<button className={classes} onClick={() => this.props.handleClick(order)}>
<Icon icon="fa fa-chevron-right" />
</button>
);
}

Expand Down
9 changes: 7 additions & 2 deletions imports/plugins/included/notifications/client/components/notificationDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class NotificationDropdown extends Component {
this.handleNoNotifications = this.handleNoNotifications.bind(this);
this.renderDropdownHead = this.renderDropdownHead.bind(this);
this.handleClick = this.handleClick.bind(this);
this.handleClickViewAll = this.handleClickViewAll.bind(this);
}

handleNoNotifications(notifyArr) {
Expand Down Expand Up @@ -42,6 +43,11 @@ class NotificationDropdown extends Component {
return markOneAsRead(notify._id);
}

handleClickViewAll() {
const url = this.prefix + "/notifications";
Reaction.Router.go(url);
}

renderDropdownHead() {
const { notificationList, unread, markAllAsRead } = this.props;
return (
Expand All @@ -56,7 +62,6 @@ class NotificationDropdown extends Component {

render() {
const { notificationList } = this.props;
const prefix = this.prefix + "/notifications";
return (
<div className="notify-bar">
{ this.renderDropdownHead() }
Expand Down Expand Up @@ -86,7 +91,7 @@ class NotificationDropdown extends Component {
})}
</ul>
<div className="dropdown-footer text-center">
<a href={prefix} data-i18n="notifications.body.viewAll">View All</a>
<a onClick={this.handleClickViewAll} data-i18n="notifications.body.viewAll">View All</a>
</div>
</div>
);
Expand Down
13 changes: 12 additions & 1 deletion imports/plugins/included/notifications/client/components/notificationRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import moment from "moment";
import { Reaction } from "/client/api";


class NotificationRoute extends Component {
Expand Down Expand Up @@ -28,6 +29,16 @@ class NotificationRoute extends Component {
}

handleClick(notify) {
if (notify.type === "forAdmin") {
const actionViewData = Reaction.Apps({
name: "reaction-orders",
provides: "dashboard"
});
Reaction.showActionView(actionViewData);
} else {
Reaction.Router.go(notify.url);
}

const { markOneAsRead } = this.props;
return markOneAsRead(notify._id);
}
Expand Down Expand Up @@ -57,7 +68,7 @@ class NotificationRoute extends Component {
const i18n = `notifications.messages.${notify.type}`;
return (
<li className={read} key={key}>
<a href={notify.url} onClick={() => {
<a onClick={() => {
this.handleClick(notify);
}}
>
Expand Down