Merge branch 'master' into develop

front-api/tools/prepare_postal_codes.rb

@@ -514,7 +514,13 @@ places_prepared = places.map &-> (p) {
   matches = separator.match(p)
   place = matches[1]
   postal_code = matches[2]
-  %Q{ <option value="#{postal_code}">#{place}</option>    }
+  # %Q{ <option value="#{postal_code}">#{place}</option>    }
+meho = <<HAMO
+  ,{
+    "code": "#{postal_code}",
+    "placeLabel": "#{place}"
+  }
+HAMO
 }
 puts places_prepared.join("\n")
 

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

@@ -46,8 +46,10 @@ 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'}>
               <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>
            </div>
         </div>
      

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

@@ -82,8 +82,11 @@ var CheckoutPage = React.createClass({
                   <label className="col-md-4 control-label" htmlFor="order"></label>
                   <div className="col-md-8">
                         <div>      Roba: <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} /><br />
+               <span className={this.state.deliveryDestinationErrors['place'] ? 'hidden' : 'shown'}>
                 Dostava: <CartTotal deliveryCosts={this.state.deliveryCosts} /><br />
-                Ukupno: <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} /></div>
+                Ukupno:  <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} />
+                </span>
+                  </div>
                         <div><button id="order" name="order" className="mybutton" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Završi narudžbu</button></div>
                   </div>
             </div>