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

SOlved conflict

Browse Source
This commit is contained in:
Senad Uka
2016-03-16 12:12:26 +01:00
parent d111406f03 fdc3362719
commit 7e62881d16
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ var CheckoutPage = React.createClass({
disabled={!this.state.isDeliveryDestinationValid}
cashOnDeliveryDisabled={!this.state.isDeliveryDestinationValid || this.state.deliveryDestination.get('gift')}
onCashClick={this._onOrderClick}
cartId={this.state.cart.get('id')}
cartId={this.state.deliveryDestination.get('id')}
/>
</div>
);
@@ -34,15 +34,15 @@ var CheckoutPage = React.createClass({
var last_used_payment;
if(this.state.deliveryDestination.get('payment_method') == 'paypal') {
last_used_payment = (
<PaypalButton disabled={!this.state.isDeliveryDestinationValid} onSubmitPaypal={this._handleOnSubmitPaypal} deliveryDestination={this.state.deliveryDestination} amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} cartId={this.state.cart.get('id')}/>
<PaypalButton disabled={!this.state.isDeliveryDestinationValid} onSubmitPaypal={this._handleOnSubmitPaypal} deliveryDestination={this.state.deliveryDestination} amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} cartId={this.state.deliveryDestination.get('id')}/>
);
} else if(this.state.deliveryDestination.get('payment_method') == 'pikpay') {
last_used_payment = (
<PikpayButton amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} disabled={!this.state.isDeliveryDestinationValid} deliveryDestination={this.state.deliveryDestination} cartId={this.state.cart.get('id')}/>
<PikpayButton amount={CartStore.getAmount()} deliveryCost={CartStore.getDeliveryCost(false)} disabled={!this.state.isDeliveryDestinationValid} deliveryDestination={this.state.deliveryDestination} cartId={this.state.deliveryDestination.get('id')}/>
);
} else {
last_used_payment = (
<CashOnDeliveryButton onCashClick={this._onOrderClick} disabled={!this.state.isDeliveryDestinationValid || this.state.deliveryDestination.get('gift')} cartId={this.state.cart.get('id')}/>
<CashOnDeliveryButton onCashClick={this._onOrderClick} disabled={!this.state.isDeliveryDestinationValid || this.state.deliveryDestination.get('gift')} cartId={this.state.deliveryDestination.get('id')}/>
);
}

8
front-ui/app/stores/cartStore.js
View File

@@ -10,7 +10,6 @@ var DeliveryDestination = require('../models/deliveryDestination');
var OrderConfirmation = require('../models/orderConfirmation');
var Place = require('../models/place');
var Validation = require('../utils/validation');
var Cart = require('../models/cart');
var _ = require('underscore');
@@ -26,8 +25,6 @@ var _deliveryCosts = new Place({
postalCode: _deliveryDestination.get('place')
});
var _cart = new Cart();
var _addressColapsed = false;
var supportedPlaces = [{
@@ -2571,7 +2568,6 @@ var nameOfThePlace = function(code) {
}
var loadCart = function() {
_cart.fetch({success: function() {
_itemsInCart.fetch({
success: function() {
states = {}
@@ -2595,7 +2591,6 @@ var loadCart = function() {
});
}
});
}});
_cartDataLoadCalled = true;
};
@@ -2880,8 +2875,7 @@ var CartStore = _.extend({}, EventEmitter.prototype, {
deliveryCosts: _deliveryCosts,
destinationValid: isDeliveryDestinationValid(),
address_colapsed: _addressColapsed,
deliveryCostsTarget: getDeliveryCostTarget(),
cart: _cart
deliveryCostsTarget: getDeliveryCostTarget()
};
return state;
},