raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP (Spree Update): Update Spree 1.3.3, install and run migrations

Browse Source
This commit is contained in:
Rob H
2013-06-29 18:02:57 +05:30
committed by Rohan Mitchell
parent 108dd6e619
commit 7941a61879
15 changed files with 163 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
Gemfile.lock
View File

@@ -23,47 +23,45 @@ GIT
GIT
remote: git://github.com/spree/spree.git
revision: 36a59eb311470a2c24b9aa826ecad114c518c01f
revision: 94566bf1b7d50f474333d10844534e570b6edf5a
branch: 1-3-stable
specs:
spree (1.3.3.beta)
spree_api (= 1.3.3.beta)
spree_cmd (= 1.3.3.beta)
spree_core (= 1.3.3.beta)
spree_dash (= 1.3.3.beta)
spree_promo (= 1.3.3.beta)
spree_sample (= 1.3.3.beta)
spree_api (1.3.3.beta)
spree_core (= 1.3.3.beta)
spree (1.3.3)
spree_api (= 1.3.3)
spree_cmd (= 1.3.3)
spree_core (= 1.3.3)
spree_promo (= 1.3.3)
spree_sample (= 1.3.3)
spree_api (1.3.3)
spree_core (= 1.3.3)
versioncake (= 0.4.0)
spree_cmd (1.3.3.beta)
spree_cmd (1.3.3)
thor (>= 0.14.6)
spree_core (1.3.3.beta)
activemerchant (~> 1.29.3)
spree_core (1.3.3)
activemerchant (~> 1.31)
acts_as_list (= 0.1.4)
awesome_nested_set (= 2.1.5)
aws-sdk (~> 1.3.4)
cancan (= 1.6.8)
deface (>= 0.9.0)
ffaker (~> 1.12.0)
highline (= 1.6.11)
ffaker (~> 1.15.0)
highline (= 1.6.18)
jquery-rails (~> 2.2.0)
json (>= 1.5.5)
kaminari (= 0.13.0)
money (= 5.0.0)
paperclip (~> 2.8)
rabl (= 0.7.2)
rails (~> 3.2.11)
ransack (~> 0.7.2)
select2-rails (~> 3.2)
rails (~> 3.2.13)
ransack (= 0.7.2)
select2-rails (= 3.2.1)
state_machine (= 1.1.2)
stringex (~> 1.3.2)
spree_dash (1.3.3.beta)
httparty (~> 0.8.1)
spree_core (= 1.3.3.beta)
spree_promo (1.3.3.beta)
spree_core (= 1.3.3.beta)
spree_sample (1.3.3.beta)
spree_core (= 1.3.3.beta)
truncate_html (~> 0.5.5)
spree_promo (1.3.3)
spree_core (= 1.3.3)
spree_sample (1.3.3)
spree_core (= 1.3.3)
GIT
remote: git://github.com/spree/spree_i18n.git
@@ -112,14 +110,14 @@ GEM
active_utils (1.0.5)
activesupport (>= 2.3.11)
i18n
activemerchant (1.29.3)
activemerchant (1.34.1)
active_utils (>= 1.0.2)
activesupport (>= 2.3.14)
builder (>= 2.0.0)
i18n
json (>= 1.5.1)
money
nokogiri
nokogiri (< 1.6.0)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
@@ -212,7 +210,7 @@ GEM
railties (>= 3.0.0)
faker (1.0.1)
i18n (~> 0.4)
ffaker (1.12.1)
ffaker (1.15.0)
ffi (1.4.0)
fog (1.12.1)
builder
@@ -226,14 +224,14 @@ GEM
ruby-hmac
formatador (0.2.4)
haml (3.1.6)
highline (1.6.11)
highline (1.6.18)
hike (1.2.3)
httparty (0.8.3)
httparty (0.11.0)
multi_json (~> 1.0)
multi_xml
multi_xml (>= 0.5.2)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.2.1)
jquery-rails (2.2.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
@@ -256,12 +254,12 @@ GEM
i18n (~> 0.4)
json
multi_json (1.7.7)
multi_xml (0.5.3)
multi_xml (0.5.4)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.8)
newrelic_rpm (3.6.0.83)
nokogiri (1.5.6)
nokogiri (1.5.10)
oj (2.1.2)
orm_adapter (0.4.0)
paperclip (2.8.0)
@@ -336,13 +334,12 @@ GEM
rspec (~> 2.10.0)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
sass (3.1.19)
sass-rails (3.2.5)
sass (3.2.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
select2-rails (3.3.0)
sass-rails (~> 3.2)
select2-rails (3.2.1)
thor (~> 0.14)
selenium-webdriver (2.31.0)
childprocess (>= 0.2.5)
@@ -384,7 +381,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
uuidtools (2.1.3)
uuidtools (2.1.4)
versioncake (0.4.0)
actionpack (>= 3.0)
activesupport (>= 3.0)

10
db/migrate/20130629120633_add_order_id_index_to_payments.spree.rb Normal file
View File

@@ -0,0 +1,10 @@
# This migration comes from spree (originally 20130207155350)
class AddOrderIdIndexToPayments < ActiveRecord::Migration
def self.up
add_index :spree_payments, :order_id
end
def self.down
remove_index :spree_payments, :order_id
end
end

6
db/migrate/20130629120634_add_primary_to_spree_products_taxons.spree.rb Normal file
View File

@@ -0,0 +1,6 @@
# This migration comes from spree (originally 20130208032954)
class AddPrimaryToSpreeProductsTaxons < ActiveRecord::Migration
def change
add_column :spree_products_taxons, :id, :primary_key
end
end

6
db/migrate/20130629120635_add_order_id_index_to_shipments.spree.rb Normal file
View File

@@ -0,0 +1,6 @@
# This migration comes from spree (originally 20130222032153)
class AddOrderIdIndexToShipments < ActiveRecord::Migration
def change
add_index :spree_shipments, :order_id
end
end

6
db/migrate/20130629120636_change_meta_description_on_spree_products_to_text.spree.rb Normal file
View File

@@ -0,0 +1,6 @@
# This migration comes from spree (originally 20130226032817)
class ChangeMetaDescriptionOnSpreeProductsToText < ActiveRecord::Migration
def change
change_column :spree_products, :meta_description, :text, :limit => nil
end
end

6
db/migrate/20130629120637_add_variant_id_index_to_spree_prices.spree.rb Normal file
View File

@@ -0,0 +1,6 @@
# This migration comes from spree (originally 20130226054936)
class AddVariantIdIndexToSpreePrices < ActiveRecord::Migration
def change
add_index :spree_prices, :variant_id
end
end

9
db/migrate/20130629120638_change_orders_total_precision.spree.rb Normal file
View File

@@ -0,0 +1,9 @@
# This migration comes from spree (originally 20130319062004)
class ChangeOrdersTotalPrecision < ActiveRecord::Migration
def change
change_column :spree_orders, :item_total, :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
change_column :spree_orders, :total, :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
change_column :spree_orders, :adjustment_total, :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
change_column :spree_orders, :payment_total, :decimal, :precision => 10, :scale => 2, :default => 0.0
end
end

8
db/migrate/20130629120639_change_spree_payments_amount_precision.spree.rb Normal file
View File

@@ -0,0 +1,8 @@
# This migration comes from spree (originally 20130319063911)
class ChangeSpreePaymentsAmountPrecision < ActiveRecord::Migration
def change
change_column :spree_payments, :amount, :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
end
end

8
db/migrate/20130629120640_change_spree_return_authorization_amount_precision.spree.rb Normal file
View File

@@ -0,0 +1,8 @@
# This migration comes from spree (originally 20130319064308)
class ChangeSpreeReturnAuthorizationAmountPrecision < ActiveRecord::Migration
def change
change_column :spree_return_authorizations, :amount, :decimal, :precision => 10, :scale => 2, :default => 0.0, :null => false
end
end

8
db/migrate/20130629120641_change_adjustments_amount_precision.spree.rb Normal file
View File

@@ -0,0 +1,8 @@
# This migration comes from spree (originally 20130319082943)
class ChangeAdjustmentsAmountPrecision < ActiveRecord::Migration
def change
change_column :spree_adjustments, :amount, :decimal, :precision => 10, :scale => 2
end
end

10
db/migrate/20130629120642_add_seo_metas_to_taxons.spree.rb Normal file
View File

@@ -0,0 +1,10 @@
# This migration comes from spree (originally 20130328195253)
class AddSeoMetasToTaxons < ActiveRecord::Migration
def change
change_table :spree_taxons do |t|
t.string :meta_title
t.string :meta_description
t.string :meta_keywords
end
end
end

7
db/migrate/20130629120643_add_cvv_result_code_and_cvv_result_message_to_spree_payments.spree.rb Normal file
View File

@@ -0,0 +1,7 @@
# This migration comes from spree (originally 20130626232741)
class AddCvvResultCodeAndCvvResultMessageToSpreePayments < ActiveRecord::Migration
def change
add_column :spree_payments, :cvv_response_code, :string
add_column :spree_payments, :cvv_response_message, :string
end
end

6
db/migrate/20130629120644_add_unique_index_to_permalink_on_spree_products.spree.rb Normal file
View File

@@ -0,0 +1,6 @@
# This migration comes from spree (originally 20130628021056)
class AddUniqueIndexToPermalinkOnSpreeProducts < ActiveRecord::Migration
def change
add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
end
end

7
db/migrate/20130629120645_add_unique_index_to_orders_shipments_and_stock_transfers.spree.rb Normal file
View File

@@ -0,0 +1,7 @@
# This migration comes from spree (originally 20130628022817)
class AddUniqueIndexToOrdersShipmentsAndStockTransfers < ActiveRecord::Migration
def add
add_index "spree_orders", ["number"], :name => "number_idx_unique", :unique => true
add_index "spree_shipments", ["number"], :name => "number_idx_unique", :unique => true
end
end

49
db/schema.rb
View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20130207043555) do
ActiveRecord::Schema.define(:version => 20130629120645) do
create_table "cms_blocks", :force => true do |t|
t.integer "page_id", :null => false
@@ -240,17 +240,17 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
create_table "spree_adjustments", :force => true do |t|
t.integer "source_id"
t.decimal "amount", :precision => 8, :scale => 2
t.decimal "amount", :precision => 10, :scale => 2
t.string "label"
t.string "source_type"
t.integer "adjustable_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.boolean "mandatory"
t.boolean "locked"
t.integer "originator_id"
t.string "originator_type"
t.boolean "eligible", :default => true
t.boolean "eligible", :default => true
t.string "adjustable_type"
end
@@ -405,17 +405,17 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
create_table "spree_orders", :force => true do |t|
t.string "number", :limit => 15
t.decimal "item_total", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal "total", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal "item_total", :precision => 10, :scale => 2, :default => 0.0, :null => false
t.decimal "total", :precision => 10, :scale => 2, :default => 0.0, :null => false
t.string "state"
t.decimal "adjustment_total", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal "adjustment_total", :precision => 10, :scale => 2, :default => 0.0, :null => false
t.integer "user_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "completed_at"
t.integer "bill_address_id"
t.integer "ship_address_id"
t.decimal "payment_total", :precision => 8, :scale => 2, :default => 0.0
t.decimal "payment_total", :precision => 10, :scale => 2, :default => 0.0
t.integer "shipping_method_id"
t.string "shipment_state"
t.string "payment_state"
@@ -441,10 +441,10 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
end
create_table "spree_payments", :force => true do |t|
t.decimal "amount", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal "amount", :precision => 10, :scale => 2, :default => 0.0, :null => false
t.integer "order_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "source_id"
t.string "source_type"
t.integer "payment_method_id"
@@ -452,8 +452,12 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
t.string "response_code"
t.string "avs_response"
t.string "identifier"
t.string "cvv_response_code"
t.string "cvv_response_message"
end
add_index "spree_payments", ["order_id"], :name => "index_spree_payments_on_order_id"
create_table "spree_paypal_accounts", :force => true do |t|
t.string "email"
t.string "payer_id"
@@ -485,6 +489,8 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
t.string "currency"
end
add_index "spree_prices", ["variant_id"], :name => "index_spree_prices_on_variant_id"
create_table "spree_product_groups", :force => true do |t|
t.string "name"
t.string "permalink"
@@ -533,7 +539,7 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
t.datetime "available_on"
t.datetime "deleted_at"
t.string "permalink"
t.string "meta_description"
t.text "meta_description"
t.string "meta_keywords"
t.integer "tax_category_id"
t.integer "shipping_category_id"
@@ -550,6 +556,7 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
add_index "spree_products", ["deleted_at"], :name => "index_products_on_deleted_at"
add_index "spree_products", ["name"], :name => "index_products_on_name"
add_index "spree_products", ["permalink"], :name => "index_products_on_permalink"
add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
create_table "spree_products_promotion_rules", :id => false, :force => true do |t|
t.integer "product_id"
@@ -559,7 +566,7 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
add_index "spree_products_promotion_rules", ["product_id"], :name => "index_products_promotion_rules_on_product_id"
add_index "spree_products_promotion_rules", ["promotion_rule_id"], :name => "index_products_promotion_rules_on_promotion_rule_id"
create_table "spree_products_taxons", :id => false, :force => true do |t|
create_table "spree_products_taxons", :force => true do |t|
t.integer "product_id"
t.integer "taxon_id"
end
@@ -620,11 +627,11 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
create_table "spree_return_authorizations", :force => true do |t|
t.string "number"
t.string "state"
t.decimal "amount", :precision => 8, :scale => 2, :default => 0.0, :null => false
t.decimal "amount", :precision => 10, :scale => 2, :default => 0.0, :null => false
t.integer "order_id"
t.text "reason"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "spree_roles", :force => true do |t|
@@ -653,6 +660,7 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
end
add_index "spree_shipments", ["number"], :name => "index_shipments_on_number"
add_index "spree_shipments", ["order_id"], :name => "index_spree_shipments_on_order_id"
create_table "spree_shipping_categories", :force => true do |t|
t.string "name"
@@ -743,6 +751,9 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
t.integer "icon_file_size"
t.datetime "icon_updated_at"
t.text "description"
t.string "meta_title"
t.string "meta_description"
t.string "meta_keywords"
end
add_index "spree_taxons", ["parent_id"], :name => "index_taxons_on_parent_id"