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

Fixing errors

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

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

@@ -37,7 +37,7 @@ var CheckoutPage = React.createClass({
} else { } else {
last_used_payment = ( 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)} />
); );
} }

5
front-ui/app/components/payment/paypalButton.js
View File

@@ -23,13 +23,8 @@ var PaypalButton = React.createClass({
var cancel_return_url = root + "/dostava"; var cancel_return_url = root + "/dostava";
return ( 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 <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"> <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="cmd" value="_xclick" />
<input type="hidden" name="business" value={Globals.PaypalId} /> <input type="hidden" name="business" value={Globals.PaypalId} />
<input type="hidden" name="lc" value="BA" /> <input type="hidden" name="lc" value="BA" />