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

Button order

Browse Source
This commit is contained in:
adam.harbas@a-net.ba
2016-01-11 10:21:11 +01:00
parent f4884c4985
commit fbcde51ef0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,8 @@ var React = require('react'),
LinkBanner = require('../linkBanner/linkBanner'), LinkBanner = require('../linkBanner/linkBanner'),
PaymentSelect = require('../payment/paymentSelect'), PaymentSelect = require('../payment/paymentSelect'),
RibicaFormError = require('../shared/ribicaFormError'), RibicaFormError = require('../shared/ribicaFormError'),
PaypalButton = require('../payment/paypalButton'); PaypalButton = require('../payment/paypalButton'),
CashOnDeliveryButton = require('../payment/cashOnDeliveryButton');
var Router = require('react-router'); var Router = require('react-router');
@@ -29,7 +29,7 @@ var CheckoutPage = React.createClass({
); );
var last_used_payment; var last_used_payment;
if(this.state.deliveryDestination.get('payment_method') == 'paypal' || true) { if(this.state.deliveryDestination.get('payment_method') == 'paypal') {
last_used_payment = ( last_used_payment = (
<PaypalButton disabled={!this.state.isDeliveryDestinationValid} onSubmitPaypal={this._handleOnSubmitPaypal} deliveryDestination={this.state.deliveryDestination} amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} /> <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 { } else {
last_used_payment = ( 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} /> Ukupno: <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} />
</p> </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"> <div className="form-group">
<label className="col-md-4 control-label" htmlFor="order"></label> <label className="col-md-4 control-label" htmlFor="order"></label>
<div className="col-md-8"> <div className="col-md-8">