added some models, started creating delivery destination state
This commit is contained in:
@@ -1,2 +1,2 @@
|
|||||||
class DeliveryDestination < ActiveRecord::Base
|
class DeliveryDestination < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
class AddUserToDeliveryDestination < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :delivery_destinations, :user_id, :integer
|
||||||
|
add_column :delivery_destinations, :anonymous_id_string, :string
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class AddAddressToCart < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :carts, :delivery_destination_id, :integer
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -11,18 +11,18 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20150220062314) do
|
ActiveRecord::Schema.define(version: 20150222055517) do
|
||||||
|
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
|
||||||
create_table "carts", force: :cascade do |t|
|
create_table "carts", force: :cascade do |t|
|
||||||
t.integer "user_id"
|
t.integer "user_id"
|
||||||
t.boolean "ordered", default: false
|
t.boolean "ordered", default: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.string "anonymous_id_string"
|
t.string "anonymous_id_string"
|
||||||
|
t.integer "delivery_destination_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "categories", force: :cascade do |t|
|
create_table "categories", force: :cascade do |t|
|
||||||
@@ -45,6 +45,8 @@ ActiveRecord::Schema.define(version: 20150220062314) do
|
|||||||
t.string "email_verification_code"
|
t.string "email_verification_code"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
|
t.integer "user_id"
|
||||||
|
t.string "anonymous_id_string"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "filter_criteria", force: :cascade do |t|
|
create_table "filter_criteria", force: :cascade do |t|
|
||||||
@@ -103,8 +105,10 @@ ActiveRecord::Schema.define(version: 20150220062314) do
|
|||||||
end
|
end
|
||||||
|
|
||||||
create_table "sub_categories", force: :cascade do |t|
|
create_table "sub_categories", force: :cascade do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
t.integer "category_id"
|
t.integer "category_id"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "units", force: :cascade do |t|
|
create_table "units", force: :cascade do |t|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ var RootApp = React.createClass({
|
|||||||
<div className="container">
|
<div className="container">
|
||||||
|
|
||||||
<div className='page-header'>
|
<div className='page-header'>
|
||||||
<h1 className="main-heading"><a href="#" style={{color: "#cd3071"}}>ribica.ba</a></h1> <CartIcon />
|
<h1 className="main-heading"><a href="/" style={{color: "#cd3071"}}>ribica.ba</a></h1> <CartIcon />
|
||||||
<div style={{float:'right'}}>
|
<div style={{float:'right'}}>
|
||||||
<LoginStatus />
|
<LoginStatus />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -8,5 +8,6 @@ module.exports = keyMirror({
|
|||||||
// and not just decrease count by 1
|
// and not just decrease count by 1
|
||||||
TAKE_ITEM_OUT: null ,
|
TAKE_ITEM_OUT: null ,
|
||||||
CART_DATA_LOADED: null,
|
CART_DATA_LOADED: null,
|
||||||
SAVE_CART_STATE_FOR_ITEM: null
|
SAVE_CART_STATE_FOR_ITEM: null,
|
||||||
|
CHANGE_DELIVERY_DESTINATION_PROPERTY: null
|
||||||
});
|
});
|
||||||
|
|||||||
22
front-ui/app/models/deliveryDestination.js
Normal file
22
front-ui/app/models/deliveryDestination.js
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
var Backbone = require('backbone');
|
||||||
|
var Globals = require('../globals');
|
||||||
|
|
||||||
|
var DeliveryDestination = Backbone.Model.extend({
|
||||||
|
|
||||||
|
initialize: function() {
|
||||||
|
$.ajaxPrefilter(
|
||||||
|
function(options, originalOptions, jqXHR) {
|
||||||
|
options.xhrFields = {
|
||||||
|
withCredentials: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
url: Globals.ApiUrl + '/cart/delivery_destination',
|
||||||
|
defaults: {
|
||||||
|
count: 0
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = DeliveryDestination;
|
||||||
@@ -5,6 +5,7 @@ var CartActions = require('../actions/cartActions');
|
|||||||
var ItemInCart = require('../models/itemInCart');
|
var ItemInCart = require('../models/itemInCart');
|
||||||
var ItemInCartCollection = require('../models/itemInCartCollection');
|
var ItemInCartCollection = require('../models/itemInCartCollection');
|
||||||
var ItemCollection = require('../models/itemCollection');
|
var ItemCollection = require('../models/itemCollection');
|
||||||
|
var DeliveryDestination = require('../models/deliveryDestination');
|
||||||
|
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
|
|
||||||
@@ -13,6 +14,7 @@ var states = {}
|
|||||||
var _itemsInCart = new ItemInCartCollection();
|
var _itemsInCart = new ItemInCartCollection();
|
||||||
var _itemsForDisplay = new ItemCollection();
|
var _itemsForDisplay = new ItemCollection();
|
||||||
_itemsForDisplay.setFromCart(true);
|
_itemsForDisplay.setFromCart(true);
|
||||||
|
var _deliveryDestination = new DeliveryDestination();
|
||||||
|
|
||||||
|
|
||||||
var loadCart = function() {
|
var loadCart = function() {
|
||||||
@@ -103,7 +105,8 @@ var CartStore = _.extend({}, EventEmitter.prototype, {
|
|||||||
var state = {
|
var state = {
|
||||||
count: numberOfItems,
|
count: numberOfItems,
|
||||||
items: _itemsForDisplay,
|
items: _itemsForDisplay,
|
||||||
itemCounts: states
|
itemCounts: states,
|
||||||
|
deliveryDestination: _deliveryDestination
|
||||||
};
|
};
|
||||||
return state;
|
return state;
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user