added delivery costs to total / added ribica logo just for fun / added validation check when confirming delivery

front-ui/app/components/cart/cartPage.js

@@ -38,7 +38,7 @@ var CartPage = React.createClass({
       console.log("bla  :" , this.state.items.length);
       var cartTotal = ( 
         <div className="row cart-total">
-           <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} /> 
+           <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts}/> 
            <div className="col-md-1 span1">
               <button className="btn btn-warning" onClick={this._onOrderClick}>Izgleda OK</button>
            </div>

front-ui/app/components/cart/cartTotal.js

@@ -5,6 +5,10 @@ var React = require('react'),
 var Router = require('react-router');
 
 
+
+
+
+
 var CartTotal = React.createClass({
 
     render: function() {
@@ -20,9 +24,20 @@ var CartTotal = React.createClass({
 
       });
 
+      var deliveryCosts = this.props.deliveryCosts.get('delivery_price');
+
       return (  
         <div className="col-md-3 cart-total">
-          Ukupno: {Globals.FormatCurrency(total)} + Dostava
+          <div>
+          Roba: {Globals.FormatCurrency(total)}
+          </div>
+          <div>
+          Dostava: {Globals.FormatCurrency(deliveryCosts)}         
+          </div>
+          <div>
+          Ukupno: {Globals.FormatCurrency(total + (+deliveryCosts))}         
+          </div>
+
         </div>
         );       
 

front-ui/app/components/cart/checkoutPage.js

@@ -599,10 +599,10 @@ var CheckoutPage = React.createClass({
             <div className="form-group">
                   <label className="col-md-4 control-label" htmlFor="order"></label>
                   <div className="col-md-8">
-                        <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} />  <button id="order" name="order" className="btn btn-success" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Naruči</button>
+                        <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} />  <button id="order" name="order" className="btn btn-success" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Naruči</button>
                   </div>
             </div>
-      </fieldset>
+      </fieldset> 
 </div>
 </div>
         );       

front-ui/app/components/rootApp.js

@@ -16,7 +16,8 @@ var RootApp = React.createClass({
     <div className='page-header'>
         <h1 className="main-heading">
         
-        <Link to="app"><span style={{color: "#cd3071"}}>ribica.ba</span></Link>
+        <Link to="app"><img src="https://res.cloudinary.com/lfvt7ps2n/image/upload/c_scale,w_132/v1426226452/ribica-ispunjava-zelje_nng0gn.png" /></Link>
+
         </h1>
         <div style={{float:'right'}}>
             <div style={{display: 'inline-block'}}>