.gitignore

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

@@ -16,6 +16,10 @@ var CartPage = React.createClass({
     _onTakeItemOut: function(itemId) {
       CartActions.takeItemOut(itemId);
     },
+    _goToStartPage: function() {
+      NavigationActions.goToHome();
+    },
+
     render: function() {
       var counts = this.state.itemCounts;
       var self = this;
@@ -46,7 +50,7 @@ var CartPage = React.createClass({
            <div className="col-lg-6 text-right">
 
              <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} /><br />
-             <span className={this.state.deliveryDestinationValid ? 'shown' : 'hidden'}>
+             <span className={this.state.deliveryDestinationErrors['place'] ? 'hidden' : 'shown'}>
               <CartTotal deliveryCosts={this.state.deliveryCosts} instantDelivery={this.state.deliveryDestination.get('instant_delivery')}/><br />
               <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} instantDelivery={this.state.deliveryDestination.get('instant_delivery')}/>
               </span>
@@ -55,7 +59,7 @@ var CartPage = React.createClass({
      
         <div className="row">
            <div className="col-lg-12 pull-left">
-              <button className="mybutton" onClick={this._onOrderClick}>Završi narudžbu</button>
+              <button className="mybutton" onClick={this._onOrderClick}>Završi narudžbu</button> ili <button className="btn btn-default" onClick={this._goToStartPage}>Nastavi kupovati</button> 
            </div>
 
         </div>