diff --git a/front-ui/app/components/cart/cartIcon.js b/front-ui/app/components/cart/cartIcon.js index 77a8be8..ae31adf 100644 --- a/front-ui/app/components/cart/cartIcon.js +++ b/front-ui/app/components/cart/cartIcon.js @@ -3,6 +3,8 @@ var CartStore = require('../../stores/cartStore.js'); var CartActions = require('../../actions/cartActions.js'); var NavigationActions = require('../../actions/navigationActions.js'); var LoginStatus = require('../shared/loginStatus'); +CartTotal = require('./cartTotal'); + @@ -29,7 +31,7 @@ var CartIcon = React.createClass({
); diff --git a/front-ui/app/components/cart/cartTotal.js b/front-ui/app/components/cart/cartTotal.js index 4a8cee0..925f759 100644 --- a/front-ui/app/components/cart/cartTotal.js +++ b/front-ui/app/components/cart/cartTotal.js @@ -6,9 +6,6 @@ var Router = require('react-router'); - - - var CartTotal = React.createClass({ render: function() { @@ -26,6 +23,8 @@ var CartTotal = React.createClass({ var deliveryCosts = this.props.deliveryCosts.get('delivery_price'); + if (!this.props.justMerchandise) { + return (