fixed problem with multiple carts and a whole load of problems with crazy delivery destination logic / if I didn't write it i would have thought it was written by a drug abuser during high

This commit is contained in:
Senad Uka
2015-03-14 08:17:06 +01:00
parent e7793f0884
commit 8815267a79
12 changed files with 195 additions and 25 deletions

View File

@@ -2,5 +2,6 @@ class Cart < ActiveRecord::Base
has_many :item_in_carts has_many :item_in_carts
belongs_to :user belongs_to :user
belongs_to :delivery_destination
end end

View File

@@ -6,7 +6,7 @@ class ItemInCart < ActiveRecord::Base
validates :item_id, presence: true validates :item_id, presence: true
validates :cart_id, presence: true validates :cart_id, presence: true
def to_s def name
item.name + " " + count.to_s + " " + price.to_s item.name + " " + count.to_s + " " + price.to_s
end end
end end

View File

@@ -11,19 +11,26 @@ helpers do
end end
end end
get '/cart' do
create_the_cart = -> () {
# -1 is a placeholder for user id when we implement users # -1 is a placeholder for user id when we implement users
# auid will still be used in case user is not logged in # auid will still be used in case user is not logged in
Cart.find_or_create(anonymous_id, -1).to_json Cart.find_or_create(anonymous_id, -1).to_json
}
post '/cart', &create_the_cart
put '/cart', &create_the_cart
get '/cart' do
Cart.just_find(anonymous_id, -1).to_json
end end
# gets number of items in cart for every item # gets number of items in cart for every item
get '/cart/item' do get '/cart/item' do
Cart.find_or_create(anonymous_id, -1).item_in_carts.to_json Cart.just_find(anonymous_id, -1).item_in_carts.to_json
end end
update_cart_item = ->() { update_cart_item = ->() {
cart_id = Cart.find_or_create(anonymous_id, -1).id cart_id = Cart.just_find(anonymous_id, -1).id
item_id = @json_params["item_id"].to_i item_id = @json_params["item_id"].to_i
count = @json_params["count"].to_i count = @json_params["count"].to_i
ItemInCart.update_state(cart_id, item_id, count).to_json ItemInCart.update_state(cart_id, item_id, count).to_json
@@ -34,7 +41,7 @@ post '/cart/item', &update_cart_item
# gets list of items in cart without count # gets list of items in cart without count
get '/cart/item/display' do get '/cart/item/display' do
cart = Cart.find_or_create(anonymous_id, -1) cart = Cart.just_find(anonymous_id, -1)
item_ids = cart.item_in_carts.map do |x| item_ids = cart.item_in_carts.map do |x|
x.item_id x.item_id
end end
@@ -44,12 +51,12 @@ get '/cart/item/display' do
end end
get '/cart/delivery_destination' do get '/cart/delivery_destination' do
cart = Cart.find_or_create(anonymous_id, -1) cart = Cart.just_find(anonymous_id, -1)
cart.delivery_destination.to_json(:except => [:created_at, :email_verification_code, :phone_verification_code]) cart.delivery_destination.to_json(:except => [:created_at, :email_verification_code, :phone_verification_code])
end end
update_delivery_destination = ->() { update_delivery_destination = ->() {
cart = Cart.find_or_create(anonymous_id, -1) cart = Cart.just_find(anonymous_id, -1)
allowed_keys = ["name", "address", "place", "postal_code", "phone", "email", "note"] allowed_keys = ["name", "address", "place", "postal_code", "phone", "email", "note"]
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)
@@ -61,10 +68,14 @@ post '/cart/delivery_destination', &update_delivery_destination
post '/cart/confirmation' do post '/cart/confirmation' do
cart = Cart.find_or_create(anonymous_id, -1) anonymous = anonymous_id
cart = Cart.just_find(anonymous, -1)
if cart.item_in_carts.length > 0 if cart.item_in_carts.length > 0
cart.ordered = true cart.ordered = true
cart.save! cart.save!
end end
# since there is no more ordered cart this needs to be done
# in order for next call of Cart#just_find to be ready
Cart.find_or_create(anonymous, -1)
"OK".to_json "OK".to_json
end end

View File

@@ -7,7 +7,14 @@ class Cart < ActiveRecord::Base
cart ||= Cart.where(anonymous_id_string: anonymous_id).where(ordered: false).first cart ||= Cart.where(anonymous_id_string: anonymous_id).where(ordered: false).first
safe_user_id = (user_id > 0) ? user_id : nil safe_user_id = (user_id > 0) ? user_id : nil
cart ||= Cart.create!(anonymous_id_string: anonymous_id, user_id: safe_user_id, ordered: false ) cart ||= Cart.create!(anonymous_id_string: anonymous_id, user_id: safe_user_id, ordered: false )
cart.delivery_destination ||= DeliveryDestination.find_or_create(anonymous_id, user_id); cart.delivery_destination ||= DeliveryDestination.create_from_last(anonymous_id, safe_user_id);
cart.save!
return cart
end
def self.just_find(anonymous_id,user_id)
cart = Cart.where(user_id: user_id).where(ordered: false).first
cart ||= Cart.where(anonymous_id_string: anonymous_id).where(ordered: false).first
return cart return cart
end end
end end

View File

@@ -2,10 +2,13 @@ class DeliveryDestination < ActiveRecord::Base
has_one :cart has_one :cart
belongs_to :user belongs_to :user
def self.find_or_create(anonymous_id, user_id) def self.create_from_last(anonymous_id, user_id)
dd = DeliveryDestination.where(user_id: user_id).order("id desc").first dd = DeliveryDestination.where(user_id: user_id).order("id desc").first
dd ||= DeliveryDestination.where(anonymous_id_string: anonymous_id).order("id desc").first dd ||= DeliveryDestination.where(anonymous_id_string: anonymous_id).order("id desc").first
dd ||= DeliveryDestination.create!({user_id: user_id, anonymous_id_string: anonymous_id }) dd ||= DeliveryDestination.new({user_id: user_id, anonymous_id_string: anonymous_id })
return dd attributes = dd.as_json
attributes.delete("id")
result = DeliveryDestination.create!(attributes)
return result
end end
end end

View File

@@ -0,0 +1,11 @@
var AppDispatcher = require('../dispatcher/appDispatcher');
var InitializationConstants = require('../constants/initializationConstants');
var IntializationActions = {
initialize: function() {
AppDispatcher.handleAction({
actionType : InitializationConstants.INITIALIZE,
});
}
};
module.exports = IntializationActions;

View File

@@ -3,14 +3,42 @@ var React = require('react'),
Router = require('react-router'), Router = require('react-router'),
Link = Router.Link, Link = Router.Link,
RouteHandler = Router.RouteHandler, RouteHandler = Router.RouteHandler,
LoginStatus = require('./shared/loginStatus'); LoginStatus = require('./shared/loginStatus'),
InitializationStore = require('../stores/initializationStore'),
InitializationActions = require('../actions/initializationActions');
var CartIcon = require('./cart/cartIcon'); var CartIcon = require('./cart/cartIcon');
var RootApp = React.createClass({ var RootApp = React.createClass({
// Add change listeners to stores
componentDidMount: function() {
InitializationStore.addChangeListener(this._onChange);
InitializationActions.initialize();
},
getInitialState: function() {
return InitializationStore.getState();
},
_onChange: function () {
if (this.isMounted()) {
this.setState(InitializationStore.getState());
}
},
componentWillUnmount: function () {
InitializationStore.removeChangeListener(this._onChange);
},
render: function() { render: function() {
if (!this.state.isEverythingReadyToStartTheShow) {
return (<div>loading...</div>);
}
return ( return (
<div className="container"> <div className="container">
<div className='page-header'> <div className='page-header'>

View File

@@ -0,0 +1,6 @@
var keyMirror = require('react/lib/keyMirror');
// Define action constants
module.exports = keyMirror({
INITIALIZE: null
});

View File

@@ -0,0 +1,22 @@
var Backbone = require('backbone');
var Globals = require('../globals');
var Cart = Backbone.Model.extend({
initialize: function() {
$.ajaxPrefilter(
function(options, originalOptions, jqXHR) {
options.xhrFields = {
withCredentials: true
}
}
);
},
urlRoot : Globals.ApiUrl + '/cart',
defaults : {
'yes': 'yes'
}
});
module.exports = Cart;

View File

@@ -9,6 +9,7 @@ var ItemCollection = require('../models/itemCollection');
var DeliveryDestination = require('../models/deliveryDestination'); var DeliveryDestination = require('../models/deliveryDestination');
var OrderConfirmation = require('../models/orderConfirmation'); var OrderConfirmation = require('../models/orderConfirmation');
var Place = require('../models/place'); var Place = require('../models/place');
var Validation = require('../utils/validation');
var _ = require('underscore'); var _ = require('underscore');
@@ -141,27 +142,27 @@ var validateDeliveryDestinationForm = function() {
_deliveryDestinationErrors = {}; _deliveryDestinationErrors = {};
var nameRegex = /.+\s+.+/i; var nameRegex = /.+\s+.+/i;
if (_deliveryDestination.get('name').search(nameRegex) < 0) { if (Validation.safeString(_deliveryDestination.get('name')).search(nameRegex) < 0) {
_deliveryDestinationErrors['name'] = "I prezime i ime su obavezni"; _deliveryDestinationErrors['name'] = "I prezime i ime su obavezni";
} }
var addressRegex = /.+\s+.+/i; var addressRegex = /.+\s+.+/i;
if (_deliveryDestination.get('address').search(addressRegex) < 0) { if (Validation.safeString(_deliveryDestination.get('address')).search(addressRegex) < 0) {
_deliveryDestinationErrors['address'] = "Adresa mora biti ispravna"; _deliveryDestinationErrors['address'] = "Adresa mora biti ispravna";
} }
var emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/i; var emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/i;
if (_deliveryDestination.get('email').search(emailRegex) < 0) { if (Validation.safeString(_deliveryDestination.get('email')).search(emailRegex) < 0) {
_deliveryDestinationErrors['email'] = "Email mora biti ispravno upisan"; _deliveryDestinationErrors['email'] = "Email mora biti ispravno upisan";
} }
var phoneRegex = /[\d\s-]{7,8}/i; var phoneRegex = /[\d\s-]{7,8}/i;
if (_deliveryDestination.get('phone').search(phoneRegex) < 0) { if (Validation.safeString(_deliveryDestination.get('phone')).search(phoneRegex) < 0) {
_deliveryDestinationErrors['phone'] = "Telefon mora biti ispravan"; _deliveryDestinationErrors['phone'] = "Telefon mora biti ispravan";
} }
var placeRegex = /^\s{0,1}\d{5}$/i; var placeRegex = /^\s{0,1}\d{5}$/i;
if (_deliveryDestination.get('place').search(placeRegex) < 0) { if (Validation.safeString(_deliveryDestination.get('place')).search(placeRegex) < 0){
_deliveryDestinationErrors['place'] = "Mjesto mora biti izabrano"; _deliveryDestinationErrors['place'] = "Mjesto mora biti izabrano";
} }

View File

@@ -0,0 +1,69 @@
var AppDispatcher = require('../dispatcher/appDispatcher');
var EventEmitter = require('events').EventEmitter;
var Cart = require('../models/cart');
var InitializationConstants = require('../constants/initializationConstants')
var _ = require('underscore');
var state = {
isEverythingReadyToStartTheShow: false
}
var initializeTheShop = function () {
// for now only guarantee that cart is created
var cart = new Cart();
cart.save(null, {
success: function () {
state.isEverythingReadyToStartTheShow = true;
InitializationStore.emitChange();
}
})
}
// Extend ItemStore with EventEmitter to add eventing capabilities
var InitializationStore = _.extend({}, EventEmitter.prototype, {
getState: function() {
return state;
},
// Emit Change event
emitChange: function() {
console.log("InitializationStore change!");
this.emit('change');
},
// Add change listener
addChangeListener: function(callback) {
this.on('change', callback);
},
// Remove change listener
removeChangeListener: function(callback) {
this.removeListener('change', callback);
}
});
// Register callback with AppDispatcher
InitializationStore.dispatchToken = AppDispatcher.register(function(payload) {
var action = payload.action;
switch (action.actionType) {
case InitializationConstants.INITIALIZE:
initializeTheShop();
break;
default:
return true;
}
// If action was responded to, emit change event
InitializationStore.emitChange();
return true;
});
module.exports = InitializationStore;

View File

@@ -1,15 +1,26 @@
var Validations = { var _ = require('underscore');
_emailRe: /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
isValidEmail: function(value) {
return this._emailRe.test(value);
}, var Validations = {
_emailRe: /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
isValidEmail: function(value) {
return this._emailRe.test(value);
},
isValidRequired: function(value) { isValidRequired: function(value) {
if(value === undefined || value === "") { if (value === undefined || value === "") {
return false; return false;
} }
return true; return true;
},
safeString: function(item) {
if (!_.isString(item)) {
return "";
} else {
return item;
}
} }
}; };