From f4884c498534b239babe2958ebf222e7a660e1bd Mon Sep 17 00:00:00 2001
From: "adam.harbas@a-net.ba" <adam.harbas@a-net.ba>
Date: Mon, 11 Jan 2016 10:07:51 +0100
Subject: [PATCH] Fixing errors

---
 front-ui/app/components/cart/checkoutPage.js    | 2 +-
 front-ui/app/components/payment/paypalButton.js | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/front-ui/app/components/cart/checkoutPage.js b/front-ui/app/components/cart/checkoutPage.js
index 6f7dddf..f4c7dcf 100644
--- a/front-ui/app/components/cart/checkoutPage.js
+++ b/front-ui/app/components/cart/checkoutPage.js
@@ -37,7 +37,7 @@ var CheckoutPage = React.createClass({
 
       } else {
         last_used_payment = (
-          <button id="order" name="order" className="mybutton" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Završi narudžbu</button>
+          <PaypalButton disabled={!this.state.isDeliveryDestinationValid} deliveryDestination={this.state.deliveryDestination} amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} />
         );
       }
 
diff --git a/front-ui/app/components/payment/paypalButton.js b/front-ui/app/components/payment/paypalButton.js
index 41c401e..a26c298 100644
--- a/front-ui/app/components/payment/paypalButton.js
+++ b/front-ui/app/components/payment/paypalButton.js
@@ -23,13 +23,8 @@ var PaypalButton = React.createClass({
       var cancel_return_url = root + "/dostava";
 
       return (
-<<<<<<< HEAD
-         <div>
-            <form onSubmit={this.props.onSubmitPaypal} action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-=======
             <button onClick={this._onPaypalClick} disabled={this.props.disabled} type="button" className="btn mybutton payment-btn">Pay with paypal
             <form id="paypal_form" className="hidden" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
->>>>>>> 7b2552c31c6f356bd24e3df0def6d3a021f6c138
               <input type="hidden" name="cmd" value="_xclick" />
               <input type="hidden" name="business" value={Globals.PaypalId} />
               <input type="hidden" name="lc" value="BA" />