money in upper right works now - zavrsi narudzbu is white

2015-04-20 05:49:23 +02:00
parent a5836a428f
commit ecbe58c626
3 changed files with 21 additions and 8 deletions
--- 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 (  
        <div className="col-md-3 cart-total">
          <div>
@@ -41,6 +40,11 @@ var CartTotal = React.createClass({
        </div>
        );       

+      }
+       else {
+         return (  <span>{Globals.FormatCurrency(total)}</span>);
+       }
+
    }

 });