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

address saving now works - masallah, la hawle we la kuwette ila billah :)

Browse Source
This commit is contained in:
Senad Uka
2015-02-27 07:33:17 +01:00
parent 1ca7d4509a
commit 2b1d0fbbc1
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front-api/controllers/cart.rb
View File

@@ -55,7 +55,7 @@ update_delivery_destination = ->() {
params = @json_params.reject { |key,_| !allowed_keys.include?(key) } params = @json_params.reject { |key,_| !allowed_keys.include?(key) }
cart.delivery_destination.update_attributes(params) cart.delivery_destination.update_attributes(params)
cart.delivery_destination.save! cart.delivery_destination.save!
cart.delivery_destination.to_json cart.delivery_destination.to_json(:except => [:created_at, :email_verification_code, :phone_verification_code])
} }
put '/cart/delivery_destination', &update_delivery_destination put '/cart/delivery_destination', &update_delivery_destination
post '/cart/delivery_destination', &update_delivery_destination post '/cart/delivery_destination', &update_delivery_destination

2
front-ui/app/actions/cartActions.js
View File

@@ -40,7 +40,7 @@ var CartActions = {
changeDeliveryDestinationProperty: function(property, value) { changeDeliveryDestinationProperty: function(property, value) {
AppDispatcher.handleAction({ AppDispatcher.handleAction({
actionType: CartConstants.CHANGE_DELIVERY_DESTINATION_PROPERTY, actionType: CartConstants.CHANGE_DELIVERY_DESTINATION_PROPERTY,
property: property, propertyName: property,
value: value value: value
}); });
}, },

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

@@ -30,15 +30,17 @@ var loadCart = function() {
}); });
_itemsForDisplay.fetch({ _itemsForDisplay.fetch({
success: function() { success: function() {
CartActions.dataLoaded();
}
})
_deliveryDestination.fetch({
success: function() {
CartActions.dataLoaded(); CartActions.dataLoaded();
} }
}) })
if (!_deliveryDestination.get('id')) {
_deliveryDestination.fetch({
success: function() {
CartActions.dataLoaded();
}
});
}
}; };
@@ -69,13 +71,13 @@ var takeItemOut = function(itemId) {
var saveCartStateForItem = function(itemId) { var saveCartStateForItem = function(itemId) {
var item = CartStore.getStateFor(itemId); var item = CartStore.getStateFor(itemId);
item.save({ item.save({
success: function () { success: function() {
CartActions.dataLoaded(); CartActions.dataLoaded();
} }
}); });
}; };
var changeDeliveryDestinationProperty = function (property, value) { var changeDeliveryDestinationProperty = function(property, value) {
_deliveryDestination.set(property, value); _deliveryDestination.set(property, value);
}; };
@@ -105,12 +107,12 @@ var CartStore = _.extend({}, EventEmitter.prototype, {
var numberOfItems = 0; var numberOfItems = 0;
for (key in states) { for (key in states) {
if(states.hasOwnProperty(key)){ if (states.hasOwnProperty(key)) {
var value = states[key]; var value = states[key];
if (value.get('count') > 0) { if (value.get('count') > 0) {
numberOfItems += value.get('count'); numberOfItems += value.get('count');
} }
} }
}; };
var state = { var state = {
@@ -163,12 +165,14 @@ AppDispatcher.register(function(payload) {
// do nothing - jsut emmit change // do nothing - jsut emmit change
break; break;
case CartConstants.SAVE_CART_STATE_FOR_ITEM: case CartConstants.SAVE_CART_STATE_FOR_ITEM:
// saveCartStateForItem(action.itemId); saveCartStateForItem(action.itemId);
break; break;
case CartConstants.CHANGE_DELIVERY_DESTINATION_PROPERTY: case CartConstants.CHANGE_DELIVERY_DESTINATION_PROPERTY:
changeDeliveryDestinationProperty(action.propety, action.value) changeDeliveryDestinationProperty(action.propertyName, action.value)
break;
case CartConstants.CONFIRM_DELIVERY: case CartConstants.CONFIRM_DELIVERY:
saveDeliveryDestination(); saveDeliveryDestination();
break;
default: default:
return true; return true;
} }