From fbcde51ef0a8fddf0149ef04813cf4af71698dd2 Mon Sep 17 00:00:00 2001
From: "adam.harbas@a-net.ba" <adam.harbas@a-net.ba>
Date: Mon, 11 Jan 2016 10:21:11 +0100
Subject: [PATCH] Button order

---
 front-ui/app/components/cart/checkoutPage.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/front-ui/app/components/cart/checkoutPage.js b/front-ui/app/components/cart/checkoutPage.js
index f4c7dcf..fe35df8 100644
--- a/front-ui/app/components/cart/checkoutPage.js
+++ b/front-ui/app/components/cart/checkoutPage.js
@@ -9,8 +9,8 @@ var React = require('react'),
     LinkBanner = require('../linkBanner/linkBanner'),
     PaymentSelect = require('../payment/paymentSelect'),
     RibicaFormError = require('../shared/ribicaFormError'),
-    PaypalButton = require('../payment/paypalButton');
-
+    PaypalButton = require('../payment/paypalButton'),
+    CashOnDeliveryButton = require('../payment/cashOnDeliveryButton');
 
 var Router = require('react-router');
 
@@ -29,7 +29,7 @@ var CheckoutPage = React.createClass({
       );
 
       var last_used_payment;
-      if(this.state.deliveryDestination.get('payment_method') == 'paypal' || true) {
+      if(this.state.deliveryDestination.get('payment_method') == 'paypal') {
         last_used_payment = (
           <PaypalButton disabled={!this.state.isDeliveryDestinationValid} onSubmitPaypal={this._handleOnSubmitPaypal} deliveryDestination={this.state.deliveryDestination} amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} />
         );
@@ -37,7 +37,7 @@ var CheckoutPage = React.createClass({
 
       } else {
         last_used_payment = (
-          <PaypalButton disabled={!this.state.isDeliveryDestinationValid} deliveryDestination={this.state.deliveryDestination} amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} />
+        <CashOnDeliveryButton onCashClick={this._onOrderClick} disabled={!this.state.isDeliveryDestinationValid}/>
         );
       }
 
@@ -138,7 +138,8 @@ var CheckoutPage = React.createClass({
                 Ukupno: <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} />
 
               </p>
-              <div className="center">{last_used_payment}</div> ili <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni adresu</button>
+              <p>{last_used_payment} ili <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni adresu</button>
+                </p>
                 <div className="form-group">
                   <label className="col-md-4 control-label" htmlFor="order"></label>
                   <div className="col-md-8">