Skip to content

Commit

Permalink
Merge pull request #12 from emreeren/order-tag-screen
Browse files Browse the repository at this point in the history
closes #11
  • Loading branch information
emreeren committed Sep 26, 2016
2 parents c654a7d + cb13c3b commit a9912ed
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion app/components/Order.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,12 @@ export default class Order extends React.Component {

onPortionSelected = (name) => {
this.props.onChangePortion(this.props.orderUid, name,
() => this.handleDetailsClose());
() => {
if (this.state.orderTags && this.state.orderTags.length > 0)
this.handleDetailsOpen(this.props.productId, name);
else
this.handleDetailsClose();
});
}

onOrderTagSelected = (name, tag) => {
Expand Down
2 changes: 1 addition & 1 deletion app/queries.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import jQuery from 'jquery';

const serverUrl = 'http://localhost:9000'
const terminaName = 'Server';
const departmentName = 'Restaurant';
const departmentName = 'Pizza Delivery';
const userName = 'Administrator';
const ticketTypeName = 'Ticket';
const menuName = 'Menu';
Expand Down

0 comments on commit a9912ed

Please sign in to comment.