Paypal button added to page

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

@@ -5,11 +5,11 @@ var React = require('react'),
     NavigationActions = require('../../actions/navigationActions'),
     SingleItem = require('../items/singleItem'),
     Globals = require('../../globals'),
-    CartTotal = require('./cartTotal'), 
+    CartTotal = require('./cartTotal'),
     LinkBanner = require('../linkBanner/linkBanner'),
     PaymentSelect = require('../payment/paymentSelect'),
     RibicaFormError = require('../shared/ribicaFormError');
-    
+
 
 var Router = require('react-router');
 
@@ -18,15 +18,14 @@ var CheckoutPage = React.createClass({
 
     render: function() {
 
-      var choosePayment = ( 
-        <div>
-          Plaćanje: <br />
+      var choosePayment = (
+        <div className="payment-btn">
           <PaymentSelect />
         </div>
       );
 
       var supportedPlaceOptions = CartStore.getSupportedPlaces().map ( function (p) {  return (<option value={p.code}>{p.placeLabel}</option>)});
- 
+
       var content = (
 <div className="checkout-page center">
       <div className="form-horizontal checkout_form_margin">
@@ -49,15 +48,15 @@ var CheckoutPage = React.createClass({
                               <span className="help-block">adresa na koju će roba biti isporučena</span>
                         </div>
                   </div>
-      
+
             <div className="form-group ">
                   <label className="col-md-4 control-label" htmlFor="place">Mjesto</label>
                   <div className="col-md-4">
                         <RibicaFormError componentName="place" errorMessagesObject={this.state.deliveryDestinationErrors} />
                         <select id="place" name="place" className="form-control" value={this.state.deliveryDestination.get('place')}  onChange={this._onFieldChange} >
-                            
-                        {supportedPlaceOptions} 
-                    
+
+                        {supportedPlaceOptions}
+
                         </select>
                   </div>
             </div>
@@ -96,19 +95,21 @@ var CheckoutPage = React.createClass({
                 </span>
                   </div>
                   <div>
+                   <br />
+                   Plaćanje: <br /><br />
+                   <div className="payment-btn"><button id="order" name="order" className="mybutton" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Završi narudžbu</button></div>
                    {choosePayment}
                    </div>
-                        <div><button id="order" name="order" className="mybutton" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Završi narudžbu</button></div>
                   </div>
             </div>
 
 
-      </fieldset> 
+      </fieldset>
 </div>
 
 
 </div>
-        );   
+        );
 
        if(CartStore.isAddressColapsed()) {
 
@@ -125,7 +126,7 @@ var CheckoutPage = React.createClass({
 
               </p>
               <p>
-               <button id="order" name="order" className="mybutton" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Završi narudžbu</button> ili <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni adresu</button> 
+               <button id="order" name="order" className="mybutton" disabled={!this.state.isDeliveryDestinationValid} onClick={this._onOrderClick}>Završi narudžbu</button> 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>
@@ -162,7 +163,7 @@ var CheckoutPage = React.createClass({
     _onFieldChange: function (event) {
       CartActions.changeDeliveryDestinationProperty(event.target.name, event.target.value);
     },
-    
+
     _onOrderClick: function (event) {
       CartActions.confirmDelivery();
     },
@@ -178,4 +179,4 @@ var CheckoutPage = React.createClass({
 });
 
 
-module.exports = CheckoutPage; 
+module.exports = CheckoutPage;

front-ui/app/css/checkout.css

@@ -3,3 +3,8 @@
 	margin-left: 10px !important;
 
 }
+
+.payment-btn {
+	float: left;
+	margin-left: 12px;
+}