senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

money in upper right works now - zavrsi narudzbu is white

Browse Source
This commit is contained in:
Senad Uka
2015-04-20 05:49:23 +02:00
parent a5836a428f
commit ecbe58c626
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front-ui/app/components/cart/cartIcon.js
View File

@@ -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({
<ul className="nav navbar-nav navbar-right">
<li><LoginStatus /></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderLeft: 'solid lightgray 1px', paddingBottom: 22}}><a ><div className="mycart"><span>{normalizeCount(this.state.count)}</span></div></a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', paddingBottom: 2}}><a href="#">0,00 KM</a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', paddingBottom: 2}}><a href="#"><CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} justMerchandise={true}/> </a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderRight: 'solid lightgray 1px'}}><a style={{marginLeft: 20, marginBottom: 10, marginRight: 15}} className="mybutton" href="#">Završi narudžbu</a></li>
</ul>
);

10
front-ui/app/components/cart/cartTotal.js
View File

@@ -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>);
}
}
});