diff --git a/front-ui/app/components/cart/cartPage.js b/front-ui/app/components/cart/cartPage.js
index 62fdeae..4202900 100644
--- a/front-ui/app/components/cart/cartPage.js
+++ b/front-ui/app/components/cart/cartPage.js
@@ -2,8 +2,8 @@ var React = require('react'),
CartStore = require('../../stores/cartStore'),
AddToCart = require('../cart/addToCart'),
CartActions = require('../../actions/cartActions'),
+ NavigationActions = require('../../actions/navigationActions'),
SingleItem = require('../items/singleItem'),
- AddToCart = require('../cart/addToCart'),
Globals = require('../../globals'),
CartTotal = require('./cartTotal');
@@ -32,15 +32,25 @@ var CartPage = React.createClass({
{ Globals.FormatCurrency(count * price) }
-
)
});
+ var cartTotal = (
+
+ );
+
return (
- {displayedItems}
-
+ {cartTotal}
+ {displayedItems}
+ {cartTotal}
+
);
@@ -62,6 +72,9 @@ var CartPage = React.createClass({
}
},
+ _onOrderClick: function () {
+ //NavigationActions.goToCheckout();
+ },
getInitialState: function () {
return CartStore.getWholeCartState();
diff --git a/front-ui/app/components/cart/cartTotal.js b/front-ui/app/components/cart/cartTotal.js
index 8217e25..5416961 100644
--- a/front-ui/app/components/cart/cartTotal.js
+++ b/front-ui/app/components/cart/cartTotal.js
@@ -20,12 +20,9 @@ var CartTotal = React.createClass({
});
- return (
-
-
-
- Ukupno: {Globals.FormatCurrency(total)} + Dostava
-
+ return (
+
+ Ukupno: {Globals.FormatCurrency(total)} + Dostava
);
diff --git a/front-ui/app/css/cart.css b/front-ui/app/css/cart.css
index 4f070d7..88834af 100644
--- a/front-ui/app/css/cart.css
+++ b/front-ui/app/css/cart.css
@@ -32,4 +32,6 @@
.cart-total {
font-size: 17px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
\ No newline at end of file