senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paypal button added to page

Browse Source
This commit is contained in:
adam.harbas@a-net.ba
2016-01-06 08:26:19 +01:00
parent abb44757a5
commit f92d54b142
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
front-ui/app/components/cart/checkoutPage.js
View File

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

5
front-ui/app/css/checkout.css
View File

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