Merge branch 'master' of https://github.com/senaduka/ribica

front-api/db/migrate/20150322043737_create_link_banners.rb

@@ -0,0 +1,25 @@
+class CreateLinkBanners < ActiveRecord::Migration
+  def change
+    create_table :link_banners do |t|
+      t.string :image_url
+      t.boolean :start_page
+      t.integer :section_id
+      t.integer :category_id
+      t.integer :sub_category_id
+      t.integer :item_id
+      t.boolean :thank_you_page
+      t.boolean :search_result_page
+      t.boolean :checkout_page
+      t.date :beginning
+      t.date :ending
+      t.boolean :footer
+      t.boolean :header
+      t.string :link_url
+
+      t.timestamps null: false
+    end
+
+    drop_table :special_offers
+
+  end
+end

front-api/db/migrate/20150322044941_create_item_groups.rb

@@ -0,0 +1,13 @@
+class CreateItemGroups < ActiveRecord::Migration
+  def change
+    create_table :item_groups do |t|
+      t.string :name
+      t.text :description
+      t.boolean :visible
+
+      t.timestamps null: false
+    end
+  end
+
+  create_join_table :item, :item_groups
+end

front-api/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150321052740) do
+ActiveRecord::Schema.define(version: 20150322044941) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -85,6 +85,14 @@ ActiveRecord::Schema.define(version: 20150321052740) do
     t.integer "filter_criteria_id"
   end
 
+  create_table "item_groups", force: :cascade do |t|
+    t.string   "name"
+    t.text     "description"
+    t.boolean  "visible"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
   create_table "item_in_carts", force: :cascade do |t|
     t.integer  "cart_id"
     t.integer  "item_id"
@@ -94,6 +102,11 @@ ActiveRecord::Schema.define(version: 20150321052740) do
     t.decimal  "price"
   end
 
+  create_table "item_item_groups", id: false, force: :cascade do |t|
+    t.integer "item_id",       null: false
+    t.integer "item_group_id", null: false
+  end
+
   create_table "items", force: :cascade do |t|
     t.string   "name"
     t.string   "code",                        limit: 10
@@ -114,6 +127,25 @@ ActiveRecord::Schema.define(version: 20150321052740) do
     t.integer  "delivery_time_estimation_id"
   end
 
+  create_table "link_banners", force: :cascade do |t|
+    t.string   "image_url"
+    t.boolean  "start_page"
+    t.integer  "section_id"
+    t.integer  "category_id"
+    t.integer  "sub_category_id"
+    t.integer  "item_id"
+    t.boolean  "thank_you_page"
+    t.boolean  "search_result_page"
+    t.boolean  "checkout_page"
+    t.date     "beginning"
+    t.date     "ending"
+    t.boolean  "footer"
+    t.boolean  "header"
+    t.string   "link_url"
+    t.datetime "created_at",         null: false
+    t.datetime "updated_at",         null: false
+  end
+
   create_table "media_types", force: :cascade do |t|
     t.string "name"
   end
@@ -139,22 +171,6 @@ ActiveRecord::Schema.define(version: 20150321052740) do
     t.integer "order"
   end
 
-  create_table "special_offers", force: :cascade do |t|
-    t.string   "image_url"
-    t.boolean  "start_page"
-    t.integer  "section_id"
-    t.integer  "category_id"
-    t.integer  "sub_category_id"
-    t.integer  "item_id"
-    t.boolean  "thank_you_page"
-    t.boolean  "search_result_page"
-    t.boolean  "checkout_page"
-    t.date     "beginning"
-    t.date     "ending"
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
-  end
-
   create_table "sub_categories", force: :cascade do |t|
     t.string  "name"
     t.integer "category_id"