- <%= render 'spree/blogs/shared/archive', :posts => @posts %>
+ <%= render 'spree/shared/archive', :posts => @posts %>
diff --git a/spree_essential_blog/app/views/spree/posts/index.html.erb b/spree_essential_blog/app/views/spree/posts/index.html.erb
new file mode 100644
index 00000000..69a44600
--- /dev/null
+++ b/spree_essential_blog/app/views/spree/posts/index.html.erb
@@ -0,0 +1,19 @@
+
+
+<% content_for :sidebar do %>
+ <%= render :partial => 'spree/shared/sidebar' %>
+<% end %>
diff --git a/spree_essential_blog/app/views/spree/blogs/posts/index.rss.builder b/spree_essential_blog/app/views/spree/posts/index.rss.builder
similarity index 100%
rename from spree_essential_blog/app/views/spree/blogs/posts/index.rss.builder
rename to spree_essential_blog/app/views/spree/posts/index.rss.builder
diff --git a/spree_essential_blog/app/views/spree/posts/show.html.erb b/spree_essential_blog/app/views/spree/posts/show.html.erb
new file mode 100644
index 00000000..5d24e779
--- /dev/null
+++ b/spree_essential_blog/app/views/spree/posts/show.html.erb
@@ -0,0 +1,37 @@
+<% content_for :sidebar do %>
+ <%= render :partial => 'spree/shared/sidebar' %>
+<% end %>
+
+
diff --git a/spree_essential_blog/app/views/spree/blogs/shared/_archive.html.erb b/spree_essential_blog/app/views/spree/shared/_archive.html.erb
similarity index 100%
rename from spree_essential_blog/app/views/spree/blogs/shared/_archive.html.erb
rename to spree_essential_blog/app/views/spree/shared/_archive.html.erb
diff --git a/spree_essential_blog/app/views/spree/blogs/shared/_disqus_comments.html.erb b/spree_essential_blog/app/views/spree/shared/_disqus_comments.html.erb
similarity index 100%
rename from spree_essential_blog/app/views/spree/blogs/shared/_disqus_comments.html.erb
rename to spree_essential_blog/app/views/spree/shared/_disqus_comments.html.erb
diff --git a/spree_essential_blog/app/views/spree/blogs/shared/_preview.html.erb b/spree_essential_blog/app/views/spree/shared/_preview.html.erb
similarity index 100%
rename from spree_essential_blog/app/views/spree/blogs/shared/_preview.html.erb
rename to spree_essential_blog/app/views/spree/shared/_preview.html.erb
diff --git a/spree_essential_blog/app/views/spree/shared/_sidebar.html.erbx b/spree_essential_blog/app/views/spree/shared/_sidebar.html.erbx
new file mode 100644
index 00000000..fbc430de
--- /dev/null
+++ b/spree_essential_blog/app/views/spree/shared/_sidebar.html.erbx
@@ -0,0 +1,26 @@
+
diff --git a/spree_essential_blog/config/locales/en.yml b/spree_essential_blog/config/locales/en.yml
index 74f2a894..249b922e 100644
--- a/spree_essential_blog/config/locales/en.yml
+++ b/spree_essential_blog/config/locales/en.yml
@@ -8,7 +8,6 @@ en:
blog:
model_name: Blog
name: Name
- permalink: Permalink
post:
model_name: Post
title: Title
@@ -16,10 +15,10 @@ en:
body: Body
live: Published
tags: Tags
+ author: Author
post_category:
model_name: Category
name: Name
- permalink: Permalink
models:
spree/post:
one: post
diff --git a/spree_essential_blog/config/locales/zh-CN.yml b/spree_essential_blog/config/locales/zh-CN.yml
index 8cfe5fad..a89b0a18 100644
--- a/spree_essential_blog/config/locales/zh-CN.yml
+++ b/spree_essential_blog/config/locales/zh-CN.yml
@@ -6,28 +6,31 @@ zh-CN:
blog:
model_name: Blog
name: Name
- permalink: Permalink
- post:
+ spree/post:
model_name: 文章
title: 标题
posted_at: 发布时间
body: 正文
+ cover: 图片
live: 是否发布
tags: 标签
+ author: 作者
post_category:
model_name: Category
name: Name
- permalink: Permalink
models:
spree/post:
one: 文章
other: 文章
+ spree/post_file:
+ one: 文件
+ other: 文件
spree:
back_to_post_list: 回到文章列表
post_list: 文章列表
new_post: 新建文章
- edit_post: 编辑文章
+ edit_post: 编辑文章
admin:
tab:
posts: 文章
@@ -39,10 +42,10 @@ zh-CN:
post:
index:
post_list: 文章列表
- new:
+ new:
new_post: 新建文章
edit:
- edit_post: 编辑文章
+ edit_post: 编辑文章
post_products:
index:
add_related_product: Add Related Products
@@ -59,7 +62,10 @@ zh-CN:
home:
title: Recent Posts
archive: Blog Archive
+ files: 文件
+ new_post_file: 新建文件
no_posts: No posts found!
+ no_post_files_found: 找不到任何文件!
posts: 文章
post:
index:
@@ -72,6 +78,8 @@ zh-CN:
back_to_posts: "Back to the blog"
show:
tagged: Tagged
+ post_details: 文章详细
+ post_files: 文件
settings:
blogs: Manage Blogs
explain_blogs: Add or Edit Blogs for posts.
@@ -94,6 +102,7 @@ zh-CN:
post_categories: Categories
subnav:
posts: Blog Posts
+ title: 标题
time:
formats:
diff --git a/spree_essential_blog/config/routes.rb b/spree_essential_blog/config/routes.rb
index f3ef4975..e82d35c3 100644
--- a/spree_essential_blog/config/routes.rb
+++ b/spree_essential_blog/config/routes.rb
@@ -1,40 +1,43 @@
Spree::Core::Engine.routes.append do
- scope(:module => "blogs") do
- namespace :admin do
- resources :posts do
+ namespace :admin do
+ resources :posts do
+ resources :files, :controller => "post_files" do
+ collection do
+ post :update_positions
+ end
+ end
resources :products, :controller => "post_products"
resources :categories, :controller => "post_categories"
end
- end
- end
+ end
# scope(:module => "blogs") do
-# namespace :admin do
-# resources :blogs, :constraints => { :id => /[a-z0-9\-\_\/]{3,}/ }
-# resources :posts do
-# resources :images, :controller => "post_images" do
+# namespace :admin do
+# resources :blogs, :constraints => { :id => /[a-z0-9\-\_\/]{3,}/ }
+# resources :posts do
+# resources :images, :controller => "post_files" do
# collection do
# post :update_positions
# end
# end
# resources :products, :controller => "post_products"
# resources :categories, :controller => "post_categories"
-# end
-# resource :disqus_settings
-# end
-# constraints :blog_id => /([a-z0-9\-\_\/]{3,})/ do
+# end
+# resource :disqus_settings
+# end
+# constraints :blog_id => /([a-z0-9\-\_\/]{3,})/ do
# constraints(
# :year => /\d{4}/,
# :month => /\d{1,2}/,
# :day => /\d{1,2}/
-# ) do
+# ) do
# get ":blog_id/:year(/:month(/:day))" => "posts#index", :as => :post_date
# get ":blog_id/:year/:month/:day/:id" => "posts#show", :as => :full_post
-# end
+# end
# get ":blog_id/category/:id" => "post_categories#show", :as => :post_category, :constraints => { :id => /.*/ }
# get ":blog_id/search/:query" => "posts#search", :as => :search_posts, :query => /.*/
# get ":blog_id/archive" => "posts#archive", :as => :archive_posts
-# get ":blog_id" => "posts#index", :as => :blog_posts
-# end
+# get ":blog_id" => "posts#index", :as => :blog_posts
+# end
# end
end
diff --git a/spree_essential_blog/db/migrate/20140806185750_acts_as_taggable_on_posts.rb b/spree_essential_blog/db/migrate/20140806185750_acts_as_taggable_on_posts.rb
deleted file mode 100644
index c94cfefa..00000000
--- a/spree_essential_blog/db/migrate/20140806185750_acts_as_taggable_on_posts.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class ActsAsTaggableOnPosts < ActiveRecord::Migration
- def self.up
- #table tags, tagings are part of gem acts-as-taggable-on, no spree namespace
- return if table_exists? :tags
-
- create_table :tags do |t|
- t.string :name
- end
-
- create_table :taggings do |t|
- t.references :tag
- # You should make sure that the column created is
- # long enough to store the required class names.
- t.references :taggable, :polymorphic => true
- t.references :tagger, :polymorphic => true
- t.string :context
- t.datetime :created_at
- end
-
- add_index :taggings, :tag_id
- add_index :taggings, [:taggable_id, :taggable_type, :context], :name=>"taggings_id_type_context"
- end
-
- def self.down
- return unless table_exists? :tags
- drop_table :tags
- drop_table :taggings
- end
-
-end
diff --git a/spree_essential_blog/db/migrate/20140806185700_create_posts.rb b/spree_essential_blog/db/migrate/20171208185700_create_posts.rb
similarity index 100%
rename from spree_essential_blog/db/migrate/20140806185700_create_posts.rb
rename to spree_essential_blog/db/migrate/20171208185700_create_posts.rb
diff --git a/spree_essential_blog/db/migrate/20140806185720_create_taxons_posts.rb b/spree_essential_blog/db/migrate/20171208185720_create_taxons_posts.rb
similarity index 100%
rename from spree_essential_blog/db/migrate/20140806185720_create_taxons_posts.rb
rename to spree_essential_blog/db/migrate/20171208185720_create_taxons_posts.rb
diff --git a/spree_essential_blog/db/migrate/20140806185730_create_post_products.rb b/spree_essential_blog/db/migrate/20171208185730_create_post_products.rb
similarity index 100%
rename from spree_essential_blog/db/migrate/20140806185730_create_post_products.rb
rename to spree_essential_blog/db/migrate/20171208185730_create_post_products.rb
diff --git a/spree_essential_blog/db/migrate/20171208185750_acts_as_taggable_on_posts.rb b/spree_essential_blog/db/migrate/20171208185750_acts_as_taggable_on_posts.rb
new file mode 100644
index 00000000..5d8af0ba
--- /dev/null
+++ b/spree_essential_blog/db/migrate/20171208185750_acts_as_taggable_on_posts.rb
@@ -0,0 +1,32 @@
+class ActsAsTaggableOnPosts < ActiveRecord::Migration
+ def self.up
+ #table tags, tagings are part of gem acts-as-taggable-on, no spree namespace
+ return if table_exists? :tags
+
+ create_table :tags do |t|
+ t.string :name
+ end
+
+ create_table :taggings do |t|
+ t.references :tag
+ # You should make sure that the column created is
+ # long enough to store the required class names.
+ t.references :taggable, :polymorphic => true
+ t.references :tagger, :polymorphic => true
+ # Limit is created to prevent MySQL error on index
+ # length for MyISAM table type: http://bit.ly/vgW2Ql
+ t.string :context, limit: 128
+ t.datetime :created_at
+ end
+
+ add_index :taggings, :tag_id
+ add_index :taggings, [:taggable_id, :taggable_type, :context], :name=>"taggings_id_type_context"
+ end
+
+ def self.down
+ return unless table_exists? :tags
+ drop_table :tags
+ drop_table :taggings
+ end
+
+end
diff --git a/spree_essential_blog/db/migrate/20140808074440_add_cover_to_post.rb b/spree_essential_blog/db/migrate/20171208194440_add_cover_to_post.rb
similarity index 100%
rename from spree_essential_blog/db/migrate/20140808074440_add_cover_to_post.rb
rename to spree_essential_blog/db/migrate/20171208194440_add_cover_to_post.rb
diff --git a/spree_essential_blog/db/migrate/20171208204372_add_position_to_posts_taxons.spree.rb b/spree_essential_blog/db/migrate/20171208204372_add_position_to_posts_taxons.spree.rb
new file mode 100644
index 00000000..72c627dd
--- /dev/null
+++ b/spree_essential_blog/db/migrate/20171208204372_add_position_to_posts_taxons.spree.rb
@@ -0,0 +1,10 @@
+# This migration comes from spree (originally 20131127001002)
+class AddPositionToPostsTaxons < ActiveRecord::Migration
+ def change
+ add_column :spree_posts_taxons, :id, :primary_key
+ add_column :spree_posts_taxons, :position, :integer
+ Spree::PostClassification.all.reverse.each{|classfication|
+ classfication.insert_at( )
+ }
+ end
+end
diff --git a/spree_essential_blog/db/migrate/20171208205253_add_seo_metas_to_posts.rb b/spree_essential_blog/db/migrate/20171208205253_add_seo_metas_to_posts.rb
new file mode 100644
index 00000000..15a28195
--- /dev/null
+++ b/spree_essential_blog/db/migrate/20171208205253_add_seo_metas_to_posts.rb
@@ -0,0 +1,9 @@
+class AddSeoMetasToPosts < ActiveRecord::Migration
+ def change
+ change_table :spree_posts do |t|
+ t.string :meta_title
+ t.string :meta_description
+ t.string :meta_keywords
+ end
+ end
+end
diff --git a/spree_essential_blog/db/migrate/20171208220001_rename_permalink_to_slug_for_posts.rb b/spree_essential_blog/db/migrate/20171208220001_rename_permalink_to_slug_for_posts.rb
new file mode 100644
index 00000000..62a8d051
--- /dev/null
+++ b/spree_essential_blog/db/migrate/20171208220001_rename_permalink_to_slug_for_posts.rb
@@ -0,0 +1,5 @@
+class RenamePermalinkToSlugForPosts < ActiveRecord::Migration
+ def change
+ rename_column :spree_posts, :permalink, :slug
+ end
+end
diff --git a/spree_essential_blog/lib/spree_essential_blog.rb b/spree_essential_blog/lib/spree_essential_blog.rb
index 85f7fe30..2dd71e5a 100644
--- a/spree_essential_blog/lib/spree_essential_blog.rb
+++ b/spree_essential_blog/lib/spree_essential_blog.rb
@@ -5,6 +5,7 @@
require "spree_essential_blog/engine"
require "spree_essential_blog/search"
require "spree_essential_blog/permitted_attributes_for_blog"
+require "spree_essential_blog/paper_clip_interpolate_site"
module SpreeEssentialBlog
mattr_accessor :site_class, :taxon_class
diff --git a/spree_essential_blog/lib/spree_essential_blog/paper_clip_interpolate_site.rb b/spree_essential_blog/lib/spree_essential_blog/paper_clip_interpolate_site.rb
new file mode 100644
index 00000000..09139da1
--- /dev/null
+++ b/spree_essential_blog/lib/spree_essential_blog/paper_clip_interpolate_site.rb
@@ -0,0 +1,5 @@
+unless Paperclip::Interpolations.all.include? :site
+ Paperclip.interpolates :site do |attachment, style_name|
+ attachment.instance.site_id # site.current do not work anymore, since we assign theme product to taxon of shop1.
+ end
+end
\ No newline at end of file
diff --git a/spree_essential_blog/lib/spree_essential_blog/permitted_attributes_for_blog.rb b/spree_essential_blog/lib/spree_essential_blog/permitted_attributes_for_blog.rb
index 6ee79353..fe536cba 100644
--- a/spree_essential_blog/lib/spree_essential_blog/permitted_attributes_for_blog.rb
+++ b/spree_essential_blog/lib/spree_essential_blog/permitted_attributes_for_blog.rb
@@ -1,11 +1,11 @@
module Spree
module PermittedAttributes
- ATTRIBUTES_FOR_BLOG=[:blog_attributes, :post_attributes, :post_image_attributes, :post_product_attributes]
+ ATTRIBUTES_FOR_BLOG=[:blog_attributes, :post_attributes, :post_file_attributes, :post_product_attributes]
mattr_reader *ATTRIBUTES_FOR_BLOG
@@blog_attributes = [:name, :permalink]
- @@post_attributes = [ :title, :cover, :teaser, :body, :posted_at, :author, :live, :tag_list, :taxon_ids, :product_ids_string]
- @@post_image_attributes = [:alt, :attachment]
+ @@post_attributes = [ :title, :cover, :teaser, :body, :posted_at, :author, :live, :tag_list, :taxon_ids, :product_ids_string, :meta_keywords, :meta_description]
+ @@post_file_attributes = [:alt, :attachment]
@@post_product_attributes = [:post_id, :product_id, :position]
end
end
\ No newline at end of file
diff --git a/spree_essential_blog/lib/spree_essential_blog/posts_controller_helper.rb b/spree_essential_blog/lib/spree_essential_blog/posts_controller_helper.rb
index 78a108b4..79b50dbb 100644
--- a/spree_essential_blog/lib/spree_essential_blog/posts_controller_helper.rb
+++ b/spree_essential_blog/lib/spree_essential_blog/posts_controller_helper.rb
@@ -3,22 +3,22 @@ module SpreeEssentialBlog::PostsControllerHelper
extend ActiveSupport::Concern
included do
- helper 'spree/blogs/posts'
- before_filter :get_blog
+ helper 'spree/posts'
+ before_action :get_blog
end
-
+
private
-
+
def default_scope
@blog.posts.live
end
-
+
def get_sidebar
@archive_posts = default_scope.limit(10)
@post_categories = @blog.categories.order(:name).all
get_tags
end
-
+
def get_tags
@tags = default_scope.tag_counts.order('count DESC').limit(25)
end
@@ -26,5 +26,5 @@ def get_tags
def get_blog
@blog = Spree::Blog.find_by_permalink!(params[:blog_id])
end
-
+
end
diff --git a/spree_essential_blog/spec/models/post_spec.rb b/spree_essential_blog/spec/models/post_spec.rb
index dd272adc..55b396a9 100644
--- a/spree_essential_blog/spec/models/post_spec.rb
+++ b/spree_essential_blog/spec/models/post_spec.rb
@@ -3,12 +3,12 @@
describe Spree::Post do
let(:post) { FactoryGirl.build(:post) }
-
-
+
+
it "new post" do
post.title = "中文标题"
post.should be_valid
- post.permalink.should be_present
+ post.friendly_id.should be_present
end
-
+
end
diff --git a/spree_essential_blog/spree_essential_blog.gemspec b/spree_essential_blog/spree_essential_blog.gemspec
index df4458a3..255753c9 100644
--- a/spree_essential_blog/spree_essential_blog.gemspec
+++ b/spree_essential_blog/spree_essential_blog.gemspec
@@ -2,23 +2,23 @@
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'spree_essential_blog'
- s.version = '2.4.0'
+ s.version = '3.0.0'
s.summary = 'blog feature for spree_abc'
s.description = 'blog feature for spree_abc'
- s.required_ruby_version = '>= 1.9.3'
+ s.required_ruby_version = '>= 2.0.0'
s.author = 'qinghe'
s.email = 'areq22@gmail.com'
- s.homepage = 'http://www.dalianshops.com'
+ s.homepage = 'http://www.getstore.cn'
#s.files = `git ls-files`.split("\n")
#s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_path = 'lib'
s.requirements << 'none'
- s.add_dependency 'spree_core', '~> 2.4.0'
- s.add_dependency('acts-as-taggable-on', '~> 3.1')
-
+ #s.add_dependency 'spree_core', '3.1.0.rc3'
+ s.add_dependency'acts-as-taggable-on', '~> 3.1'
+
s.add_development_dependency 'capybara', '~> 2.4'
s.add_development_dependency 'coffee-rails'
s.add_development_dependency 'database_cleaner'
diff --git a/spree_essential_blog/test/integration/spree/blogs/admin/blogs_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/admin/blogs_integration_test.rb
index d8215d52..95854122 100644
--- a/spree_essential_blog/test/integration/spree/blogs/admin/blogs_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/admin/blogs_integration_test.rb
@@ -3,7 +3,7 @@
require 'test_helper'
-class Spree::Blogs::Admin::BlogsIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::Admin::BlogsIntegrationTest < SpreeEssentials::IntegrationCase
setup do
Spree::Blog.destroy_all
diff --git a/spree_essential_blog/test/integration/spree/blogs/admin/disqus_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/admin/disqus_integration_test.rb
index a7a77769..2985be4c 100644
--- a/spree_essential_blog/test/integration/spree/blogs/admin/disqus_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/admin/disqus_integration_test.rb
@@ -3,7 +3,7 @@
require 'test_helper'
-class Spree::Blogs::Admin::DisqusIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::Admin::DisqusIntegrationTest < SpreeEssentials::IntegrationCase
should "have a link to disqus config" do
visit spree.admin_configurations_path
diff --git a/spree_essential_blog/test/integration/spree/blogs/admin/post_category_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/admin/post_category_integration_test.rb
index 38ce2876..487d31f1 100644
--- a/spree_essential_blog/test/integration/spree/blogs/admin/post_category_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/admin/post_category_integration_test.rb
@@ -3,7 +3,7 @@
require 'test_helper'
-class Spree::Blogs::Admin::PostCategoryIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::Admin::PostCategoryIntegrationTest < SpreeEssentials::IntegrationCase
def setup
Spree::Post.destroy_all
diff --git a/spree_essential_blog/test/integration/spree/blogs/admin/post_images_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/admin/post_images_integration_test.rb
index db9fc256..c7428da5 100644
--- a/spree_essential_blog/test/integration/spree/blogs/admin/post_images_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/admin/post_images_integration_test.rb
@@ -1,30 +1,30 @@
require 'test_helper'
-class Spree::Admin::PostImagesIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::Admin::PostFilesIntegrationTest < SpreeEssentials::IntegrationCase
setup do
- Spree::PostImage.destroy_all
+ Spree::PostFile.destroy_all
@post = Spree::Post.first || Factory.create(:spree_post)
end
should "have a link to new post image" do
- visit spree.admin_post_images_path(@post)
+ visit spree.admin_post_files_path(@post)
btn = find("#new_image_link").native
- assert_match /#{spree.new_admin_post_image_path(@post)}$/, btn.attribute('href')
+ assert_match /#{spree.new_admin_post_file_path(@post)}$/, btn.attribute('href')
assert_equal "New Image", btn.text
end
should "get new post image" do
- visit spree.new_admin_post_image_path(@post)
+ visit spree.new_admin_post_file_path(@post)
assert_seen "New Image"
- within "#new_post_image" do
+ within "#new_post_file" do
assert has_field?("Attachment")
assert has_field?("Alt")
end
end
should "validate post image" do
- visit spree.new_admin_post_image_path(@post)
+ visit spree.new_admin_post_file_path(@post)
click_button "Create"
within "#errorExplanation" do
assert_seen "2 errors prohibited this record from being saved:"
@@ -34,35 +34,35 @@ class Spree::Admin::PostImagesIntegrationTest < SpreeEssentials::IntegrationCase
end
should "create post image" do
- visit spree.admin_post_images_path(@post)
+ visit spree.admin_post_files_path(@post)
click_link "New Image"
- within "#new_post_image" do
+ within "#new_post_file" do
attach_file "Attachment", sample_image_path
fill_in "Alt", :with => "alt text!"
end
click_button "Create"
- assert_equal spree.admin_post_images_path(@post), current_path
+ assert_equal spree.admin_post_files_path(@post), current_path
assert_flash :notice, "Post image has been successfully created!"
end
context "existing post image" do
setup do
- @post_image = Factory.create(:spree_post_image, :viewable => @post)
+ @post_file = Factory.create(:spree_post_file, :viewable => @post)
end
should "edit and update" do
- visit spree.edit_admin_post_image_path(@post, @post_image)
- within "#edit_post_image_#{@post_image.id}" do
+ visit spree.edit_admin_post_file_path(@post, @post_file)
+ within "#edit_post_file_#{@post_file.id}" do
attach_file "Attachment", sample_image_path("2.jpg")
fill_in "Alt", :with => "omg!"
end
click_button "Update"
- assert_equal spree.admin_post_images_path(@post), current_path
+ assert_equal spree.admin_post_files_path(@post), current_path
assert_flash :notice, "Post image has been successfully updated!"
end
should "get destroyed" do
- visit spree.admin_post_images_path(@post)
+ visit spree.admin_post_files_path(@post)
within "table.index" do
find("a[href='#']").click
end
@@ -74,17 +74,17 @@ class Spree::Admin::PostImagesIntegrationTest < SpreeEssentials::IntegrationCase
context "several post images" do
setup do
- setup_action_controller_behaviour(Spree::Blogs::Admin::PostImagesController)
- @post_images = Array.new(2) {|i| Factory(:spree_post_image, :alt => "Image ##{i + 1}", :viewable => @post, :position => i) }
+ setup_action_controller_behaviour(Spree::Admin::PostFilesController)
+ @post_files = Array.new(2) {|i| Factory(:spree_post_file, :alt => "Image ##{i + 1}", :viewable => @post, :position => i) }
end
should "update positions" do
- positions = Hash[@post_images.map{|i| [i.id, 2 - i.position ]}]
- visit spree.admin_post_images_path(@post)
+ positions = Hash[@post_files.map{|i| [i.id, 2 - i.position ]}]
+ visit spree.admin_post_files_path(@post)
assert_seen "Image #1", :within => "tbody tr:first"
assert_seen "Image #2", :within => "tbody tr:last"
xhr :post, :update_positions, { :post_id => @post.to_param, :positions => positions }
- visit spree.admin_post_images_path(@post)
+ visit spree.admin_post_files_path(@post)
assert_seen "Image #2", :within => "tbody tr:first"
assert_seen "Image #1", :within => "tbody tr:last"
end
diff --git a/spree_essential_blog/test/integration/spree/blogs/admin/post_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/admin/post_integration_test.rb
index b6480204..806d3642 100644
--- a/spree_essential_blog/test/integration/spree/blogs/admin/post_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/admin/post_integration_test.rb
@@ -3,7 +3,7 @@
require 'test_helper'
-class Spree::Blogs::Admin::PostIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::Admin::PostIntegrationTest < SpreeEssentials::IntegrationCase
setup do
Spree::Post.destroy_all
diff --git a/spree_essential_blog/test/integration/spree/blogs/post_category_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/post_category_integration_test.rb
index 32faae73..d704cacf 100644
--- a/spree_essential_blog/test/integration/spree/blogs/post_category_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/post_category_integration_test.rb
@@ -3,9 +3,9 @@
require 'test_helper'
-class Spree::Blogs::PostCategoryIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::PostCategoryIntegrationTest < SpreeEssentials::IntegrationCase
- include Spree::Blogs::PostsHelper
+ include Spree::PostsHelper
def setup
Spree::Blog.destroy_all
diff --git a/spree_essential_blog/test/integration/spree/blogs/post_integration_test.rb b/spree_essential_blog/test/integration/spree/blogs/post_integration_test.rb
index 33d1d6ba..36a32d57 100644
--- a/spree_essential_blog/test/integration/spree/blogs/post_integration_test.rb
+++ b/spree_essential_blog/test/integration/spree/blogs/post_integration_test.rb
@@ -4,10 +4,10 @@
require 'test_helper'
-class Spree::Blogs::PostIntegrationTest < SpreeEssentials::IntegrationCase
+class Spree::PostIntegrationTest < SpreeEssentials::IntegrationCase
- include Spree::Blogs::PostsHelper
+ include Spree::PostsHelper
def setup
Spree::Blog.destroy_all
diff --git a/spree_essential_blog/test/support/factories.rb b/spree_essential_blog/test/support/factories.rb
index c4b68923..12435d31 100644
--- a/spree_essential_blog/test/support/factories.rb
+++ b/spree_essential_blog/test/support/factories.rb
@@ -17,7 +17,7 @@
name "Jellies"
end
- factory :spree_post_image, :class => Spree::PostImage do
+ factory :spree_post_file, :class => Spree::PostFile do
viewable { Spree::Post.first }
attachment { sample_image }
end
diff --git a/spree_essential_blog/test/unit/spree/post_image_test.rb b/spree_essential_blog/test/unit/spree/post_image_test.rb
index a0bef48a..48ec98b5 100644
--- a/spree_essential_blog/test/unit/spree/post_image_test.rb
+++ b/spree_essential_blog/test/unit/spree/post_image_test.rb
@@ -1,9 +1,9 @@
require 'test_helper'
-class Spree::PostImageTest < ActiveSupport::TestCase
+class Spree::PostFileTest < ActiveSupport::TestCase
setup do
- @post_image = Spree::PostImage.new
+ @post_file = Spree::PostFile.new
end
should belong_to(:viewable)
@@ -11,28 +11,28 @@ class Spree::PostImageTest < ActiveSupport::TestCase
%w(image/jpeg image/gif image/png image/tiff).each do |mime|
should "return true for #{mime} as image content" do
- @post_image.attachment_content_type = mime
- assert @post_image.image_content?
+ @post_file.attachment_content_type = mime
+ assert @post_file.image_content?
end
end
%w(application/pdf text/css).each do |mime|
should "return false for #{mime} as image content" do
- @post_image.attachment_content_type = mime
- assert !@post_image.image_content?
+ @post_file.attachment_content_type = mime
+ assert !@post_file.image_content?
end
end
should "have blank attachment sizes hash if post is not image content" do
hash = {}
- assert_equal hash, @post_image.attachment_sizes
+ assert_equal hash, @post_file.attachment_sizes
end
%w(image/jpeg image/gif image/png image/tiff).each do |mime|
should "have attachment sizes hash for #{mime}" do
- @post_image.attachment_content_type = mime
+ @post_file.attachment_content_type = mime
hash = { :mini => '48x48>', :small => '150x150>', :medium => '600x600>', :large => '950x700>' }
- assert_equal hash, @post_image.attachment_sizes
+ assert_equal hash, @post_file.attachment_sizes
end
end
diff --git a/spree_flexi_variants/app/assets/javascripts/store/spree_flexi_variants.js b/spree_flexi_variants/app/assets/javascripts/store/spree_flexi_variants.js
index 5d4322d7..db7cab81 100644
--- a/spree_flexi_variants/app/assets/javascripts/store/spree_flexi_variants.js
+++ b/spree_flexi_variants/app/assets/javascripts/store/spree_flexi_variants.js
@@ -1,4 +1,4 @@
-//= require store/spree_frontend
+//= require spree/frontend
//= require jquery.formatCurrency-1.4.0.min
//= require i18n/jquery.formatCurrency.all
//= require_self
diff --git a/spree_flexi_variants/app/assets/stylesheets/store/spree_flexi_variants.css b/spree_flexi_variants/app/assets/stylesheets/store/spree_flexi_variants.css
index b6e718b5..2a711634 100644
--- a/spree_flexi_variants/app/assets/stylesheets/store/spree_flexi_variants.css
+++ b/spree_flexi_variants/app/assets/stylesheets/store/spree_flexi_variants.css
@@ -1,4 +1,4 @@
/*
- *= require store/spree_frontend
+ *= require spree/frontend
*= require_self
*/
diff --git a/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_option_types_controller.rb b/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_option_types_controller.rb
index 972ca4ca..efeac686 100644
--- a/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_option_types_controller.rb
+++ b/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_option_types_controller.rb
@@ -1,8 +1,8 @@
module Spree
class Admin::AdHocOptionTypesController < Admin::ResourceController
- before_filter :load_product, :only => [:selected]
- before_filter :load_available_option_values, :only => [:edit]
+ before_action :load_product, :only => [:selected]
+ before_action :load_available_option_values, :only => [:edit]
def selected
@option_types = @product.ad_hoc_option_types
diff --git a/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_variant_exclusions_controller.rb b/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_variant_exclusions_controller.rb
index 8cd339cb..dbb99fe6 100644
--- a/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_variant_exclusions_controller.rb
+++ b/spree_flexi_variants/app/controllers/spree/admin/ad_hoc_variant_exclusions_controller.rb
@@ -1,7 +1,7 @@
module Spree
class Admin::AdHocVariantExclusionsController < Admin::ResourceController
- before_filter :load_product, :only => [:index, :new, :create]
+ before_action :load_product, :only => [:index, :new, :create]
def create
diff --git a/spree_flexi_variants/app/controllers/spree/admin/option_types_controller_decorator.rb b/spree_flexi_variants/app/controllers/spree/admin/option_types_controller_decorator.rb
index bc080d99..98289023 100644
--- a/spree_flexi_variants/app/controllers/spree/admin/option_types_controller_decorator.rb
+++ b/spree_flexi_variants/app/controllers/spree/admin/option_types_controller_decorator.rb
@@ -1,7 +1,7 @@
module Spree
Admin::OptionTypesController.class_eval do
- # not sure if I have to repeat the 'before_filter' for the original option_types account
- before_filter :load_product_decorator, :only => [:select_ad_hoc, :available_ad_hoc]
+ # not sure if I have to repeat the 'before_action' for the original option_types account
+ before_action :load_product_decorator, :only => [:select_ad_hoc, :available_ad_hoc]
def available_ad_hoc
set_available_ad_hoc_option_types
diff --git a/spree_flexi_variants/app/controllers/spree/admin/product_customization_types_controller.rb b/spree_flexi_variants/app/controllers/spree/admin/product_customization_types_controller.rb
index a85b6127..41ec4dba 100644
--- a/spree_flexi_variants/app/controllers/spree/admin/product_customization_types_controller.rb
+++ b/spree_flexi_variants/app/controllers/spree/admin/product_customization_types_controller.rb
@@ -1,7 +1,7 @@
module Spree
class Admin::ProductCustomizationTypesController < Admin::ResourceController
- before_filter :load_product, :only => [:selected, :available, :remove]
- before_filter :load_calculators, :only => [:new, :edit]
+ before_action :load_product, :only => [:selected, :available, :remove]
+ before_action :load_calculators, :only => [:new, :edit]
def edit
@product_customization_type= ProductCustomizationType.find(params[:id])
diff --git a/spree_flexi_variants/app/controllers/spree/orders_controller_decorator.rb b/spree_flexi_variants/app/controllers/spree/orders_controller_decorator.rb
index a33c200e..f9c9d3d4 100644
--- a/spree_flexi_variants/app/controllers/spree/orders_controller_decorator.rb
+++ b/spree_flexi_variants/app/controllers/spree/orders_controller_decorator.rb
@@ -10,22 +10,18 @@ module Spree
# needs to occur in the cart partial for this to be done 'right'
#
# Adds a new item to the order (creating a new order if none already exists)
- def populate
- populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
- flexi_hash = {ad_hoc_option_value_ids: ad_hoc_option_value_ids, product_customizations: product_customizations}
-
- if populator.populate(params.slice(:products, :variants, :quantity).merge(flexi_hash))
- current_order.ensure_updated_shipments
-
- fire_event('spree.cart.add')
- fire_event('spree.order.contents_changed')
- respond_with(@order) do |format|
- format.html { redirect_to cart_path }
- end
- else
- flash[:error] = populator.errors.full_messages.join(" ")
- redirect_to :back
- end
- end
+# def populate
+# populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
+# flexi_hash = {ad_hoc_option_value_ids: ad_hoc_option_value_ids, product_customizations: product_customizations}
+#
+# if populator.populate(params.slice(:products, :variants, :quantity).merge(flexi_hash))
+# respond_with(@order) do |format|
+# format.html { redirect_to cart_path }
+# end
+# else
+# flash[:error] = populator.errors.full_messages.join(" ")
+# redirect_to :back
+# end
+# end
end
end
diff --git a/spree_flexi_variants/app/models/spree/ad_hoc_option_type.rb b/spree_flexi_variants/app/models/spree/ad_hoc_option_type.rb
index 086dcae5..873f70dc 100644
--- a/spree_flexi_variants/app/models/spree/ad_hoc_option_type.rb
+++ b/spree_flexi_variants/app/models/spree/ad_hoc_option_type.rb
@@ -10,7 +10,7 @@ class AdHocOptionType < ActiveRecord::Base
# currently no controller for normal users present
#attr_accessible :is_required, :ad_hoc_option_values_attributes, :product_id, :option_type_id, :position
- default_scope order(:position)
+ default_scope { order(:position) }
# price_modifier_type
# is_required
diff --git a/spree_flexi_variants/app/models/spree/ad_hoc_option_value.rb b/spree_flexi_variants/app/models/spree/ad_hoc_option_value.rb
index 4720d406..53d5d6ae 100644
--- a/spree_flexi_variants/app/models/spree/ad_hoc_option_value.rb
+++ b/spree_flexi_variants/app/models/spree/ad_hoc_option_value.rb
@@ -6,7 +6,7 @@ class AdHocOptionValue < ActiveRecord::Base
has_many :excluded_ad_hoc_option_values, :dependent => :destroy
# currently no controller for normal users present
- attr_accessible :price_modifier, :ad_hoc_option_type_id, :option_value_id, :selected, :cost_price_modifier
+ #attr_accessible :price_modifier, :ad_hoc_option_type_id, :option_value_id, :selected, :cost_price_modifier
# this opens up a can of worms..deleting option values and having historical data still intact...ugh...what to do?...add 'deleted_at' somewhere along the chain?
# has_many :ad_hoc_option_values_line_items, :dependent => :destroy
@@ -14,7 +14,7 @@ class AdHocOptionValue < ActiveRecord::Base
# price_modifier
alias :option_type :ad_hoc_option_type
acts_as_list :scope => :ad_hoc_option_type
- default_scope order("position asc")
+ default_scope { order("position asc") }
delegate :name, :to => :option_value
delegate :presentation, :to => :option_value
diff --git a/spree_flexi_variants/app/models/spree/line_item_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/line_item_decorator.rb
similarity index 100%
rename from spree_flexi_variants/app/models/spree/line_item_decorator.rb
rename to spree_flexi_variants/app/models/spree/decorators/line_item_decorator.rb
diff --git a/spree_flexi_variants/app/models/spree/option_type_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/option_type_decorator.rb
similarity index 100%
rename from spree_flexi_variants/app/models/spree/option_type_decorator.rb
rename to spree_flexi_variants/app/models/spree/decorators/option_type_decorator.rb
diff --git a/spree_flexi_variants/app/models/spree/option_value_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/option_value_decorator.rb
similarity index 100%
rename from spree_flexi_variants/app/models/spree/option_value_decorator.rb
rename to spree_flexi_variants/app/models/spree/decorators/option_value_decorator.rb
diff --git a/spree_flexi_variants/app/models/spree/decorators/order_contents_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/order_contents_decorator.rb
new file mode 100644
index 00000000..e79a91c2
--- /dev/null
+++ b/spree_flexi_variants/app/models/spree/decorators/order_contents_decorator.rb
@@ -0,0 +1,67 @@
+module Spree
+ OrderContents.class_eval do
+ # Get current line item for variant if exists
+ # Add variant qty to line_item
+ def add(variant, quantity = 1, currency = nil, shipment = nil, ad_hoc_option_value_ids = [], product_customizations = [])
+ line_item = add_to_line_item(variant, quantity, currency, shipment, ad_hoc_option_value_ids, product_customizations)
+ reload_totals
+ PromotionHandler::Cart.new(order, line_item).activate
+ ItemAdjustments.new(line_item).update
+ reload_totals
+ line_item
+ end
+
+ private
+ def add_to_line_item(variant, quantity, currency=nil, shipment=nil, ad_hoc_option_value_ids = [], product_customizations = [])
+ line_item = grab_line_item_by_variant(variant, false, ad_hoc_option_value_ids, product_customizations)
+
+ if line_item
+ line_item.target_shipment = shipment
+ line_item.quantity += quantity.to_i
+ line_item.currency = currency unless currency.nil?
+ else
+ line_item = order.line_items.new(quantity: quantity, variant: variant)
+ line_item.target_shipment = shipment
+
+ line_item.product_customizations = product_customizations
+ product_customizations.each {|pc| pc.line_item = line_item}
+
+ product_customizations.map(&:save) # it is now safe to save the customizations we built
+
+ # find, and add the configurations, if any. these have not been fetched from the db yet. line_items.first.variant_id
+ # we postponed it (performance reasons) until we actaully knew we needed them
+ povs=[]
+ ad_hoc_option_value_ids.each do |cid|
+ povs << AdHocOptionValue.find(cid)
+ end
+ line_item.ad_hoc_option_values = povs
+
+ offset_price = povs.map(&:price_modifier).compact.sum + product_customizations.map {|pc| pc.price(variant)}.sum
+Rails.logger.debug "start to get price...."
+a = variant.price_in(currency)
+b = variant.price_in(currency).amount
+ Rails.logger.debug "currency=#{currency.inspect},#{currency}, a = #{a.inspect}, b=#{b.inspect}, offset_price=#{offset_price} variant.price_in(currency)=#{variant.price_in(currency)}"
+
+ if currency
+ line_item.currency = currency unless currency.nil?
+ line_item.price = variant.price_in(currency).amount + offset_price
+ else
+ line_item.price = variant.price + offset_price
+ end
+ end
+
+ line_item.save
+ line_item
+ end
+
+ def grab_line_item_by_variant(variant, raise_error = false, ad_hoc_option_value_ids = [], product_customizations = [])
+ line_item = order.find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations)
+
+ if !line_item.present? && raise_error
+ raise ActiveRecord::RecordNotFound, "Line item not found for variant #{variant.sku}"
+ end
+
+ line_item
+ end
+ end
+end
diff --git a/spree_flexi_variants/app/models/spree/decorators/order_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/order_decorator.rb
new file mode 100644
index 00000000..08b5567e
--- /dev/null
+++ b/spree_flexi_variants/app/models/spree/decorators/order_decorator.rb
@@ -0,0 +1,90 @@
+module Spree
+ Order.class_eval do
+ def add_variant(variant, quantity = 1, ad_hoc_option_value_ids=[], product_customizations=[])
+ current_item = find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations)
+ if current_item
+ current_item.quantity += quantity
+ current_item.save
+ else
+ current_item = LineItem.new(:quantity => quantity)
+ current_item.variant = variant
+
+ # add the product_customizations, if any
+ # TODO: is this an unnecessary step?
+ product_customizations.map(&:save) # it is now safe to save the customizations we created in the OrdersController.populate
+
+ current_item.product_customizations = product_customizations
+
+ # find, and add the configurations, if any. these have not been fetched from the db yet. line_items.first.variant_id
+ # we postponed it (performance reasons) until we actaully knew we needed them
+ povs=[]
+ ad_hoc_option_value_ids.each do |cid|
+ povs << AdHocOptionValue.find(cid)
+ end
+ current_item.ad_hoc_option_values = povs
+
+ current_item.price = variant.price + povs.map(&:price_modifier).compact.sum + product_customizations.map {|pc| pc.price(variant)}.sum
+ self.line_items << current_item
+ end
+ current_item
+ end
+
+ def contains?(variant, ad_hoc_option_value_ids, product_customizations)
+ find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations).present?
+ end
+
+ def find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations)
+ line_items.detect do |li|
+ li.variant_id == variant.id &&
+ matching_configurations(li.ad_hoc_option_values,ad_hoc_option_value_ids) &&
+ matching_customizations(li.product_customizations,product_customizations)
+ end
+ end
+
+ def merge!(order, user = nil)
+ order.line_items.each do |line_item|
+ self.add_variant(line_item.variant, line_item.quantity, line_item.ad_hoc_option_value_ids, line_item.product_customizations)
+ end
+
+ self.associate_user!(user) if !self.user && !user.blank?
+
+ # So that the destroy doesn't take out line items which may have been re-assigned
+ order.line_items.reload
+ order.destroy
+ end
+
+ private
+
+ # produces a list of [customizable_product_option.id,value] pairs for subsequent comparison
+ def customization_pairs(product_customizations)
+ pairs= product_customizations.map(&:customized_product_options).flatten.map do |m|
+ [m.customizable_product_option.id, m.value.present? ? m.value : m.customization_image.to_s ]
+ end
+
+ Set.new pairs
+ end
+
+ def matching_configurations(existing_povs,new_povs)
+ # if there aren't any povs, there's a 'match'
+ return true if existing_povs.empty? && new_povs.empty?
+
+ existing_povs.map(&:id).sort == new_povs.map(&:to_i).sort
+ end
+
+ def matching_customizations(existing_customizations,new_customizations)
+
+ # if there aren't any customizations, there's a 'match'
+ return true if existing_customizations.empty? && new_customizations.empty?
+
+ # exact match of all customization types?
+ return false unless existing_customizations.map(&:product_customization_type_id).sort == new_customizations.map(&:product_customization_type_id).sort
+
+ # get a list of [customizable_product_option.id,value] pairs
+ existing_vals = customization_pairs existing_customizations
+ new_vals = customization_pairs new_customizations
+
+ # do a set-compare here
+ existing_vals == new_vals
+ end
+ end
+end
diff --git a/spree_flexi_variants/app/models/spree/order_populator_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/order_populator_decorator.rb
similarity index 100%
rename from spree_flexi_variants/app/models/spree/order_populator_decorator.rb
rename to spree_flexi_variants/app/models/spree/decorators/order_populator_decorator.rb
diff --git a/spree_flexi_variants/app/models/spree/product_decorator.rb b/spree_flexi_variants/app/models/spree/decorators/product_decorator.rb
similarity index 100%
rename from spree_flexi_variants/app/models/spree/product_decorator.rb
rename to spree_flexi_variants/app/models/spree/decorators/product_decorator.rb
diff --git a/spree_flexi_variants/app/models/spree/excluded_ad_hoc_option_value.rb b/spree_flexi_variants/app/models/spree/excluded_ad_hoc_option_value.rb
index 46259d47..f150bf77 100644
--- a/spree_flexi_variants/app/models/spree/excluded_ad_hoc_option_value.rb
+++ b/spree_flexi_variants/app/models/spree/excluded_ad_hoc_option_value.rb
@@ -3,6 +3,6 @@ class ExcludedAdHocOptionValue < ActiveRecord::Base
belongs_to :ad_hoc_variant_exclusion
belongs_to :ad_hoc_option_value
- attr_accessible :ad_hoc_variant_exclusion, :ad_hoc_option_value_id
+ #attr_accessible :ad_hoc_variant_exclusion, :ad_hoc_option_value_id
end
end
diff --git a/spree_flexi_variants/app/models/spree/order_contents_decorator.rb b/spree_flexi_variants/app/models/spree/order_contents_decorator.rb
deleted file mode 100644
index 2a70709d..00000000
--- a/spree_flexi_variants/app/models/spree/order_contents_decorator.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-module Spree
- OrderContents.class_eval do
- # Get current line item for variant if exists
- # Add variant qty to line_item
- def add(variant, quantity = 1, currency = nil, shipment = nil, ad_hoc_option_value_ids = [], product_customizations = [])
- line_item = order.find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations)
- add_to_line_item(line_item, variant, quantity, currency, shipment, ad_hoc_option_value_ids, product_customizations)
- end
-
- private
- def add_to_line_item(line_item, variant, quantity, currency=nil, shipment=nil, ad_hoc_option_value_ids = [], product_customizations = [])
- if line_item
- line_item.target_shipment = shipment
- line_item.quantity += quantity.to_i
- line_item.currency = currency unless currency.nil?
- else
- line_item = order.line_items.new(quantity: quantity, variant_id: variant.id)
- line_item.target_shipment = shipment
-
- product_customizations.map(&:save) # it is now safe to save the customizations we built
-
- line_item.product_customizations = product_customizations
-
- # find, and add the configurations, if any. these have not been fetched from the db yet. line_items.first.variant_id
- # we postponed it (performance reasons) until we actaully knew we needed them
- povs=[]
- ad_hoc_option_value_ids.each do |cid|
- povs << AdHocOptionValue.find(cid)
- end
- line_item.ad_hoc_option_values = povs
-
- offset_price = povs.map(&:price_modifier).compact.sum + product_customizations.map {|pc| pc.price(variant)}.sum
-
- if currency
- line_item.currency = currency unless currency.nil?
- line_item.price = variant.price_in(currency).amount + offset_price
- else
- line_item.price = variant.price + adjusted_price
- end
- end
-
- line_item.save
- order.reload
-
- line_item
- end
-
- end
-end
diff --git a/spree_flexi_variants/app/models/spree/order_decorator.rb b/spree_flexi_variants/app/models/spree/order_decorator.rb
deleted file mode 100644
index b25b2b87..00000000
--- a/spree_flexi_variants/app/models/spree/order_decorator.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-module Spree
- Order.class_eval do
-
- def find_line_item_by_variant(variant, ad_hoc_option_value_ids=[], product_customizations=[])
- line_items.detect do |li|
- li.variant_id == variant.id &&
- matching_configurations(li.ad_hoc_option_values,ad_hoc_option_value_ids) &&
- matching_customizations(li.product_customizations,product_customizations)
- end
- end
-
- # copy original method merge! here, only change the way get current_line_item
- def merge!(order, user = nil)
- order.line_items.each do |line_item|
- next unless line_item.currency == currency
- # change the way get current_line_item
- current_line_item = find_line_item_by_variant( line_item.variant, line_item.ad_hoc_option_value_ids, line_item.product_customizations )
- if current_line_item
- current_line_item.quantity += line_item.quantity
- current_line_item.save
- else
- line_item.order_id = self.id
- line_item.save
- end
- end
-
- self.associate_user!(user) if !self.user && !user.blank?
-
- # So that the destroy doesn't take out line items which may have been re-assigned
- order.line_items.reload
- order.destroy
- end
-
- private
-
- # produces a list of [customizable_product_option.id,value] pairs for subsequent comparison
- def customization_pairs(product_customizations)
- pairs= product_customizations.map(&:customized_product_options).flatten.map do |m|
- [m.customizable_product_option.id, m.value.present? ? m.value : m.customization_image.to_s ]
- end
-
- Set.new pairs
- end
-
- def matching_configurations(existing_povs,new_povs)
- # if there aren't any povs, there's a 'match'
- return true if existing_povs.empty? && new_povs.empty?
-
- existing_povs.map(&:id).sort == new_povs.map(&:to_i).sort
- end
-
- def matching_customizations(existing_customizations,new_customizations)
-
- # if there aren't any customizations, there's a 'match'
- return true if existing_customizations.empty? && new_customizations.empty?
-
- # exact match of all customization types?
- return false unless existing_customizations.map(&:product_customization_type_id).sort == new_customizations.map(&:product_customization_type_id).sort
-
- # get a list of [customizable_product_option.id,value] pairs
- existing_vals = customization_pairs existing_customizations
- new_vals = customization_pairs new_customizations
-
- # do a set-compare here
- existing_vals == new_vals
- end
- end
-end
diff --git a/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb b/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb
index 8ba37c67..ca0dc33c 100644
--- a/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_option_value_fields.html.erb
@@ -8,7 +8,7 @@
<%#link_to_remove_nested_fields t("remove"), f, :no_text => true, :nest => "ad_hoc_option_type" %>
<%=
link_to_with_icon(
- 'icon-trash', '',
+ 'trash', '',
admin_ad_hoc_option_value_path(f.object),
:method => :delete,
:class => "remove_fields no-text with-tip"
diff --git a/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_selected.html.erb b/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_selected.html.erb
index d7db851d..147054ff 100644
--- a/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_selected.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/_selected.html.erb
@@ -38,5 +38,5 @@
diff --git a/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/edit.html.erb b/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/edit.html.erb
index 6a0273df..5bb5db28 100644
--- a/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/edit.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/ad_hoc_option_types/edit.html.erb
@@ -42,9 +42,9 @@
<% end %>
- <%= button t("update"), 'icon-refresh' %>
+ <%= button t("update"), 'refresh' %>
<%= t("or") %>
- <%= button_link_to t("cancel"), selected_admin_product_ad_hoc_option_types_url(@ad_hoc_option_type.product), :icon => 'icon-remove' %>
+ <%= button_link_to t("cancel"), selected_admin_product_ad_hoc_option_types_url(@ad_hoc_option_type.product), :icon => 'remove' %>
<% end %>
diff --git a/spree_flexi_variants/app/views/spree/admin/option_types/_available_ad_hoc.html.erb b/spree_flexi_variants/app/views/spree/admin/option_types/_available_ad_hoc.html.erb
index e4d785f9..465a96be 100644
--- a/spree_flexi_variants/app/views/spree/admin/option_types/_available_ad_hoc.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/option_types/_available_ad_hoc.html.erb
@@ -12,10 +12,10 @@
| <%=ot.name %> |
<%=ot.presentation %> |
- <%= link_to_with_icon 'icon-plus', t("select"),
+ | <%= link_to_with_icon 'plus', t("select"),
url_for(:controller => "admin/option_types",
:id => ot,
- :product_id => @product.permalink,
+ :product_id => @product.friendly_id,
:action => "select_ad_hoc",
:option_type_id => ot),
:class => 'iconlink' %>
diff --git a/spree_flexi_variants/app/views/spree/admin/product_customization_types/_available.html.erb b/spree_flexi_variants/app/views/spree/admin/product_customization_types/_available.html.erb
index 94091bb7..3aaf59c3 100644
--- a/spree_flexi_variants/app/views/spree/admin/product_customization_types/_available.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/product_customization_types/_available.html.erb
@@ -14,7 +14,7 @@
| <%= link_to icon('add') + ' ' + t("select"),
url_for(:controller => "admin/product_customization_types",
:id => ct,
- :product_id => @product.permalink,
+ :product_id => @product.friendly_id,
:action => "select",
:product_customization_type_id => ct),
:remote => true, :class => 'iconlink' %>
diff --git a/spree_flexi_variants/app/views/spree/admin/product_customization_types/edit.html.erb b/spree_flexi_variants/app/views/spree/admin/product_customization_types/edit.html.erb
index ccbf1f2a..76729356 100644
--- a/spree_flexi_variants/app/views/spree/admin/product_customization_types/edit.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/product_customization_types/edit.html.erb
@@ -6,7 +6,7 @@
<% content_for :page_actions do %>
- <%= button_link_to Spree.t(:product_customization_types_list), spree.admin_product_customization_types_path, :icon => 'icon-arrow-left' %>
+ <%= button_link_to Spree.t(:product_customization_types_list), spree.admin_product_customization_types_path, :icon => 'arrow-left' %>
<% end %>
diff --git a/spree_flexi_variants/app/views/spree/admin/product_customization_types/index.html.erb b/spree_flexi_variants/app/views/spree/admin/product_customization_types/index.html.erb
index f78fe76c..ca7b06ea 100644
--- a/spree_flexi_variants/app/views/spree/admin/product_customization_types/index.html.erb
+++ b/spree_flexi_variants/app/views/spree/admin/product_customization_types/index.html.erb
@@ -3,7 +3,7 @@
<% content_for(:page_title, Spree.t("product_customization_types")) %>
<% content_for(:page_actions) do %>
- <%= button_link_to Spree.t("new_product_customization_type"), new_admin_product_customization_type_url, { :remote => true, :icon => 'icon-plus', :id => 'new_product_customization_type_link' } %>
+ <%= button_link_to Spree.t("new_product_customization_type"), new_admin_product_customization_type_url, { :remote => true, :icon => 'plus', :id => 'new_product_customization_type_link' } %>
<% end %>
diff --git a/spree_multi_site/Gemfile b/spree_multi_site/Gemfile
index 5581d11c..b9484863 100644
--- a/spree_multi_site/Gemfile
+++ b/spree_multi_site/Gemfile
@@ -1,13 +1,6 @@
-source 'http://ruby.taobao.org'
+source 'https://ruby.taobao.org'
#source 'http://rubygems.org'
-
-
-group :development,:test do
- gem 'mail_view'
- # Provides basic authentication functionality for testing parts of your engine
- gem 'spree', '~>2.4' # required to create dummy
- #gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
-end
+#do not inlucde spree_devise_auth, or spec has to skip authorization
+#eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
gemspec
-
diff --git a/spree_multi_site/README.md b/spree_multi_site/README.md
index 72bde69a..0e347105 100644
--- a/spree_multi_site/README.md
+++ b/spree_multi_site/README.md
@@ -5,26 +5,26 @@ Introduction goes here.
# set site sample_path, default is Rails.application.root/db/sample
# copy it into config/initializers/spree.rb
Spree::Site.sample_path = File.join(Rails.application.root, "db", 'sample')
- # url for site admin
+ # url for site admin
http://localhost:3000/admin/sites
-
- # create new site
+
+ # create new site
http://localhost:3000/new_site
-
+
# it is using delayed_job to load sample when create site vie above url
# Start a delayed_job worker.
rake jobs:work
want more about delayed_job, please go to https://github.com/collectiveidea/delayed_job
-
- # a site load the sample data in console
+
+ # a site load the sample data in console
$> rails r "Spree::Site.first.load_sample"
-
- # a site remove sample data in console
+
+ # a site remove sample data in console
$> rails r "Spree::Site.first.load_sample(false)"
-
+
# login shop by localhost for test
please set cookies key :abc_development_domain=your-site-domain.
-
+
Example
=======
@@ -38,9 +38,9 @@ Be sure to bundle your dependencies and then create a dummy test app for the spe
$ bundle
$ bundle exec rake test app
$ bundle exec rspec spec
- # modify spec/dummy/db/seeds, add next line,comment out other lines
+ # modify spec/dummy/db/seeds, add next line,comment out other lines
# SpreeMultiSite::Engine.load_seed if defined?(SpreeMultiSite)
-
+
# if you delete all migrations in db/migrate, try all belows to recovery
bundle exec rake spree:install:migrations
bundle exec rake spree_api:install:migrations
@@ -50,13 +50,13 @@ Be sure to bundle your dependencies and then create a dummy test app for the spe
# load default data, no sample
$ rake db:test:clone
$ rake db:seed RAILS_ENV=test
-
+
After load default&first seeds, you could test manually by providing those parameters or cookies,
- params[:n]: n is 'short_name.dalianshops.com'
- cookies[:abc_development_short_name]: abc_development_short_name is site's short_name
+ params[:n]: n is '#{n}.tld'
+ cookies[:abc_development_short_name]: abc_development_short_name is site's short_name
Todos
=======
fix db index, add site_id into index
-
+
Copyright (c) 2012 [david,hui], released under the New BSD License
diff --git a/spree_multi_site/app/assets/javascripts/spree/backend/spree_multi_site.js b/spree_multi_site/app/assets/javascripts/spree/backend/spree_multi_site.js
new file mode 100644
index 00000000..1424ae2d
--- /dev/null
+++ b/spree_multi_site/app/assets/javascripts/spree/backend/spree_multi_site.js
@@ -0,0 +1 @@
+//= require spree/backend
diff --git a/spree_multi_site/app/assets/javascripts/spree/frontend/spree_multi_site.js b/spree_multi_site/app/assets/javascripts/spree/frontend/spree_multi_site.js
new file mode 100644
index 00000000..fa0a16ee
--- /dev/null
+++ b/spree_multi_site/app/assets/javascripts/spree/frontend/spree_multi_site.js
@@ -0,0 +1 @@
+//= require spree/frontend
diff --git a/spree_multi_site/app/assets/javascripts/store/spree_multi_site.js b/spree_multi_site/app/assets/javascripts/store/spree_multi_site.js
deleted file mode 100644
index d10fba7f..00000000
--- a/spree_multi_site/app/assets/javascripts/store/spree_multi_site.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require store/spree_frontend
diff --git a/spree_multi_site/app/assets/stylesheets/spree/backend/spree_multi_site.css b/spree_multi_site/app/assets/stylesheets/spree/backend/spree_multi_site.css
new file mode 100644
index 00000000..a5cec986
--- /dev/null
+++ b/spree_multi_site/app/assets/stylesheets/spree/backend/spree_multi_site.css
@@ -0,0 +1,3 @@
+/*
+ *= require spree/backend
+*/
diff --git a/spree_multi_site/app/assets/stylesheets/spree/frontend/spree_multi_site.css b/spree_multi_site/app/assets/stylesheets/spree/frontend/spree_multi_site.css
new file mode 100644
index 00000000..ad7db303
--- /dev/null
+++ b/spree_multi_site/app/assets/stylesheets/spree/frontend/spree_multi_site.css
@@ -0,0 +1,3 @@
+/*
+ *= require spree/frontend
+*/
diff --git a/spree_multi_site/app/assets/stylesheets/store/spree_multi_site.css b/spree_multi_site/app/assets/stylesheets/store/spree_multi_site.css
deleted file mode 100644
index bce0f84f..00000000
--- a/spree_multi_site/app/assets/stylesheets/store/spree_multi_site.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require store/spree_frontend
-*/
diff --git a/spree_multi_site/app/controllers/spree/admin/general_settings_controller_decorator.rb b/spree_multi_site/app/controllers/spree/admin/general_settings_controller_decorator.rb
index 94e6da54..cd02d25b 100644
--- a/spree_multi_site/app/controllers/spree/admin/general_settings_controller_decorator.rb
+++ b/spree_multi_site/app/controllers/spree/admin/general_settings_controller_decorator.rb
@@ -1,18 +1,28 @@
Spree::Admin::GeneralSettingsController.class_eval do
#override original, update site model
+ def edit
+ @preferences_security = [:allow_ssl_in_production,
+ :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
+ :check_for_spree_alerts]
+ @preferences_currency = [:display_currency, :hide_cents]
+ end
+
+
def update
- params.each do |name, value|
- next unless Spree::Config.has_preference? name
- Spree::Config[name] = value
- if name =='site_name'
- Spree::Site.current.update_attribute(:name, value)
- end
- if name =='site_url'
- Spree::Site.current.update_attribute(:domain, value)
- end
- end
- flash[:success] = Spree.t(:successfully_updated, :resource => Spree.t(:general_settings))
+ #params.each do |name, value|
+ # next unless Spree::Config.has_preference? name
+ # Spree::Config[name] = value
+ #end
+ current_store.update_attributes store_params
+
+ current_store.site.update_attributes site_params
+ flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
redirect_to edit_admin_general_settings_path
end
- end
\ No newline at end of file
+
+ def site_params
+ params.require(:site).permit(Spree::PermittedAttributes.site_attributes)
+ end
+
+ end
diff --git a/spree_multi_site/app/controllers/spree/admin/images_controller_decorator.rb b/spree_multi_site/app/controllers/spree/admin/images_controller_decorator.rb
index af1212d3..e65ebeee 100644
--- a/spree_multi_site/app/controllers/spree/admin/images_controller_decorator.rb
+++ b/spree_multi_site/app/controllers/spree/admin/images_controller_decorator.rb
@@ -1,24 +1,24 @@
Spree::Admin::ImagesController.class_eval do
- create.before :update_paperclip_settings
- update.before :update_paperclip_settings
+ #create.before :update_paperclip_settings
+ #update.before :update_paperclip_settings
private
+ # we do not support this feature now.
# copy from image_settings_controller
# by default Spree::Image.attachment_definitions is set before site initialize, we need reset it after get site.
- def update_paperclip_settings
- if Spree::Config[:use_s3]
- s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
- Spree::Image.attachment_definitions[:attachment][:storage] = :s3
- Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
- Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
- Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
- else
- Spree::Image.attachment_definitions[:attachment].delete :storage
- end
-
- Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
- Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
- Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
- Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
- end
+ #def update_paperclip_settings
+ # if Spree::Config[:use_s3]
+ # s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
+ # Spree::Image.attachment_definitions[:attachment][:storage] = :s3
+ # Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+ # Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+ # Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+ # else
+ # Spree::Image.attachment_definitions[:attachment].delete :storage
+ # end
+ # Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
+ # Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+ # Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
+ # Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
+ #end
end
diff --git a/spree_multi_site/app/controllers/spree/admin/products_controller_decorator.rb b/spree_multi_site/app/controllers/spree/admin/products_controller_decorator.rb
index c8a2f691..d1921d8a 100644
--- a/spree_multi_site/app/controllers/spree/admin/products_controller_decorator.rb
+++ b/spree_multi_site/app/controllers/spree/admin/products_controller_decorator.rb
@@ -1,21 +1,18 @@
Spree::Admin::ProductsController.class_eval do
update.before :prepare_more_params
create.before :prepare_more_params
- around_filter :only=>[:create,:edit, :update, :destroy] do |controller, action_block|
- Spree::MultiSiteSystem.with_context_admin_site_product{
- action_block.call
+ around_action :only=>[:create,:edit, :update, :destroy] do |controller, action_block|
+ Spree::MultiSiteSystem.with_context_free_taxon{
+ action_block.call
}
end
-
-
+
+
private
def prepare_more_params
if params[:product][:global_taxon_ids].present?
params[:product][:global_taxon_ids] = params[:product][:global_taxon_ids].split(',')
end
- end
-
- #def prepare_multi_site_context
- # Spree::MultiSiteSystem.setup_context('admin_site_product')
- #end
- end
\ No newline at end of file
+ end
+
+ end
diff --git a/spree_multi_site/app/controllers/spree/admin/sites_controller.rb b/spree_multi_site/app/controllers/spree/admin/sites_controller.rb
index 62743966..e4dbdbda 100644
--- a/spree_multi_site/app/controllers/spree/admin/sites_controller.rb
+++ b/spree_multi_site/app/controllers/spree/admin/sites_controller.rb
@@ -1,27 +1,27 @@
module Spree
module Admin
class SitesController< Spree::Admin::ResourceController
- before_filter :ensure_access_allowed
+ before_action :ensure_access_allowed
#resource_controller
self.create.after( :create_after )
-
+
def index
@sites = Site.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
end
-
+
def new
@user = @site.users.build
- super
+ super
end
-
+
def create
@user = Spree.user_class.new(params[:user])
@site.users << @user
super
end
-
+
def create_after
- @site.users.first.roles << Role.find_by_name("admin")
+ @site.users.first.roles << Role.find_by_name("admin")
# should not add @site.name as suffix of role.name, User.admin require :name="admin"
if @site.has_sample?
@site.load_sample
@@ -30,13 +30,14 @@ def create_after
#Delayed::Job.enqueue SampleSeedJob.new( @site )
end
end
-
+
private
def ensure_access_allowed
- unless Spree::Site.current.dalianshops?
- redirect_to Spree::Site.current.admin_url
+ unless Spree::Store.current.god?
+ raise CanCan::AccessDenied.new("Not authorized!", :access, Site)
+ #redirect_to Spree::Site.current.admin_url
end
end
end
end
-end
\ No newline at end of file
+end
diff --git a/spree_multi_site/app/controllers/spree/api/v1/variants_controller_decorator.rb b/spree_multi_site/app/controllers/spree/api/v1/variants_controller_decorator.rb
new file mode 100644
index 00000000..16134ef8
--- /dev/null
+++ b/spree_multi_site/app/controllers/spree/api/v1/variants_controller_decorator.rb
@@ -0,0 +1,8 @@
+Spree::Api::V1::VariantsController.class_eval do
+ def index
+ # since variant have no site_id, we should join product here
+ @variants = scope.joins(:product).includes({ option_values: :option_type }, :product, :default_price, :images, { stock_items: :stock_location })
+ .ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+ respond_with(@variants)
+ end
+end
diff --git a/spree_multi_site/app/controllers/spree/sites_controller.rb b/spree_multi_site/app/controllers/spree/sites_controller.rb
index 248521e0..0e408c35 100644
--- a/spree_multi_site/app/controllers/spree/sites_controller.rb
+++ b/spree_multi_site/app/controllers/spree/sites_controller.rb
@@ -1,69 +1,78 @@
-#encoding: utf-8
module Spree
class SitesController< StoreController
- respond_to :html,:js
-
+ #respond_to :html,:js
+
+ def one_click_trial
+ @site = Site.new
+ end
+
def new
if params[:template_theme_id].present?
- @template_theme = Spree::TemplateTheme.foreign.find params[:template_theme_id]
+ @template_theme = Spree::TemplateTheme.foreign.find params[:template_theme_id]
end
- @site = Site.new
+ @site = Site.new
@user = @site.users.build
+ @store = @site.stores.build
end
-
- # called from dalianshops home page
+
+ # called from www.tld home page
def quick_lunch
- params[:user][:password_confirmation] = params[:user][:password]
- @site = create_site( params[:site], params[:user] )
+
+ @site = create_site( permitted_resource_params )
if @site.persisted?
redirect_to @site.admin_url
else
- redirect_to root_path()
- end
+ redirect_to root_path()
+ end
end
-
+
def show
@site = Site.find(params[:id])
render :after_new
end
-
+
def create
- @site = create_site( params[:site], params[:user] )
+ @site = create_site( permitted_resource_params )
if @site.persisted?
flash[:success] = Spree.t(:site_successfully_opened, :site_name => @site.name)
#redirect_to @site.admin_url, format: 'js', status: 303
respond_with(@site) do |format|
format.html { redirect_to @site.admin_url }
format.js { render :js => "window.location = '#{@site.admin_url}'" }
- end
+ end
else
respond_with(@site) do |format|
format.js { render :action => 'new'}
- end
+ end
end
end
-
- # options
- def create_site( site_params, user_params, options= {})
- site = Site.new(site_params)
- user = Spree.user_class.new(user_params)
- site.users << user
+
+ # options
+ def create_site( permitted_site_params)
+ site = Site.new(permitted_site_params)
if site.save
- site.users.first.spree_roles << Spree::Role.find_by_name('admin')
- shipping_category = site.shipping_categories.create!( :name=>Spree.t(:default))
# should not add @site.name as suffix of role.name, User.admin require :name="admin"
if site.has_sample?
site.load_sample
#@site.update_attributes!(:loading_sample=>true)
# add job to load sample
#Delayed::Job.enqueue SampleSeedJob.new( @site )
- end
+ end
else
flash[:error] = Spree.t('errors.messages.could_not_create_site')
- end
+ end
site
end
-
+
+ private
+ def permitted_resource_params
+ params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new
+ end
+
+ def object_name
+ 'site'
+ end
+
end
-
-end
\ No newline at end of file
+
+end
diff --git a/spree_multi_site/app/helpers/spree/base_helper_decorator.rb b/spree_multi_site/app/helpers/spree/base_helper_decorator.rb
new file mode 100644
index 00000000..e75ded08
--- /dev/null
+++ b/spree_multi_site/app/helpers/spree/base_helper_decorator.rb
@@ -0,0 +1,15 @@
+module Spree
+ module BaseHelper
+ private
+ # override original, always return style for feature :aliyun_oss
+ # Returns style of image or nil
+ def image_style_from_method_name(method_name)
+ if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
+ #possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
+ #style if style.in? possible_styles.with_indifferent_access
+ style
+ end
+ end
+
+ end
+end
diff --git a/spree_multi_site/app/jobs/sample_seed_job.rb b/spree_multi_site/app/jobs/sample_seed_job.rb
index df3fd168..7efe4e38 100644
--- a/spree_multi_site/app/jobs/sample_seed_job.rb
+++ b/spree_multi_site/app/jobs/sample_seed_job.rb
@@ -1,14 +1,13 @@
class SampleSeedJob < Struct.new(:site)
def perform
- Spree::Site.current = site
+ Spree::Site.current = site
#site.users.first, it require `spree_users`.`site_id` =current_site.id
admin_user = site.users.first
- site.load_sample
-Rails.logger.info "user=#{admin_user.id}"
+ site.load_sample
Spree::UserMailer.load_sample(admin_user).deliver
end
def success(job)
site.update_attributes!(:loading_sample=>false)
end
-end
\ No newline at end of file
+end
diff --git a/spree_multi_site/app/models/spree/decorator/taxon_decorator.rb b/spree_multi_site/app/models/spree/decorator/taxon_decorator.rb
new file mode 100644
index 00000000..076290b8
--- /dev/null
+++ b/spree_multi_site/app/models/spree/decorator/taxon_decorator.rb
@@ -0,0 +1,3 @@
+Spree::Taxon.class_eval do
+
+end
diff --git a/spree_multi_site/app/models/spree/image_decorator.rb b/spree_multi_site/app/models/spree/image_decorator.rb
index d35777c6..6b4fa1aa 100644
--- a/spree_multi_site/app/models/spree/image_decorator.rb
+++ b/spree_multi_site/app/models/spree/image_decorator.rb
@@ -1,30 +1,46 @@
Spree::Image.class_eval do
-#override attachement[:path]
- Spree::Image.attachment_definitions[:attachment][:url] = '/shops/:rails_env/:site/products/:id/:basename_:style.:extension'
- Spree::Image.attachment_definitions[:attachment][:path] = ':rails_root/public/shops/:rails_env/:site/products/:id/:basename_:style.:extension'
+ #override attachement[:path]
+ attachment_definitions[:attachment][:url] = '/shops/:rails_env/:site/products/:id/:basename_:style.:extension'
+ attachment_definitions[:attachment][:path] = ':rails_root/public/shops/:rails_env/:site/products/:id/:basename_:style.:extension'
+ attachment_definitions[:attachment][:styles] = { mini: '48x48>', small: '100x100>', product: '240x240>', medium: '350x350>', large: '600x600>' }
- Spree::Image.attachment_definitions[:attachment][:styles] = { mini: '48x48>', small: '100x100>', product: '240x240>', medium: '350x350>', large: '600x600>' }
+ extend SpreeMultiSite::PaperclipAliyunOssHelper
end
Spree::Taxon.class_eval do
- #override attachement[:path]
+ #override attachement[:path]
attachment_definitions[:icon][:url] = '/shops/:rails_env/:site/taxons/:id/:style/:basename.:extension'
attachment_definitions[:icon][:path] = ':rails_root/public/shops/:rails_env/:site/taxons/:id/:style/:basename.:extension'
+
+ extend SpreeMultiSite::PaperclipAliyunOssHelper
end
#Spree::Post.class_eval do
-# #override attachement[:path]
-# attachment_definitions[:cover][:url] = '/shops/:rails_env/:site/posts/:id/:style/:basename.:extension'
-# attachment_definitions[:cover][:path] = ':rails_root/public/shops/:rails_env/:site/posts/:id/:style/:basename.:extension'
+# #override attachement[:path]
+# attachment_definitions[:cover][:url] = '/shops/:rails_env/:site/posts/:id/:basename_:style.:extension'
+# attachment_definitions[:cover][:path] = ':rails_root/public/shops/:rails_env/:site/posts/:id/:basename_:style.:extension'
+# extend SpreeMultiSite::PaperclipAliyunOssHelper
#end
-Rails.application.config.spree_multi_site.site_scope_required_classes_with_image_from_other_gems.each do |attachement_name_symbol, extra_class|
- extra_class.class_eval do
- include Spree::MultiSiteSystem
- # Spree::Post => 'posts'
- attachment_definitions[attachement_name_symbol][:url] = "/shops/:rails_env/:site/#{extra_class.to_s.demodulize.underscore.pluralize}/:id/:style/:basename.:extension"
- attachment_definitions[attachement_name_symbol][:path] = ':rails_root/public/shops/:rails_env/:site/#{extra_class.to_s.demodulize.underscore.pluralize}/:id/:style/:basename.:extension'
+#Spree::TemplateFile.class_eval do
+# attachment_definitions[:attachment][:url] = "/shops/:rails_env/:site/:class/:id/:basename_:style.:extension"
+# attachment_definitions[:attachment][:path] = ":rails_root/public/shops/:rails_env/:site/:class/:id/:basename_:style.:extension"
+# extend SpreeMultiSite::PaperclipAliyunOssHelper
+#end
- end
+# these class do not define in spree and spree_multi_site, we should specify in
+# site_scope_required_classes_with_image_from_other_gems, or cause error uninitialized constant
+# eventhough spree_multi_site is in spree_abc, tests in spree_multi_site would not work.
+# [['Spree::Post',:cover],['Spree::TemplateFile',:attachment]]
+Rails.application.config.spree_multi_site.site_scope_required_classes_with_image_from_other_gems.each do | klass, attachement_name_symbol|
+# extra_class.class_eval do
+# include Spree::MultiSiteSystem
+# end
+ klass.constantize.class_eval do
+ # Spree::Post => 'posts' class.to_s.demodulize.underscore.pluralize
+ attachment_definitions[attachement_name_symbol][:url] = "/shops/:rails_env/:site/:class/:id/:basename_:style.:extension"
+ attachment_definitions[attachement_name_symbol][:path] = ':rails_root/public/shops/:rails_env/:site/:class/:id/:basename_:style.:extension'
+ extend SpreeMultiSite::PaperclipAliyunOssHelper
+ end
end
diff --git a/spree_multi_site/app/models/spree/multi_site_configuration.rb b/spree_multi_site/app/models/spree/multi_site_configuration.rb
index dd2cac21..524d2ac0 100644
--- a/spree_multi_site/app/models/spree/multi_site_configuration.rb
+++ b/spree_multi_site/app/models/spree/multi_site_configuration.rb
@@ -1,10 +1,4 @@
-# I have to create own configuration class,
-# because that app_configuration_decorator is loaded after initialize,
-# so in config/initializers/spree.rb, could not get seed_dir
-# this new class would work
module Spree
class MultiSiteConfiguration < Preferences::Configuration
- #description start with global means it is for whole application, not just one site
- preference :seed_dir, :string, :default => File.join(SpreeMultiSite::Engine.root,'db')
end
end
diff --git a/spree_multi_site/app/models/spree/preferences/preferable_decorator.rb b/spree_multi_site/app/models/spree/preferences/preferable_decorator.rb
index c9165ff6..f0f82899 100644
--- a/spree_multi_site/app/models/spree/preferences/preferable_decorator.rb
+++ b/spree_multi_site/app/models/spree/preferences/preferable_decorator.rb
@@ -1,8 +1,8 @@
-Spree::Preferences::Preferable.class_eval do
- #replace original :preference_cache_key, add current_site.id as part of key
- #fix error Duplicate entry 'spree/calculator/flat_rate/amount/1'
- def preference_cache_key(name)
- return unless id
- [self.class.name, name, id, Spree::Site.current.id].join('::').underscore
- end
-end
\ No newline at end of file
+#Spree::Preferences::Preferable.class_eval do
+# #replace original :preference_cache_key, add current_site.id as part of key
+# #fix error Duplicate entry 'spree/calculator/flat_rate/amount/1'
+# def preference_cache_key(name)
+# return unless id
+# [self.class.name, name, id, Spree::Site.current.id].join('::').underscore
+# end
+#end
diff --git a/spree_multi_site/app/models/spree/site.rb b/spree_multi_site/app/models/spree/site.rb
index 6ba7c129..df08cf02 100644
--- a/spree_multi_site/app/models/spree/site.rb
+++ b/spree_multi_site/app/models/spree/site.rb
@@ -1,13 +1,14 @@
#encoding: utf-8
class Spree::Site < ActiveRecord::Base
- cattr_accessor :unknown,:subdomain_regexp, :loading_fake_order_with_sample
+ cattr_accessor :subdomain_regexp
+
has_many :taxonomies,:inverse_of =>:site,:dependent=>:destroy
has_many :products,:inverse_of =>:site,:dependent=>:destroy
has_many :orders,:inverse_of =>:site,:dependent=>:destroy
- has_many :users,:dependent=>:destroy, :class_name=>"Spree::User" #Spree.user_class.to_s
- #FIXME,:inverse_of =>:site, it cause uninitialized constant Spree::Site::,
+ has_many :users,:dependent=>:destroy, :class_name=>Spree.user_class.to_s
+ #FIXME,:inverse_of =>:site, it cause uninitialized constant Spree::Site::,
has_many :tax_categories,:inverse_of =>:site,:dependent=>:destroy
-
+
has_many :shipping_categories,:dependent=>:destroy
has_many :shipping_methods,:dependent=>:destroy
has_many :prototypes,:dependent=>:destroy
@@ -16,62 +17,66 @@ class Spree::Site < ActiveRecord::Base
has_many :payment_methods,:dependent=>:destroy
has_many :assets,:dependent=>:destroy
has_many :zones,:dependent=>:destroy
- has_many :state_changes,:dependent=>:destroy
+ has_many :state_changes,:dependent=>:destroy
+
+ has_many :stores, :dependent=>:destroy
#acts_as_nested_set
+ accepts_nested_attributes_for :stores
accepts_nested_attributes_for :users
-
- #app_configuration require site_id
- self.unknown = Struct.new(:id).new(0)
+
# it is load before create site table. self.new would trigger error "Table spree_sites' doesn't exist"
# db/migrate/some_migration is using Spree::Product, it has default_scope using Site.current.id
# so it require a default value.
self.subdomain_regexp = /\A([a-z0-9\-])*\Z/
- self.loading_fake_order_with_sample = false
+
+ enum status: { active: 0, inactive: 1 }
+ #these attr is only used when create site, it is unavailabe in other case.
+ attr_accessor :email, :password, :password_confirmation
+
validates :name, length: 4..32 #"中国".length=> 2
- validates :short_name, uniqueness: true, presence: true, length: 4..32, format: {with: subdomain_regexp} #, unless: "domain.blank?"
- validates_uniqueness_of :domain, :allow_blank=>true
+ # do not allow user set short_name, it is generated by name, length can be 3..32, allow 'www' for test.
+ validates :short_name, uniqueness: true, presence: true, length: 3..32, format: {with: subdomain_regexp} #, unless: "domain.blank?"
+ validates_uniqueness_of :domain, :allow_blank=>true
#attr_accessible :name, :domain, :short_name, :has_sample
#generate short name fro name
before_validation :set_short_name
-
+ after_create :add_default_data
+
+ after_save :fix_status_of_stores
+
class << self
- def dalianshops
- #in development, we may change site domain
- find_by_short_name('first')#find_by_domain
- end
-
+
def current
- ::Thread.current[:spree_site] || self.unknown
+ Spree::Store.current.site
end
-
+
def current=(some_site)
- ::Thread.current[:spree_site] = some_site
+ if some_site # durring test, add_default_data cause some_site nil
+ Spree::Store.current = Spree::Store.unscoped.where( site_id: some_site.id ).first
+ end
+ some_site
end
-
+
# execute block with given site
def with_site(new_site)
original_current = self.current
begin
self.current = new_site
- yield
+ yield( new_site )
ensure
- self.current = original_current
+ self.current = original_current
end
end
+
+ def system_top_domain
+ Rails.application.config.spree_multi_site.system_top_domain
+ end
end
-
- def dalianshops?
- self == self.class.dalianshops
- end
-
+
def current?
self == self.class.current
end
-
- def unknown?
- !(self.id>0)
- end
-
+
def load_sample( )
require 'ffaker'
# global tables
@@ -85,7 +90,7 @@ def load_sample( )
# [properties(site), prototypes(site)] -> properties_prototypes
# , option_types(site)] ->option_type_prototypes
# ->products(site)->variants(site?)->assets(site)
- # payment_methods(site)->payments->adjustments
+ # payment_methods(site)->payments->adjustments
# ->payment_capture_events
# ->alipay_transactions( source )
# preference(site)
@@ -95,36 +100,36 @@ def load_sample( )
# to be confirm
# spree_tracker, state_changes
# return_authorizations
- # mail_methods,
+ # mail_methods,
# friendly_id_slugs
# promotion_categories -> promotions -> promotion_rules
- # -> promotion_actions
- # product_promotion_rules, taxons_promotion_rules,
- #
+ # -> promotion_actions
+ # product_promotion_rules, taxons_promotion_rules,
+ #
# stores
#:spree_refunds
#:spree_return_authorization_inventory_units
#:spree_return_authorizations
#:spree_refund_reasons
#:spree_customer_returns
-
+
#:spree_reimbursements
#:spree_reimbursement_types
#:spree_reimbursement_credits
#:spree_taxons_prototypes
-
+
# unused table
# credit_cards(site?), gateways(site?)
#
raise "exists products" if self.products.any?
- self.class.with_site( self ) do
- load_sample_products
+ self.class.with_site( self ) do
+ load_sample_products
end
self
end
-
+
def unload_sample
- self.class.with_site( self ) do
+ self.class.with_site( self ) do
self.orders.each{|order|
order.state_changes.clear
order.inventory_units.clear
@@ -145,12 +150,12 @@ def unload_sample
taxonomy.root.destroy # remove taxons
taxonomy.destroy
}
-
+
self.zones.each{|zone|
zone.destroy
}
self.shipping_methods.clear
-
+
#TODO fix taxons.taconomy_id
self.users.includes(:ship_address,:bill_address).offset(1).each{|user|
user.bill_address.destroy
@@ -160,43 +165,62 @@ def unload_sample
#shipping_method, calculator, creditcard, inventory_units, state_change,tokenized_permission
#TODO remove image files
self.assets.clear
- #FIXME seems it do not work
- self.clear_preferences #remove preferences
#TODO clear those tables
# creditcarts,preferences
- self.state_changes.clear
+ self.state_changes.clear
end
self
end
-
- # current site'subdomain => short_name.dalianshops.com
+
+ # current site'subdomain => short_name.tld
def subdomain
- return self.domain if dalianshops? #fix: first.dalianshops.com
- ([self.short_name] + self.class.dalianshops.domain.split('.')[1..-1]).join('.')
+ #for debug at localhost
+ return self.class.system_top_domain if self.class.system_top_domain == 'localhost'
+ short_name + '.' + self.class.system_top_domain
end
-
+
def admin_url
"http://"+subdomain+"/admin"
end
-
+
private
+
+ def add_default_data
+ #current site is first, self is another.
+ self.class.with_site( self ) do| site |
+ site.stores.create!( name: site.name, code: site.short_name )
+ user_attributes = { email: site.email, password: site.password, password_confirmation: password_confirmation }
+ user = site.users.create!(user_attributes)
+ user.spree_roles << Spree::Role.find_by_name('admin')
+ site.shipping_categories.create!( name: Spree.t(:default) )
+ end
+ end
+
def load_sample_products
- file = Pathname.new(File.join(SpreeMultiSite::Config.seed_dir, 'samples', "seed.rb"))
+ file = File.join( Rails.application.root, 'db', 'samples', "seed.rb")
load file
end
-
+
def load_sample_orders
- file = Pathname.new(File.join(SpreeMultiSite::Config.seed_dir, 'fake_order', "seed.rb"))
+ file = File.join( Rails.application.root, 'db', 'fake_order', "seed.rb")
load file
end
-
+
def set_short_name
if short_name.blank?
- self.short_name = name.to_url
+ self.short_name = name.to_url
if self.class.exists?(:short_name=> self.short_name)
self.short_name << "-#{(self.class.last.id+1).to_s}"
end
end
end
+
+ def fix_status_of_stores
+ if active?
+ self.stores.update_all( is_public: true )
+ else
+ self.stores.update_all( is_public: false )
+ end
+ end
end
diff --git a/spree_multi_site/app/models/spree/site_decorator.rb b/spree_multi_site/app/models/spree/site_decorator.rb
index 41a4ee28..f8dfbfb6 100644
--- a/spree_multi_site/app/models/spree/site_decorator.rb
+++ b/spree_multi_site/app/models/spree/site_decorator.rb
@@ -3,19 +3,25 @@
Spree::Asset.class_eval do
include Spree::MultiSiteSystem
end
-Spree::Configuration.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
-end
+
+#Spree::Configuration.class_eval do
+# belongs_to :site
+# default_scope { where(:site_id => Spree::Site.current.id) }
+#end
+
Spree::LogEntry.class_eval do
belongs_to :site
default_scope { where(:site_id => Spree::Site.current.id) }
-end
+end
Spree::OptionType.class_eval do
belongs_to :site
default_scope { where(:site_id => Spree::Site.current.id) }
-end
+ clear_validators!
+ # Add new validates_uniqueness_of with correct scope
+ validates :name, :uniqueness => { :scope => [:site_id] }
+
+end
Spree::Order.class_eval do
include Spree::MultiSiteSystem
@@ -23,56 +29,61 @@
# we should never call LineItem.find or LineItem.new
# use @order.line_items, @order.add_variant instead
-Spree::LineItem.class_eval do
- #this cause ActiveRecord::ReadOnlyRecord, while modify lineitem
- #default_scope :joins => :order
- #default_scope {where("spree_orders.site_id=?", Spree::Site.current.id)}
-end
Spree::Prototype.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
-end
+ include Spree::MultiSiteSystem
+end
Spree::Preference.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
-end
+ include Spree::MultiSiteSystem
+end
Spree::PaymentMethod.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
-end
+ include Spree::MultiSiteSystem
+end
Spree::Product.class_eval do
include Spree::MultiSiteSystem
include Spree::ProductExtraScope
-
- has_many :global_classifications, dependent: :delete_all
- has_many :global_taxons, through: :global_classifications, source: :taxon
+ #has_many :global_classifications, dependent: :delete_all
+ #has_many :global_taxons, through: :global_classifications, source: :taxon
+
+
+ # Try building a slug based on the following fields in increasing order of specificity.
+ def slug_candidates
+ [
+ :name_to_url,
+ [:name_to_url, :sku],
+ [:name_to_url, :sku, :site_id]
+ ]
+ end
+
+ def name_to_url
+ name.to_url
+ end
end
Spree::Property.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
+ include Spree::MultiSiteSystem
end
#TODO add site_id into shipments?
Spree::ShippingCategory.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
+ include Spree::MultiSiteSystem
+ clear_validators!
+ validates :name, presence: true, uniqueness: { allow_blank: true, scope: :site_id }
end
Spree::ShippingMethod.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
+ include Spree::MultiSiteSystem
+
end
+
Spree::Taxonomy.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
+ include Spree::MultiSiteSystem
end
@@ -81,54 +92,69 @@
has_many :global_classifications, dependent: :delete_all
has_many :global_products, through: :global_classifications, source: :product
-
+
end
Spree::TaxCategory.class_eval do
-
+
belongs_to :site
default_scope { where(:site_id => Spree::Site.current.id) }
clear_validators!
# Add new validates_uniqueness_of with correct scope
- validates :name, :uniqueness => { :scope => [:site_id,:deleted_at] }
+ validates :name, :uniqueness => { scope: [:site_id,:deleted_at], allow_blank: true }
end
# TaxRate is join table, include tax_catory_id and zone_id
# in TaxRate.match it called method :all, so we have to add joins=>tax_category
-# in fact, we should never use TaxRate in spree_abc for now.
+# in fact, we should never use TaxRate in spree_abc for now.
Spree::TaxRate.class_eval do
default_scope { joins( :tax_category). where("spree_tax_categories.site_id=?", Spree::Site.current.id) }
end
Spree::Tracker.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
+ include Spree::MultiSiteSystem
+
+ def self.current
+ tracker = where(active: true).first
+ tracker.analytics_id.present? ? tracker : nil if tracker
+ end
end
Spree.user_class.class_eval do
# user.email validation is unique, it is defined in devise/lib/models/validatable.rb
- # 1. we required dalianshops user have unique email,
+ # 1. we required user have unique email,
# 2. we allow user modify their password after sign up.
# fix unique with scope [site_id] would conflict with 1
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
+ include Spree::MultiSiteSystem
+end
+
+Spree::Variant.class_eval do
+ clear_validators!
+ # copy original validates
+ #validate :check_price
+
+ validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
+ validates :price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
+ # disable uniqueness_of :sku
+ validates_uniqueness_of :sku, allow_blank: true, conditions: -> { joins(:product).where( spree_variants: { deleted_at: nil}, spree_products: {site_id: Spree::Site.current.id } ) }
+
end
Spree::Zone.class_eval do
- belongs_to :site
- default_scope { where(:site_id => Spree::Site.current.id) }
-
+ include Spree::MultiSiteSystem
+
clear_validators!
# Add new validates_uniqueness_of with correct scope
validates :name, :presence => true, :uniqueness => { :scope => [:site_id] }
-end
+end
+
Rails.application.config.spree_multi_site.site_scope_required_classes_from_other_gems.each do |extra_class|
- extra_class.class_eval do
+ extra_class.constantize.class_eval do
belongs_to :site
default_scope { where(:site_id => Spree::Site.current.id) }
- end
+ end
end
diff --git a/spree_multi_site/app/models/spree/store_decorator.rb b/spree_multi_site/app/models/spree/store_decorator.rb
new file mode 100644
index 00000000..a961b1f2
--- /dev/null
+++ b/spree_multi_site/app/models/spree/store_decorator.rb
@@ -0,0 +1,65 @@
+Spree::Store.class_eval do
+ # Do not use default_scope, in view template_theme/foreign, we want to get store of template_theme.
+ # include Spree::MultiSiteSystem
+ belongs_to :site
+
+ clear_validators!
+ class << self
+ #override original current
+ def current(domain = nil)
+ #UnknownStore.instance is for test only
+ ::Thread.current[:spree_store] || UnknownStore.instance
+ end
+
+ def current=(some_store)
+ ::Thread.current[:spree_store] = some_store
+ end
+
+ def by_domain( domain )
+ current_store = if domain.is_a? String
+ if domain.end_with? Spree::Site.system_top_domain
+ short_name = domain.split('.').first
+ self.find_by_code(short_name)
+ else
+ self.by_url(domain).first
+ end
+ else
+ self.default
+ end
+ current_store
+ end
+
+ # we can not easily modify cookies except firefox, we'll add default_site for debug page on other browser.
+ # we could set default site for missing site as well.
+ def default
+ where( default: true ).first
+ end
+
+ def god
+ where( code: 'www' ).first
+ end
+ end
+
+ # current site'subdomain => short_name.tld
+ def subdomain
+ code + '.' + Spree::Site.system_top_domain
+ end
+
+ # it is god(first) store
+ def god?
+ self == self.class.god
+ end
+
+ #app_configuration require site_id
+ class UnknownStore
+ include Singleton
+ def id
+ 0
+ end
+
+ def site
+ #app_configuration require site_id
+ Struct.new(:id).new(0)
+ end
+ end
+end
diff --git a/spree_multi_site/app/views/spree/admin/general_settings/edit.html.erb b/spree_multi_site/app/views/spree/admin/general_settings/edit.html.erb
new file mode 100644
index 00000000..2c36b861
--- /dev/null
+++ b/spree_multi_site/app/views/spree/admin/general_settings/edit.html.erb
@@ -0,0 +1,125 @@
+<% content_for :page_title do %>
+ <%= Spree.t(:general_settings) %>
+<% end %>
+
+<%= form_tag admin_general_settings_path, method: :put, enctype: 'multipart/form-data' do %>
+
+
+
+
+
-
-
- <%= f.field_container :name do %>
- <%= f.label :name, t(:site_name) %> *
- <%= f.text_field :name, :class => 'fullwidth title' %>
- <%= f.error_message_on :name %>
- <% end %>
- <%= f.field_container :domain do %>
- <%= f.label :domain, t(:site_domain) %>
- <%= f.text_field :domain, :class => 'fullwidth title' %>
- <%= f.error_message_on :domain %>
- <% end %>
- <%= f.field_container :short_name do %>
- <%= f.label :short_name, t(:site_short_name) %> *
- <%= f.text_field :short_name, :class => 'fullwidth title' %>
- <%= f.error_message_on :short_name %>
- <% end %>
- <%= f.field_container :layout do %>
- <%= f.label :layout, t(:site_layout) %>
- <%= f.text_field :layout, :class => 'fullwidth title' %>
- <%= f.error_message_on :layout %>
- <% end %>
+
+
+ <%= f.label :name, Spree.t(:name) %>
+ <%= f.text_field :name, :class => 'form-control' %>
+
+
+ <%= f.label :domain %>
+ <%= f.text_field :domain, :class => 'form-control' %>
+
- <%= f.field_container :has_sample do %>
- <%= f.label :has_sample, t(:site_has_sample) %>
- <%= f.check_box :has_sample, :class => 'fullwidth title' %>
- <%= f.error_message_on :has_sample %>
- <% end %>
- <% if @site.new_record? %>
-
- <%= render :partial => 'spree/admin/sites/user', :locals => { :user => @user } %>
-
- <% end %>
-
+
+ <%= f.label :status %>
+
+ <%= f.select :status, Spree::Site.statuses.to_a.map { |w| [w[0].humanize, w[0]] }, {}, :class => 'select2' %>
+
diff --git a/spree_multi_site/app/views/spree/admin/sites/edit.html.erb b/spree_multi_site/app/views/spree/admin/sites/edit.html.erb
index 3c91f2ff..7f71d206 100644
--- a/spree_multi_site/app/views/spree/admin/sites/edit.html.erb
+++ b/spree_multi_site/app/views/spree/admin/sites/edit.html.erb
@@ -1,8 +1,12 @@
- <%= t("editing_site") %>
-
+<% content_for :page_title do %>
+ <%= Spree.t(:editing_resource, resource: Spree::Site.model_name.human) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @site } %>
+
<%= form_for [:admin, @site] do |f| %>
- <%= render :partial => "form", :locals => { :f => f } %>
-
- <%= button t(:update) %> <%= t(:or) %> <%= link_to t(:cancel), admin_sites_path %>
-
+
<% end %>
diff --git a/spree_multi_site/app/views/spree/admin/sites/index.html.erb b/spree_multi_site/app/views/spree/admin/sites/index.html.erb
index 14ac1442..f66c2296 100644
--- a/spree_multi_site/app/views/spree/admin/sites/index.html.erb
+++ b/spree_multi_site/app/views/spree/admin/sites/index.html.erb
@@ -1,36 +1,40 @@
<% content_for :page_title do %>
- <%= Spree.t('site.index') %>
+ <%= Spree.t('site.index') %>
<% end %>
-
+
-
-
-
+
+
+
+
+
| <%= Spree::Site.human_attribute_name(:name) %> |
<%= Spree::Site.human_attribute_name(:domain) %> |
<%= Spree.user_class.human_attribute_name(:email) %> |
+ <%= Spree::Site.human_attribute_name(:status) %> |
<%= Spree::Site.human_attribute_name(:created_at) %> |
+ |
<%- @sites.each do |site|%>
| <%= site.name %> |
<%= site.subdomain %> |
- <%= site.users.admin.first.email %> |
+
+ <%= Spree::MultiSiteSystem.with_context_admin_sites{ site.users.admin.first.email }%>
+ |
+ <%= site.status %> |
<%= pretty_time site.created_at %> |
- <%= link_to_with_icon 'icon-eye', Spree.t(:admin_store), site.admin_url, {:target=>'_blank',:no_text => true} %>
-
+ <%= link_to_with_icon('edit', Spree.t(:edit), spree.edit_admin_site_url(site), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' }) if can? :edit, site %>
+ <%= link_to_with_icon 'eye-open', Spree.t(:admin_store), site.admin_url, {class: 'btn btn-primary btn-sm', target: '_blank', no_text: true} %>
|
<% end %>
-
-<%= paginate @sites %>
-
-
+<%= paginate @sites %>
diff --git a/spree_multi_site/app/views/spree/sites/_form.html.erb b/spree_multi_site/app/views/spree/sites/_form.html.erb
index 83b2c9d5..23099edd 100644
--- a/spree_multi_site/app/views/spree/sites/_form.html.erb
+++ b/spree_multi_site/app/views/spree/sites/_form.html.erb
@@ -3,25 +3,25 @@
<%= f.label :name %>
- <%= f.text_field :name, :class => 'fullwidth title', :minlength=>4, :maxlength=>30, :required=>"" %>
+ <%= f.text_field :name, :minlength=>4, :maxlength=>30, :required=>true %>
-
- <%= f.label :short_name %>
- <%= f.text_field :short_name, :class => 'fullwidth title', :minlength=>4, :maxlength=>30, :required=>"" %>
- .dalianshops.com
-
-
- <% if @site.new_record? %>
- <%= render :partial => 'spree/sites/user', :locals => { :user => @user } %>
- <% end %>
+
+ <%= f.label :email, Spree.t(:email) %>
+ <%= f.email_field :email, size: 30 %>
+
+
+
+ <%= f.label :password, Spree.t(:password) %>
+ <%= f.password_field :password, :minlength=>6, :maxlength=>30, :required=>"" %>
+
<% if @template_theme.present? %>
<%= f.label :foreign_theme_id %>
- <%= f.hidden_field :foreign_theme_id, :value=>@template_theme.id %>
- <%= text_field_tag :template_theme_name, @template_theme.title, :class => 'fullwidth title', :readonly=>true, :size=>30 %>
-
+ <%= f.hidden_field :foreign_theme_id, :value=>@template_theme.id %>
+ <%= text_field_tag :template_theme_name, @template_theme.title, :readonly=>true, :size=>30 %>
+
<% end %>
diff --git a/spree_multi_site/app/views/spree/sites/_form_for_spree_theme.html.erb b/spree_multi_site/app/views/spree/sites/_form_for_spree_theme.html.erb
deleted file mode 100644
index 2b164f0d..00000000
--- a/spree_multi_site/app/views/spree/sites/_form_for_spree_theme.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
- @site ||= SpreeTheme.site_class.new
- @user ||= @site.users.build
-%>
-<%= form_for :site, :url => quick_lunch_path, :html=>{:id=>"site_form"} do |f| %>
-
-
- <%= f.text_field :name, :class => 'fullwidth title', :placeholder => Spree.t(:name_store), :minlength=>4, :maxlength=>24, :required=>"" %>
-
-
- <%= email_field :user, :email, :placeholder => Spree.t(:email)%>
-
-
- <%= password_field :user,:password, :placeholder=>Spree.t(:password), :minlength=>6, :maxlength=>24, :required=>"" %>
-
- <%= f.button Spree.t(:new_site), :class => 'button primary' %>
-
-网站地址 <%=link_to @site.subdomain, :host=>@site.subdomain,:controller=>"home"%>
+网站地址 <%=link_to @site.subdomain, :host=>@site.subdomain %>
管理地址 <%=link_to @site.subdomain+'/admin', 'http://'+@site.subdomain+'/admin' %>
<% if @site.loading_sample? %>
<%= t :loading_sample %>
diff --git a/spree_multi_site/app/views/spree/sites/new.html.erb b/spree_multi_site/app/views/spree/sites/new.html.erb
index 02fd1cec..07bffd71 100644
--- a/spree_multi_site/app/views/spree/sites/new.html.erb
+++ b/spree_multi_site/app/views/spree/sites/new.html.erb
@@ -1,7 +1,7 @@
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @site } %>
<%= t(:new_site) %>
-<%= form_for :site, :url => new_site_path do |f| %>
+<%= form_for @site, :url => create_site_path do |f| %>
<%= render :partial => "form", :locals => { :f => f } %>
<%= f.submit Spree.t(:create), :class => 'button primary' %>
<% end %>
diff --git a/spree_multi_site/config/locales/zh-CN.yml b/spree_multi_site/config/locales/zh-CN.yml
index 34df2ca1..52d47269 100644
--- a/spree_multi_site/config/locales/zh-CN.yml
+++ b/spree_multi_site/config/locales/zh-CN.yml
@@ -1,22 +1,27 @@
----
+---
zh-CN:
site_account: Site Account
site_layout: Site Layout
site: 网络商店
site_has_sample: 填充示例数据
- load_sample:
+ load_sample:
test_mailer:
test_email:
load_sample: 载入示例数据
loading_sample: 系统正在为您加载示例产品信息, 请您登录注册使用的邮箱查询我们的邮件通知!
- activerecord:
- attributes:
- spree/site:
+ activerecord:
+ attributes:
+ spree/site:
name: 网店名字
short_name: 二级域名
domain: 网店域名
created_at: 创建时间
+ status: 状态
foreign_theme_id: 模板
+ spree/site/users:
+ email: 电子邮箱
+ password: 密码
+ password_confirmation: 密码
spree:
admin_store: 管理商店
errors:
@@ -28,4 +33,4 @@ zh-CN:
site:
index: 商店列表
new:
- site_successfully_opened: ! 您的商店'%{site_name}'创建成功了。
\ No newline at end of file
+ site_successfully_opened: ! 您的商店'%{site_name}'创建成功了。
diff --git a/spree_multi_site/config/routes.rb b/spree_multi_site/config/routes.rb
index ee7f3074..671e5a17 100644
--- a/spree_multi_site/config/routes.rb
+++ b/spree_multi_site/config/routes.rb
@@ -3,12 +3,18 @@
namespace :admin do
resources :sites
end
- post '/quick_lunch',:to => 'sites#quick_lunch', :as => :quick_lunch
+ # one click get form to trial
+ get 'one_click_trial' => 'sites#one_click_trial', :as => :one_click_trial
+
+ # bottom signup form
+ post 'quick_lunch',:to => 'sites#quick_lunch', :as => :quick_lunch
+
+ # create site with template_theme
get 'new_site' => 'sites#new', :as => :new_site
post 'create_site' => 'sites#create', :as => :create_site
resources :sites, :only => [:show]
- if Rails.env.development?
- mount Spree::UserMailer::Preview => 'mail_view'
- end
+ #if Rails.env.development?
+ # mount Spree::UserMailer::Preview => 'mail_view'
+ #end
end
diff --git a/spree_multi_site/db/default/spree/countries.rb b/spree_multi_site/db/default/spree/countries.rb
index 32483fac..da6c4ba1 100644
--- a/spree_multi_site/db/default/spree/countries.rb
+++ b/spree_multi_site/db/default/spree/countries.rb
@@ -1,229 +1,229 @@
-Spree::Country.create!({"name"=>"Chad", "iso3"=>"TCD", "iso"=>"TD", "iso_name"=>"CHAD", "numcode"=>"148"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Faroe Islands", "iso3"=>"FRO", "iso"=>"FO", "iso_name"=>"FAROE ISLANDS", "numcode"=>"234"}, :without_protection => true)
-Spree::Country.create!({"name"=>"India", "iso3"=>"IND", "iso"=>"IN", "iso_name"=>"INDIA", "numcode"=>"356"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Nicaragua", "iso3"=>"NIC", "iso"=>"NI", "iso_name"=>"NICARAGUA", "numcode"=>"558"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Saint Lucia", "iso3"=>"LCA", "iso"=>"LC", "iso_name"=>"SAINT LUCIA", "numcode"=>"662"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Fiji", "iso3"=>"FJI", "iso"=>"FJ", "iso_name"=>"FIJI", "numcode"=>"242"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Indonesia", "iso3"=>"IDN", "iso"=>"ID", "iso_name"=>"INDONESIA", "numcode"=>"360"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Niger", "iso3"=>"NER", "iso"=>"NE", "iso_name"=>"NIGER", "numcode"=>"562"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Saint Pierre and Miquelon", "iso3"=>"SPM", "iso"=>"PM", "iso_name"=>"SAINT PIERRE AND MIQUELON", "numcode"=>"666"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Finland", "iso3"=>"FIN", "iso"=>"FI", "iso_name"=>"FINLAND", "numcode"=>"246"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Nigeria", "iso3"=>"NGA", "iso"=>"NG", "iso_name"=>"NIGERIA", "numcode"=>"566"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Saint Vincent and the Grenadines", "iso3"=>"VCT", "iso"=>"VC", "iso_name"=>"SAINT VINCENT AND THE GRENADINES", "numcode"=>"670"}, :without_protection => true)
-Spree::Country.create!({"name"=>"France", "iso3"=>"FRA", "iso"=>"FR", "iso_name"=>"FRANCE", "numcode"=>"250"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Iran, Islamic Republic of", "iso3"=>"IRN", "iso"=>"IR", "iso_name"=>"IRAN, ISLAMIC REPUBLIC OF", "numcode"=>"364"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Niue", "iso3"=>"NIU", "iso"=>"NU", "iso_name"=>"NIUE", "numcode"=>"570"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Samoa", "iso3"=>"WSM", "iso"=>"WS", "iso_name"=>"SAMOA", "numcode"=>"882"}, :without_protection => true)
-Spree::Country.create!({"name"=>"French Guiana", "iso3"=>"GUF", "iso"=>"GF", "iso_name"=>"FRENCH GUIANA", "numcode"=>"254"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Iraq", "iso3"=>"IRQ", "iso"=>"IQ", "iso_name"=>"IRAQ", "numcode"=>"368"}, :without_protection => true)
-Spree::Country.create!({"name"=>"San Marino", "iso3"=>"SMR", "iso"=>"SM", "iso_name"=>"SAN MARINO", "numcode"=>"674"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Ireland", "iso3"=>"IRL", "iso"=>"IE", "iso_name"=>"IRELAND", "numcode"=>"372"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Sao Tome and Principe", "iso3"=>"STP", "iso"=>"ST", "iso_name"=>"SAO TOME AND PRINCIPE", "numcode"=>"678"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Israel", "iso3"=>"ISR", "iso"=>"IL", "iso_name"=>"ISRAEL", "numcode"=>"376"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Saudi Arabia", "iso3"=>"SAU", "iso"=>"SA", "iso_name"=>"SAUDI ARABIA", "numcode"=>"682"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Italy", "iso3"=>"ITA", "iso"=>"IT", "iso_name"=>"ITALY", "numcode"=>"380"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Senegal", "iso3"=>"SEN", "iso"=>"SN", "iso_name"=>"SENEGAL", "numcode"=>"686"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Jamaica", "iso3"=>"JAM", "iso"=>"JM", "iso_name"=>"JAMAICA", "numcode"=>"388"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Japan", "iso3"=>"JPN", "iso"=>"JP", "iso_name"=>"JAPAN", "numcode"=>"392"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Jordan", "iso3"=>"JOR", "iso"=>"JO", "iso_name"=>"JORDAN", "numcode"=>"400"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Belgium", "iso3"=>"BEL", "iso"=>"BE", "iso_name"=>"BELGIUM", "numcode"=>"56"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Belize", "iso3"=>"BLZ", "iso"=>"BZ", "iso_name"=>"BELIZE", "numcode"=>"84"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Kazakhstan", "iso3"=>"KAZ", "iso"=>"KZ", "iso_name"=>"KAZAKHSTAN", "numcode"=>"398"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Uganda", "iso3"=>"UGA", "iso"=>"UG", "iso_name"=>"UGANDA", "numcode"=>"800"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Benin", "iso3"=>"BEN", "iso"=>"BJ", "iso_name"=>"BENIN", "numcode"=>"204"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Kenya", "iso3"=>"KEN", "iso"=>"KE", "iso_name"=>"KENYA", "numcode"=>"404"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Ukraine", "iso3"=>"UKR", "iso"=>"UA", "iso_name"=>"UKRAINE", "numcode"=>"804"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bermuda", "iso3"=>"BMU", "iso"=>"BM", "iso_name"=>"BERMUDA", "numcode"=>"60"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Kiribati", "iso3"=>"KIR", "iso"=>"KI", "iso_name"=>"KIRIBATI", "numcode"=>"296"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Mexico", "iso3"=>"MEX", "iso"=>"MX", "iso_name"=>"MEXICO", "numcode"=>"484"}, :without_protection => true)
-Spree::Country.create!({"name"=>"United Arab Emirates", "iso3"=>"ARE", "iso"=>"AE", "iso_name"=>"UNITED ARAB EMIRATES", "numcode"=>"784"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bhutan", "iso3"=>"BTN", "iso"=>"BT", "iso_name"=>"BHUTAN", "numcode"=>"64"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cuba", "iso3"=>"CUB", "iso"=>"CU", "iso_name"=>"CUBA", "numcode"=>"192"}, :without_protection => true)
-Spree::Country.create!({"name"=>"North Korea", "iso3"=>"PRK", "iso"=>"KP", "iso_name"=>"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", "numcode"=>"408"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Micronesia, Federated States of", "iso3"=>"FSM", "iso"=>"FM", "iso_name"=>"MICRONESIA, FEDERATED STATES OF", "numcode"=>"583"}, :without_protection => true)
-Spree::Country.create!({"name"=>"United Kingdom", "iso3"=>"GBR", "iso"=>"GB", "iso_name"=>"UNITED KINGDOM", "numcode"=>"826"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bolivia", "iso3"=>"BOL", "iso"=>"BO", "iso_name"=>"BOLIVIA", "numcode"=>"68"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cyprus", "iso3"=>"CYP", "iso"=>"CY", "iso_name"=>"CYPRUS", "numcode"=>"196"}, :without_protection => true)
-Spree::Country.create!({"name"=>"South Korea", "iso3"=>"KOR", "iso"=>"KR", "iso_name"=>"KOREA, REPUBLIC OF", "numcode"=>"410"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Moldova, Republic of", "iso3"=>"MDA", "iso"=>"MD", "iso_name"=>"MOLDOVA, REPUBLIC OF", "numcode"=>"498"}, :without_protection => true)
-Spree::Country.create!({"name"=>"United States", "iso3"=>"USA", "iso"=>"US", "iso_name"=>"UNITED STATES", "numcode"=>"840"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bosnia and Herzegovina", "iso3"=>"BIH", "iso"=>"BA", "iso_name"=>"BOSNIA AND HERZEGOVINA", "numcode"=>"70"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Czech Republic", "iso3"=>"CZE", "iso"=>"CZ", "iso_name"=>"CZECH REPUBLIC", "numcode"=>"203"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Kuwait", "iso3"=>"KWT", "iso"=>"KW", "iso_name"=>"KUWAIT", "numcode"=>"414"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Monaco", "iso3"=>"MCO", "iso"=>"MC", "iso_name"=>"MONACO", "numcode"=>"492"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Uruguay", "iso3"=>"URY", "iso"=>"UY", "iso_name"=>"URUGUAY", "numcode"=>"858"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Botswana", "iso3"=>"BWA", "iso"=>"BW", "iso_name"=>"BOTSWANA", "numcode"=>"72"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Denmark", "iso3"=>"DNK", "iso"=>"DK", "iso_name"=>"DENMARK", "numcode"=>"208"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Guadeloupe", "iso3"=>"GLP", "iso"=>"GP", "iso_name"=>"GUADELOUPE", "numcode"=>"312"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Kyrgyzstan", "iso3"=>"KGZ", "iso"=>"KG", "iso_name"=>"KYRGYZSTAN", "numcode"=>"417"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Mongolia", "iso3"=>"MNG", "iso"=>"MN", "iso_name"=>"MONGOLIA", "numcode"=>"496"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Philippines", "iso3"=>"PHL", "iso"=>"PH", "iso_name"=>"PHILIPPINES", "numcode"=>"608"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Brazil", "iso3"=>"BRA", "iso"=>"BR", "iso_name"=>"BRAZIL", "numcode"=>"76"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Djibouti", "iso3"=>"DJI", "iso"=>"DJ", "iso_name"=>"DJIBOUTI", "numcode"=>"262"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Guam", "iso3"=>"GUM", "iso"=>"GU", "iso_name"=>"GUAM", "numcode"=>"316"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Lao People's Democratic Republic", "iso3"=>"LAO", "iso"=>"LA", "iso_name"=>"LAO PEOPLE'S DEMOCRATIC REPUBLIC", "numcode"=>"418"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Montserrat", "iso3"=>"MSR", "iso"=>"MS", "iso_name"=>"MONTSERRAT", "numcode"=>"500"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Pitcairn", "iso3"=>"PCN", "iso"=>"PN", "iso_name"=>"PITCAIRN", "numcode"=>"612"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Uzbekistan", "iso3"=>"UZB", "iso"=>"UZ", "iso_name"=>"UZBEKISTAN", "numcode"=>"860"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Brunei Darussalam", "iso3"=>"BRN", "iso"=>"BN", "iso_name"=>"BRUNEI DARUSSALAM", "numcode"=>"96"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Dominica", "iso3"=>"DMA", "iso"=>"DM", "iso_name"=>"DOMINICA", "numcode"=>"212"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Guatemala", "iso3"=>"GTM", "iso"=>"GT", "iso_name"=>"GUATEMALA", "numcode"=>"320"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Morocco", "iso3"=>"MAR", "iso"=>"MA", "iso_name"=>"MOROCCO", "numcode"=>"504"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Poland", "iso3"=>"POL", "iso"=>"PL", "iso_name"=>"POLAND", "numcode"=>"616"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Vanuatu", "iso3"=>"VUT", "iso"=>"VU", "iso_name"=>"VANUATU", "numcode"=>"548"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Dominican Republic", "iso3"=>"DOM", "iso"=>"DO", "iso_name"=>"DOMINICAN REPUBLIC", "numcode"=>"214"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Mozambique", "iso3"=>"MOZ", "iso"=>"MZ", "iso_name"=>"MOZAMBIQUE", "numcode"=>"508"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Portugal", "iso3"=>"PRT", "iso"=>"PT", "iso_name"=>"PORTUGAL", "numcode"=>"620"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Sudan", "iso3"=>"SDN", "iso"=>"SD", "iso_name"=>"SUDAN", "numcode"=>"736"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Venezuela", "iso3"=>"VEN", "iso"=>"VE", "iso_name"=>"VENEZUELA", "numcode"=>"862"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Ecuador", "iso3"=>"ECU", "iso"=>"EC", "iso_name"=>"ECUADOR", "numcode"=>"218"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Guinea", "iso3"=>"GIN", "iso"=>"GN", "iso_name"=>"GUINEA", "numcode"=>"324"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Myanmar", "iso3"=>"MMR", "iso"=>"MM", "iso_name"=>"MYANMAR", "numcode"=>"104"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Puerto Rico", "iso3"=>"PRI", "iso"=>"PR", "iso_name"=>"PUERTO RICO", "numcode"=>"630"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Suriname", "iso3"=>"SUR", "iso"=>"SR", "iso_name"=>"SURINAME", "numcode"=>"740"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Viet Nam", "iso3"=>"VNM", "iso"=>"VN", "iso_name"=>"VIET NAM", "numcode"=>"704"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Egypt", "iso3"=>"EGY", "iso"=>"EG", "iso_name"=>"EGYPT", "numcode"=>"818"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Guinea-Bissau", "iso3"=>"GNB", "iso"=>"GW", "iso_name"=>"GUINEA-BISSAU", "numcode"=>"624"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Namibia", "iso3"=>"NAM", "iso"=>"NA", "iso_name"=>"NAMIBIA", "numcode"=>"516"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Qatar", "iso3"=>"QAT", "iso"=>"QA", "iso_name"=>"QATAR", "numcode"=>"634"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Svalbard and Jan Mayen", "iso3"=>"SJM", "iso"=>"SJ", "iso_name"=>"SVALBARD AND JAN MAYEN", "numcode"=>"744"}, :without_protection => true)
-Spree::Country.create!({"name"=>"El Salvador", "iso3"=>"SLV", "iso"=>"SV", "iso_name"=>"EL SALVADOR", "numcode"=>"222"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Guyana", "iso3"=>"GUY", "iso"=>"GY", "iso_name"=>"GUYANA", "numcode"=>"328"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Reunion", "iso3"=>"REU", "iso"=>"RE", "iso_name"=>"REUNION", "numcode"=>"638"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Haiti", "iso3"=>"HTI", "iso"=>"HT", "iso_name"=>"HAITI", "numcode"=>"332"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Romania", "iso3"=>"ROM", "iso"=>"RO", "iso_name"=>"ROMANIA", "numcode"=>"642"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Swaziland", "iso3"=>"SWZ", "iso"=>"SZ", "iso_name"=>"SWAZILAND", "numcode"=>"748"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Holy See (Vatican City State)", "iso3"=>"VAT", "iso"=>"VA", "iso_name"=>"HOLY SEE (VATICAN CITY STATE)", "numcode"=>"336"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Russian Federation", "iso3"=>"RUS", "iso"=>"RU", "iso_name"=>"RUSSIAN FEDERATION", "numcode"=>"643"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Sweden", "iso3"=>"SWE", "iso"=>"SE", "iso_name"=>"SWEDEN", "numcode"=>"752"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Honduras", "iso3"=>"HND", "iso"=>"HN", "iso_name"=>"HONDURAS", "numcode"=>"340"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Rwanda", "iso3"=>"RWA", "iso"=>"RW", "iso_name"=>"RWANDA", "numcode"=>"646"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Switzerland", "iso3"=>"CHE", "iso"=>"CH", "iso_name"=>"SWITZERLAND", "numcode"=>"756"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Hong Kong", "iso3"=>"HKG", "iso"=>"HK", "iso_name"=>"HONG KONG", "numcode"=>"344"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Syrian Arab Republic", "iso3"=>"SYR", "iso"=>"SY", "iso_name"=>"SYRIAN ARAB REPUBLIC", "numcode"=>"760"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Taiwan", "iso3"=>"TWN", "iso"=>"TW", "iso_name"=>"TAIWAN, PROVINCE OF CHINA", "numcode"=>"158"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Tajikistan", "iso3"=>"TJK", "iso"=>"TJ", "iso_name"=>"TAJIKISTAN", "numcode"=>"762"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Tanzania, United Republic of", "iso3"=>"TZA", "iso"=>"TZ", "iso_name"=>"TANZANIA, UNITED REPUBLIC OF", "numcode"=>"834"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Armenia", "iso3"=>"ARM", "iso"=>"AM", "iso_name"=>"ARMENIA", "numcode"=>"51"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Aruba", "iso3"=>"ABW", "iso"=>"AW", "iso_name"=>"ARUBA", "numcode"=>"533"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Australia", "iso3"=>"AUS", "iso"=>"AU", "iso_name"=>"AUSTRALIA", "numcode"=>"36"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Thailand", "iso3"=>"THA", "iso"=>"TH", "iso_name"=>"THAILAND", "numcode"=>"764"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Austria", "iso3"=>"AUT", "iso"=>"AT", "iso_name"=>"AUSTRIA", "numcode"=>"40"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Madagascar", "iso3"=>"MDG", "iso"=>"MG", "iso_name"=>"MADAGASCAR", "numcode"=>"450"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Togo", "iso3"=>"TGO", "iso"=>"TG", "iso_name"=>"TOGO", "numcode"=>"768"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Azerbaijan", "iso3"=>"AZE", "iso"=>"AZ", "iso_name"=>"AZERBAIJAN", "numcode"=>"31"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Chile", "iso3"=>"CHL", "iso"=>"CL", "iso_name"=>"CHILE", "numcode"=>"152"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Malawi", "iso3"=>"MWI", "iso"=>"MW", "iso_name"=>"MALAWI", "numcode"=>"454"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Tokelau", "iso3"=>"TKL", "iso"=>"TK", "iso_name"=>"TOKELAU", "numcode"=>"772"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bahamas", "iso3"=>"BHS", "iso"=>"BS", "iso_name"=>"BAHAMAS", "numcode"=>"44"}, :without_protection => true)
-Spree::Country.create!({"name"=>"China", "iso3"=>"CHN", "iso"=>"CN", "iso_name"=>"CHINA", "numcode"=>"156"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Malaysia", "iso3"=>"MYS", "iso"=>"MY", "iso_name"=>"MALAYSIA", "numcode"=>"458"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Tonga", "iso3"=>"TON", "iso"=>"TO", "iso_name"=>"TONGA", "numcode"=>"776"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bahrain", "iso3"=>"BHR", "iso"=>"BH", "iso_name"=>"BAHRAIN", "numcode"=>"48"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Colombia", "iso3"=>"COL", "iso"=>"CO", "iso_name"=>"COLOMBIA", "numcode"=>"170"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Maldives", "iso3"=>"MDV", "iso"=>"MV", "iso_name"=>"MALDIVES", "numcode"=>"462"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Trinidad and Tobago", "iso3"=>"TTO", "iso"=>"TT", "iso_name"=>"TRINIDAD AND TOBAGO", "numcode"=>"780"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bangladesh", "iso3"=>"BGD", "iso"=>"BD", "iso_name"=>"BANGLADESH", "numcode"=>"50"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Comoros", "iso3"=>"COM", "iso"=>"KM", "iso_name"=>"COMOROS", "numcode"=>"174"}, :without_protection => true)
-Spree::Country.create!({"name"=>"French Polynesia", "iso3"=>"PYF", "iso"=>"PF", "iso_name"=>"FRENCH POLYNESIA", "numcode"=>"258"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Mali", "iso3"=>"MLI", "iso"=>"ML", "iso_name"=>"MALI", "numcode"=>"466"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Norfolk Island", "iso3"=>"NFK", "iso"=>"NF", "iso_name"=>"NORFOLK ISLAND", "numcode"=>"574"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Tunisia", "iso3"=>"TUN", "iso"=>"TN", "iso_name"=>"TUNISIA", "numcode"=>"788"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Barbados", "iso3"=>"BRB", "iso"=>"BB", "iso_name"=>"BARBADOS", "numcode"=>"52"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Congo", "iso3"=>"COG", "iso"=>"CG", "iso_name"=>"CONGO", "numcode"=>"178"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Gabon", "iso3"=>"GAB", "iso"=>"GA", "iso_name"=>"GABON", "numcode"=>"266"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Malta", "iso3"=>"MLT", "iso"=>"MT", "iso_name"=>"MALTA", "numcode"=>"470"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Northern Mariana Islands", "iso3"=>"MNP", "iso"=>"MP", "iso_name"=>"NORTHERN MARIANA ISLANDS", "numcode"=>"580"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Turkey", "iso3"=>"TUR", "iso"=>"TR", "iso_name"=>"TURKEY", "numcode"=>"792"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Congo, the Democratic Republic of the", "iso3"=>"COD", "iso"=>"CD", "iso_name"=>"CONGO, THE DEMOCRATIC REPUBLIC OF THE", "numcode"=>"180"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Marshall Islands", "iso3"=>"MHL", "iso"=>"MH", "iso_name"=>"MARSHALL ISLANDS", "numcode"=>"584"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Norway", "iso3"=>"NOR", "iso"=>"NO", "iso_name"=>"NORWAY", "numcode"=>"578"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Turkmenistan", "iso3"=>"TKM", "iso"=>"TM", "iso_name"=>"TURKMENISTAN", "numcode"=>"795"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Belarus", "iso3"=>"BLR", "iso"=>"BY", "iso_name"=>"BELARUS", "numcode"=>"112"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cook Islands", "iso3"=>"COK", "iso"=>"CK", "iso_name"=>"COOK ISLANDS", "numcode"=>"184"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Gambia", "iso3"=>"GMB", "iso"=>"GM", "iso_name"=>"GAMBIA", "numcode"=>"270"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Martinique", "iso3"=>"MTQ", "iso"=>"MQ", "iso_name"=>"MARTINIQUE", "numcode"=>"474"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Oman", "iso3"=>"OMN", "iso"=>"OM", "iso_name"=>"OMAN", "numcode"=>"512"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Seychelles", "iso3"=>"SYC", "iso"=>"SC", "iso_name"=>"SEYCHELLES", "numcode"=>"690"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Turks and Caicos Islands", "iso3"=>"TCA", "iso"=>"TC", "iso_name"=>"TURKS AND CAICOS ISLANDS", "numcode"=>"796"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Georgia", "iso3"=>"GEO", "iso"=>"GE", "iso_name"=>"GEORGIA", "numcode"=>"268"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Mauritania", "iso3"=>"MRT", "iso"=>"MR", "iso_name"=>"MAURITANIA", "numcode"=>"478"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Pakistan", "iso3"=>"PAK", "iso"=>"PK", "iso_name"=>"PAKISTAN", "numcode"=>"586"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Sierra Leone", "iso3"=>"SLE", "iso"=>"SL", "iso_name"=>"SIERRA LEONE", "numcode"=>"694"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Tuvalu", "iso3"=>"TUV", "iso"=>"TV", "iso_name"=>"TUVALU", "numcode"=>"798"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Costa Rica", "iso3"=>"CRI", "iso"=>"CR", "iso_name"=>"COSTA RICA", "numcode"=>"188"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Germany", "iso3"=>"DEU", "iso"=>"DE", "iso_name"=>"GERMANY", "numcode"=>"276"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Mauritius", "iso3"=>"MUS", "iso"=>"MU", "iso_name"=>"MAURITIUS", "numcode"=>"480"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Palau", "iso3"=>"PLW", "iso"=>"PW", "iso_name"=>"PALAU", "numcode"=>"585"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cote D'Ivoire", "iso3"=>"CIV", "iso"=>"CI", "iso_name"=>"COTE D'IVOIRE", "numcode"=>"384"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Panama", "iso3"=>"PAN", "iso"=>"PA", "iso_name"=>"PANAMA", "numcode"=>"591"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Singapore", "iso3"=>"SGP", "iso"=>"SG", "iso_name"=>"SINGAPORE", "numcode"=>"702"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Croatia", "iso3"=>"HRV", "iso"=>"HR", "iso_name"=>"CROATIA", "numcode"=>"191"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Ghana", "iso3"=>"GHA", "iso"=>"GH", "iso_name"=>"GHANA", "numcode"=>"288"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Papua New Guinea", "iso3"=>"PNG", "iso"=>"PG", "iso_name"=>"PAPUA NEW GUINEA", "numcode"=>"598"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Slovakia", "iso3"=>"SVK", "iso"=>"SK", "iso_name"=>"SLOVAKIA", "numcode"=>"703"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Gibraltar", "iso3"=>"GIB", "iso"=>"GI", "iso_name"=>"GIBRALTAR", "numcode"=>"292"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Paraguay", "iso3"=>"PRY", "iso"=>"PY", "iso_name"=>"PARAGUAY", "numcode"=>"600"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Slovenia", "iso3"=>"SVN", "iso"=>"SI", "iso_name"=>"SLOVENIA", "numcode"=>"705"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Greece", "iso3"=>"GRC", "iso"=>"GR", "iso_name"=>"GREECE", "numcode"=>"300"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Peru", "iso3"=>"PER", "iso"=>"PE", "iso_name"=>"PERU", "numcode"=>"604"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Solomon Islands", "iso3"=>"SLB", "iso"=>"SB", "iso_name"=>"SOLOMON ISLANDS", "numcode"=>"90"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Greenland", "iso3"=>"GRL", "iso"=>"GL", "iso_name"=>"GREENLAND", "numcode"=>"304"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Somalia", "iso3"=>"SOM", "iso"=>"SO", "iso_name"=>"SOMALIA", "numcode"=>"706"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Grenada", "iso3"=>"GRD", "iso"=>"GD", "iso_name"=>"GRENADA", "numcode"=>"308"}, :without_protection => true)
-Spree::Country.create!({"name"=>"South Africa", "iso3"=>"ZAF", "iso"=>"ZA", "iso_name"=>"SOUTH AFRICA", "numcode"=>"710"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Spain", "iso3"=>"ESP", "iso"=>"ES", "iso_name"=>"SPAIN", "numcode"=>"724"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Sri Lanka", "iso3"=>"LKA", "iso"=>"LK", "iso_name"=>"SRI LANKA", "numcode"=>"144"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Afghanistan", "iso3"=>"AFG", "iso"=>"AF", "iso_name"=>"AFGHANISTAN", "numcode"=>"4"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Albania", "iso3"=>"ALB", "iso"=>"AL", "iso_name"=>"ALBANIA", "numcode"=>"8"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Algeria", "iso3"=>"DZA", "iso"=>"DZ", "iso_name"=>"ALGERIA", "numcode"=>"12"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Latvia", "iso3"=>"LVA", "iso"=>"LV", "iso_name"=>"LATVIA", "numcode"=>"428"}, :without_protection => true)
-Spree::Country.create!({"name"=>"American Samoa", "iso3"=>"ASM", "iso"=>"AS", "iso_name"=>"AMERICAN SAMOA", "numcode"=>"16"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Bulgaria", "iso3"=>"BGR", "iso"=>"BG", "iso_name"=>"BULGARIA", "numcode"=>"100"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Lebanon", "iso3"=>"LBN", "iso"=>"LB", "iso_name"=>"LEBANON", "numcode"=>"422"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Andorra", "iso3"=>"AND", "iso"=>"AD", "iso_name"=>"ANDORRA", "numcode"=>"20"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Burkina Faso", "iso3"=>"BFA", "iso"=>"BF", "iso_name"=>"BURKINA FASO", "numcode"=>"854"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Lesotho", "iso3"=>"LSO", "iso"=>"LS", "iso_name"=>"LESOTHO", "numcode"=>"426"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Angola", "iso3"=>"AGO", "iso"=>"AO", "iso_name"=>"ANGOLA", "numcode"=>"24"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Burundi", "iso3"=>"BDI", "iso"=>"BI", "iso_name"=>"BURUNDI", "numcode"=>"108"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Liberia", "iso3"=>"LBR", "iso"=>"LR", "iso_name"=>"LIBERIA", "numcode"=>"430"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Virgin Islands, British", "iso3"=>"VGB", "iso"=>"VG", "iso_name"=>"VIRGIN ISLANDS, BRITISH", "numcode"=>"92"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Anguilla", "iso3"=>"AIA", "iso"=>"AI", "iso_name"=>"ANGUILLA", "numcode"=>"660"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cambodia", "iso3"=>"KHM", "iso"=>"KH", "iso_name"=>"CAMBODIA", "numcode"=>"116"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Equatorial Guinea", "iso3"=>"GNQ", "iso"=>"GQ", "iso_name"=>"EQUATORIAL GUINEA", "numcode"=>"226"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Libyan Arab Jamahiriya", "iso3"=>"LBY", "iso"=>"LY", "iso_name"=>"LIBYAN ARAB JAMAHIRIYA", "numcode"=>"434"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Nauru", "iso3"=>"NRU", "iso"=>"NR", "iso_name"=>"NAURU", "numcode"=>"520"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Virgin Islands, U.S.", "iso3"=>"VIR", "iso"=>"VI", "iso_name"=>"VIRGIN ISLANDS, U.S.", "numcode"=>"850"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Antigua and Barbuda", "iso3"=>"ATG", "iso"=>"AG", "iso_name"=>"ANTIGUA AND BARBUDA", "numcode"=>"28"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cameroon", "iso3"=>"CMR", "iso"=>"CM", "iso_name"=>"CAMEROON", "numcode"=>"120"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Liechtenstein", "iso3"=>"LIE", "iso"=>"LI", "iso_name"=>"LIECHTENSTEIN", "numcode"=>"438"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Nepal", "iso3"=>"NPL", "iso"=>"NP", "iso_name"=>"NEPAL", "numcode"=>"524"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Wallis and Futuna", "iso3"=>"WLF", "iso"=>"WF", "iso_name"=>"WALLIS AND FUTUNA", "numcode"=>"876"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Western Sahara", "iso3"=>"ESH", "iso"=>"EH", "iso_name"=>"WESTERN SAHARA", "numcode"=>"732"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Argentina", "iso3"=>"ARG", "iso"=>"AR", "iso_name"=>"ARGENTINA", "numcode"=>"32"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Canada", "iso3"=>"CAN", "iso"=>"CA", "iso_name"=>"CANADA", "numcode"=>"124"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Eritrea", "iso3"=>"ERI", "iso"=>"ER", "iso_name"=>"ERITREA", "numcode"=>"232"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Lithuania", "iso3"=>"LTU", "iso"=>"LT", "iso_name"=>"LITHUANIA", "numcode"=>"440"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Netherlands", "iso3"=>"NLD", "iso"=>"NL", "iso_name"=>"NETHERLANDS", "numcode"=>"528"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Yemen", "iso3"=>"YEM", "iso"=>"YE", "iso_name"=>"YEMEN", "numcode"=>"887"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cape Verde", "iso3"=>"CPV", "iso"=>"CV", "iso_name"=>"CAPE VERDE", "numcode"=>"132"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Estonia", "iso3"=>"EST", "iso"=>"EE", "iso_name"=>"ESTONIA", "numcode"=>"233"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Luxembourg", "iso3"=>"LUX", "iso"=>"LU", "iso_name"=>"LUXEMBOURG", "numcode"=>"442"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Netherlands Antilles", "iso3"=>"ANT", "iso"=>"AN", "iso_name"=>"NETHERLANDS ANTILLES", "numcode"=>"530"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Saint Helena", "iso3"=>"SHN", "iso"=>"SH", "iso_name"=>"SAINT HELENA", "numcode"=>"654"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Zambia", "iso3"=>"ZMB", "iso"=>"ZM", "iso_name"=>"ZAMBIA", "numcode"=>"894"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Cayman Islands", "iso3"=>"CYM", "iso"=>"KY", "iso_name"=>"CAYMAN ISLANDS", "numcode"=>"136"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Ethiopia", "iso3"=>"ETH", "iso"=>"ET", "iso_name"=>"ETHIOPIA", "numcode"=>"231"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Hungary", "iso3"=>"HUN", "iso"=>"HU", "iso_name"=>"HUNGARY", "numcode"=>"348"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Macao", "iso3"=>"MAC", "iso"=>"MO", "iso_name"=>"MACAO", "numcode"=>"446"}, :without_protection => true)
-Spree::Country.create!({"name"=>"New Caledonia", "iso3"=>"NCL", "iso"=>"NC", "iso_name"=>"NEW CALEDONIA", "numcode"=>"540"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Zimbabwe", "iso3"=>"ZWE", "iso"=>"ZW", "iso_name"=>"ZIMBABWE", "numcode"=>"716"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Central African Republic", "iso3"=>"CAF", "iso"=>"CF", "iso_name"=>"CENTRAL AFRICAN REPUBLIC", "numcode"=>"140"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Falkland Islands (Malvinas)", "iso3"=>"FLK", "iso"=>"FK", "iso_name"=>"FALKLAND ISLANDS (MALVINAS)", "numcode"=>"238"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Iceland", "iso3"=>"ISL", "iso"=>"IS", "iso_name"=>"ICELAND", "numcode"=>"352"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Macedonia", "iso3"=>"MKD", "iso"=>"MK", "iso_name"=>"MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", "numcode"=>"807"}, :without_protection => true)
-Spree::Country.create!({"name"=>"New Zealand", "iso3"=>"NZL", "iso"=>"NZ", "iso_name"=>"NEW ZEALAND", "numcode"=>"554"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Saint Kitts and Nevis", "iso3"=>"KNA", "iso"=>"KN", "iso_name"=>"SAINT KITTS AND NEVIS", "numcode"=>"659"}, :without_protection => true)
-Spree::Country.create!({"name"=>"Serbia", "iso3"=>"SRB", "iso"=>"RS", "iso_name" => "SERBIA", "numcode"=>"999"}, :without_protection => true)
+Spree::Country.create!({"name"=>"Chad", "iso3"=>"TCD", "iso"=>"TD", "iso_name"=>"CHAD", "numcode"=>"148"})
+Spree::Country.create!({"name"=>"Faroe Islands", "iso3"=>"FRO", "iso"=>"FO", "iso_name"=>"FAROE ISLANDS", "numcode"=>"234"})
+Spree::Country.create!({"name"=>"India", "iso3"=>"IND", "iso"=>"IN", "iso_name"=>"INDIA", "numcode"=>"356"})
+Spree::Country.create!({"name"=>"Nicaragua", "iso3"=>"NIC", "iso"=>"NI", "iso_name"=>"NICARAGUA", "numcode"=>"558"})
+Spree::Country.create!({"name"=>"Saint Lucia", "iso3"=>"LCA", "iso"=>"LC", "iso_name"=>"SAINT LUCIA", "numcode"=>"662"})
+Spree::Country.create!({"name"=>"Fiji", "iso3"=>"FJI", "iso"=>"FJ", "iso_name"=>"FIJI", "numcode"=>"242"})
+Spree::Country.create!({"name"=>"Indonesia", "iso3"=>"IDN", "iso"=>"ID", "iso_name"=>"INDONESIA", "numcode"=>"360"})
+Spree::Country.create!({"name"=>"Niger", "iso3"=>"NER", "iso"=>"NE", "iso_name"=>"NIGER", "numcode"=>"562"})
+Spree::Country.create!({"name"=>"Saint Pierre and Miquelon", "iso3"=>"SPM", "iso"=>"PM", "iso_name"=>"SAINT PIERRE AND MIQUELON", "numcode"=>"666"})
+Spree::Country.create!({"name"=>"Finland", "iso3"=>"FIN", "iso"=>"FI", "iso_name"=>"FINLAND", "numcode"=>"246"})
+Spree::Country.create!({"name"=>"Nigeria", "iso3"=>"NGA", "iso"=>"NG", "iso_name"=>"NIGERIA", "numcode"=>"566"})
+Spree::Country.create!({"name"=>"Saint Vincent and the Grenadines", "iso3"=>"VCT", "iso"=>"VC", "iso_name"=>"SAINT VINCENT AND THE GRENADINES", "numcode"=>"670"})
+Spree::Country.create!({"name"=>"France", "iso3"=>"FRA", "iso"=>"FR", "iso_name"=>"FRANCE", "numcode"=>"250"})
+Spree::Country.create!({"name"=>"Iran, Islamic Republic of", "iso3"=>"IRN", "iso"=>"IR", "iso_name"=>"IRAN, ISLAMIC REPUBLIC OF", "numcode"=>"364"})
+Spree::Country.create!({"name"=>"Niue", "iso3"=>"NIU", "iso"=>"NU", "iso_name"=>"NIUE", "numcode"=>"570"})
+Spree::Country.create!({"name"=>"Samoa", "iso3"=>"WSM", "iso"=>"WS", "iso_name"=>"SAMOA", "numcode"=>"882"})
+Spree::Country.create!({"name"=>"French Guiana", "iso3"=>"GUF", "iso"=>"GF", "iso_name"=>"FRENCH GUIANA", "numcode"=>"254"})
+Spree::Country.create!({"name"=>"Iraq", "iso3"=>"IRQ", "iso"=>"IQ", "iso_name"=>"IRAQ", "numcode"=>"368"})
+Spree::Country.create!({"name"=>"San Marino", "iso3"=>"SMR", "iso"=>"SM", "iso_name"=>"SAN MARINO", "numcode"=>"674"})
+Spree::Country.create!({"name"=>"Ireland", "iso3"=>"IRL", "iso"=>"IE", "iso_name"=>"IRELAND", "numcode"=>"372"})
+Spree::Country.create!({"name"=>"Sao Tome and Principe", "iso3"=>"STP", "iso"=>"ST", "iso_name"=>"SAO TOME AND PRINCIPE", "numcode"=>"678"})
+Spree::Country.create!({"name"=>"Israel", "iso3"=>"ISR", "iso"=>"IL", "iso_name"=>"ISRAEL", "numcode"=>"376"})
+Spree::Country.create!({"name"=>"Saudi Arabia", "iso3"=>"SAU", "iso"=>"SA", "iso_name"=>"SAUDI ARABIA", "numcode"=>"682"})
+Spree::Country.create!({"name"=>"Italy", "iso3"=>"ITA", "iso"=>"IT", "iso_name"=>"ITALY", "numcode"=>"380"})
+Spree::Country.create!({"name"=>"Senegal", "iso3"=>"SEN", "iso"=>"SN", "iso_name"=>"SENEGAL", "numcode"=>"686"})
+Spree::Country.create!({"name"=>"Jamaica", "iso3"=>"JAM", "iso"=>"JM", "iso_name"=>"JAMAICA", "numcode"=>"388"})
+Spree::Country.create!({"name"=>"Japan", "iso3"=>"JPN", "iso"=>"JP", "iso_name"=>"JAPAN", "numcode"=>"392"})
+Spree::Country.create!({"name"=>"Jordan", "iso3"=>"JOR", "iso"=>"JO", "iso_name"=>"JORDAN", "numcode"=>"400"})
+Spree::Country.create!({"name"=>"Belgium", "iso3"=>"BEL", "iso"=>"BE", "iso_name"=>"BELGIUM", "numcode"=>"56"})
+Spree::Country.create!({"name"=>"Belize", "iso3"=>"BLZ", "iso"=>"BZ", "iso_name"=>"BELIZE", "numcode"=>"84"})
+Spree::Country.create!({"name"=>"Kazakhstan", "iso3"=>"KAZ", "iso"=>"KZ", "iso_name"=>"KAZAKHSTAN", "numcode"=>"398"})
+Spree::Country.create!({"name"=>"Uganda", "iso3"=>"UGA", "iso"=>"UG", "iso_name"=>"UGANDA", "numcode"=>"800"})
+Spree::Country.create!({"name"=>"Benin", "iso3"=>"BEN", "iso"=>"BJ", "iso_name"=>"BENIN", "numcode"=>"204"})
+Spree::Country.create!({"name"=>"Kenya", "iso3"=>"KEN", "iso"=>"KE", "iso_name"=>"KENYA", "numcode"=>"404"})
+Spree::Country.create!({"name"=>"Ukraine", "iso3"=>"UKR", "iso"=>"UA", "iso_name"=>"UKRAINE", "numcode"=>"804"})
+Spree::Country.create!({"name"=>"Bermuda", "iso3"=>"BMU", "iso"=>"BM", "iso_name"=>"BERMUDA", "numcode"=>"60"})
+Spree::Country.create!({"name"=>"Kiribati", "iso3"=>"KIR", "iso"=>"KI", "iso_name"=>"KIRIBATI", "numcode"=>"296"})
+Spree::Country.create!({"name"=>"Mexico", "iso3"=>"MEX", "iso"=>"MX", "iso_name"=>"MEXICO", "numcode"=>"484"})
+Spree::Country.create!({"name"=>"United Arab Emirates", "iso3"=>"ARE", "iso"=>"AE", "iso_name"=>"UNITED ARAB EMIRATES", "numcode"=>"784"})
+Spree::Country.create!({"name"=>"Bhutan", "iso3"=>"BTN", "iso"=>"BT", "iso_name"=>"BHUTAN", "numcode"=>"64"})
+Spree::Country.create!({"name"=>"Cuba", "iso3"=>"CUB", "iso"=>"CU", "iso_name"=>"CUBA", "numcode"=>"192"})
+Spree::Country.create!({"name"=>"North Korea", "iso3"=>"PRK", "iso"=>"KP", "iso_name"=>"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", "numcode"=>"408"})
+Spree::Country.create!({"name"=>"Micronesia, Federated States of", "iso3"=>"FSM", "iso"=>"FM", "iso_name"=>"MICRONESIA, FEDERATED STATES OF", "numcode"=>"583"})
+Spree::Country.create!({"name"=>"United Kingdom", "iso3"=>"GBR", "iso"=>"GB", "iso_name"=>"UNITED KINGDOM", "numcode"=>"826"})
+Spree::Country.create!({"name"=>"Bolivia", "iso3"=>"BOL", "iso"=>"BO", "iso_name"=>"BOLIVIA", "numcode"=>"68"})
+Spree::Country.create!({"name"=>"Cyprus", "iso3"=>"CYP", "iso"=>"CY", "iso_name"=>"CYPRUS", "numcode"=>"196"})
+Spree::Country.create!({"name"=>"South Korea", "iso3"=>"KOR", "iso"=>"KR", "iso_name"=>"KOREA, REPUBLIC OF", "numcode"=>"410"})
+Spree::Country.create!({"name"=>"Moldova, Republic of", "iso3"=>"MDA", "iso"=>"MD", "iso_name"=>"MOLDOVA, REPUBLIC OF", "numcode"=>"498"})
+Spree::Country.create!({"name"=>"United States", "iso3"=>"USA", "iso"=>"US", "iso_name"=>"UNITED STATES", "numcode"=>"840"})
+Spree::Country.create!({"name"=>"Bosnia and Herzegovina", "iso3"=>"BIH", "iso"=>"BA", "iso_name"=>"BOSNIA AND HERZEGOVINA", "numcode"=>"70"})
+Spree::Country.create!({"name"=>"Czech Republic", "iso3"=>"CZE", "iso"=>"CZ", "iso_name"=>"CZECH REPUBLIC", "numcode"=>"203"})
+Spree::Country.create!({"name"=>"Kuwait", "iso3"=>"KWT", "iso"=>"KW", "iso_name"=>"KUWAIT", "numcode"=>"414"})
+Spree::Country.create!({"name"=>"Monaco", "iso3"=>"MCO", "iso"=>"MC", "iso_name"=>"MONACO", "numcode"=>"492"})
+Spree::Country.create!({"name"=>"Uruguay", "iso3"=>"URY", "iso"=>"UY", "iso_name"=>"URUGUAY", "numcode"=>"858"})
+Spree::Country.create!({"name"=>"Botswana", "iso3"=>"BWA", "iso"=>"BW", "iso_name"=>"BOTSWANA", "numcode"=>"72"})
+Spree::Country.create!({"name"=>"Denmark", "iso3"=>"DNK", "iso"=>"DK", "iso_name"=>"DENMARK", "numcode"=>"208"})
+Spree::Country.create!({"name"=>"Guadeloupe", "iso3"=>"GLP", "iso"=>"GP", "iso_name"=>"GUADELOUPE", "numcode"=>"312"})
+Spree::Country.create!({"name"=>"Kyrgyzstan", "iso3"=>"KGZ", "iso"=>"KG", "iso_name"=>"KYRGYZSTAN", "numcode"=>"417"})
+Spree::Country.create!({"name"=>"Mongolia", "iso3"=>"MNG", "iso"=>"MN", "iso_name"=>"MONGOLIA", "numcode"=>"496"})
+Spree::Country.create!({"name"=>"Philippines", "iso3"=>"PHL", "iso"=>"PH", "iso_name"=>"PHILIPPINES", "numcode"=>"608"})
+Spree::Country.create!({"name"=>"Brazil", "iso3"=>"BRA", "iso"=>"BR", "iso_name"=>"BRAZIL", "numcode"=>"76"})
+Spree::Country.create!({"name"=>"Djibouti", "iso3"=>"DJI", "iso"=>"DJ", "iso_name"=>"DJIBOUTI", "numcode"=>"262"})
+Spree::Country.create!({"name"=>"Guam", "iso3"=>"GUM", "iso"=>"GU", "iso_name"=>"GUAM", "numcode"=>"316"})
+Spree::Country.create!({"name"=>"Lao People's Democratic Republic", "iso3"=>"LAO", "iso"=>"LA", "iso_name"=>"LAO PEOPLE'S DEMOCRATIC REPUBLIC", "numcode"=>"418"})
+Spree::Country.create!({"name"=>"Montserrat", "iso3"=>"MSR", "iso"=>"MS", "iso_name"=>"MONTSERRAT", "numcode"=>"500"})
+Spree::Country.create!({"name"=>"Pitcairn", "iso3"=>"PCN", "iso"=>"PN", "iso_name"=>"PITCAIRN", "numcode"=>"612"})
+Spree::Country.create!({"name"=>"Uzbekistan", "iso3"=>"UZB", "iso"=>"UZ", "iso_name"=>"UZBEKISTAN", "numcode"=>"860"})
+Spree::Country.create!({"name"=>"Brunei Darussalam", "iso3"=>"BRN", "iso"=>"BN", "iso_name"=>"BRUNEI DARUSSALAM", "numcode"=>"96"})
+Spree::Country.create!({"name"=>"Dominica", "iso3"=>"DMA", "iso"=>"DM", "iso_name"=>"DOMINICA", "numcode"=>"212"})
+Spree::Country.create!({"name"=>"Guatemala", "iso3"=>"GTM", "iso"=>"GT", "iso_name"=>"GUATEMALA", "numcode"=>"320"})
+Spree::Country.create!({"name"=>"Morocco", "iso3"=>"MAR", "iso"=>"MA", "iso_name"=>"MOROCCO", "numcode"=>"504"})
+Spree::Country.create!({"name"=>"Poland", "iso3"=>"POL", "iso"=>"PL", "iso_name"=>"POLAND", "numcode"=>"616"})
+Spree::Country.create!({"name"=>"Vanuatu", "iso3"=>"VUT", "iso"=>"VU", "iso_name"=>"VANUATU", "numcode"=>"548"})
+Spree::Country.create!({"name"=>"Dominican Republic", "iso3"=>"DOM", "iso"=>"DO", "iso_name"=>"DOMINICAN REPUBLIC", "numcode"=>"214"})
+Spree::Country.create!({"name"=>"Mozambique", "iso3"=>"MOZ", "iso"=>"MZ", "iso_name"=>"MOZAMBIQUE", "numcode"=>"508"})
+Spree::Country.create!({"name"=>"Portugal", "iso3"=>"PRT", "iso"=>"PT", "iso_name"=>"PORTUGAL", "numcode"=>"620"})
+Spree::Country.create!({"name"=>"Sudan", "iso3"=>"SDN", "iso"=>"SD", "iso_name"=>"SUDAN", "numcode"=>"736"})
+Spree::Country.create!({"name"=>"Venezuela", "iso3"=>"VEN", "iso"=>"VE", "iso_name"=>"VENEZUELA", "numcode"=>"862"})
+Spree::Country.create!({"name"=>"Ecuador", "iso3"=>"ECU", "iso"=>"EC", "iso_name"=>"ECUADOR", "numcode"=>"218"})
+Spree::Country.create!({"name"=>"Guinea", "iso3"=>"GIN", "iso"=>"GN", "iso_name"=>"GUINEA", "numcode"=>"324"})
+Spree::Country.create!({"name"=>"Myanmar", "iso3"=>"MMR", "iso"=>"MM", "iso_name"=>"MYANMAR", "numcode"=>"104"})
+Spree::Country.create!({"name"=>"Puerto Rico", "iso3"=>"PRI", "iso"=>"PR", "iso_name"=>"PUERTO RICO", "numcode"=>"630"})
+Spree::Country.create!({"name"=>"Suriname", "iso3"=>"SUR", "iso"=>"SR", "iso_name"=>"SURINAME", "numcode"=>"740"})
+Spree::Country.create!({"name"=>"Viet Nam", "iso3"=>"VNM", "iso"=>"VN", "iso_name"=>"VIET NAM", "numcode"=>"704"})
+Spree::Country.create!({"name"=>"Egypt", "iso3"=>"EGY", "iso"=>"EG", "iso_name"=>"EGYPT", "numcode"=>"818"})
+Spree::Country.create!({"name"=>"Guinea-Bissau", "iso3"=>"GNB", "iso"=>"GW", "iso_name"=>"GUINEA-BISSAU", "numcode"=>"624"})
+Spree::Country.create!({"name"=>"Namibia", "iso3"=>"NAM", "iso"=>"NA", "iso_name"=>"NAMIBIA", "numcode"=>"516"})
+Spree::Country.create!({"name"=>"Qatar", "iso3"=>"QAT", "iso"=>"QA", "iso_name"=>"QATAR", "numcode"=>"634"})
+Spree::Country.create!({"name"=>"Svalbard and Jan Mayen", "iso3"=>"SJM", "iso"=>"SJ", "iso_name"=>"SVALBARD AND JAN MAYEN", "numcode"=>"744"})
+Spree::Country.create!({"name"=>"El Salvador", "iso3"=>"SLV", "iso"=>"SV", "iso_name"=>"EL SALVADOR", "numcode"=>"222"})
+Spree::Country.create!({"name"=>"Guyana", "iso3"=>"GUY", "iso"=>"GY", "iso_name"=>"GUYANA", "numcode"=>"328"})
+Spree::Country.create!({"name"=>"Reunion", "iso3"=>"REU", "iso"=>"RE", "iso_name"=>"REUNION", "numcode"=>"638"})
+Spree::Country.create!({"name"=>"Haiti", "iso3"=>"HTI", "iso"=>"HT", "iso_name"=>"HAITI", "numcode"=>"332"})
+Spree::Country.create!({"name"=>"Romania", "iso3"=>"ROM", "iso"=>"RO", "iso_name"=>"ROMANIA", "numcode"=>"642"})
+Spree::Country.create!({"name"=>"Swaziland", "iso3"=>"SWZ", "iso"=>"SZ", "iso_name"=>"SWAZILAND", "numcode"=>"748"})
+Spree::Country.create!({"name"=>"Holy See (Vatican City State)", "iso3"=>"VAT", "iso"=>"VA", "iso_name"=>"HOLY SEE (VATICAN CITY STATE)", "numcode"=>"336"})
+Spree::Country.create!({"name"=>"Russian Federation", "iso3"=>"RUS", "iso"=>"RU", "iso_name"=>"RUSSIAN FEDERATION", "numcode"=>"643"})
+Spree::Country.create!({"name"=>"Sweden", "iso3"=>"SWE", "iso"=>"SE", "iso_name"=>"SWEDEN", "numcode"=>"752"})
+Spree::Country.create!({"name"=>"Honduras", "iso3"=>"HND", "iso"=>"HN", "iso_name"=>"HONDURAS", "numcode"=>"340"})
+Spree::Country.create!({"name"=>"Rwanda", "iso3"=>"RWA", "iso"=>"RW", "iso_name"=>"RWANDA", "numcode"=>"646"})
+Spree::Country.create!({"name"=>"Switzerland", "iso3"=>"CHE", "iso"=>"CH", "iso_name"=>"SWITZERLAND", "numcode"=>"756"})
+Spree::Country.create!({"name"=>"Hong Kong", "iso3"=>"HKG", "iso"=>"HK", "iso_name"=>"HONG KONG", "numcode"=>"344"})
+Spree::Country.create!({"name"=>"Syrian Arab Republic", "iso3"=>"SYR", "iso"=>"SY", "iso_name"=>"SYRIAN ARAB REPUBLIC", "numcode"=>"760"})
+Spree::Country.create!({"name"=>"Taiwan", "iso3"=>"TWN", "iso"=>"TW", "iso_name"=>"TAIWAN, PROVINCE OF CHINA", "numcode"=>"158"})
+Spree::Country.create!({"name"=>"Tajikistan", "iso3"=>"TJK", "iso"=>"TJ", "iso_name"=>"TAJIKISTAN", "numcode"=>"762"})
+Spree::Country.create!({"name"=>"Tanzania, United Republic of", "iso3"=>"TZA", "iso"=>"TZ", "iso_name"=>"TANZANIA, UNITED REPUBLIC OF", "numcode"=>"834"})
+Spree::Country.create!({"name"=>"Armenia", "iso3"=>"ARM", "iso"=>"AM", "iso_name"=>"ARMENIA", "numcode"=>"51"})
+Spree::Country.create!({"name"=>"Aruba", "iso3"=>"ABW", "iso"=>"AW", "iso_name"=>"ARUBA", "numcode"=>"533"})
+Spree::Country.create!({"name"=>"Australia", "iso3"=>"AUS", "iso"=>"AU", "iso_name"=>"AUSTRALIA", "numcode"=>"36"})
+Spree::Country.create!({"name"=>"Thailand", "iso3"=>"THA", "iso"=>"TH", "iso_name"=>"THAILAND", "numcode"=>"764"})
+Spree::Country.create!({"name"=>"Austria", "iso3"=>"AUT", "iso"=>"AT", "iso_name"=>"AUSTRIA", "numcode"=>"40"})
+Spree::Country.create!({"name"=>"Madagascar", "iso3"=>"MDG", "iso"=>"MG", "iso_name"=>"MADAGASCAR", "numcode"=>"450"})
+Spree::Country.create!({"name"=>"Togo", "iso3"=>"TGO", "iso"=>"TG", "iso_name"=>"TOGO", "numcode"=>"768"})
+Spree::Country.create!({"name"=>"Azerbaijan", "iso3"=>"AZE", "iso"=>"AZ", "iso_name"=>"AZERBAIJAN", "numcode"=>"31"})
+Spree::Country.create!({"name"=>"Chile", "iso3"=>"CHL", "iso"=>"CL", "iso_name"=>"CHILE", "numcode"=>"152"})
+Spree::Country.create!({"name"=>"Malawi", "iso3"=>"MWI", "iso"=>"MW", "iso_name"=>"MALAWI", "numcode"=>"454"})
+Spree::Country.create!({"name"=>"Tokelau", "iso3"=>"TKL", "iso"=>"TK", "iso_name"=>"TOKELAU", "numcode"=>"772"})
+Spree::Country.create!({"name"=>"Bahamas", "iso3"=>"BHS", "iso"=>"BS", "iso_name"=>"BAHAMAS", "numcode"=>"44"})
+Spree::Country.create!({"name"=>"China", "iso3"=>"CHN", "iso"=>"CN", "iso_name"=>"CHINA", "numcode"=>"156"})
+Spree::Country.create!({"name"=>"Malaysia", "iso3"=>"MYS", "iso"=>"MY", "iso_name"=>"MALAYSIA", "numcode"=>"458"})
+Spree::Country.create!({"name"=>"Tonga", "iso3"=>"TON", "iso"=>"TO", "iso_name"=>"TONGA", "numcode"=>"776"})
+Spree::Country.create!({"name"=>"Bahrain", "iso3"=>"BHR", "iso"=>"BH", "iso_name"=>"BAHRAIN", "numcode"=>"48"})
+Spree::Country.create!({"name"=>"Colombia", "iso3"=>"COL", "iso"=>"CO", "iso_name"=>"COLOMBIA", "numcode"=>"170"})
+Spree::Country.create!({"name"=>"Maldives", "iso3"=>"MDV", "iso"=>"MV", "iso_name"=>"MALDIVES", "numcode"=>"462"})
+Spree::Country.create!({"name"=>"Trinidad and Tobago", "iso3"=>"TTO", "iso"=>"TT", "iso_name"=>"TRINIDAD AND TOBAGO", "numcode"=>"780"})
+Spree::Country.create!({"name"=>"Bangladesh", "iso3"=>"BGD", "iso"=>"BD", "iso_name"=>"BANGLADESH", "numcode"=>"50"})
+Spree::Country.create!({"name"=>"Comoros", "iso3"=>"COM", "iso"=>"KM", "iso_name"=>"COMOROS", "numcode"=>"174"})
+Spree::Country.create!({"name"=>"French Polynesia", "iso3"=>"PYF", "iso"=>"PF", "iso_name"=>"FRENCH POLYNESIA", "numcode"=>"258"})
+Spree::Country.create!({"name"=>"Mali", "iso3"=>"MLI", "iso"=>"ML", "iso_name"=>"MALI", "numcode"=>"466"})
+Spree::Country.create!({"name"=>"Norfolk Island", "iso3"=>"NFK", "iso"=>"NF", "iso_name"=>"NORFOLK ISLAND", "numcode"=>"574"})
+Spree::Country.create!({"name"=>"Tunisia", "iso3"=>"TUN", "iso"=>"TN", "iso_name"=>"TUNISIA", "numcode"=>"788"})
+Spree::Country.create!({"name"=>"Barbados", "iso3"=>"BRB", "iso"=>"BB", "iso_name"=>"BARBADOS", "numcode"=>"52"})
+Spree::Country.create!({"name"=>"Congo", "iso3"=>"COG", "iso"=>"CG", "iso_name"=>"CONGO", "numcode"=>"178"})
+Spree::Country.create!({"name"=>"Gabon", "iso3"=>"GAB", "iso"=>"GA", "iso_name"=>"GABON", "numcode"=>"266"})
+Spree::Country.create!({"name"=>"Malta", "iso3"=>"MLT", "iso"=>"MT", "iso_name"=>"MALTA", "numcode"=>"470"})
+Spree::Country.create!({"name"=>"Northern Mariana Islands", "iso3"=>"MNP", "iso"=>"MP", "iso_name"=>"NORTHERN MARIANA ISLANDS", "numcode"=>"580"})
+Spree::Country.create!({"name"=>"Turkey", "iso3"=>"TUR", "iso"=>"TR", "iso_name"=>"TURKEY", "numcode"=>"792"})
+Spree::Country.create!({"name"=>"Congo, the Democratic Republic of the", "iso3"=>"COD", "iso"=>"CD", "iso_name"=>"CONGO, THE DEMOCRATIC REPUBLIC OF THE", "numcode"=>"180"})
+Spree::Country.create!({"name"=>"Marshall Islands", "iso3"=>"MHL", "iso"=>"MH", "iso_name"=>"MARSHALL ISLANDS", "numcode"=>"584"})
+Spree::Country.create!({"name"=>"Norway", "iso3"=>"NOR", "iso"=>"NO", "iso_name"=>"NORWAY", "numcode"=>"578"})
+Spree::Country.create!({"name"=>"Turkmenistan", "iso3"=>"TKM", "iso"=>"TM", "iso_name"=>"TURKMENISTAN", "numcode"=>"795"})
+Spree::Country.create!({"name"=>"Belarus", "iso3"=>"BLR", "iso"=>"BY", "iso_name"=>"BELARUS", "numcode"=>"112"})
+Spree::Country.create!({"name"=>"Cook Islands", "iso3"=>"COK", "iso"=>"CK", "iso_name"=>"COOK ISLANDS", "numcode"=>"184"})
+Spree::Country.create!({"name"=>"Gambia", "iso3"=>"GMB", "iso"=>"GM", "iso_name"=>"GAMBIA", "numcode"=>"270"})
+Spree::Country.create!({"name"=>"Martinique", "iso3"=>"MTQ", "iso"=>"MQ", "iso_name"=>"MARTINIQUE", "numcode"=>"474"})
+Spree::Country.create!({"name"=>"Oman", "iso3"=>"OMN", "iso"=>"OM", "iso_name"=>"OMAN", "numcode"=>"512"})
+Spree::Country.create!({"name"=>"Seychelles", "iso3"=>"SYC", "iso"=>"SC", "iso_name"=>"SEYCHELLES", "numcode"=>"690"})
+Spree::Country.create!({"name"=>"Turks and Caicos Islands", "iso3"=>"TCA", "iso"=>"TC", "iso_name"=>"TURKS AND CAICOS ISLANDS", "numcode"=>"796"})
+Spree::Country.create!({"name"=>"Georgia", "iso3"=>"GEO", "iso"=>"GE", "iso_name"=>"GEORGIA", "numcode"=>"268"})
+Spree::Country.create!({"name"=>"Mauritania", "iso3"=>"MRT", "iso"=>"MR", "iso_name"=>"MAURITANIA", "numcode"=>"478"})
+Spree::Country.create!({"name"=>"Pakistan", "iso3"=>"PAK", "iso"=>"PK", "iso_name"=>"PAKISTAN", "numcode"=>"586"})
+Spree::Country.create!({"name"=>"Sierra Leone", "iso3"=>"SLE", "iso"=>"SL", "iso_name"=>"SIERRA LEONE", "numcode"=>"694"})
+Spree::Country.create!({"name"=>"Tuvalu", "iso3"=>"TUV", "iso"=>"TV", "iso_name"=>"TUVALU", "numcode"=>"798"})
+Spree::Country.create!({"name"=>"Costa Rica", "iso3"=>"CRI", "iso"=>"CR", "iso_name"=>"COSTA RICA", "numcode"=>"188"})
+Spree::Country.create!({"name"=>"Germany", "iso3"=>"DEU", "iso"=>"DE", "iso_name"=>"GERMANY", "numcode"=>"276"})
+Spree::Country.create!({"name"=>"Mauritius", "iso3"=>"MUS", "iso"=>"MU", "iso_name"=>"MAURITIUS", "numcode"=>"480"})
+Spree::Country.create!({"name"=>"Palau", "iso3"=>"PLW", "iso"=>"PW", "iso_name"=>"PALAU", "numcode"=>"585"})
+Spree::Country.create!({"name"=>"Cote D'Ivoire", "iso3"=>"CIV", "iso"=>"CI", "iso_name"=>"COTE D'IVOIRE", "numcode"=>"384"})
+Spree::Country.create!({"name"=>"Panama", "iso3"=>"PAN", "iso"=>"PA", "iso_name"=>"PANAMA", "numcode"=>"591"})
+Spree::Country.create!({"name"=>"Singapore", "iso3"=>"SGP", "iso"=>"SG", "iso_name"=>"SINGAPORE", "numcode"=>"702"})
+Spree::Country.create!({"name"=>"Croatia", "iso3"=>"HRV", "iso"=>"HR", "iso_name"=>"CROATIA", "numcode"=>"191"})
+Spree::Country.create!({"name"=>"Ghana", "iso3"=>"GHA", "iso"=>"GH", "iso_name"=>"GHANA", "numcode"=>"288"})
+Spree::Country.create!({"name"=>"Papua New Guinea", "iso3"=>"PNG", "iso"=>"PG", "iso_name"=>"PAPUA NEW GUINEA", "numcode"=>"598"})
+Spree::Country.create!({"name"=>"Slovakia", "iso3"=>"SVK", "iso"=>"SK", "iso_name"=>"SLOVAKIA", "numcode"=>"703"})
+Spree::Country.create!({"name"=>"Gibraltar", "iso3"=>"GIB", "iso"=>"GI", "iso_name"=>"GIBRALTAR", "numcode"=>"292"})
+Spree::Country.create!({"name"=>"Paraguay", "iso3"=>"PRY", "iso"=>"PY", "iso_name"=>"PARAGUAY", "numcode"=>"600"})
+Spree::Country.create!({"name"=>"Slovenia", "iso3"=>"SVN", "iso"=>"SI", "iso_name"=>"SLOVENIA", "numcode"=>"705"})
+Spree::Country.create!({"name"=>"Greece", "iso3"=>"GRC", "iso"=>"GR", "iso_name"=>"GREECE", "numcode"=>"300"})
+Spree::Country.create!({"name"=>"Peru", "iso3"=>"PER", "iso"=>"PE", "iso_name"=>"PERU", "numcode"=>"604"})
+Spree::Country.create!({"name"=>"Solomon Islands", "iso3"=>"SLB", "iso"=>"SB", "iso_name"=>"SOLOMON ISLANDS", "numcode"=>"90"})
+Spree::Country.create!({"name"=>"Greenland", "iso3"=>"GRL", "iso"=>"GL", "iso_name"=>"GREENLAND", "numcode"=>"304"})
+Spree::Country.create!({"name"=>"Somalia", "iso3"=>"SOM", "iso"=>"SO", "iso_name"=>"SOMALIA", "numcode"=>"706"})
+Spree::Country.create!({"name"=>"Grenada", "iso3"=>"GRD", "iso"=>"GD", "iso_name"=>"GRENADA", "numcode"=>"308"})
+Spree::Country.create!({"name"=>"South Africa", "iso3"=>"ZAF", "iso"=>"ZA", "iso_name"=>"SOUTH AFRICA", "numcode"=>"710"})
+Spree::Country.create!({"name"=>"Spain", "iso3"=>"ESP", "iso"=>"ES", "iso_name"=>"SPAIN", "numcode"=>"724"})
+Spree::Country.create!({"name"=>"Sri Lanka", "iso3"=>"LKA", "iso"=>"LK", "iso_name"=>"SRI LANKA", "numcode"=>"144"})
+Spree::Country.create!({"name"=>"Afghanistan", "iso3"=>"AFG", "iso"=>"AF", "iso_name"=>"AFGHANISTAN", "numcode"=>"4"})
+Spree::Country.create!({"name"=>"Albania", "iso3"=>"ALB", "iso"=>"AL", "iso_name"=>"ALBANIA", "numcode"=>"8"})
+Spree::Country.create!({"name"=>"Algeria", "iso3"=>"DZA", "iso"=>"DZ", "iso_name"=>"ALGERIA", "numcode"=>"12"})
+Spree::Country.create!({"name"=>"Latvia", "iso3"=>"LVA", "iso"=>"LV", "iso_name"=>"LATVIA", "numcode"=>"428"})
+Spree::Country.create!({"name"=>"American Samoa", "iso3"=>"ASM", "iso"=>"AS", "iso_name"=>"AMERICAN SAMOA", "numcode"=>"16"})
+Spree::Country.create!({"name"=>"Bulgaria", "iso3"=>"BGR", "iso"=>"BG", "iso_name"=>"BULGARIA", "numcode"=>"100"})
+Spree::Country.create!({"name"=>"Lebanon", "iso3"=>"LBN", "iso"=>"LB", "iso_name"=>"LEBANON", "numcode"=>"422"})
+Spree::Country.create!({"name"=>"Andorra", "iso3"=>"AND", "iso"=>"AD", "iso_name"=>"ANDORRA", "numcode"=>"20"})
+Spree::Country.create!({"name"=>"Burkina Faso", "iso3"=>"BFA", "iso"=>"BF", "iso_name"=>"BURKINA FASO", "numcode"=>"854"})
+Spree::Country.create!({"name"=>"Lesotho", "iso3"=>"LSO", "iso"=>"LS", "iso_name"=>"LESOTHO", "numcode"=>"426"})
+Spree::Country.create!({"name"=>"Angola", "iso3"=>"AGO", "iso"=>"AO", "iso_name"=>"ANGOLA", "numcode"=>"24"})
+Spree::Country.create!({"name"=>"Burundi", "iso3"=>"BDI", "iso"=>"BI", "iso_name"=>"BURUNDI", "numcode"=>"108"})
+Spree::Country.create!({"name"=>"Liberia", "iso3"=>"LBR", "iso"=>"LR", "iso_name"=>"LIBERIA", "numcode"=>"430"})
+Spree::Country.create!({"name"=>"Virgin Islands, British", "iso3"=>"VGB", "iso"=>"VG", "iso_name"=>"VIRGIN ISLANDS, BRITISH", "numcode"=>"92"})
+Spree::Country.create!({"name"=>"Anguilla", "iso3"=>"AIA", "iso"=>"AI", "iso_name"=>"ANGUILLA", "numcode"=>"660"})
+Spree::Country.create!({"name"=>"Cambodia", "iso3"=>"KHM", "iso"=>"KH", "iso_name"=>"CAMBODIA", "numcode"=>"116"})
+Spree::Country.create!({"name"=>"Equatorial Guinea", "iso3"=>"GNQ", "iso"=>"GQ", "iso_name"=>"EQUATORIAL GUINEA", "numcode"=>"226"})
+Spree::Country.create!({"name"=>"Libyan Arab Jamahiriya", "iso3"=>"LBY", "iso"=>"LY", "iso_name"=>"LIBYAN ARAB JAMAHIRIYA", "numcode"=>"434"})
+Spree::Country.create!({"name"=>"Nauru", "iso3"=>"NRU", "iso"=>"NR", "iso_name"=>"NAURU", "numcode"=>"520"})
+Spree::Country.create!({"name"=>"Virgin Islands, U.S.", "iso3"=>"VIR", "iso"=>"VI", "iso_name"=>"VIRGIN ISLANDS, U.S.", "numcode"=>"850"})
+Spree::Country.create!({"name"=>"Antigua and Barbuda", "iso3"=>"ATG", "iso"=>"AG", "iso_name"=>"ANTIGUA AND BARBUDA", "numcode"=>"28"})
+Spree::Country.create!({"name"=>"Cameroon", "iso3"=>"CMR", "iso"=>"CM", "iso_name"=>"CAMEROON", "numcode"=>"120"})
+Spree::Country.create!({"name"=>"Liechtenstein", "iso3"=>"LIE", "iso"=>"LI", "iso_name"=>"LIECHTENSTEIN", "numcode"=>"438"})
+Spree::Country.create!({"name"=>"Nepal", "iso3"=>"NPL", "iso"=>"NP", "iso_name"=>"NEPAL", "numcode"=>"524"})
+Spree::Country.create!({"name"=>"Wallis and Futuna", "iso3"=>"WLF", "iso"=>"WF", "iso_name"=>"WALLIS AND FUTUNA", "numcode"=>"876"})
+Spree::Country.create!({"name"=>"Western Sahara", "iso3"=>"ESH", "iso"=>"EH", "iso_name"=>"WESTERN SAHARA", "numcode"=>"732"})
+Spree::Country.create!({"name"=>"Argentina", "iso3"=>"ARG", "iso"=>"AR", "iso_name"=>"ARGENTINA", "numcode"=>"32"})
+Spree::Country.create!({"name"=>"Canada", "iso3"=>"CAN", "iso"=>"CA", "iso_name"=>"CANADA", "numcode"=>"124"})
+Spree::Country.create!({"name"=>"Eritrea", "iso3"=>"ERI", "iso"=>"ER", "iso_name"=>"ERITREA", "numcode"=>"232"})
+Spree::Country.create!({"name"=>"Lithuania", "iso3"=>"LTU", "iso"=>"LT", "iso_name"=>"LITHUANIA", "numcode"=>"440"})
+Spree::Country.create!({"name"=>"Netherlands", "iso3"=>"NLD", "iso"=>"NL", "iso_name"=>"NETHERLANDS", "numcode"=>"528"})
+Spree::Country.create!({"name"=>"Yemen", "iso3"=>"YEM", "iso"=>"YE", "iso_name"=>"YEMEN", "numcode"=>"887"})
+Spree::Country.create!({"name"=>"Cape Verde", "iso3"=>"CPV", "iso"=>"CV", "iso_name"=>"CAPE VERDE", "numcode"=>"132"})
+Spree::Country.create!({"name"=>"Estonia", "iso3"=>"EST", "iso"=>"EE", "iso_name"=>"ESTONIA", "numcode"=>"233"})
+Spree::Country.create!({"name"=>"Luxembourg", "iso3"=>"LUX", "iso"=>"LU", "iso_name"=>"LUXEMBOURG", "numcode"=>"442"})
+Spree::Country.create!({"name"=>"Netherlands Antilles", "iso3"=>"ANT", "iso"=>"AN", "iso_name"=>"NETHERLANDS ANTILLES", "numcode"=>"530"})
+Spree::Country.create!({"name"=>"Saint Helena", "iso3"=>"SHN", "iso"=>"SH", "iso_name"=>"SAINT HELENA", "numcode"=>"654"})
+Spree::Country.create!({"name"=>"Zambia", "iso3"=>"ZMB", "iso"=>"ZM", "iso_name"=>"ZAMBIA", "numcode"=>"894"})
+Spree::Country.create!({"name"=>"Cayman Islands", "iso3"=>"CYM", "iso"=>"KY", "iso_name"=>"CAYMAN ISLANDS", "numcode"=>"136"})
+Spree::Country.create!({"name"=>"Ethiopia", "iso3"=>"ETH", "iso"=>"ET", "iso_name"=>"ETHIOPIA", "numcode"=>"231"})
+Spree::Country.create!({"name"=>"Hungary", "iso3"=>"HUN", "iso"=>"HU", "iso_name"=>"HUNGARY", "numcode"=>"348"})
+Spree::Country.create!({"name"=>"Macao", "iso3"=>"MAC", "iso"=>"MO", "iso_name"=>"MACAO", "numcode"=>"446"})
+Spree::Country.create!({"name"=>"New Caledonia", "iso3"=>"NCL", "iso"=>"NC", "iso_name"=>"NEW CALEDONIA", "numcode"=>"540"})
+Spree::Country.create!({"name"=>"Zimbabwe", "iso3"=>"ZWE", "iso"=>"ZW", "iso_name"=>"ZIMBABWE", "numcode"=>"716"})
+Spree::Country.create!({"name"=>"Central African Republic", "iso3"=>"CAF", "iso"=>"CF", "iso_name"=>"CENTRAL AFRICAN REPUBLIC", "numcode"=>"140"})
+Spree::Country.create!({"name"=>"Falkland Islands (Malvinas)", "iso3"=>"FLK", "iso"=>"FK", "iso_name"=>"FALKLAND ISLANDS (MALVINAS)", "numcode"=>"238"})
+Spree::Country.create!({"name"=>"Iceland", "iso3"=>"ISL", "iso"=>"IS", "iso_name"=>"ICELAND", "numcode"=>"352"})
+Spree::Country.create!({"name"=>"Macedonia", "iso3"=>"MKD", "iso"=>"MK", "iso_name"=>"MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", "numcode"=>"807"})
+Spree::Country.create!({"name"=>"New Zealand", "iso3"=>"NZL", "iso"=>"NZ", "iso_name"=>"NEW ZEALAND", "numcode"=>"554"})
+Spree::Country.create!({"name"=>"Saint Kitts and Nevis", "iso3"=>"KNA", "iso"=>"KN", "iso_name"=>"SAINT KITTS AND NEVIS", "numcode"=>"659"})
+Spree::Country.create!({"name"=>"Serbia", "iso3"=>"SRB", "iso"=>"RS", "iso_name" => "SERBIA", "numcode"=>"999"})
Spree::Config[:default_country_id] = Spree::Country.find_by_name("United States").id
diff --git a/spree_multi_site/db/default/spree/states.rb b/spree_multi_site/db/default/spree/states.rb
index 01c7468b..0a43f780 100644
--- a/spree_multi_site/db/default/spree/states.rb
+++ b/spree_multi_site/db/default/spree/states.rb
@@ -1,57 +1,57 @@
# encoding: utf-8
country = Spree::Country.find_by_name('United States')
-Spree::State.create!({"name"=>"Michigan", "abbr"=>"MI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"South Dakota", "abbr"=>"SD", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Washington", "abbr"=>"WA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Wisconsin", "abbr"=>"WI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Arizona", "abbr"=>"AZ", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Illinois", "abbr"=>"IL", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New Hampshire", "abbr"=>"NH", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"North Carolina", "abbr"=>"NC", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Kansas", "abbr"=>"KS", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Missouri", "abbr"=>"MO", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Arkansas", "abbr"=>"AR", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Nevada", "abbr"=>"NV", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"District of Columbia", "abbr"=>"DC", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Idaho", "abbr"=>"ID", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Nebraska", "abbr"=>"NE", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Pennsylvania", "abbr"=>"PA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Hawaii", "abbr"=>"HI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Utah", "abbr"=>"UT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Vermont", "abbr"=>"VT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Delaware", "abbr"=>"DE", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Rhode Island", "abbr"=>"RI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Oklahoma", "abbr"=>"OK", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Louisiana", "abbr"=>"LA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Montana", "abbr"=>"MT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Tennessee", "abbr"=>"TN", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Maryland", "abbr"=>"MD", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Florida", "abbr"=>"FL", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Virginia", "abbr"=>"VA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Minnesota", "abbr"=>"MN", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New Jersey", "abbr"=>"NJ", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Ohio", "abbr"=>"OH", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"California", "abbr"=>"CA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"North Dakota", "abbr"=>"ND", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Maine", "abbr"=>"ME", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Indiana", "abbr"=>"IN", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Texas", "abbr"=>"TX", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Oregon", "abbr"=>"OR", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Wyoming", "abbr"=>"WY", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Alabama", "abbr"=>"AL", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Iowa", "abbr"=>"IA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Mississippi", "abbr"=>"MS", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Kentucky", "abbr"=>"KY", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New Mexico", "abbr"=>"NM", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Georgia", "abbr"=>"GA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Colorado", "abbr"=>"CO", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Massachusetts", "abbr"=>"MA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Connecticut", "abbr"=>"CT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New York", "abbr"=>"NY", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"South Carolina", "abbr"=>"SC", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Alaska", "abbr"=>"AK", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"West Virginia", "abbr"=>"WV", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"U.S. Armed Forces – Americas", "abbr"=>"AA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"U.S. Armed Forces – Europe", "abbr"=>"AE", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"U.S. Armed Forces – Pacific", "abbr"=>"AP", :country=>country}, :without_protection => true)
+Spree::State.create!({"name"=>"Michigan", "abbr"=>"MI", :country=>country})
+Spree::State.create!({"name"=>"South Dakota", "abbr"=>"SD", :country=>country})
+Spree::State.create!({"name"=>"Washington", "abbr"=>"WA", :country=>country})
+Spree::State.create!({"name"=>"Wisconsin", "abbr"=>"WI", :country=>country})
+Spree::State.create!({"name"=>"Arizona", "abbr"=>"AZ", :country=>country})
+Spree::State.create!({"name"=>"Illinois", "abbr"=>"IL", :country=>country})
+Spree::State.create!({"name"=>"New Hampshire", "abbr"=>"NH", :country=>country})
+Spree::State.create!({"name"=>"North Carolina", "abbr"=>"NC", :country=>country})
+Spree::State.create!({"name"=>"Kansas", "abbr"=>"KS", :country=>country})
+Spree::State.create!({"name"=>"Missouri", "abbr"=>"MO", :country=>country})
+Spree::State.create!({"name"=>"Arkansas", "abbr"=>"AR", :country=>country})
+Spree::State.create!({"name"=>"Nevada", "abbr"=>"NV", :country=>country})
+Spree::State.create!({"name"=>"District of Columbia", "abbr"=>"DC", :country=>country})
+Spree::State.create!({"name"=>"Idaho", "abbr"=>"ID", :country=>country})
+Spree::State.create!({"name"=>"Nebraska", "abbr"=>"NE", :country=>country})
+Spree::State.create!({"name"=>"Pennsylvania", "abbr"=>"PA", :country=>country})
+Spree::State.create!({"name"=>"Hawaii", "abbr"=>"HI", :country=>country})
+Spree::State.create!({"name"=>"Utah", "abbr"=>"UT", :country=>country})
+Spree::State.create!({"name"=>"Vermont", "abbr"=>"VT", :country=>country})
+Spree::State.create!({"name"=>"Delaware", "abbr"=>"DE", :country=>country})
+Spree::State.create!({"name"=>"Rhode Island", "abbr"=>"RI", :country=>country})
+Spree::State.create!({"name"=>"Oklahoma", "abbr"=>"OK", :country=>country})
+Spree::State.create!({"name"=>"Louisiana", "abbr"=>"LA", :country=>country})
+Spree::State.create!({"name"=>"Montana", "abbr"=>"MT", :country=>country})
+Spree::State.create!({"name"=>"Tennessee", "abbr"=>"TN", :country=>country})
+Spree::State.create!({"name"=>"Maryland", "abbr"=>"MD", :country=>country})
+Spree::State.create!({"name"=>"Florida", "abbr"=>"FL", :country=>country})
+Spree::State.create!({"name"=>"Virginia", "abbr"=>"VA", :country=>country})
+Spree::State.create!({"name"=>"Minnesota", "abbr"=>"MN", :country=>country})
+Spree::State.create!({"name"=>"New Jersey", "abbr"=>"NJ", :country=>country})
+Spree::State.create!({"name"=>"Ohio", "abbr"=>"OH", :country=>country})
+Spree::State.create!({"name"=>"California", "abbr"=>"CA", :country=>country})
+Spree::State.create!({"name"=>"North Dakota", "abbr"=>"ND", :country=>country})
+Spree::State.create!({"name"=>"Maine", "abbr"=>"ME", :country=>country})
+Spree::State.create!({"name"=>"Indiana", "abbr"=>"IN", :country=>country})
+Spree::State.create!({"name"=>"Texas", "abbr"=>"TX", :country=>country})
+Spree::State.create!({"name"=>"Oregon", "abbr"=>"OR", :country=>country})
+Spree::State.create!({"name"=>"Wyoming", "abbr"=>"WY", :country=>country})
+Spree::State.create!({"name"=>"Alabama", "abbr"=>"AL", :country=>country})
+Spree::State.create!({"name"=>"Iowa", "abbr"=>"IA", :country=>country})
+Spree::State.create!({"name"=>"Mississippi", "abbr"=>"MS", :country=>country})
+Spree::State.create!({"name"=>"Kentucky", "abbr"=>"KY", :country=>country})
+Spree::State.create!({"name"=>"New Mexico", "abbr"=>"NM", :country=>country})
+Spree::State.create!({"name"=>"Georgia", "abbr"=>"GA", :country=>country})
+Spree::State.create!({"name"=>"Colorado", "abbr"=>"CO", :country=>country})
+Spree::State.create!({"name"=>"Massachusetts", "abbr"=>"MA", :country=>country})
+Spree::State.create!({"name"=>"Connecticut", "abbr"=>"CT", :country=>country})
+Spree::State.create!({"name"=>"New York", "abbr"=>"NY", :country=>country})
+Spree::State.create!({"name"=>"South Carolina", "abbr"=>"SC", :country=>country})
+Spree::State.create!({"name"=>"Alaska", "abbr"=>"AK", :country=>country})
+Spree::State.create!({"name"=>"West Virginia", "abbr"=>"WV", :country=>country})
+Spree::State.create!({"name"=>"U.S. Armed Forces – Americas", "abbr"=>"AA", :country=>country})
+Spree::State.create!({"name"=>"U.S. Armed Forces – Europe", "abbr"=>"AE", :country=>country})
+Spree::State.create!({"name"=>"U.S. Armed Forces – Pacific", "abbr"=>"AP", :country=>country})
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/addresses.yml b/spree_multi_site/db/fake_order1.2.0/spree/addresses.yml
deleted file mode 100644
index 03a06d78..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/addresses.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-I18n.reload!
-1.upto(100) do |i|
-%>
-ship_address_<%= i %>:
- firstname: <%= Faker::Name.first_name %>
- lastname: <%= Faker::Name.last_name %>
- address1: <%= Faker::Address.street_address %>
- address2: <%= Faker::Address.secondary_address %>
- city: <%= Faker::Address.city %>
- state_id: 889445952
- zipcode: 16804
- country_id: 214
- phone: <%= Faker::PhoneNumber.phone_number %>
-<% end %>
-<% 1.upto(100) do |i| %>
-bill_address_<%= i %>:
- firstname: <%= Faker::Name.first_name %>
- lastname: <%= Faker::Name.last_name %>
- address1: <%= Faker::Address.street_address %>
- address2: <%= Faker::Address.secondary_address %>
- city: <%= Faker::Address.city %>
- state_id: 889445952
- zipcode: 16804
- country_id: 214
- phone: <%= Faker::PhoneNumber.phone_number %>
-<% end %>
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/adjustments.yml b/spree_multi_site/db/fake_order1.2.0/spree/adjustments.yml
deleted file mode 100644
index dd4a14ed..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/adjustments.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-<%
-orders = Spree::Order.all(:include=>:shipments)
-sf_ground = Spree::ShippingMethod.first
-
-%>
-<% 1.upto(100) do |i| %>
-<% order = orders[i-1] %>
-ship_<%= i %>:
- adjustable_id: <%= order.id %>
- adjustable_type: Spree::Order
- amount: 5
- source_id: <%= order.shipments.last.id %>
- source_type: Spree::Shipment
- originator_id: <%=sf_ground.id%>
- originator_type: Spree::ShippingMethod
- label: Shipping
- locked: true
- mandatory: true
-<% end %>
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/line_items.yml b/spree_multi_site/db/fake_order1.2.0/spree/line_items.yml
deleted file mode 100644
index a9d2980c..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/line_items.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-orders = Spree::Order.all
-products = Spree::Product.all(:include=>:master,:limit=>10)
-%>
-
-<% for i in 1..100 do%>
-li_<%= i %>:
- order_id: <%= orders[i-1].id %>
- variant_id: <%=products[1].master.id %>
- quantity: <%= rand(4) + 1 %>
- price: 15.99
-<% end %>
-
-<% for i in 1..10 do%>
-li_<%= i + 1000 %>:
- order_id: <%= orders[i-1].id %>
- variant_id: <%=products[2].master.id %>
- quantity: <%= rand(2) + 1 %>
- price: 22.99
-<% end %>
-
-<% for i in 10..20 do%>
-li_<%= i + 2000 %>:
- order_id: <%= orders[i-1].id %>
- variant_id: <%=products[3].master.id %>
- quantity: <%= rand(3) + 1 %>
- price: 19.99
-<% end %>
-
-<% for i in 10..30 do%>
-li_<%= i + 3000 %>:
- order_id: <%= orders[i-1].id %>
- variant_id: <%=products[4].master.id %>
- quantity: <%= rand(3) + 1 %>
- price: 16.99
-<% end %>
-
-<% for i in 30..50 do%>
-li_<%= i + 4000 %>:
- order_id: <%= orders[i-1].id %>
- variant_id: <%=products[5].master.id %>
- quantity: <%= rand(10) + 1 %>
- price: 13.99
-<% end %>
-
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/orders.yml b/spree_multi_site/db/fake_order1.2.0/spree/orders.yml
deleted file mode 100644
index 69f1b3b4..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/orders.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-# skip first admin
-users = Spree.user_class.all(:include=>[:bill_address,:ship_address], :offset=>1)
-order_date = Time.now
-1.upto(100) do |i|
- order_date -= rand(12).hours
- item_total = "#{1 + rand(400)}.#{rand(100)}".to_f
- charges_total = "#{1 + rand(30)}.#{rand(100)}".to_f
- user = users[i-1]
-%>
-order_<%= i %>:
- number: <%= "R#{Array.new(9){rand(9)}.join}" %>
- user_id: <%= user.id %>
- state: complete
- email: <%= Faker::Internet.email %>
- item_total: <%= item_total %>
- created_at: <%= order_date.to_s(:db) %>
- completed_at: <%= order_date.to_s(:db) %>
- total: <%= item_total + charges_total %>
- adjustment_total: <%= charges_total %>
- ship_address_id: <%= user.ship_address.id %>
- bill_address_id: <%= user.bill_address.id %>
-<% end %>
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/payments.rb b/spree_multi_site/db/fake_order1.2.0/spree/payments.rb
deleted file mode 100644
index 68d8c63b..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/payments.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# create payments based on the totals since they can't be known in YAML (quantities are random)
-#method = Spree::PaymentMethod.where(:name => 'Credit Card', :active => true).first
-method = Spree::PaymentMethod.where(:name => 'Check', :active => true).first
-
-# Hack the current method so we're able to return a gateway without a RAILS_ENV
-Spree::Gateway.class_eval do
- def self.current
- Spree::Gateway::Bogus.new
- end
-end
-
-creditcard = Spree::CreditCard.create({:cc_type => 'visa', :month => 12, :year => 2014, :last_digits => '1111',
- :first_name => 'Sean', :last_name => 'Schofield',
- :gateway_customer_profile_id => 'BGS-1234'}, :without_protection => true)
-
-Spree::Order.all.each_with_index do |order,index|
- printf "\rProcessing order #{index}"
- STDOUT.flush
- order.update!
- payment = order.payments.create({:amount => order.total, :payment_method => method}, :without_protection => true) # :source => creditcard.clone,
- payment.update_attributes_without_callbacks({
- :state => 'pending',
- :response_code => '12345'
- })
-end
-puts
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/shipments.yml b/spree_multi_site/db/fake_order1.2.0/spree/shipments.yml
deleted file mode 100644
index 83c4f77e..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/shipments.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-<%
-orders = Spree::Order.all(:include=>[:ship_address])
-sf_ground = Spree::ShippingMethod.first
-%>
-<% 1.upto(100) do |i| %>
-shipment_<%= i %>:
- number: H<%= Array.new(11){rand(11)}.join %>
- order_id: <%= orders[i-1].id %>
- shipping_method_id: <%= sf_ground.id%>
- address_id: <%= orders[i-1].ship_address.id %>
- state: pending
-<% end %>
\ No newline at end of file
diff --git a/spree_multi_site/db/fake_order1.2.0/spree/users.yml b/spree_multi_site/db/fake_order1.2.0/spree/users.yml
deleted file mode 100644
index f85d813b..00000000
--- a/spree_multi_site/db/fake_order1.2.0/spree/users.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-<%
-addresses = Spree::Address.all()
-ship_addresses = addresses[0,100]
-bill_addresses = addresses[100,100]
-1.upto(100) do |i|
-%>
-user_<%= i %>:
- email: <%= Faker::Internet.email %>
- ship_address_id: <%= ship_addresses[i-1].id %>
- bill_address_id: <%= bill_addresses[i-1].id %>
-<% end %>
\ No newline at end of file
diff --git a/spree_multi_site/db/firstshop/1sites.rb b/spree_multi_site/db/firstshop/1sites.rb
index 6d61740f..c533d97f 100644
--- a/spree_multi_site/db/firstshop/1sites.rb
+++ b/spree_multi_site/db/firstshop/1sites.rb
@@ -1,18 +1,17 @@
-attributes = {
- :name => "Dalian shops",
- :domain => "www.dalianshops.com",
- :short_name => "firstshop"
+attributes = {
+ :name => "firstshop",
+ :short_name => "www"
}
-Spree::Site.create!(attributes)
+Spree::Site.create!(attributes)
Spree::Site.current = Spree::Site.first
# see last line where we create an admin if there is none, asking for email and password
=begin
def create_site
-
+
name = 'Abc'
- domain = Spree::Site.abc_domain
-
+ domain = Spree::Site.abc_domain
+
attributes = {
:name => name,
:domain => domain
@@ -23,14 +22,14 @@ def create_site
if Spree::Site.find_by_domain(domain)
say "\nWARNING: There is already a site with the domain: #{domain}, so no site changes were made. If you wish to create an additional site, please run rake db:site:create again with a different domain.\n\n"
else
- admin = Spree::Site.create!(attributes)
+ admin = Spree::Site.create!(attributes)
end
end
if Spree::Site.admin.blank?
create_site
#creating user require it.
- Spree::Site.current =Spree::Site.admin
+ Spree::Site.current =Spree::Site.admin
else
puts "Default site #{domain} has already been previously created."
end
diff --git a/spree_multi_site/db/firstshop/users.rb b/spree_multi_site/db/firstshop/users.rb
deleted file mode 100644
index da550829..00000000
--- a/spree_multi_site/db/firstshop/users.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#copy from spree_auth_devise/db/defaults/users
-require 'highline/import'
-
-# see last line where we create an admin if there is none, asking for email and password
-def prompt_for_admin_password
- if ENV['ADMIN_PASSWORD']
- password = ENV['ADMIN_PASSWORD'].dup
- say "Admin Password #{password}"
- else
- password = ask('Password [spree123]: ') do |q|
- q.echo = false
- q.validate = /^(|.{5,40})$/
- q.responses[:not_valid] = 'Invalid password. Must be at least 5 characters long.'
- q.whitespace = :strip
- end
- password = 'spree123' if password.blank?
- end
-
- password
-end
-
-def prompt_for_admin_email
- if ENV['ADMIN_EMAIL']
- email = ENV['ADMIN_EMAIL'].dup
- say "Admin User #{email}"
- else
- email = ask('Email [spree@example.com]: ') do |q|
- q.echo = true
- q.whitespace = :strip
- end
- email = 'spree@example.com' if email.blank?
- end
-
- email
-end
-
-def create_admin_user
- if ENV['AUTO_ACCEPT']
- password = 'spree123'
- email = 'spree@example.com'
- else
- puts 'Create the admin user (press enter for defaults).'
- #name = prompt_for_admin_name unless name
- email = prompt_for_admin_email
- password = prompt_for_admin_password
- end
- attributes = {
- :password => password,
- :password_confirmation => password,
- :email => email,
- :login => email
- }
-
-# load 'spree/user.rb'
-
- if Spree.user_class.find_by_email(email)
- say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made. If you wish to create an additional admin user, please run rake db:admin:create again with a different email.\n\n"
- else
- admin = Spree.user_class.create(attributes,:without_protection => true)
- # create an admin role and and assign the admin user to that role
- role = Spree::Role.find_or_create_by_name 'admin'
- admin.spree_roles << role
- admin.save
- end
-end
-
-unless Spree.user_class.exists?
- create_admin_user
-else
- puts 'Admin user has already been previously created.'
- if agree('Would you like to create a new admin user? (yes/no)')
- create_admin_user
- else
- puts 'No admin user created.'
- end
-end
-
diff --git a/spree_multi_site/db/migrate/20120415215214_create_sites.rb b/spree_multi_site/db/migrate/20120415215214_create_sites.rb
deleted file mode 100644
index d1ef0f79..00000000
--- a/spree_multi_site/db/migrate/20120415215214_create_sites.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateSites < ActiveRecord::Migration
- def self.up
- create_table :spree_sites do |t|
- t.string :name
- t.string :domain
-
- t.timestamps
- end
- end
-
- def self.down
- drop_table :spree_sites
- end
-end
diff --git a/spree_multi_site/db/migrate/20120415215214_site_create_sites.rb b/spree_multi_site/db/migrate/20120415215214_site_create_sites.rb
new file mode 100644
index 00000000..3987fd02
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120415215214_site_create_sites.rb
@@ -0,0 +1,17 @@
+class SiteCreateSites < ActiveRecord::Migration
+ def self.up
+ # disable default site during migration,
+ # or default :site cause error before site_id added.
+ Spree::MultiSiteSystem.multi_site_context = 'admin_sites'
+ create_table :spree_sites do |t|
+ t.string :name
+ t.string :domain
+
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :spree_sites
+ end
+end
diff --git a/spree_multi_site/db/migrate/20120420163828_add_site_orders.rb b/spree_multi_site/db/migrate/20120420163828_add_site_orders.rb
deleted file mode 100644
index 12bbfdd5..00000000
--- a/spree_multi_site/db/migrate/20120420163828_add_site_orders.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class AddSiteOrders < ActiveRecord::Migration
- def self.up
- #for history reason,
- #spree's table have no prefix 'spree_' at beginning,
- #later migration NamespaceTopLevelModels add prefix 'spree_'
- #so here table_exists?(:taxonomies) is accurate name.
- table_name = Spree::Zone.connection.table_exists?(:zones) ? :zones : :spree_zones
- add_column table_name, :site_id, :integer
- table_name = Spree::Taxonomy.connection.table_exists?(:taxonomies) ? :taxonomies : :spree_taxonomies
- add_column table_name, :site_id, :integer
- table_name = Spree::Order.connection.table_exists?(:orders) ? :orders : :spree_orders
- add_column table_name, :site_id, :integer
- table_name = Spree.user_class.connection.table_exists?(:users) ? :users : :spree_users
- add_column table_name, :site_id, :integer
- table_name = Spree::Product.connection.table_exists?(:products) ? :products : :spree_products
- add_column table_name, :site_id, :integer
- end
-
- def self.down
- remove_column Spree::Zone.table_name, :site_id
- remove_column Spree::Taxonomy.table_name, :site_id
- remove_column Spree::Order.table_name, :site_id
- remove_column Spree.user_class.table_name, :site_id
- remove_column Spree::Product.table_name, :site_id
- end
-end
\ No newline at end of file
diff --git a/spree_multi_site/db/migrate/20120420163828_site_add_site_orders.rb b/spree_multi_site/db/migrate/20120420163828_site_add_site_orders.rb
new file mode 100644
index 00000000..96863e04
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120420163828_site_add_site_orders.rb
@@ -0,0 +1,26 @@
+class SiteAddSiteOrders < ActiveRecord::Migration
+ def self.up
+ #for history reason,
+ #spree's table have no prefix 'spree_' at beginning,
+ #later migration NamespaceTopLevelModels add prefix 'spree_'
+ #so here table_exists?(:taxonomies) is accurate name.
+ table_name = Spree::Zone.connection.table_exists?(:zones) ? :zones : :spree_zones
+ add_column table_name, :site_id, :integer
+ table_name = Spree::Taxonomy.connection.table_exists?(:taxonomies) ? :taxonomies : :spree_taxonomies
+ add_column table_name, :site_id, :integer
+ table_name = Spree::Order.connection.table_exists?(:orders) ? :orders : :spree_orders
+ add_column table_name, :site_id, :integer
+ table_name = Spree.user_class.connection.table_exists?(:users) ? :users : :spree_users
+ add_column table_name, :site_id, :integer
+ table_name = Spree::Product.connection.table_exists?(:products) ? :products : :spree_products
+ add_column table_name, :site_id, :integer
+ end
+
+ def self.down
+ remove_column Spree::Zone.table_name, :site_id
+ remove_column Spree::Taxonomy.table_name, :site_id
+ remove_column Spree::Order.table_name, :site_id
+ remove_column Spree.user_class.table_name, :site_id
+ remove_column Spree::Product.table_name, :site_id
+ end
+end
diff --git a/spree_multi_site/db/migrate/20120423194433_add_short_name_and_parent_id_to_site.rb b/spree_multi_site/db/migrate/20120423194433_add_short_name_and_parent_id_to_site.rb
deleted file mode 100644
index cde57c6d..00000000
--- a/spree_multi_site/db/migrate/20120423194433_add_short_name_and_parent_id_to_site.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class AddShortNameAndParentIdToSite < ActiveRecord::Migration
- def self.up
- add_column :spree_sites, :layout, :string
- add_column :spree_sites, :parent_id, :integer
- add_column :spree_sites, :short_name, :string
- add_column :spree_sites, :rgt, :integer
- add_column :spree_sites, :lft, :integer
- end
-
- def self.down
- remove_column :spree_sites, :layout
- remove_column :spree_sites, :parent_id
- remove_column :spree_sites, :short_name
- remove_column :spree_sites, :lft
- remove_column :spree_sites, :rgt
- end
-end
\ No newline at end of file
diff --git a/spree_multi_site/db/migrate/20120423194433_site_add_short_name_and_parent_id_to_site.rb b/spree_multi_site/db/migrate/20120423194433_site_add_short_name_and_parent_id_to_site.rb
new file mode 100644
index 00000000..b21cd813
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120423194433_site_add_short_name_and_parent_id_to_site.rb
@@ -0,0 +1,17 @@
+class SiteAddShortNameAndParentIdToSite < ActiveRecord::Migration
+ def self.up
+ add_column :spree_sites, :layout, :string
+ add_column :spree_sites, :parent_id, :integer
+ add_column :spree_sites, :short_name, :string
+ add_column :spree_sites, :rgt, :integer
+ add_column :spree_sites, :lft, :integer
+ end
+
+ def self.down
+ remove_column :spree_sites, :layout
+ remove_column :spree_sites, :parent_id
+ remove_column :spree_sites, :short_name
+ remove_column :spree_sites, :lft
+ remove_column :spree_sites, :rgt
+ end
+end
diff --git a/spree_multi_site/db/migrate/20120812064151_add_has_sample.rb b/spree_multi_site/db/migrate/20120812064151_add_has_sample.rb
deleted file mode 100644
index aad590aa..00000000
--- a/spree_multi_site/db/migrate/20120812064151_add_has_sample.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddHasSample < ActiveRecord::Migration
- def up
- add_column :spree_sites, :has_sample, :boolean, :default=>false
- add_column :spree_sites, :loading_sample, :boolean, :default=>false
- end
-
- def down
- remove_column :spree_sites, :has_sample
- remove_column :spree_sites, :loading_sample
- end
-end
diff --git a/spree_multi_site/db/migrate/20120812064151_site_add_has_sample.rb b/spree_multi_site/db/migrate/20120812064151_site_add_has_sample.rb
new file mode 100644
index 00000000..66e6c21d
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120812064151_site_add_has_sample.rb
@@ -0,0 +1,11 @@
+class SiteAddHasSample < ActiveRecord::Migration
+ def up
+ add_column :spree_sites, :has_sample, :boolean, :default=>false
+ add_column :spree_sites, :loading_sample, :boolean, :default=>false
+ end
+
+ def down
+ remove_column :spree_sites, :has_sample
+ remove_column :spree_sites, :loading_sample
+ end
+end
diff --git a/spree_multi_site/db/migrate/20120813135747_add_site_taxons.rb b/spree_multi_site/db/migrate/20120813135747_add_site_taxons.rb
deleted file mode 100644
index c5b6ac9d..00000000
--- a/spree_multi_site/db/migrate/20120813135747_add_site_taxons.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-class AddSiteTaxons < ActiveRecord::Migration
- def up
- table_name = Spree::Taxon.connection.table_exists?(:taxons) ? :taxons : :spree_taxons
- add_column table_name, :site_id, :integer
- table_name = Spree::TaxCategory.connection.table_exists?(:tax_categories) ? :tax_categories : :spree_tax_categories
- add_column table_name, :site_id, :integer
- table_name = Spree::ShippingCategory.connection.table_exists?(:shipping_categories) ? :shipping_categories : :spree_shipping_categories
- add_column table_name, :site_id, :integer
-
- # ShippingMethod.all_available called :all, we have to add default_scope fix it.
- # Zone has_many :shipping_methods, :dependent => :nullify, if zone is deleted, respect shipping_methods.zone_id is set to null
- # for above two reasons, add site_id to shipping_method
- table_name = Spree::ShippingMethod.connection.table_exists?(:shipping_methods) ? :shipping_methods : :spree_shipping_methods
- add_column table_name, :site_id, :integer
-
- table_name = Spree::Prototype.connection.table_exists?(:prototypes) ? :prototypes : :spree_prototypes
- add_column table_name, :site_id, :integer
- table_name = Spree::Property.connection.table_exists?(:properties) ? :properties : :spree_properties
- add_column table_name, :site_id, :integer
- table_name = Spree::OptionType.connection.table_exists?(:option_types) ? :option_types : :spree_option_types
- add_column table_name, :site_id, :integer
- table_name = Spree::Asset.connection.table_exists?(:assets) ? :assets : :spree_assets
- add_column table_name, :site_id, :integer
- table_name = Spree::Preference.connection.table_exists?(:preferences) ? :preferences : :spree_preferences
- add_column table_name, :site_id, :integer, :default=>0 #site_id & key is index, unique, could not be null, or unique would not work.
- end
-
- def down
- remove_column Spree::Taxon.table_name, :site_id, :integer
- remove_column Spree::TaxCategory.table_name, :site_id
- remove_column Spree::ShippingCategory.table_name, :site_id
- remove_column Spree::ShippingMethod.table_name, :site_id
- remove_column Spree::Prototype.table_name, :site_id
- remove_column Spree::Property.table_name, :site_id
- remove_column Spree::OptionType.table_name, :site_id
- remove_column Spree::Asset.table_name, :site_id
- remove_column Spree::Preference.table_name, :site_id
- end
-
-end
diff --git a/spree_multi_site/db/migrate/20120813135747_site_add_site_taxons.rb b/spree_multi_site/db/migrate/20120813135747_site_add_site_taxons.rb
new file mode 100644
index 00000000..bac4356a
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120813135747_site_add_site_taxons.rb
@@ -0,0 +1,40 @@
+class SiteAddSiteTaxons < ActiveRecord::Migration
+ def up
+ table_name = Spree::Taxon.connection.table_exists?(:taxons) ? :taxons : :spree_taxons
+ add_column table_name, :site_id, :integer
+ table_name = Spree::TaxCategory.connection.table_exists?(:tax_categories) ? :tax_categories : :spree_tax_categories
+ add_column table_name, :site_id, :integer
+ table_name = Spree::ShippingCategory.connection.table_exists?(:shipping_categories) ? :shipping_categories : :spree_shipping_categories
+ add_column table_name, :site_id, :integer
+
+ # ShippingMethod.all_available called :all, we have to add default_scope fix it.
+ # Zone has_many :shipping_methods, :dependent => :nullify, if zone is deleted, respect shipping_methods.zone_id is set to null
+ # for above two reasons, add site_id to shipping_method
+ table_name = Spree::ShippingMethod.connection.table_exists?(:shipping_methods) ? :shipping_methods : :spree_shipping_methods
+ add_column table_name, :site_id, :integer
+
+ table_name = Spree::Prototype.connection.table_exists?(:prototypes) ? :prototypes : :spree_prototypes
+ add_column table_name, :site_id, :integer
+ table_name = Spree::Property.connection.table_exists?(:properties) ? :properties : :spree_properties
+ add_column table_name, :site_id, :integer
+ table_name = Spree::OptionType.connection.table_exists?(:option_types) ? :option_types : :spree_option_types
+ add_column table_name, :site_id, :integer
+ table_name = Spree::Asset.connection.table_exists?(:assets) ? :assets : :spree_assets
+ add_column table_name, :site_id, :integer
+ table_name = Spree::Preference.connection.table_exists?(:preferences) ? :preferences : :spree_preferences
+ add_column table_name, :site_id, :integer, :default=>0 #site_id & key is index, unique, could not be null, or unique would not work.
+ end
+
+ def down
+ remove_column Spree::Taxon.table_name, :site_id, :integer
+ remove_column Spree::TaxCategory.table_name, :site_id
+ remove_column Spree::ShippingCategory.table_name, :site_id
+ remove_column Spree::ShippingMethod.table_name, :site_id
+ remove_column Spree::Prototype.table_name, :site_id
+ remove_column Spree::Property.table_name, :site_id
+ remove_column Spree::OptionType.table_name, :site_id
+ remove_column Spree::Asset.table_name, :site_id
+ remove_column Spree::Preference.table_name, :site_id
+ end
+
+end
diff --git a/spree_multi_site/db/migrate/20120818045742_last_add_site_payment_methods.rb b/spree_multi_site/db/migrate/20120818045742_last_add_site_payment_methods.rb
deleted file mode 100644
index 7211b4ad..00000000
--- a/spree_multi_site/db/migrate/20120818045742_last_add_site_payment_methods.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class LastAddSitePaymentMethods < ActiveRecord::Migration
- # in this file add site_id after all table complete.
- def up
- table_name = Spree::PaymentMethod.connection.table_exists?(:payment_methods) ? :payment_methods : :spree_payment_methods
- add_column table_name, :site_id, :integer
- table_name = Spree::Configuration.connection.table_exists?(:configurations) ? :configurations : :spree_configurations
- add_column table_name, :site_id, :integer
- table_name = Spree::LogEntry.connection.table_exists?(:log_entries) ? :log_entries : :spree_log_entries
- add_column table_name, :site_id, :integer
- table_name = Spree::StateChange.connection.table_exists?(:state_changes) ? :state_changes : :spree_state_changes
- add_column table_name, :site_id, :integer
-
- # support RuanShan/spree_static_content
- if Spree::Configuration.connection.table_exists?(:spree_pages)
- add_column :spree_pages, :site_id, :integer
- end
-
- end
-
- def down
- remove_column Spree::PaymentMethod.table_name, :site_id
- remove_column Spree::Configuration.table_name, :site_id
- remove_column Spree::LogEntry.table_name, :site_id
- remove_column Spree::StateChange.table_name, :site_id
- # support RuanShan/spree_static_content
- if Spree::Configuration.connection.table_exists?(:spree_pages)
- remove_column :spree_pages, :site_id
- end
- end
-end
diff --git a/spree_multi_site/db/migrate/20120818045742_site_last_add_site_payment_methods.rb b/spree_multi_site/db/migrate/20120818045742_site_last_add_site_payment_methods.rb
new file mode 100644
index 00000000..89fc6ced
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120818045742_site_last_add_site_payment_methods.rb
@@ -0,0 +1,19 @@
+class SiteLastAddSitePaymentMethods < ActiveRecord::Migration
+ # in this file add site_id after all table complete.
+ def up
+ table_name = Spree::PaymentMethod.connection.table_exists?(:payment_methods) ? :payment_methods : :spree_payment_methods
+ add_column table_name, :site_id, :integer
+ table_name = Spree::LogEntry.connection.table_exists?(:log_entries) ? :log_entries : :spree_log_entries
+ add_column table_name, :site_id, :integer
+ table_name = Spree::StateChange.connection.table_exists?(:state_changes) ? :state_changes : :spree_state_changes
+ add_column table_name, :site_id, :integer
+
+ end
+
+ def down
+ remove_column Spree::PaymentMethod.table_name, :site_id
+ remove_column Spree::LogEntry.table_name, :site_id
+ remove_column Spree::StateChange.table_name, :site_id
+
+ end
+end
diff --git a/spree_multi_site/db/migrate/20120819000000_last_create_delayed_jobs.rb b/spree_multi_site/db/migrate/20120819000000_last_create_delayed_jobs.rb
deleted file mode 100644
index e6630a25..00000000
--- a/spree_multi_site/db/migrate/20120819000000_last_create_delayed_jobs.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class LastCreateDelayedJobs < ActiveRecord::Migration
- def self.up
- create_table :delayed_jobs, :force => true do |table|
- table.integer :priority, :default => 0 # Allows some jobs to jump to the front of the queue
- table.integer :attempts, :default => 0 # Provides for retries, but still fail eventually.
- table.text :handler # YAML-encoded string of the object that will do work
- table.text :last_error # reason for last failure (See Note below)
- table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future.
- table.datetime :locked_at # Set when a client is working on this object
- table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead)
- table.string :locked_by # Who is working on this object (if locked)
- table.string :queue # The name of the queue this job is in
- table.timestamps
- end
-
- add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
- end
-
- def self.down
- drop_table :delayed_jobs
- end
-end
diff --git a/spree_multi_site/db/migrate/20120819000000_site_last_create_delayed_jobs.rb b/spree_multi_site/db/migrate/20120819000000_site_last_create_delayed_jobs.rb
new file mode 100644
index 00000000..325455b6
--- /dev/null
+++ b/spree_multi_site/db/migrate/20120819000000_site_last_create_delayed_jobs.rb
@@ -0,0 +1,22 @@
+class SiteLastCreateDelayedJobs < ActiveRecord::Migration
+ def self.up
+ create_table :delayed_jobs, :force => true do |table|
+ table.integer :priority, :default => 0 # Allows some jobs to jump to the front of the queue
+ table.integer :attempts, :default => 0 # Provides for retries, but still fail eventually.
+ table.text :handler # YAML-encoded string of the object that will do work
+ table.text :last_error # reason for last failure (See Note below)
+ table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+ table.datetime :locked_at # Set when a client is working on this object
+ table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead)
+ table.string :locked_by # Who is working on this object (if locked)
+ table.string :queue # The name of the queue this job is in
+ table.timestamps
+ end
+
+ add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+ end
+
+ def self.down
+ drop_table :delayed_jobs
+ end
+end
diff --git a/spree_multi_site/db/migrate/20121216093739_last_fix_unique_index.rb b/spree_multi_site/db/migrate/20121216093739_last_fix_unique_index.rb
deleted file mode 100644
index 37901faf..00000000
--- a/spree_multi_site/db/migrate/20121216093739_last_fix_unique_index.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class LastFixUniqueIndex < ActiveRecord::Migration
- def change
- if Spree::Site.table_exists?
- if defined?(Spree::Auth)
- remove_index "spree_users", :name => "email_idx_unique"
- add_index "spree_users", ["site_id","email"], :name => "email_idx_unique", :unique => true
- end
-
- remove_index :spree_preferences, :name => 'index_spree_preferences_on_key'
- add_index "spree_preferences", ["site_id","key"], :name => "index_spree_preferences_on_key", :unique => true
-
- remove_index :spree_products, :name => 'permalink_idx_unique'
- add_index "spree_products", ["site_id", "slug"], :name => "permalink_idx_unique", :unique => true
- end
- end
-end
diff --git a/spree_multi_site/db/migrate/20121216093739_site_last_fix_unique_index.rb b/spree_multi_site/db/migrate/20121216093739_site_last_fix_unique_index.rb
new file mode 100644
index 00000000..8df1ad47
--- /dev/null
+++ b/spree_multi_site/db/migrate/20121216093739_site_last_fix_unique_index.rb
@@ -0,0 +1,17 @@
+class SiteLastFixUniqueIndex < ActiveRecord::Migration
+ def change
+ if Spree::Site.table_exists?
+ if defined?(Spree::Auth)
+ remove_index :spree_users, :slug if index_exists?(:spree_users, :email)
+ add_index :spree_users, [:site_id,:email], :unique => true
+ end
+
+ remove_index :spree_preferences, :key if index_exists?(:spree_preferences, :key)
+ add_index :spree_preferences, [:site_id,:key], :unique => true
+
+ remove_index :spree_products, :slug if index_exists?(:spree_products, :slug)
+ add_index :spree_products, [:site_id, :slug], unique: true
+
+ end
+ end
+end
diff --git a/spree_multi_site/db/migrate/20121217045742_site_add_site_trackers.rb b/spree_multi_site/db/migrate/20121217045742_site_add_site_trackers.rb
new file mode 100644
index 00000000..acbda4f0
--- /dev/null
+++ b/spree_multi_site/db/migrate/20121217045742_site_add_site_trackers.rb
@@ -0,0 +1,10 @@
+class SiteAddSiteTrackers < ActiveRecord::Migration
+ # in this file add site_id after all table complete.
+ def up
+ add_column :spree_trackers, :site_id, :integer
+ end
+
+ def down
+ remove_column :spree_trackers, :site_id
+ end
+end
diff --git a/spree_multi_site/db/migrate/20121218010101_site_add_products_global_taxons.rb b/spree_multi_site/db/migrate/20121218010101_site_add_products_global_taxons.rb
new file mode 100644
index 00000000..270754b4
--- /dev/null
+++ b/spree_multi_site/db/migrate/20121218010101_site_add_products_global_taxons.rb
@@ -0,0 +1,11 @@
+class SiteAddProductsGlobalTaxons < ActiveRecord::Migration
+ # we want to display product in www.tld
+ # each product should have global taxon( taxon in www.tld )
+ create_table :spree_products_global_taxons, :id => false do |t|
+ t.references :product
+ t.references :taxon
+ end
+
+ add_index :spree_products_global_taxons, [:product_id], :name => 'index_spree_products_global_taxons_on_product_id'
+ add_index :spree_products_global_taxons, [:taxon_id], :name => 'index_spree_products_global_taxons_on_taxon_id'
+end
diff --git a/spree_multi_site/db/migrate/20121219135747_site_associate_store_with_site.rb b/spree_multi_site/db/migrate/20121219135747_site_associate_store_with_site.rb
new file mode 100644
index 00000000..7d79d77e
--- /dev/null
+++ b/spree_multi_site/db/migrate/20121219135747_site_associate_store_with_site.rb
@@ -0,0 +1,12 @@
+class SiteAssociateStoreWithSite < ActiveRecord::Migration
+ def change
+ add_column :spree_stores, :site_id, :integer, :default=>0
+ Spree::Site.all.each{|site|
+ if site.stores.blank?
+ site.stores.create!( url: site.domain, name: site.name, code: site.short_name )
+ end
+ }
+ end
+
+
+end
diff --git a/spree_multi_site/db/migrate/20121220135747_site_move_app_configuration_to_site.rb b/spree_multi_site/db/migrate/20121220135747_site_move_app_configuration_to_site.rb
new file mode 100644
index 00000000..4fe2ae5f
--- /dev/null
+++ b/spree_multi_site/db/migrate/20121220135747_site_move_app_configuration_to_site.rb
@@ -0,0 +1,18 @@
+class SiteMoveAppConfigurationToSite < ActiveRecord::Migration
+ def change
+ add_column :spree_sites, :allow_ssl_in_production, :boolean, :default=>false
+ add_column :spree_sites, :allow_ssl_in_development_and_test, :boolean, :default=>false
+ add_column :spree_sites, :allow_ssl_in_staging, :boolean, :default=>false
+ add_column :spree_sites, :check_for_spree_alerts, :boolean, :default=>false
+
+ add_column :spree_sites, :display_currency, :boolean, :default=>false
+ add_column :spree_sites, :hide_cents, :boolean, :default=>false
+
+ add_column :spree_sites, :currency, :string, :default=>'CNY'
+ add_column :spree_sites, :currency_symbol_position, :string, :default=>"before"
+ add_column :spree_sites, :currency_decimal_mark, :string, :default=>"."
+ add_column :spree_sites, :currency_thousands_separator, :string, :default=>","
+ end
+
+
+end
diff --git a/spree_multi_site/db/migrate/20121221045742_site_add_site_status.rb b/spree_multi_site/db/migrate/20121221045742_site_add_site_status.rb
new file mode 100644
index 00000000..804bd317
--- /dev/null
+++ b/spree_multi_site/db/migrate/20121221045742_site_add_site_status.rb
@@ -0,0 +1,6 @@
+class SiteAddSiteStatus < ActiveRecord::Migration
+ # add feature store disignable
+ def change
+ add_column :spree_sites, :status, :integer, default: 0
+ end
+end
diff --git a/spree_multi_site/db/migrate/20140606045742_add_site_trackers.rb b/spree_multi_site/db/migrate/20140606045742_add_site_trackers.rb
deleted file mode 100644
index 3e50375a..00000000
--- a/spree_multi_site/db/migrate/20140606045742_add_site_trackers.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddSiteTrackers < ActiveRecord::Migration
- # in this file add site_id after all table complete.
- def up
- add_column :spree_trackers, :site_id, :integer
- end
-
- def down
- remove_column :spree_trackers, :site_id
- end
-end
diff --git a/spree_multi_site/db/migrate/20141027010101_add_products_global_taxons.rb b/spree_multi_site/db/migrate/20141027010101_add_products_global_taxons.rb
deleted file mode 100644
index 366f6b92..00000000
--- a/spree_multi_site/db/migrate/20141027010101_add_products_global_taxons.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddProductsGlobalTaxons < ActiveRecord::Migration
- # we want to display product in s.dalianshops.com
- # each product should have global taxon( taxon in dalianshops )
- create_table :spree_products_global_taxons, :id => false do |t|
- t.references :product
- t.references :taxon
- end
-
- add_index :spree_products_global_taxons, [:product_id], :name => 'index_spree_products_global_taxons_on_product_id'
- add_index :spree_products_global_taxons, [:taxon_id], :name => 'index_spree_products_global_taxons_on_taxon_id'
-end
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/addresses.yml.skip b/spree_multi_site/db/sample1.2.0/spree/addresses.yml.skip
deleted file mode 100644
index 03a06d78..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/addresses.yml.skip
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-I18n.reload!
-1.upto(100) do |i|
-%>
-ship_address_<%= i %>:
- firstname: <%= Faker::Name.first_name %>
- lastname: <%= Faker::Name.last_name %>
- address1: <%= Faker::Address.street_address %>
- address2: <%= Faker::Address.secondary_address %>
- city: <%= Faker::Address.city %>
- state_id: 889445952
- zipcode: 16804
- country_id: 214
- phone: <%= Faker::PhoneNumber.phone_number %>
-<% end %>
-<% 1.upto(100) do |i| %>
-bill_address_<%= i %>:
- firstname: <%= Faker::Name.first_name %>
- lastname: <%= Faker::Name.last_name %>
- address1: <%= Faker::Address.street_address %>
- address2: <%= Faker::Address.secondary_address %>
- city: <%= Faker::Address.city %>
- state_id: 889445952
- zipcode: 16804
- country_id: 214
- phone: <%= Faker::PhoneNumber.phone_number %>
-<% end %>
diff --git a/spree_multi_site/db/sample1.2.0/spree/adjustments.yml.skip b/spree_multi_site/db/sample1.2.0/spree/adjustments.yml.skip
deleted file mode 100644
index 6bf3658b..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/adjustments.yml.skip
+++ /dev/null
@@ -1,26 +0,0 @@
-<% 1.upto(100) do |i| %>
-tax_<%= i %>:
- adjustable: order_<%= i %>
- adjustable_type: Spree::Order
- amount: 0
- source: order_<%= i %>
- source_type: Spree::Order
- originator: tax_rate_north_america
- originator_type: Spree::TaxRate
- label: Tax
- locked: false
- mandatory: true
-<% end %>
-<% 1.upto(100) do |i| %>
-ship_<%= i %>:
- adjustable_id: order_<%= i %>
- adjustable_type: Spree::Order
- amount: 5
- source: shipment_<%= i %>
- source_type: Spree::Shipment
- originator: ups_ground
- originator_type: Spree::ShippingMethod
- label: Shipping
- locked: true
- mandatory: true
-<% end %>
diff --git a/spree_multi_site/db/sample1.2.0/spree/assets.yml b/spree_multi_site/db/sample1.2.0/spree/assets.yml
deleted file mode 100644
index 39b957cf..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/assets.yml
+++ /dev/null
@@ -1,440 +0,0 @@
-img_tote:
- id: 1
- viewable: ror_tote_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_tote.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_tote_back:
- id: 2
- viewable: ror_tote_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_tote_back.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 2
-img_bag:
- id: 3
- viewable: ror_bag_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_bag.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_baseball:
- id: 4
- viewable: ror_baseball_jersey_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_baseball.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_baseball_back:
- id: 5
- viewable: ror_baseball_jersey_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_baseball_back.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 2
-img_jr_spaghetti:
- id: 6
- viewable: ror_jr_spaghetti_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_jr_spaghetti.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_mug:
- id: 7
- viewable: ror_mug_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_mug.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_mug_back:
- id: 8
- viewable: ror_mug_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_mug_back.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 2
-img_ringer:
- id: 9
- viewable: ror_ringer_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_ringer.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_ringer_back:
- id: 10
- viewable: ror_ringer_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_ringer_back.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 2
-img_stein:
- id: 11
- viewable: ror_stein_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_stein.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_stein_back:
- id: 12
- viewable: ror_stein_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: ror_stein_back.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 2
-img_apache_baseball:
- id: 1004
- viewable: apache_baseball_jersey_v
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: apache_baseball.png
- attachment_width: 504
- attachment_height: 484
- type: Spree::Image
- position: 1
-img_ruby_baseball:
- id: 1008
- viewable: ruby_baseball_jersey_v
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ruby_baseball.png
- attachment_width: 495
- attachment_height: 477
- type: Spree::Image
- position: 1
-img_baseball_small_green:
- id: 1009
- viewable: small-green-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_green.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_small_green_back:
- id: 1010
- viewable: small-green-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_green.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_med_green:
- id: 1011
- viewable: med-green-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_green.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_med_green_back:
- id: 1012
- viewable: med-green-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_green.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_large_green:
- id: 1013
- viewable: large-green-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_green.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_large_green_back:
- id: 1014
- viewable: large-green-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_green.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_small_blue:
- id: 1015
- viewable: small-blue-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_blue.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_small_blue_back:
- id: 1016
- viewable: small-blue-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_blue.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_med_blue:
- id: 1017
- viewable: med-blue-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_blue.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_med_blue_back:
- id: 1018
- viewable: med-blue-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_blue.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_large_blue:
- id: 1019
- viewable: large-blue-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_blue.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_large_blue_back:
- id: 1020
- viewable: large-blue-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_blue.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_large_red:
- id: 1021
- viewable: large-red-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_red.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_large_red_back:
- id: 1022
- viewable: large-red-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_red.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_med_red:
- id: 1023
- viewable: med-red-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_red.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_med_red_back:
- id: 1024
- viewable: med-red-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_red.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_baseball_small_red:
- id: 1025
- viewable: small-red-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_red.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 1
-img_baseball_small_red_back:
- id: 1026
- viewable: small-red-baseball
- viewable_type: Spree::Variant
- attachment_content_type: image/png
- attachment_file_name: ror_baseball_jersey_back_red.png
- attachment_width: 240
- attachment_height: 240
- type: Spree::Image
- position: 2
-img_spree_bag:
- id: 1027
- viewable: spree_bag_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_bag.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 1
-img_spree_tote:
- id: 1028
- viewable: spree_tote_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_tote_front.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 1
-img_tote_back:
- id: 1029
- viewable: spree_tote_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_tote_back.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 2
-img_spree_ringer:
- id: 1030
- viewable: spree_ringer_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_ringer_t.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 1
-img_spree_ringer_back:
- id: 1031
- viewable: spree_ringer_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_ringer_t_back.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 2
-img_spree_jr_spaghetti:
- id: 1032
- viewable: spree_jr_spaghetti_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_spaghetti.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 1
-img_spree_stein:
- id: 1033
- viewable: spree_stein_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_stein.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 1
-img_spree_stein_back:
- id: 1034
- viewable: spree_stein_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_stein_back.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 2
-img_spree_mug:
- id: 1035
- viewable: spree_mug_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_mug.jpeg
- attachment_width: 360
- attachment_height: 360
- type: Spree::Image
- position: 1
-img_spree_mug_back:
- id: 1036
- viewable: spree_mug_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_mug_back.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 2
-img_spree_baseball:
- id: 1037
- viewable: spree_baseball_jersey_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_jersey.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 1
-img_spree_baseball_back:
- id: 1038
- viewable: spree_baseball_jersey_v
- viewable_type: Spree::Variant
- attachment_content_type: image/jpg
- attachment_file_name: spree_jersey_back.jpeg
- attachment_width: 480
- attachment_height: 480
- type: Spree::Image
- position: 2
diff --git a/spree_multi_site/db/sample1.2.0/spree/calculators.yml b/spree_multi_site/db/sample1.2.0/spree/calculators.yml
deleted file mode 100644
index 3ea5916a..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/calculators.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-ups_ground:
- calculable: ups_ground
- calculable_type: Spree::ShippingMethod
- type: Spree::Calculator::FlatRate
-ups_two_day:
- calculable: ups_two_day
- calculable_type: Spree::ShippingMethod
- type: Spree::Calculator::FlatRate
-ups_one_day:
- calculable: ups_one_day
- calculable_type: Spree::ShippingMethod
- type: Spree::Calculator::FlatRate
-#FIXME Spree::Promotion
-#flat_rate_coupon_calculator:
-# calculable: spree_coupon
-# calculable_type: Spree::Promotion
-# type: Spree::Calculator::FlatRate
-tax_rate_calculator:
- calculable: tax_rate_north_america
- calculable_type: Spree::TaxRate
- type: Spree::Calculator::DefaultTax
-
-
diff --git a/spree_multi_site/db/sample1.2.0/spree/inventory_units.rb b/spree_multi_site/db/sample1.2.0/spree/inventory_units.rb
deleted file mode 100644
index c2efa2c1..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/inventory_units.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# create the inventory units associated with the line item (we need to do this after the fixture b/c quantity is random)
-Spree::LineItem.all.each do |li|
- li.quantity.times { li.order.inventory_units.create({:variant => li.variant, :state => 'sold', :shipment => li.order.shipment}, :without_protection => true) }
-end
diff --git a/spree_multi_site/db/sample1.2.0/spree/line_items.yml.skip b/spree_multi_site/db/sample1.2.0/spree/line_items.yml.skip
deleted file mode 100644
index d75dc7f4..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/line_items.yml.skip
+++ /dev/null
@@ -1,40 +0,0 @@
-<% for i in 1..100 do%>
-li_<%= i %>:
- order: order_<%= i %>
- variant: ror_tote_v
- quantity: <%= rand(4) + 1 %>
- price: 15.99
-<% end %>
-
-<% for i in 1..10 do%>
-li_<%= i + 1000 %>:
- order: order_<%= i %>
- variant: ror_bag_v
- quantity: <%= rand(2) + 1 %>
- price: 22.99
-<% end %>
-
-<% for i in 10..20 do%>
-li_<%= i + 2000 %>:
- order: order_<%= i %>
- variant: large-blue-baseball
- quantity: <%= rand(3) + 1 %>
- price: 19.99
-<% end %>
-
-<% for i in 10..30 do%>
-li_<%= i + 3000 %>:
- order: order_<%= i %>
- variant: ror_stein_v
- quantity: <%= rand(3) + 1 %>
- price: 16.99
-<% end %>
-
-<% for i in 30..50 do%>
-li_<%= i + 4000 %>:
- order: order_<%= i %>
- variant: ror_mug_v
- quantity: <%= rand(10) + 1 %>
- price: 13.99
-<% end %>
-
diff --git a/spree_multi_site/db/sample1.2.0/spree/option_types.yml b/spree_multi_site/db/sample1.2.0/spree/option_types.yml
deleted file mode 100644
index 39f6b7ee..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/option_types.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-size:
- name: tshirt-size
- presentation: Size
- position: 1
-color:
- name: tshirt-color
- presentation: Color
- position: 2
diff --git a/spree_multi_site/db/sample1.2.0/spree/option_values.yml b/spree_multi_site/db/sample1.2.0/spree/option_values.yml
deleted file mode 100644
index c7108eeb..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/option_values.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-s:
- name: Small
- presentation: S
- position: 1
- option_type: size
-m:
- name: Medium
- presentation: M
- position: 2
- option_type: size
-l:
- name: Large
- presentation: L
- position: 3
- option_type: size
-xl:
- name: Extra Large
- presentation: XL
- position: 4
- option_type: size
-red:
- name: Red
- presentation: Red
- position: 1
- option_type: color
-green:
- name: Green
- presentation: Green
- position: 2
- option_type: color
-blue:
- name: Blue
- presentation: Blue
- position: 3
- option_type: color
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/orders.yml.skip b/spree_multi_site/db/sample1.2.0/spree/orders.yml.skip
deleted file mode 100644
index 1312afb5..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/orders.yml.skip
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-order_date = Time.now
-1.upto(100) do |i|
- order_date -= rand(12).hours
- item_total = "#{1 + rand(400)}.#{rand(100)}".to_f
- charges_total = "#{1 + rand(30)}.#{rand(100)}".to_f
-%>
-order_<%= i %>:
- number: <%= "R#{Array.new(9){rand(9)}.join}" %>
- user: user_<%= i %>
- state: complete
- email: <%= Faker::Internet.email %>
- item_total: <%= item_total %>
- created_at: <%= order_date.to_s(:db) %>
- completed_at: <%= order_date.to_s(:db) %>
- total: <%= item_total + charges_total %>
- adjustment_total: <%= charges_total %>
- ship_address: ship_address_<%= i %>
- bill_address: bill_address_<%= i %>
-<% end %>
diff --git a/spree_multi_site/db/sample1.2.0/spree/payment_methods.yml b/spree_multi_site/db/sample1.2.0/spree/payment_methods.yml
deleted file mode 100644
index 207e4a7f..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/payment_methods.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-bogus_dev:
- name: Credit Card
- description: Bogus payment gateway for development.
- environment: development
- active: true
- type: Spree::Gateway::Bogus
-check_method:
- name: Check
- description: Pay by check.
- active: true
- type: Spree::PaymentMethod::Check
-bogus_test:
- name: Credit Card
- description: Bogus payment gateway for test.
- environment: test
- active: true
- type: Spree::Gateway::Bogus
-bogus_prod:
- name: Credit Card
- description: Bogus payment gateway for production.
- environment: production
- active: true
- type: Spree::Gateway::Bogus
-bogus_staging:
- name: Credit Card
- description: Bogus payment gateway for staging.
- environment: staging
- active: true
- type: Spree::Gateway::Bogus
diff --git a/spree_multi_site/db/sample1.2.0/spree/payments.rb.skip b/spree_multi_site/db/sample1.2.0/spree/payments.rb.skip
deleted file mode 100644
index 631edace..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/payments.rb.skip
+++ /dev/null
@@ -1,25 +0,0 @@
-# create payments based on the totals since they can't be known in YAML (quantities are random)
-method = Spree::PaymentMethod.where(:name => 'Credit Card', :active => true).first
-
-# Hack the current method so we're able to return a gateway without a RAILS_ENV
-Spree::Gateway.class_eval do
- def self.current
- Spree::Gateway::Bogus.new
- end
-end
-
-creditcard = Spree::Creditcard.create({:cc_type => 'visa', :month => 12, :year => 2014, :last_digits => '1111',
- :first_name => 'Sean', :last_name => 'Schofield',
- :gateway_customer_profile_id => 'BGS-1234'}, :without_protection => true)
-
-Spree::Order.all.each_with_index do |order,index|
- printf "\rProcessing order #{index}"
- STDOUT.flush
- order.update!
- payment = order.payments.create({:amount => order.total, :source => creditcard.clone, :payment_method => method}, :without_protection => true)
- payment.update_attributes_without_callbacks({
- :state => 'pending',
- :response_code => '12345'
- })
-end
-puts
diff --git a/spree_multi_site/db/sample1.2.0/spree/preferences.rb b/spree_multi_site/db/sample1.2.0/spree/preferences.rb
deleted file mode 100644
index ce91b127..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/preferences.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-shipping_method = Spree::ShippingMethod.find_by_name("UPS Ground")
-shipping_method.calculator.preferred_amount = 5
-
-shipping_method = Spree::ShippingMethod.find_by_name("UPS One Day")
-shipping_method.calculator.preferred_amount = 15
-
-shipping_method = Spree::ShippingMethod.find_by_name("UPS Two Day")
-shipping_method.calculator.preferred_amount = 10
-
-# flat_rate_five_dollars:
-# name: amount
-# owner: flat_rate_coupon_calculator
-# owner_type: Spree::Calculator
-# value: 5
diff --git a/spree_multi_site/db/sample1.2.0/spree/product_option_types.yml b/spree_multi_site/db/sample1.2.0/spree/product_option_types.yml
deleted file mode 100644
index 5389abc0..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/product_option_types.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-ror_baseball_size:
- product: ror_baseball_jersey
- option_type: size
- position: 1
-ror_baseball_color:
- product: ror_baseball_jersey
- option_type: color
- position: 2
-spree_baseball_size:
- product: spree_baseball_jersey
- option_type: size
- position: 3
-spree_baseball_color:
- product: spree_baseball_jersey
- option_type: color
- position: 4
diff --git a/spree_multi_site/db/sample1.2.0/spree/product_properties.yml b/spree_multi_site/db/sample1.2.0/spree/product_properties.yml
deleted file mode 100644
index c2c8606c..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/product_properties.yml
+++ /dev/null
@@ -1,264 +0,0 @@
-shirt_man_a:
- product: ror_baseball_jersey
- property: prop_manufacturer
- value: Wilson
-shirt_man_b:
- product: ror_jr_spaghetti
- property: prop_manufacturer
- value: Jerseys
-shirt_man_c:
- product: ror_ringer
- property: prop_manufacturer
- value: Jerseys
-shirt_brand_a:
- product: ror_baseball_jersey
- property: prop_brand
- value: Wannabe Sports
-shirt_brand_b:
- product: ror_jr_spaghetti
- property: prop_brand
- value: Resilance
-shirt_brand_c:
- product: ror_ringer
- property: prop_brand
- value: Conditioned
-shirt_model_a:
- product: ror_baseball_jersey
- property: prop_model
- value: JK1002
-shirt_model_b:
- product: ror_jr_spaghetti
- property: prop_model
- value: TL174
-shirt_model_c:
- product: ror_ringer
- property: prop_model
- value: TL9002
-shirt_type_a:
- product: ror_baseball_jersey
- property: prop_shirt_type
- value: Baseball Jersey
-shirt_type_b:
- product: ror_jr_spaghetti
- property: prop_shirt_type
- value: Jr Spaghetti T
-shirt_type_c:
- product: ror_ringer
- property: prop_shirt_type
- value: Ringer T
-shirt_sleeve_a:
- product: ror_baseball_jersey
- property: prop_shirt_sleeve_type
- value: long
-shirt_sleeve_b:
- product: ror_jr_spaghetti
- property: prop_shirt_sleeve_type
- value: none
-shirt_sleeve_c:
- product: ror_ringer
- property: prop_shirt_sleeve_type
- value: short
-shirt_fab_a:
- product: ror_baseball_jersey
- property: prop_shirt_fabric
- value: 100% Cotton
-shirt_fab_b:
- product: ror_jr_spaghetti
- property: prop_shirt_fabric
- value: 90% Cotton, 10% Nylon
-shirt_fab_c:
- product: ror_ringer
- property: prop_shirt_fabric
- value: 100% Vellum
-shirt_fit_a:
- product: ror_baseball_jersey
- property: prop_shirt_fit
- value: loose
-shirt_fit_b:
- product: ror_jr_spaghetti
- property: prop_shirt_fit
- value: form
-shirt_fit_c:
- product: ror_ringer
- property: prop_shirt_fit
- value: loose
-shirt_gender_a:
- product: ror_baseball_jersey
- property: prop_gender
- value: Men's
-shirt_gender_b:
- product: ror_jr_spaghetti
- property: prop_gender
- value: Women's
-shirt_gender_c:
- product: ror_ringer
- property: prop_gender
- value: Men's
-bag_type_a:
- product: ror_tote
- property: prop_bag_type
- value: Tote
-bag_type_b:
- product: ror_bag
- property: prop_bag_type
- value: Messenger
-bag_size_a:
- product: ror_tote
- property: prop_bag_size
- value: 15" x 18" x 6"
-bag_size_b:
- product: ror_bag
- property: prop_bag_size
- value: 14 1/2" x 12" x 5"
-bag_mats_a:
- product: ror_tote
- property: prop_bag_material
- value: Canvas
-bag_mats_b:
- product: ror_bag
- property: prop_bag_material
- value: 600 Denier Polyester
-mug_type_a:
- product: ror_mug
- property: prop_mug_type
- value: Mug
-mug_type_b:
- product: ror_stein
- property: prop_mug_type
- value: Stein
-mug_size_a:
- product: ror_mug
- property: prop_mug_size
- value: 4.5" tall, 3.25" dia.
-mug_size_b:
- product: ror_stein
- property: prop_mug_size
- value: 6.75" tall, 3.75" dia. base, 3" dia. rim
-spree_mug_size_a:
- product: spree_mug
- property: prop_mug_size
- value: 4.5" tall, 3.25" dia.
-spree_mug_size_b:
- product: spree_stein
- property: prop_mug_size
- value: 6.75" tall, 3.75" dia. base, 3" dia. rim
-s_mug_type_a:
- product: spree_mug
- property: prop_mug_type
- value: Mug
-s_mug_type_b:
- product: spree_stein
- property: prop_mug_type
- value: Stein
-s_bag_type_a:
- product: spree_tote
- property: prop_bag_type
- value: Tote
-s_bag_type_b:
- product: spree_bag
- property: prop_bag_type
- value: Messenger
-s_bag_size_a:
- product: spree_tote
- property: prop_bag_size
- value: 15" x 18" x 6"
-s_bag_size_b:
- product: spree_bag
- property: prop_bag_size
- value: 14 1/2" x 12" x 5"
-s_shirt_man_a:
- product: spree_baseball_jersey
- property: prop_manufacturer
- value: Wilson
-s_shirt_man_b:
- product: spree_jr_spaghetti
- property: prop_manufacturer
- value: Jerseys
-s_shirt_man_c:
- product: spree_ringer
- property: prop_manufacturer
- value: Jerseys
-s_shirt_brand_a:
- product: spree_baseball_jersey
- property: prop_brand
- value: Wannabe Sports
-s_shirt_brand_b:
- product: spree_jr_spaghetti
- property: prop_brand
- value: Resilance
-s_shirt_brand_c:
- product: spree_ringer
- property: prop_brand
- value: Conditioned
-s_shirt_model_a:
- product: spree_baseball_jersey
- property: prop_model
- value: JK1002
-s_shirt_model_b:
- product: spree_jr_spaghetti
- property: prop_model
- value: TL174
-s_shirt_model_c:
- product: spree_ringer
- property: prop_model
- value: TL9002
-s_shirt_type_a:
- product: spree_baseball_jersey
- property: prop_shirt_type
- value: Baseball Jersey
-s_shirt_type_b:
- product: spree_jr_spaghetti
- property: prop_shirt_type
- value: Jr Spaghetti T
-s_shirt_type_c:
- product: spree_ringer
- property: prop_shirt_type
- value: Ringer T
-s_shirt_sleeve_a:
- product: spree_baseball_jersey
- property: prop_shirt_sleeve_type
- value: long
-s_shirt_sleeve_b:
- product: spree_jr_spaghetti
- property: prop_shirt_sleeve_type
- value: none
-s_shirt_sleeve_c:
- product: spree_ringer
- property: prop_shirt_sleeve_type
- value: short
-s_shirt_fab_a:
- product: spree_baseball_jersey
- property: prop_shirt_fabric
- value: 100% Cotton
-s_shirt_fab_b:
- product: spree_jr_spaghetti
- property: prop_shirt_fabric
- value: 90% Cotton, 10% Nylon
-s_shirt_fab_c:
- product: spree_ringer
- property: prop_shirt_fabric
- value: 100% Vellum
-s_shirt_fit_a:
- product: spree_baseball_jersey
- property: prop_shirt_fit
- value: loose
-s_shirt_fit_b:
- product: spree_jr_spaghetti
- property: prop_shirt_fit
- value: form
-s_shirt_fit_c:
- product: spree_ringer
- property: prop_shirt_fit
- value: loose
-s_shirt_gender_a:
- product: spree_baseball_jersey
- property: prop_gender
- value: Men's
-s_shirt_gender_b:
- product: spree_jr_spaghetti
- property: prop_gender
- value: Women's
-s_shirt_gender_c:
- product: spree_ringer
- property: prop_gender
- value: Men's
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/products.rb b/spree_multi_site/db/sample1.2.0/spree/products.rb
deleted file mode 100644
index 6bb49e9d..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/products.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# make sure the product images directory exists
-FileUtils.mkdir_p "#{Rails.root}/public/spree/products/"
-
-Spree::Asset.all.each do |asset|
- filename = asset.attachment_file_name
- puts "-- Processing image: #{filename}\r"
- path = File.join(File.dirname(__FILE__), "products/#{filename}")
-
- if FileTest.exists? path
- asset.attachment = File.open(path)
- asset.save
- else
- puts "--- Could not find image at: #{path}"
- end
-end
diff --git a/spree_multi_site/db/sample1.2.0/spree/products.yml b/spree_multi_site/db/sample1.2.0/spree/products.yml
deleted file mode 100644
index 2c2c0bcc..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/products.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-ror_tote:
- name: Ruby on Rails Tote
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-tote
- count_on_hand: 10
- tax_category: tax_cat_clothing
-ror_bag:
- name: Ruby on Rails Bag
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-bag
- count_on_hand: 10
- tax_category: tax_cat_clothing
-ror_baseball_jersey:
- name: Ruby on Rails Baseball Jersey
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-baseball-jersey
- tax_category: tax_cat_clothing
- count_on_hand: 88
-ror_jr_spaghetti:
- name: Ruby on Rails Jr. Spaghetti
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-jr-spaghetti
- count_on_hand: 10
- tax_category: tax_cat_clothing
-ror_mug:
- name: Ruby on Rails Mug
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-mug
- count_on_hand: 10
-ror_ringer:
- name: Ruby on Rails Ringer T-Shirt
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-ringer-t-shirt
- count_on_hand: 10
- tax_category: tax_cat_clothing
-ror_stein:
- name: Ruby on Rails Stein
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-on-rails-stein
- count_on_hand: 10
-ruby_baseball_jersey:
- name: Ruby Baseball Jersey
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: ruby-baseball-jersey
- count_on_hand: 10
- tax_category: tax_cat_clothing
-apache_baseball_jersey:
- name: Apache Baseball Jersey
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: apache-baseball-jersey
- count_on_hand: 10
- tax_category: tax_cat_clothing
-spree_baseball_jersey:
- name: Spree Baseball Jersey
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-baseball-jersey
- count_on_hand: 30
- tax_category: tax_cat_clothing
-spree_stein:
- name: Spree Stein
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-stein
- count_on_hand: 10
-spree_jr_spaghetti:
- name: Spree Jr. Spaghetti
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-jr-spaghetti
- count_on_hand: 10
- tax_category: tax_cat_clothing
-spree_mug:
- name: Spree Mug
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-mug
- count_on_hand: 10
-spree_ringer:
- name: Spree Ringer T-Shirt
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-ringer-t-shirt
- count_on_hand: 10
- tax_category: tax_cat_clothing
-spree_tote:
- name: Spree Tote
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-tote
- count_on_hand: 10
- tax_category: tax_cat_clothing
-spree_bag:
- name: Spree Bag
- description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
- available_on: <%= Time.zone.now.to_s(:db) %>
- permalink: spree-bag
- count_on_hand: 10
- tax_category: tax_cat_clothing
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/apache_baseball.png b/spree_multi_site/db/sample1.2.0/spree/products/apache_baseball.png
deleted file mode 100644
index cc677bc0..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/apache_baseball.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_bag.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_bag.jpeg
deleted file mode 100644
index e062536f..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_bag.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball.jpeg
deleted file mode 100644
index 3aaf65ae..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_back.jpeg
deleted file mode 100644
index 08b9db6e..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_blue.png b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_blue.png
deleted file mode 100644
index de551c62..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_blue.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_green.png b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_green.png
deleted file mode 100644
index 0f254893..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_green.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_red.png b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_red.png
deleted file mode 100644
index 864fe092..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_back_red.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_blue.png b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_blue.png
deleted file mode 100644
index 55f98b14..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_blue.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_green.png b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_green.png
deleted file mode 100644
index a14b7fcb..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_green.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_red.png b/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_red.png
deleted file mode 100644
index 1b534f9e..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_baseball_jersey_red.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_jr_spaghetti.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_jr_spaghetti.jpeg
deleted file mode 100644
index b24d4313..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_jr_spaghetti.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_mug.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_mug.jpeg
deleted file mode 100644
index 6d5b406b..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_mug.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_mug_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_mug_back.jpeg
deleted file mode 100644
index 687e949c..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_mug_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_ringer.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_ringer.jpeg
deleted file mode 100644
index 935ad95f..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_ringer.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_ringer_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_ringer_back.jpeg
deleted file mode 100644
index c8f5f30c..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_ringer_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_stein.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_stein.jpeg
deleted file mode 100644
index 2d65f6e5..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_stein.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_stein_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_stein_back.jpeg
deleted file mode 100644
index cdc98718..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_stein_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_tote.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_tote.jpeg
deleted file mode 100644
index 08bff014..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_tote.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ror_tote_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/ror_tote_back.jpeg
deleted file mode 100644
index bb0e7681..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ror_tote_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/ruby_baseball.png b/spree_multi_site/db/sample1.2.0/spree/products/ruby_baseball.png
deleted file mode 100644
index 8eef1bed..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/ruby_baseball.png and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_bag.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_bag.jpeg
deleted file mode 100644
index f57951e2..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_bag.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_jersey.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_jersey.jpeg
deleted file mode 100644
index cd569b35..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_jersey.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_jersey_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_jersey_back.jpeg
deleted file mode 100644
index 5bd7433c..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_jersey_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_mug.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_mug.jpeg
deleted file mode 100644
index 9e9b6496..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_mug.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_mug_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_mug_back.jpeg
deleted file mode 100644
index 9f7d5ce9..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_mug_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_ringer_t.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_ringer_t.jpeg
deleted file mode 100644
index f8594896..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_ringer_t.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_ringer_t_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_ringer_t_back.jpeg
deleted file mode 100644
index e2dc7c58..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_ringer_t_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_spaghetti.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_spaghetti.jpeg
deleted file mode 100644
index 81e1221a..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_spaghetti.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_stein.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_stein.jpeg
deleted file mode 100644
index deba9854..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_stein.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_stein_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_stein_back.jpeg
deleted file mode 100644
index ecadca94..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_stein_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_tote_back.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_tote_back.jpeg
deleted file mode 100644
index 18119c33..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_tote_back.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/products/spree_tote_front.jpeg b/spree_multi_site/db/sample1.2.0/spree/products/spree_tote_front.jpeg
deleted file mode 100644
index 4e7d7fb4..00000000
Binary files a/spree_multi_site/db/sample1.2.0/spree/products/spree_tote_front.jpeg and /dev/null differ
diff --git a/spree_multi_site/db/sample1.2.0/spree/properties.yml b/spree_multi_site/db/sample1.2.0/spree/properties.yml
deleted file mode 100644
index 1483a891..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/properties.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-prop_manufacturer:
- name: manufacturer
- presentation: Manufacturer
-prop_brand:
- name: brand
- presentation: Brand
-prop_model:
- name: model
- presentation: Model
-prop_shirt_type:
- name: shirt_type
- presentation: Type
-prop_shirt_sleeve_type:
- name: shirt_sleeve_length
- presentation: Sleeve
-prop_shirt_fabric:
- name: shirt_fabric
- presentation: Fabric
-prop_shirt_fit:
- name: shirt_fit
- presentation: fit
-prop_gender:
- name: gender
- presentation: Gender
-prop_mug_type:
- name: mug_type
- presentation: Type
-prop_mug_size:
- name: mug_size
- presentation: Size
-prop_bag_type:
- name: bag_type
- presentation: Type
-prop_bag_material:
- name: bag_material
- presentation: Material
-prop_bag_size:
- name: bag_size
- presentation: Size
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/prototypes.yml b/spree_multi_site/db/sample1.2.0/spree/prototypes.yml
deleted file mode 100644
index 49bf199a..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/prototypes.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-proto_shirts:
- name: Shirt
- properties: prop_manufacturer, prop_brand, prop_model, prop_shirt_type, prop_shirt_sleeve_type, prop_shirt_fabric, prop_shirt_fit, prop_gender
-proto_bags:
- name: Bag
- properties: prop_bag_type, prop_bag_size, prop_bag_material
-proto_mugs:
- name: Mug
- properties: prop_mug_size, prop_mug_type
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/shipments.yml.skip b/spree_multi_site/db/sample1.2.0/spree/shipments.yml.skip
deleted file mode 100644
index 40255757..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/shipments.yml.skip
+++ /dev/null
@@ -1,8 +0,0 @@
-<% 1.upto(100) do |i| %>
-shipment_<%= i %>:
- number: H<%= Array.new(11){rand(11)}.join %>
- order: order_<%= i %>
- shipping_method: ups_ground
- address: ship_address_<%= i %>
- state: pending
-<% end %>
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/shipping_categories.yml b/spree_multi_site/db/sample1.2.0/spree/shipping_categories.yml
deleted file mode 100644
index a39aa451..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/shipping_categories.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-default_shipping:
- name: Default Shipping
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/shipping_methods.yml b/spree_multi_site/db/sample1.2.0/spree/shipping_methods.yml
deleted file mode 100644
index 1f2033d9..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/shipping_methods.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-ups_ground:
- name: UPS Ground
- zone_id: 2
-ups_two_day:
- name: UPS Two Day
- zone_id: 2
-ups_one_day:
- name: UPS One Day
- zone_id: 2
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/tax_categories.yml b/spree_multi_site/db/sample1.2.0/spree/tax_categories.yml
deleted file mode 100644
index 7d659172..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/tax_categories.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-tax_cat_clothing:
- name: Clothing
- description:
-tax_cat_food:
- name: Food
- description:
diff --git a/spree_multi_site/db/sample1.2.0/spree/tax_rates.yml b/spree_multi_site/db/sample1.2.0/spree/tax_rates.yml
deleted file mode 100644
index 50944437..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/tax_rates.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-tax_rate_north_america:
- zone_id: 2
- amount: 0.05
- tax_category: tax_cat_clothing
diff --git a/spree_multi_site/db/sample1.2.0/spree/taxonomies.yml b/spree_multi_site/db/sample1.2.0/spree/taxonomies.yml
deleted file mode 100644
index 02db5f3d..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/taxonomies.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-master_categories:
- name: Categories
-brand:
- name: Brand
diff --git a/spree_multi_site/db/sample1.2.0/spree/taxons.rb b/spree_multi_site/db/sample1.2.0/spree/taxons.rb
deleted file mode 100644
index 20108153..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/taxons.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Fixtures were created for acts_as_adjency_list, but now we have nested set, so we need to rebuild it after import
-# root Categories
-# +- Bags(ror_tote, ror_bag, spree_tote, spree_bag)
-# +- Mugs(ror_mug, ror_stein, spree_stein, spree_mug)
-# +- Clothing
-# +- Shirts(ror_jr_spaghetti, spree_jr_spaghetti)
-# +- T-Shirts(ror_baseball_jersey, ror_ringer, apache_baseball_jersey, ruby_baseball_jersey, spree_baseball_jersey, spree_ringer)
-# root Brands
-# +- Ruby
-# +- Ruby on Rails
-# +- Apache
-# +- Spree
-
-Spree::Taxon.rebuild!
-Spree::Taxon.all.each{ |t| t.send(:set_permalink); t.save }
diff --git a/spree_multi_site/db/sample1.2.0/spree/taxons.yml b/spree_multi_site/db/sample1.2.0/spree/taxons.yml
deleted file mode 100644
index 5dbedb79..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/taxons.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-#parent_id would be replace by customer_fixtures while loading
-mc_root:
- name: Categories
- taxonomy: master_categories
- permalink: categories
- position: 0
-
-mc_l1_n1:
- name: Bags
- taxonomy: master_categories
- parent_id: mc_root
- position: 1
- products: ror_tote, ror_bag, spree_tote, spree_bag
- permalink: categories/bags
-
-mc_l1_n2:
- name: Mugs
- taxonomy: master_categories
- parent_id: mc_root
- position: 2
- products: ror_mug, ror_stein, spree_stein, spree_mug
- permalink: categories/mugs
-
-clothing:
- name: Clothing
- taxonomy: master_categories
- parent_id: mc_root
- products: ror_baseball_jersey, ror_jr_spaghetti, ror_ringer
- permalink: categories/clothing
-
-shirts:
- name: Shirts
- taxonomy: master_categories
- parent_id: clothing
- position: 0
- products: ror_jr_spaghetti, spree_jr_spaghetti
- permalink: categories/clothing/shirts
-
-t_shirts:
- name: T-Shirts
- taxonomy: master_categories
- parent_id: shirts
- products: ror_baseball_jersey, ror_ringer, apache_baseball_jersey, ruby_baseball_jersey, spree_baseball_jersey, spree_ringer
- position: 0
- permalink: categories/clothing/shirts/t-shirts
-
-brand_root:
- name: Brands
- taxonomy: brand
- permalink: brands
-
-ruby:
- name: Ruby
- taxonomy: brand
- parent_id: brand_root
- position: 0
- products: ruby_baseball_jersey
- permalink: brands/ruby
-
-rails:
- name: Ruby on Rails
- taxonomy: brand
- parent_id: brand_root
- position: 1
- products: ror_baseball_jersey, ror_jr_spaghetti, ror_ringer, ror_stein, ror_bag, ror_tote, ror_mug
- permalink: brands/ruby-on-rails
-
-apache:
- name: Apache
- taxonomy: brand
- parent_id: brand_root
- position: 2
- products: apache_baseball_jersey
- permalink: brands/apache
-
-spree:
- name: Spree
- taxonomy: brand
- parent_id: brand_root
- position: 3
- products: spree_baseball_jersey, spree_stein, spree_jr_spaghetti, spree_mug, spree_ringer, spree_tote, spree_bag
- permalink: brands/spree
diff --git a/spree_multi_site/db/sample1.2.0/spree/users.yml.skip b/spree_multi_site/db/sample1.2.0/spree/users.yml.skip
deleted file mode 100644
index 5bd748e2..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/users.yml.skip
+++ /dev/null
@@ -1,8 +0,0 @@
-<%
-1.upto(100) do |i|
-%>
-user_<%= i %>:
- email: <%= Faker::Internet.email %>
- ship_address: ship_address_<%= i %>
- bill_address: bill_address_<%= i %>
-<% end %>
\ No newline at end of file
diff --git a/spree_multi_site/db/sample1.2.0/spree/variants.yml b/spree_multi_site/db/sample1.2.0/spree/variants.yml
deleted file mode 100644
index 5e4751e9..00000000
--- a/spree_multi_site/db/sample1.2.0/spree/variants.yml
+++ /dev/null
@@ -1,203 +0,0 @@
-small-red-baseball:
- product: ror_baseball_jersey
- option_values: s, red
- sku: ROR-00001
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-small-blue-baseball:
- product: ror_baseball_jersey
- option_values: s, blue
- sku: ROR-00002
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-small-green-baseball:
- product: ror_baseball_jersey
- option_values: s, green
- sku: ROR-00003
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-med-red-baseball:
- product: ror_baseball_jersey
- option_values: m, red
- sku: ROR-00004
- price: 19.99
- cost_price: 17.00
- count_on_hand: 3
-med-blue-baseball:
- product: ror_baseball_jersey
- option_values: m, blue
- sku: ROR-00005
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-med-green-baseball:
- product: ror_baseball_jersey
- option_values: m, green
- sku: ROR-00006
- price: 19.99
- cost_price: 17.00
- count_on_hand: 14
-large-red-baseball:
- product: ror_baseball_jersey
- option_values: l, red
- sku: ROR-00007
- price: 19.99
- cost_price: 17.00
- count_on_hand: 1
-large-blue-baseball:
- product: ror_baseball_jersey
- option_values: l, blue
- sku: ROR-00008
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-large-green-baseball:
- product: ror_baseball_jersey
- option_values: l, green
- sku: ROR-00009
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-xlarge-green-baseball:
- product: ror_baseball_jersey
- option_values: xl, red
- sku: ROR-00010
- price: 21.99
- cost_price: 20.00
- count_on_hand: 10
-ror_baseball_jersey_v:
- product: ror_baseball_jersey
- sku: ROR-001
- price: 19.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-ror_tote_v:
- product: ror_tote
- sku: ROR-00011
- price: 15.99
- cost_price: 13.00
- is_master: true
- count_on_hand: 10
-ror_bag_v:
- product: ror_bag
- sku: ROR-00012
- price: 22.99
- cost_price: 21.00
- is_master: true
- count_on_hand: 10
-ror_jr_spaghetti_v:
- product: ror_jr_spaghetti
- sku: ROR-00013
- price: 19.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-ror_mug_v:
- product: ror_mug
- sku: ROR-00014
- price: 13.99
- cost_price: 11.00
- is_master: true
- count_on_hand: 10
-ror_ringer_v:
- product: ror_ringer
- sku: ROR-00015
- price: 17.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-ror_stein_v:
- product: ror_stein
- sku: ROR-00016
- price: 16.99
- cost_price: 15.00
- is_master: true
- count_on_hand: 10
-apache_baseball_jersey_v:
- product: apache_baseball_jersey
- sku: APC-00001
- price: 19.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-ruby_baseball_jersey_v:
- product: ruby_baseball_jersey
- sku: RUB-00001
- price: 19.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-spree_baseball_jersey_v:
- product: spree_baseball_jersey
- sku: SPR-00001
- price: 19.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-spree_stein_v:
- product: spree_stein
- sku: SPR-00016
- price: 16.99
- cost_price: 15.00
- is_master: true
- count_on_hand: 10
-spree_jr_spaghetti_v:
- product: spree_jr_spaghetti
- sku: SPR-00013
- price: 19.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-spree_mug_v:
- product: spree_mug
- sku: SPR-00014
- price: 13.99
- cost_price: 11.00
- is_master: true
- count_on_hand: 10
-spree_ringer_v:
- product: spree_ringer
- sku: SPR-00015
- price: 17.99
- cost_price: 17.00
- is_master: true
- count_on_hand: 10
-spree_tote_v:
- product: spree_tote
- sku: SPR-00011
- price: 15.99
- cost_price: 13.00
- is_master: true
- count_on_hand: 10
-spree_bag_v:
- product: spree_bag
- sku: SPR-00012
- price: 22.99
- cost_price: 21.00
- is_master: true
- count_on_hand: 10
-small-spree-baseball:
- product: spree_baseball_jersey
- option_values: s
- sku: SPR-00002
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-med-spree-baseball:
- product: spree_baseball_jersey
- option_values: m
- sku: SPR-00005
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
-large-spree-baseball:
- product: spree_baseball_jersey
- option_values: l
- sku: SPR-00008
- price: 19.99
- cost_price: 17.00
- count_on_hand: 10
diff --git a/spree_multi_site/db/samples/addresses.rb b/spree_multi_site/db/samples/addresses.rb
index 7899c5f8..a7b9070d 100644
--- a/spree_multi_site/db/samples/addresses.rb
+++ b/spree_multi_site/db/samples/addresses.rb
@@ -12,7 +12,7 @@
:zipcode => 16804,
:country => united_states,
:phone => Faker::PhoneNumber.phone_number
-}, :without_protection => true)
+})
#Shipping address
Spree::Address.create!({
@@ -25,4 +25,4 @@
:zipcode => 16804,
:country => united_states,
:phone => Faker::PhoneNumber.phone_number
-}, :without_protection => true)
+})
diff --git a/spree_multi_site/db/samples/adjustments.rb b/spree_multi_site/db/samples/adjustments.rb
index e635bae0..b802e236 100644
--- a/spree_multi_site/db/samples/adjustments.rb
+++ b/spree_multi_site/db/samples/adjustments.rb
@@ -10,7 +10,7 @@
:label => "Tax",
:state => "open",
:mandatory => true
-}, :without_protection => true)
+})
last_order.adjustments.create!({
:amount => 0,
@@ -19,7 +19,7 @@
:label => "Tax",
:state => "open",
:mandatory => true
-}, :without_protection => true)
+})
first_order.adjustments.create!({
:amount => 0,
@@ -28,7 +28,7 @@
:label => "Shipping",
:state => "finalized",
:mandatory => true
-}, :without_protection => true)
+})
last_order.adjustments.create!({
:amount => 0,
@@ -37,4 +37,4 @@
:label => "Shipping",
:state => "finalized",
:mandatory => true
-}, :without_protection => true)
+})
diff --git a/spree_multi_site/db/samples/option_types.rb b/spree_multi_site/db/samples/option_types.rb
index 0e15384f..f862173f 100644
--- a/spree_multi_site/db/samples/option_types.rb
+++ b/spree_multi_site/db/samples/option_types.rb
@@ -12,5 +12,5 @@
]
option_types.each do |option_type_attrs|
- Spree::OptionType.create!(option_type_attrs, :without_protection => true)
+ Spree::OptionType.create!(option_type_attrs)
end
diff --git a/spree_multi_site/db/samples/option_values.rb b/spree_multi_site/db/samples/option_values.rb
index 36c87cba..34aaac8b 100644
--- a/spree_multi_site/db/samples/option_values.rb
+++ b/spree_multi_site/db/samples/option_values.rb
@@ -49,5 +49,5 @@
]
option_values.each do |option_value_attrs|
- Spree::OptionValue.create!(option_values, :without_protection => true)
+ Spree::OptionValue.create!(option_values)
end
diff --git a/spree_multi_site/db/samples/orders.rb b/spree_multi_site/db/samples/orders.rb
index 08515db1..c0f143a9 100644
--- a/spree_multi_site/db/samples/orders.rb
+++ b/spree_multi_site/db/samples/orders.rb
@@ -9,7 +9,7 @@
:total => 301.90,
:shipping_address => Spree::Address.first,
:billing_address => Spree::Address.last
-}, :without_protection => true)
+})
orders << Spree::Order.create!({
:number => "R987654321",
@@ -19,19 +19,19 @@
:total => 31.90,
:shipping_address => Spree::Address.first,
:billing_address => Spree::Address.last
-}, :without_protection => true)
+})
orders[0].line_items.create!({
:variant => Spree::Product.find_by_name!("Ruby on Rails Tote").master,
:quantity => 1,
:price => 15.99
-}, :without_protection => true)
+})
orders[1].line_items.create!({
:variant => Spree::Product.find_by_name!("Ruby on Rails Bag").master,
:quantity => 1,
:price => 22.99
-}, :without_protection => true)
+})
orders.each(&:create_proposed_shipments)
diff --git a/spree_multi_site/db/samples/payments.rb b/spree_multi_site/db/samples/payments.rb
index 66992f19..a61d1795 100644
--- a/spree_multi_site/db/samples/payments.rb
+++ b/spree_multi_site/db/samples/payments.rb
@@ -14,11 +14,11 @@ def self.current
creditcard = Spree::CreditCard.create({ :cc_type => 'visa', :month => 12, :year => 2014, :last_digits => '1111',
:first_name => 'Sean', :last_name => 'Schofield',
- :gateway_customer_profile_id => 'BGS-1234' }, :without_protection => true)
+ :gateway_customer_profile_id => 'BGS-1234' })
Spree::Order.all.each_with_index do |order, index|
order.update!
- payment = order.payments.create!({ :amount => order.total, :source => creditcard.clone, :payment_method => method }, :without_protection => true)
+ payment = order.payments.create!({ :amount => order.total, :source => creditcard.clone, :payment_method => method })
payment.update_attributes_without_callbacks({
:state => 'pending',
:response_code => '12345'
diff --git a/spree_multi_site/db/samples/products.rb b/spree_multi_site/db/samples/products.rb
index c7d53d55..e2e11457 100644
--- a/spree_multi_site/db/samples/products.rb
+++ b/spree_multi_site/db/samples/products.rb
@@ -126,7 +126,7 @@
Spree::Config[:currency] = "USD"
default_shipping_category = Spree::ShippingCategory.find_by_name!("Default Shipping")
- product = Spree::Product.create!(default_attrs.merge(product_attrs), :without_protection => true)
+ product = Spree::Product.create!(default_attrs.merge(product_attrs))
Spree::Config[:currency] = "EUR"
product.reload
product.price = eur_price
diff --git a/spree_multi_site/db/samples/shipping_methods.rb b/spree_multi_site/db/samples/shipping_methods.rb
index f099c5b2..efa94bd8 100644
--- a/spree_multi_site/db/samples/shipping_methods.rb
+++ b/spree_multi_site/db/samples/shipping_methods.rb
@@ -7,7 +7,7 @@
end
europe_vat = Spree::Zone.find_by_name!("EU_VAT")
-shipping_category = Spree::ShippingCategory.find_or_create_by_name!('Default')
+shipping_category = Spree::ShippingCategory.find_or_create_by!( name: 'Default')
shipping_methods = [
{
@@ -37,7 +37,7 @@
]
shipping_methods.each do |shipping_method_attrs|
- Spree::ShippingMethod.create!(shipping_method_attrs, :without_protection => true)
+ Spree::ShippingMethod.create!(shipping_method_attrs)
end
{
diff --git a/spree_multi_site/db/samples/taxons.rb b/spree_multi_site/db/samples/taxons.rb
index f5942da6..4233d100 100644
--- a/spree_multi_site/db/samples/taxons.rb
+++ b/spree_multi_site/db/samples/taxons.rb
@@ -116,6 +116,6 @@
taxons.each do |taxon_attrs|
if taxon_attrs[:parent]
taxon_attrs[:parent] = Spree::Taxon.find_by_name!(taxon_attrs[:parent])
- Spree::Taxon.create!(taxon_attrs, :without_protection => true)
+ Spree::Taxon.create!(taxon_attrs)
end
end
diff --git a/spree_multi_site/db/samples/variants.rb b/spree_multi_site/db/samples/variants.rb
index 8c06ad5e..75a7f3c0 100644
--- a/spree_multi_site/db/samples/variants.rb
+++ b/spree_multi_site/db/samples/variants.rb
@@ -160,7 +160,7 @@
}
variants.each do |variant_attrs|
- Spree::Variant.create!(variant_attrs, :without_protection => true)
+ Spree::Variant.create!(variant_attrs)
end
masters.each do |product, variant_attrs|
diff --git a/spree_multi_site/db/seeds.rb b/spree_multi_site/db/seeds.rb
index 92c8d14f..e69de29b 100644
--- a/spree_multi_site/db/seeds.rb
+++ b/spree_multi_site/db/seeds.rb
@@ -1,10 +0,0 @@
-
-default_path = File.join(SpreeMultiSite::Config.seed_dir, 'default')
-# This first resets the task's already_invoked state, allowing the task to then be executed again, dependencies and all:
-Rake::Task['db:load_dir'].reenable
-Rake::Task['db:load_dir'].invoke(default_path)
-
-# For easy to test, load first shop while load seeds.
-#default_path = File.join(SpreeMultiSite::Config.seed_dir, 'firstshop')
-#Rake::Task['db:load_dir'].reenable
-#Rake::Task['db:load_dir'].invoke(default_path)
\ No newline at end of file
diff --git a/spree_multi_site/lib/spree_multi_site.rb b/spree_multi_site/lib/spree_multi_site.rb
index c8628e96..7d4b20e9 100644
--- a/spree_multi_site/lib/spree_multi_site.rb
+++ b/spree_multi_site/lib/spree_multi_site.rb
@@ -2,7 +2,17 @@
require 'spree_multi_site/engine'
require 'spree_multi_site/multi_site_system'
require 'spree_multi_site/paper_clip_interpolate_site'
-require 'spree_multi_site/permalinks'
require 'spree_multi_site/middleware'
require 'spree_multi_site/environment'
require 'spree_multi_site/permitted_attributes_for_site'
+require 'spree_multi_site/paperclip_aliyun_oss_helper'
+
+
+module SpreeMultiSite
+ # these keys are alipay oss folder names
+ AttachmentClassEnum = Struct.new( \
+ :spree_taxon, :spree_post, :spree_image, :ckeditor_picture, :ckeditor_file,\
+ :spree_template_file, :spree_post_files, :spree_store_logos, :spree_store_favicons )\
+ ['Spree::Taxon','Spree::Post','Spree::Image', 'Ckeditor::Picture','Ckeditor::AttachmentFile',\
+ 'Spree::TemplateFile','Spree::PostFile', 'Spree::StoreLogo', 'Spree::StoreFavicon']
+end
diff --git a/spree_multi_site/lib/spree_multi_site/custom_fixtures.rb b/spree_multi_site/lib/spree_multi_site/custom_fixtures.rb
index 686fb641..e69de29b 100644
--- a/spree_multi_site/lib/spree_multi_site/custom_fixtures.rb
+++ b/spree_multi_site/lib/spree_multi_site/custom_fixtures.rb
@@ -1,254 +0,0 @@
-require 'active_record/fixtures'
-
-module SpreeMultiSite
-
- class Fixtures < ActiveRecord::Fixtures
-
- @@all_cached_models = Hash.new { |h,k| h[k] = {} }
- #handle has_and_belongs_to_many join table , key is association_reflection
- @@all_cached_habtm_rows = Hash.new { |h,k| h[k] = [] }
-
- def self.cache_for_table(table_name)
- @@all_cached_models[table_name]
- end
- def self.cache_models(table_name, models_map)
- cache_for_table(table_name).update(models_map)
- end
- def self.cache_habtm_rows(habtm_association, rows)
- @@all_cached_habtm_rows[habtm_association].concat rows
- end
- # Since create sample for each site, original key generating in Fixtures
- # would not work. We should load fixture in proper order, all created model
- # instances are cached, then the right foreign id could be set while create
- # model instance which contains belongs_to association.
- # ex. assets belongs_to variant, variant should be loaded before assets.
- # Replace this method to prevent the table being emptied on each call. Needed
- # when both core & auth have user fixtures, see below for code commented out.
- #
- def self.create_fixtures(fixtures_directory, table_names, class_names = {})
- table_names = [table_names].flatten.map { |n| n.to_s }
- if class_names.empty?
- table_names.each { |n|
- class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
- }
- end
- # FIXME: Apparently JK uses this.
- connection = block_given? ? yield : ActiveRecord::Base.connection
-
- files_to_read = table_names.reject { |table_name|
- fixture_is_cached?(connection, table_name)
- }
-
- unless files_to_read.empty?
- connection.disable_referential_integrity do
- fixtures_map = {}
-
- fixture_files = files_to_read.map do |path|
- table_name = path.tr '/', '_'
-
- fixtures_map[path] = self.new(
- connection,
- table_name,
- class_names[table_name.to_sym] || table_name.classify,
- ::File.join(fixtures_directory, path))
- end
-
- all_loaded_fixtures.update(fixtures_map)
-
- connection.transaction(:requires_new => true) do
- fixture_files.each do |ff|
- models_map = {}
- conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
- client_connection = conn.instance_variable_get(:@connection)
- table_rows = ff.table_rows
- model_class= ff.model_class
- # REMOVED BY SPREE
- # table_rows.keys.each do |table|
- # conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
- # end
- habtm_association = model_class.reflect_on_all_associations(:has_and_belongs_to_many).first
-
- table_rows.each do |table_name,rows|
- #handle join table separately, assume one model only have one HABTM association
- next if habtm_association.present? and table_name == habtm_association.options[:join_table]
- #correct it after create all objects.
- rows.each do |row|
- #conn.insert_fixture(row, table_name)
- primary_key = ff.identify_primary_key(row)
- row.delete( "id" )
-
- if row['parent_id'].present? # nested set, taxon
- parent_key = ActiveRecord::Fixtures.identify(row['parent_id'])
- row['parent_id'] = models_map[parent_key]
- if row['parent_id']==0
-Rails.logger.debug "model_class=#{ff.model_class},primary_key=#{primary_key},table_name=#{table_name},parent_id=#{row['parent_id']}"
- raise "can not find parent reference: #{row.inspect},parent_key=#{parent_key},models_map=#{models_map.inspect}"
- end
- end
-Rails.logger.debug "model_class=#{ff.model_class},primary_key=#{primary_key},table_name=#{table_name},parent_id=#{row['parent_id']}"
- model_instance = model_class.new()
- model_instance.assign_attributes(row,:without_protection => true)
- if table_name=~/taxonomies|tax_rates|shipping_methods|products|users|shipments/
- # taxonomies has :after_save to create taxon root, insert_fixture would avoid that.
- # tax_rate has one calculator, calculator belongs to tax_rate,
- # we have to create tax_rate before calculator since calculator require tax_rate.id
- # tax_rate has calculator presence validation, so set validate=>false here. so does shipping_method
- # TODO for product price validation
- #model_instance.save!(:validate => false), it may not work,
- conn.insert_fixture(row, table_name)
- models_map[primary_key] = client_connection.last_id
- else
- model_instance.save!
- models_map[primary_key] = model_instance.id
- end
-#puts "primary_key=#{primary_key},model_instance=#{model_instance.inspect}"
- end
- end
- #create HABTM join talbe record with real foreign_key and mock association_foreign_key
- #because association may not be created yet
- #correct it after load all fixtures
- if habtm_association.present?
- habtm_rows =table_rows[habtm_association.options[:join_table]]
-#Rails.logger.debug "cache habtm_association=#{habtm_association.options[:join_table]},#{habtm_rows.length}---------------------"
- cache_habtm_rows(habtm_association, habtm_rows)
- end
- cache_models(ff.table_name, models_map)
- end
-
- # Cap primary key sequences to max(pk).
- if connection.respond_to?(:reset_pk_sequence!)
- table_names.each do |table_name|
- connection.reset_pk_sequence!(table_name.tr('/', '_'))
- end
- end
- end
-
- cache_fixtures(connection, fixtures_map)
- end
- end
- cached_fixtures(connection, table_names)
- end
-
- #we have to create join table record after normal fixtures created.
- def self.create_habtm_records
- @@all_cached_habtm_rows.each_pair{|habtm_association, rows|
- foreign_models_map = cache_for_table(habtm_association.active_record.table_name)
- association_foreign_models_map = cache_for_table(habtm_association.klass.table_name)
- association_klass = habtm_association.klass
- rows.each{|row|
- #set real foreign_key from created models
-# puts "original_row=#{row.inspect},\nmodel_class=#{association_klass}"
- row[ habtm_association.foreign_key ] = foreign_models_map[ row[ habtm_association.foreign_key ]]
- row[ habtm_association.association_foreign_key ] = association_foreign_models_map[ row[ habtm_association.association_foreign_key ]]
-if row[ habtm_association.foreign_key ].nil? or row[ habtm_association.association_foreign_key ].nil?
- #puts "row[#{habtm_association.foreign_key}]=#{row[ habtm_association.foreign_key ]},#{foreign_models_map.length}"
- #puts "row[#{habtm_association.association_foreign_key}]=#{row[ habtm_association.association_foreign_key ]},#{association_foreign_models_map.keys.inspect} "
- raise "can not find foreign reference"
-end
- association_klass.connection.insert_fixture(row, habtm_association.options[:join_table])
- }
- }
- @@all_cached_habtm_rows.clear
- end
-
-
- # Replace this method to handle associations in yml.
- # Return a hash of rows to be inserted. The key is the table, the value is
- # a list of rows to insert to that table.
- def table_rows
- now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
- now = now.to_s(:db)
- site_column = 'site_id'
- # allow a standard key to be used for doing defaults in YAML
- fixtures.delete('DEFAULTS')
-
- # track any join tables we need to insert later
- rows = Hash.new { |h,table| h[table] = [] }
-
- rows[table_name] = fixtures.map do |label, fixture|
- row = fixture.to_hash
-
- if model_class && model_class < ActiveRecord::Base
- # fill in timestamp columns if they aren't specified and the model is set to record_timestamps
- if model_class.record_timestamps
- timestamp_column_names.each do |name|
- row[name] = now unless row.key?(name)
- end
- end
- #set current site id if they aren't specified
- if model_class.column_names.include? site_column
- row[site_column] = Spree::Site.current.id unless row.key?(site_column)
- end
- # interpolate the fixture label
- row.each do |key, value|
- row[key] = label if value == "$LABEL"
- end
-
- # generate a primary key if necessary
- if has_primary_key_column? && !row.include?(primary_key_name)
-#Rails.logger.debug "label=#{label},identify=#{ActiveRecord::Fixtures.identify(label)}"
- row[primary_key_name] = ActiveRecord::Fixtures.identify(label)
- end
-
- # If STI is used, find the correct subclass for association reflection
- reflection_class =
- if row.include?(inheritance_column_name)
- row[inheritance_column_name].constantize rescue model_class
- else
- model_class
- end
-
- reflection_class.reflect_on_all_associations.each do |association|
- case association.macro
- when :belongs_to
- # Do not replace association name with association foreign key if they are named the same
- fk_name = (association.options[:foreign_key] || "#{association.name}_id").to_s
-#puts "association.name=#{association.name}, "
- if association.name.to_s != fk_name && value = row.delete(association.name.to_s)
-
- if association.options[:polymorphic]
- if value.sub!(/\s*\(([^\)]*)\)\s*$/, "")
- # support polymorphic belongs_to as "label (Type)"
- row[association.foreign_type] = $1
- end
- #puts "cached_table=#{self.class.cache_for_table(row[association.foreign_type].constantize.table_name).inspect}"
- #puts "row[association.foreign_type].constantize.table_name=#{row[association.foreign_type].constantize.table_name}"
- row[fk_name] = self.class.cache_for_table(row[association.foreign_type].constantize.table_name)[ActiveRecord::Fixtures.identify(value)]
- else
- row[fk_name] = self.class.cache_for_table(association.klass.table_name)[ActiveRecord::Fixtures.identify(value)]
- end
- if row[fk_name].nil?
- puts "looking for #{table_name},row=#{row.inspect}"
- #puts "self.class.cache_for_table('spree_variants')=#{self.class.cache_for_table('spree_variants').keys.inspect}"
- puts "@@all_cached_models=#{@@all_cached_models.keys.inspect}"
- raise "can not find foreign reference: #{reflection_class}.#{fk_name}"
- end
- #row[fk_name] = ActiveRecord::Fixtures.identify(value)
- end
- when :has_and_belongs_to_many
- if (targets = row.delete(association.name.to_s))
- targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
- table_name = association.options[:join_table]
- rows[table_name].concat targets.map { |target|
-# Rails.logger.debug "target=#{target},#{ActiveRecord::Fixtures.identify(target)}"
- { association.foreign_key => row[primary_key_name],
- association.association_foreign_key => ActiveRecord::Fixtures.identify(target) }
- }
- end
- end
- end
- end
-
- row
- end
- rows
- end
-
- # generate a primary key if necessary
- def identify_primary_key(row)
- # Rails.logger.debug "primary_key_name=#{primary_key_name},val=#{row[primary_key_name]}, has_primary_key_column?=#{has_primary_key_column?} "
- row[primary_key_name] if has_primary_key_column? && row.include?(primary_key_name)
- end
- end
-
-end
\ No newline at end of file
diff --git a/spree_multi_site/lib/spree_multi_site/engine.rb b/spree_multi_site/lib/spree_multi_site/engine.rb
index 827868d2..bb736e12 100644
--- a/spree_multi_site/lib/spree_multi_site/engine.rb
+++ b/spree_multi_site/lib/spree_multi_site/engine.rb
@@ -9,41 +9,41 @@ class Engine < Rails::Engine
g.test_framework :rspec
end
- initializer "spree.multisite.environment", :before => "spree.environment" do |app|
+ initializer "spree.multisite.environment", :before => :load_environment_config do |app|
app.config.spree_multi_site = SpreeMultiSite::Environment.new
- SpreeMultiSite::Config = app.config.spree_multi_site.preferences #legacy access
- app.config.spree_multi_site.site_scope_required_classes_from_other_gems = []
-
+ #SpreeMultiSite::Config = app.config.spree_multi_site.preferences
+ #app.config.spree_multi_site.site_scope_required_classes_from_other_gems = []
+ # use site.attributes instead
# preferences contains two kind of records
# 1. override AppConfiguration's default value.
- # a. some preferences in AppConfiguration are for whole application, so override record site_id=0, like seed_dir
+ # a. some preferences in AppConfiguration are for whole application, so override record site_id=0
# this kind preference's description start with 'global'
- # b. some preferences are for one site, so override record site_id>0, like :default_seo_title
- #
- # 2. preference in other models, site_id>0, key contain model instance id.
-
- #hack this class before :load_config_initializers, Spree::Config is using while initialize
- Spree::AppConfiguration.class_eval do
- #replace original :preference_cache_key, add current_site.id as part of key
- #fix error Duplicate entry 'spree/app_configuration/site_url/1'
- def preference_cache_key(name)
- global_preferences = ["seed_dir"]
- some_key = nil
- if global_preferences.include? name#preference_description( name ).to_s.start_with? "global_"
- some_key =[self.class.name, name, 0].join('::').underscore
- else
- some_key =[self.class.name, name, Spree::Site.current.id].join('::').underscore
- end
- some_key
- end
- end
+ # b. some preferences are for one site, so override record site_id>0, like :default_seo_title
+ #
+ # 2. preference in other models, site_id>0, key contain model instance id.
+
+ #hack this class before :load_config_initializers, Spree::Config is using while initialize
+ #Spree::AppConfiguration.class_eval do
+ # #replace original :preference_cache_key, add current_site.id as part of key
+ # #fix error Duplicate entry 'spree/app_configuration/site_url/1'
+ # def preference_cache_key(name)
+ # global_preferences = []
+ # some_key = nil
+ # if global_preferences.include? name#preference_description( name ).to_s.start_with? "global_"
+ # some_key =[self.class.name, name, 0].join('::').underscore
+ # else
+ # some_key =[self.class.name, name, Spree::Site.current.id].join('::').underscore
+ # end
+ # some_key
+ # end
+ #end
end
-
+
initializer "spree.multisite.add_middleware" do |app|
app.middleware.use SpreeMultiSite::Middleware
- end
-
+ end
+
def self.activate
Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
Rails.configuration.cache_classes ? require(c) : load(c)
@@ -51,9 +51,9 @@ def self.activate
end
#spree_abc require #{config.root}/app/mailers
config.autoload_paths += %W(#{config.root}/app/models/spree #{config.root}/app/jobs)
- #Defines generic callbacks to run before after_initialize.
+ #Defines generic callbacks to run before after_initialize.
config.to_prepare &method(:activate).to_proc
-
-
+
+
end
end
diff --git a/spree_multi_site/lib/spree_multi_site/environment.rb b/spree_multi_site/lib/spree_multi_site/environment.rb
index 0b8a3077..bacea5fd 100644
--- a/spree_multi_site/lib/spree_multi_site/environment.rb
+++ b/spree_multi_site/lib/spree_multi_site/environment.rb
@@ -4,12 +4,17 @@ class Environment
include Spree::Core::EnvironmentExtension
attr_accessor :site_scope_required_classes_from_other_gems, :site_scope_required_classes_with_image_from_other_gems, :preferences
+ # system_top_domain is required, in middleware, we compare it with request.host,
+ # it tell us to initialize site by short_name or domain.
+ attr_accessor :system_top_domain
def initialize
- @preferences = Spree::MultiSiteConfiguration.new
+ #@preferences = Spree::MultiSiteConfiguration.new
+ #"Spree.user_class MUST be a String or Symbol object, not a Class object."
+ # it has to be in Environment, it vary in env
+ @system_top_domain = "example.com"
@site_scope_required_classes_from_other_gems = []
- @site_scope_required_classes_with_image_from_other_gems ={}
+ @site_scope_required_classes_with_image_from_other_gems = []
end
end
end
-
diff --git a/spree_multi_site/lib/spree_multi_site/middleware.rb b/spree_multi_site/lib/spree_multi_site/middleware.rb
index d0d59e76..cc3bd9a4 100644
--- a/spree_multi_site/lib/spree_multi_site/middleware.rb
+++ b/spree_multi_site/lib/spree_multi_site/middleware.rb
@@ -3,44 +3,46 @@ class Middleware
def initialize(app)
@app = app
end
-
+
def call(env)
+ #env['ORIGINAL_FULLPATH'] = /,
+ #env['REQUEST_URI'] = http://localhost:3000/
request = Rack::Request.new(env)
- unless request.path.include?('.') # ignore .css, .js, .img
- site = get_site_from_request(request)
- Spree::Site.current = ( site || Spree::Site.first)
+ resource_extension = request.path[/\.[\w]+/]
+ # ignore .css, .js, .img, except .json
+ if resource_extension.nil? || resource_extension=='.json'
+ Spree::Store.current = get_store_from_request(request)
end
- status, headers, body = @app.call(env)
+ status, headers, body = @app.call(env)
[status, headers, body]
end
-
- def get_site_from_request( request )
- site = nil
- # test.david.com => www.david.com/?n=test.david.com
- # our domain is www.dalianshops.com
- if request.params['n'].try(:split,'.') # support short_name.dalianshops.com
- short_name = request.params['n'].split('.').first
- site = Spree::Site.find_by_short_name(short_name)
- end
- if site.blank?
- # support domain, ex. www.david.com
- # TODO should use public_suffix_service handle example.com.cn
- site = Spree::Site.find_by_domain(request.host)
- end
-
- if(( Rails.env !~ /prduction/ ) && ( site.blank? ) )
+ def get_store_from_request( request )
+
+ store = Spree::Store.by_domain( request.host )
+
+ # support domain, ex. www.david.com
+ # apache rewrite test.david.com => localhost:8080/?n=test.david.com, request.host is 'test.david.com'
+ # TODO should use public_suffix_service handle example.com.cn
+
+ if(( Rails.env =~ /development|test/ ) && ( store.blank? ) )
# for development or test, enable get site from cookie
- #Rails.logger.debug "request.cookie_jar=#{request.cookie_jar.inspect},#{request.cookie_jar[:abc_development_domain]},#{request.cookie_jar['abc_development_domain']}"
- #string and symbol both OK. cookie.domain should be exactly same as host, www.domain.com != domain.com
- cookie_domain = request.cookies['_dalianshops_domain']
- if cookie_domain.present?
- site = Spree::Site.find_by_domain( cookie_domain )
- end
+ # string and symbol both OK. cookie.domain should be exactly same as host, www.domain.com != domain.com
+ # disable domain, some site have no domain, short_name always exists.
+ # edit /etc/hosts file, add domains as below for development
+ # local test domains:
+ # first.david.com, design.david.com, demo.david.com
+ short_name = request.host.split('.').first
+ if short_name.present?
+ store = Spree::Store.unscoped.find_by_code( short_name )
+ end
+ #support request.host for development
+ store ||= Spree::Store.default
+
end
- site
+ store
end
end
-end
\ No newline at end of file
+end
diff --git a/spree_multi_site/lib/spree_multi_site/multi_site_system.rb b/spree_multi_site/lib/spree_multi_site/multi_site_system.rb
index 82315578..f1753435 100644
--- a/spree_multi_site/lib/spree_multi_site/multi_site_system.rb
+++ b/spree_multi_site/lib/spree_multi_site/multi_site_system.rb
@@ -1,63 +1,59 @@
# Spree::BaseController.class_eval would not work
# Spree::UserSessionsController derive from Devise::SessionsController, it included Spree::Core::ControllerHelpers
-require 'spree/core/controller_helpers/common'
-class<< Spree::Core::ControllerHelpers::Common
- #def included_with_site_support(receiver)
- # receiver.send :include, Spree::MultiSiteSystem
- # included_without_site_support(receiver)
- # #receiver.prepend_before_filter :get_site #initialize site before authorize user in Spree::UserSessionsController.create
- #end
- #alias_method_chain :included, :site_support
-
- #Spree::Api::BaseController would include MultiSiteSystem, get_layout should not in it.
- #override original methods
- def get_layout
- Spree::Site.current.layout.present? ? Spree::Site.current.layout : Spree::Config[:layout]
- end
-end
-
+#require 'spree/core/controller_helpers/common'
+#class<< Spree::Core::ControllerHelpers::Common
+# #Spree::Api::BaseController would include MultiSiteSystem, get_layout should not in it.
+# #override original methods
+# def get_layout
+# Spree::Site.current.layout.present? ? Spree::Site.current.layout : Spree::Config[:layout]
+# end
+#end
+
module Spree
module MultiSiteSystem
extend ActiveSupport::Concern
mattr_accessor :multi_site_context
-
+
included do
belongs_to :site
# rails 3.2.19
# fix: Spree::Taxon.create!({ taxonomy_id: 0, name: 'name' }, without_protection: true) =>
- #
- before_create {|record| record.site_id||= Spree::Site.current.id }
-
+ #
+ # before_create {|record| record.site_id||= Spree::Site.current.id }
+
default_scope {
- # admin_site_product, create or update global taxon.
- if self == Spree::Taxon && multi_site_context=='admin_site_product'
- scoped
- # first site list template themes
- elsif self == Spree::Product && multi_site_context=='site1_themes'
- scoped
- # first site list product images
- elsif self == Spree::Image && multi_site_context=='site_product_images'
- scoped
- elsif multi_site_context=='admin_migration'
- scoped
- else
+ # design shop create theme product, assign it to global taxon( taxon in site 1)
+ # enable getting taxon from site 1
+ # user import theme from design site, we support import theme with taxon.
+ # enable geting taxon from design site
+ if ( self == Spree::Taxon || self == Spree::Taxonomy ) && multi_site_context=='free_taxon'
+ where(nil)
+ # first site list template themes
+ elsif ( self == Spree::Product || self == Spree::Property || Spree::Image ) && multi_site_context=='site1_themes'
+ where(nil)
+ # first site list product images
+ elsif multi_site_context=='site_product_images'
+ where(nil)
+ # admin sites, site.users site.stores ..
+ elsif multi_site_context=='admin_sites'
+ where(nil)
+ else
where(:site_id => Spree::Site.current.id)
- end
+ end
}
-
+
end
-
+
module ClassMethods
- # remove it after upgrade to rails 4.0
def multi_site_context
MultiSiteSystem.multi_site_context
- end
+ end
end
-
+
def self.setup_context( new_multi_site_context = nil)
self.multi_site_context = new_multi_site_context
end
-
+
# do block with given context
def self.with_context( new_context, &block )
original_context = self.multi_site_context
@@ -68,17 +64,22 @@ def self.with_context( new_context, &block )
self.multi_site_context = original_context
end
end
-
- def self.with_context_admin_site_product(&block)
- with_context( 'admin_site_product', &block )
+
+ def self.with_context_free_taxon(&block)
+ with_context( 'free_taxon', &block )
end
def self.with_context_site1_themes(&block)
with_context( 'site1_themes', &block )
end
+
def self.with_context_site_product_images(&block)
with_context( 'site_product_images', &block )
end
-
+
+ def self.with_context_admin_sites(&block)
+ with_context( 'admin_sites', &block )
+ end
+
end
-end
\ No newline at end of file
+end
diff --git a/spree_multi_site/lib/spree_multi_site/paper_clip_interpolate_site.rb b/spree_multi_site/lib/spree_multi_site/paper_clip_interpolate_site.rb
index 09139da1..52b72f8d 100644
--- a/spree_multi_site/lib/spree_multi_site/paper_clip_interpolate_site.rb
+++ b/spree_multi_site/lib/spree_multi_site/paper_clip_interpolate_site.rb
@@ -1,5 +1,78 @@
-unless Paperclip::Interpolations.all.include? :site
- Paperclip.interpolates :site do |attachment, style_name|
- attachment.instance.site_id # site.current do not work anymore, since we assign theme product to taxon of shop1.
+module SpreeMultiSite
+
+ unless Paperclip::Interpolations.all.include? :site
+
+ Paperclip.interpolates :site do |attachment, style_name|
+ #belongs to site: product
+ #belongs to store: logo, favicon
+ attachment.instance.try(:site_id) || attachment.instance.try(:store).try(:site_id) # site.current do not work anymore, since we assign theme product to taxon of shop1.
+ end
+ # Paperclip support :class, Spree::Taxon => spree/taxon, with simple_class, Spree::Taxon => taxon
+ Paperclip.interpolates :simple_class do |attachment, style_name|
+
+ AttachmentClassEnum.to_h.key( attachment.instance.class.name ) || 'unkown'
+ #attachment.instance.class.name.demodulize.underscore
+ end
+
+ Paperclip.interpolates :aliyun_host do |attachment, style_name|
+ #style_name is symbol
+ case style_name
+ when :original
+ Paperclip::Attachment.default_options[:aliyun][:oss_host]
+ else
+ Paperclip::Attachment.default_options[:aliyun][:img_host]
+ end
+ end
+
+ # support aliyun image resize service
+ # product image { mini: '48x48>', small: '100x100>', product: '240x240>', medium: '350x350>', large: '600x600>' }
+ # post image { mini: '60x60>', small: '180x120>', medium: '280x190>', large: '670x370>'},
+ # http://userdomain/object.jpg@100w_100h_90Q.jpg
+ Paperclip.interpolates :aliyun_style do |attachment, style_name|
+ extension = '.jpg'
+ style_symbol = style_name.to_sym
+ if attachment.instance.class.name == AttachmentClassEnum.spree_image
+ case style_symbol
+ when :mini
+ '@48w_48h_1x' + extension
+ when :small
+ '@100w_100h_1x' + extension
+ when :product
+ '@240w_240h_1x' + extension
+ when :medium
+ '@350w_350h_1x' + extension
+ when :large
+ '@600w_600h_1x' + extension
+ end
+ elsif attachment.instance.class.name == AttachmentClassEnum.spree_post
+ case style_symbol
+ when :mini # post cover
+ '@60w_60h_1x' + extension
+ when :small
+ '@180w_120h_1x' + extension
+ when :medium
+ '@280w_190h_1x' + extension
+ when :large
+ '@670w_370h_1x' + extension
+ end
+ elsif attachment.instance.class.name == AttachmentClassEnum.ckeditor_picture
+ case style_symbol
+ when :thumb # ckeditor image, '118x100#', as list item
+ #先把图按短边优先缩略，然后再用指定颜色填充剩余区域
+ '@118w_100h_4e' + extension
+ when :content # ckeditor image, '800>' , as editor content
+ '@800w_l1' + extension
+ end
+ elsif attachment.instance.class.name == AttachmentClassEnum.spree_template_file
+ case style_symbol
+ when :mini
+ #将图按短边缩略到48x48, 然后按白色填充
+ '@48w_48h_4e' + extension
+ end
+
+ end
+
+ end # :aliyun_style
end
-end
\ No newline at end of file
+
+end # SpreeMultiSite
diff --git a/spree_multi_site/lib/spree_multi_site/paperclip_aliyun_oss_helper.rb b/spree_multi_site/lib/spree_multi_site/paperclip_aliyun_oss_helper.rb
new file mode 100644
index 00000000..9b4bcc0a
--- /dev/null
+++ b/spree_multi_site/lib/spree_multi_site/paperclip_aliyun_oss_helper.rb
@@ -0,0 +1,35 @@
+module SpreeMultiSite
+
+ # include into model
+ module PaperclipAliyunOssHelper
+ # original path and url
+ # :url => "/shops/:rails_env/:site/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+ # :path => ":rails_root/public/shops/:rails_env/:site/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+
+ def self.extended( base )
+ if base.storage_aliyun?
+ base.fix_path_for_aliyun_oss
+ end
+ end
+
+ def fix_path_for_aliyun_oss
+ # ex. Spree::Taxon path = 1/taxon/1_test.jpg, :aliyun_style start with @
+ # taxon/post/
+ path = ":site/:simple_class/:id_:filename"
+ #make sure each
+ attachment_key = :attachment # spree_image/ spree_template_file
+ attachment_key = :icon if self.name == AttachmentClassEnum.spree_taxon
+ attachment_key = :cover if self.name == AttachmentClassEnum.spree_post
+ attachment_key = :data if self.name == AttachmentClassEnum.ckeditor_picture #Ckeditor::Picture,
+ attachment_key = :data if self.name == AttachmentClassEnum.ckeditor_file #Ckeditor::AttachmentFile
+ attachment_definitions[attachment_key][:path] = path
+ attachment_definitions[attachment_key][:url] = 'http://:aliyun_host/'+path+':aliyun_style'
+ attachment_definitions[attachment_key][:styles] = {} #no need styles anymore. it is supproted by oss style
+ end
+
+ def storage_aliyun?
+ (attachment_definitions[:storage]||Paperclip::Attachment.default_options[:storage]) == :aliyun
+ end
+ end
+
+end
diff --git a/spree_multi_site/lib/spree_multi_site/permalinks.rb b/spree_multi_site/lib/spree_multi_site/permalinks.rb
deleted file mode 100644
index c7b07e87..00000000
--- a/spree_multi_site/lib/spree_multi_site/permalinks.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spree/core/permalinks'
-#override permalinks, add site scope
-class<< Spree::Core::Permalinks::ClassMethods
-
- def make_permalink(options={})
- options[:field] ||= :permalink
- self.permalink_options = options
-
- #add site scope
- #validates permalink_options[:field], :uniqueness => true
- validates permalink_options[:field], :uniqueness => { :scope => [:site_id] }
-
- if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
- before_validation(:on => :create) { save_permalink }
- end
- end
-
-end
\ No newline at end of file
diff --git a/spree_multi_site/lib/spree_multi_site/permitted_attributes_for_site.rb b/spree_multi_site/lib/spree_multi_site/permitted_attributes_for_site.rb
index 2bc1d1c2..5c1b76d4 100644
--- a/spree_multi_site/lib/spree_multi_site/permitted_attributes_for_site.rb
+++ b/spree_multi_site/lib/spree_multi_site/permitted_attributes_for_site.rb
@@ -4,6 +4,9 @@ module PermittedAttributes
ATTRIBUTES_FOR_SITE=[:site_attributes]
mattr_reader *ATTRIBUTES_FOR_SITE
- @@site_attributes = [:name, :domain, :short_name, :has_sample, :index_page,:theme_id,:foreign_theme_id]
+ @@site_attributes = [:name, :domain, :short_name, :has_sample, :index_page,:theme_id,:foreign_theme_id, :email, :password,:password_confirmation,
+ # from app_configuration
+ :allow_ssl_in_production, :allow_ssl_in_development_and_test, :allow_ssl_in_staging, :check_for_spree_alerts, :display_currency, :hide_cents, :currency, :currency_symbol_position, :currency_decimal_mark, :currency_thousands_separator
+ ]
end
-end
\ No newline at end of file
+end
diff --git a/spree_multi_site/lib/spree_multi_site/testing_support/factories.rb b/spree_multi_site/lib/spree_multi_site/testing_support/factories.rb
new file mode 100644
index 00000000..a36a5d0b
--- /dev/null
+++ b/spree_multi_site/lib/spree_multi_site/testing_support/factories.rb
@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
+ load File.expand_path(f)
+end
diff --git a/spree_multi_site/lib/spree_multi_site/testing_support/factories/site_factory.rb b/spree_multi_site/lib/spree_multi_site/testing_support/factories/site_factory.rb
new file mode 100644
index 00000000..d77a5aa9
--- /dev/null
+++ b/spree_multi_site/lib/spree_multi_site/testing_support/factories/site_factory.rb
@@ -0,0 +1,34 @@
+FactoryGirl.define do
+ factory :site1, class: Spree::Site do
+ name 'first'
+ email 'first@example.com'
+ password 'password'
+ short_name 'www' # indicate tld
+
+ before(:create) do
+ Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
+ end
+
+ after(:create) do| site |
+ store = create(:store, site: site, default: true )
+ end
+
+ end
+
+ factory :site2, class: Spree::Site do
+ name 'design'
+ email 'design@example.com'
+ password 'password'
+
+ before(:create) do
+ Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
+ end
+
+ after(:create) do| site |
+ store = create(:store, site: site )
+ end
+
+ end
+
+
+end
diff --git a/spree_multi_site/lib/tasks/multi_site_extension_tasks.rake b/spree_multi_site/lib/tasks/multi_site_extension_tasks.rake
index f89b054a..d67b288f 100644
--- a/spree_multi_site/lib/tasks/multi_site_extension_tasks.rake
+++ b/spree_multi_site/lib/tasks/multi_site_extension_tasks.rake
@@ -1,18 +1,25 @@
def rename_multi_site_migrations
puts "calling spree_multi_site:install:migrations enhance"
- #default migration sequence is spree's migration -> extension's migration
- #we need to create site first, or User.find will cause error, so change name to reset order
- #1create_site -> spree_zero_nine_zero -> other_spree_multi_site_migrations
+ # default migration sequence is spree's migration -> extension's migration
+ # we need to create site first, or User.find will cause error, so change name to reset order
+ #
+ # 1create_site ->
+ # -> spree_zero_nine_zero -> other_spree_multi_site_migrations
spree_zero_nine_zero_migration = nil
- spree_multi_site_migrations = []
+ special_migration_regex = /create_sites/
+ #add_site_orders|
+ #add_short_name_and_parent_id_to_site|
+ #add_has_sample|
+ #add_site_taxons/
+ spree_multi_site_migrations = []
Dir[File.join(Rails.root,'db','migrate','*.rb')].sort.each{|file|
spree_zero_nine_zero_migration = file if file =~/spree_one_two/
- spree_multi_site_migrations<< file if file=~/spree_multi_site.rb$/ && file !~/_last_/ #z: load it at last.
- #leave this file 'add_site_payment_methods' at the end
+ spree_multi_site_migrations<< file if file=~/spree_multi_site.rb$/ && file =~special_migration_regex #z: load it at last.
+ #leave this file 'add_site_payment_methods' at the end
}
- #puts "--spree_zero_nine_zero_migration=#{spree_zero_nine_zero_migration}"
- #puts "--spree_multi_site_migrations=#{spree_multi_site_migrations}"
- if spree_zero_nine_zero_migration.present? and spree_multi_site_migrations.present?
+ #puts "--spree_zero_nine_zero_migration=#{spree_zero_nine_zero_migration}"
+ #puts "--spree_multi_site_migrations=#{spree_multi_site_migrations}"
+ if spree_zero_nine_zero_migration.present? && spree_multi_site_migrations.present?
spree_zero_file_name = File.basename(spree_zero_nine_zero_migration,'.rb') # spree_zero_nine_zero_migration is full path
migration_start_number = spree_zero_file_name.to_i - spree_multi_site_migrations.size
create_site_migration = spree_multi_site_migrations.shift
@@ -23,12 +30,12 @@ def rename_multi_site_migrations
File.rename(spree_zero_nine_zero_migration, spree_zero_nine_zero_migration.sub(/\d+/,(migration_start_number+1).to_s))
spree_multi_site_migrations.each_index{|i|
migration_file = spree_multi_site_migrations[i]
- File.rename(migration_file, migration_file.sub(/\d+/,(migration_start_number+2+i).to_s))
+ File.rename(migration_file, migration_file.sub(/\d+/,(migration_start_number+2+i).to_s))
}
- end
+ end
end
- puts "complete renaming spree_multi_site's migration"
-
+ puts "complete renaming spree_multi_site's migration"
+
end
# task test_app call railties:install:migrations
@@ -38,7 +45,7 @@ end
#namespace :spree_multi_site do
# namespace :install do
-# namespace :migrations do
+# namespace :migrations do
# end
# end
#end
@@ -56,13 +63,13 @@ namespace :spree do
mkdir_p RAILS_ROOT + directory
cp file, RAILS_ROOT + path
end
- end
+ end
desc "remove multi_site's migrations first,then install again, useful for modifing some existing migration file!"
task :reinstall_migrations => :environment do
Dir[File.join(Rails.root,'db','migrate','*.rb')].sort.each{|file|
if file=~/spree_multi_site.rb$/
File.delete(file)
- end
+ end
}
Rake::Task['spree_multi_site:install:migrations'].invoke
end
@@ -74,7 +81,7 @@ namespace :spree do
#site.taxonomies = Spree::Taxonomy.find(:all)
#site.orders = Spree::Order.find(:all)
#site.save
- #end
+ #end
end
end
-end
\ No newline at end of file
+end
diff --git a/spree_multi_site/spec/controllers/spree/site_controller_spec.rb b/spree_multi_site/spec/controllers/spree/site_controller_spec.rb
deleted file mode 100644
index 2b9e2c69..00000000
--- a/spree_multi_site/spec/controllers/spree/site_controller_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Spree::SitesController do
-
- it "should create site" do
- spree_post :quick_lunch,{:site=>{:name=>"a test"}, :user=>{:email=>'test@test.com',:password=>'123456'}}
- site = assigns(:site)
- site.should be_kind_of Spree::Site
- site.shipping_categories.count.should eq 1
- site.users.count.should eq 1
- response.should redirect_to(site.admin_url)
- end
-end
diff --git a/spree_multi_site/spec/controllers/spree/sites_controller_spec.rb b/spree_multi_site/spec/controllers/spree/sites_controller_spec.rb
new file mode 100644
index 00000000..5a6a6c2e
--- /dev/null
+++ b/spree_multi_site/spec/controllers/spree/sites_controller_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Spree::SitesController do
+ #let!(:user) { mock_model(Spree::User, :spree_api_key => 'fake', :last_incomplete_spree_order => nil) }
+ let!(:role) { create(:admin_role) }
+ context "with site www.tld" do
+ before do
+ Spree::Site.current = create(:site1)
+ end
+ #Delete this example and add some real ones
+ it "should use Spree::SitesController" do
+ controller.should be_an_instance_of(Spree::SitesController)
+ end
+ #{"utf8"=>"✓", "authenticity_token"=>"Klllros8vRbKw1rGMzq33yHRXJ2ioTyaXV0Uy2YlsUw=", "site"=>{"name"=>"test", "short_name"=>"test", "has_sample"=>"1"}, "user"=>{"email"=>"test@gmail.com", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}, "commit"=>"创建"}
+ it "should create a site successfully" do
+ spree_post :create, { "site"=>{"name"=>"test", "short_name"=>"test", "email"=>"test@gmail.com", "password"=>"123456", "password_confirmation"=>"123456"} }
+ expect(assigns(:site)).to be_kind_of Spree::Site
+ expect(response).to redirect_to( assigns(:site).admin_url )
+ end
+
+ it "should quick lunch a site successfully" do
+ spree_post :quick_lunch, { "site"=>{"name"=>"test", "short_name"=>"test", "email"=>"test@gmail.com", "password"=>"123456"}}
+ expect(assigns(:site)).to be_kind_of Spree::Site
+ expect(response).to redirect_to( assigns(:site).admin_url )
+ end
+ end
+
+end
diff --git a/spree_multi_site/spec/controllers/spree/store_controller_spec.rb b/spree_multi_site/spec/controllers/spree/store_controller_spec.rb
deleted file mode 100644
index be44744c..00000000
--- a/spree_multi_site/spec/controllers/spree/store_controller_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Spree::StoreController do
-
- #Delete this example and add some real ones
- it "should use Spree::StoreController" do
- controller.should be_an_instance_of(Spree::StoreController)
- expect( controller.methods).to include(:get_site_and_products)
-
- end
-#{"utf8"=>"✓", "authenticity_token"=>"Klllros8vRbKw1rGMzq33yHRXJ2ioTyaXV0Uy2YlsUw=", "site"=>{"name"=>"test", "short_name"=>"test", "has_sample"=>"1"}, "user"=>{"email"=>"test@gmail.com", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}, "commit"=>"创建"}
- it "should create a site successfully with an HTTP 200 status code" do
- post :new
- expect(response).to be_success
- expect(response.status).to eq(200)
- end
-end
diff --git a/spree_multi_site/spec/fixtures/qinghe.jpg b/spree_multi_site/spec/fixtures/qinghe.jpg
new file mode 100644
index 00000000..6e647b70
Binary files /dev/null and b/spree_multi_site/spec/fixtures/qinghe.jpg differ
diff --git a/spree_multi_site/spec/helpers/spree/admin/sites_helper_spec.rb b/spree_multi_site/spec/helpers/spree/admin/sites_helper_spec.rb
deleted file mode 100644
index 89bafc9c..00000000
--- a/spree_multi_site/spec/helpers/spree/admin/sites_helper_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe Spree::Admin::SitesHelper do
-
- #Delete this example and add some real ones or delete this file
- it "should include the Spree::Admin::SitesHelper" do
- #included_modules = self.metaclass.send :included_modules
- #included_modules.should include(Spree::Admin::SitesHelper)
- true
- end
-
-end
diff --git a/spree_multi_site/spec/models/site_spec.rb b/spree_multi_site/spec/models/site_spec.rb
index 8b820260..7b915bc4 100644
--- a/spree_multi_site/spec/models/site_spec.rb
+++ b/spree_multi_site/spec/models/site_spec.rb
@@ -2,87 +2,76 @@
require 'spec_helper'
describe Spree::Site do
before(:each) do
- @site = Spree::Site.new(:name=>'ABCD',:domain=>'www.abc.net')
+ create(:admin_role)
+ @site = Spree::Site.new(:name=>'ABCD',:domain=>'www.abc.net', :email=>'test@example.com', :password=>'123456')
end
- it "should be valid" do
- @site.should be_valid
- @site.domain = ''
- @site.should be_valid
-
+ it "should be valid with blank domain" do
@site.domain = nil
@site.should be_valid
-
- @site.domain = 'www.abc.net'
- @site.save!
-
- site2 = @site.dup
- site2.should be_invalid
- site2.short_name = nil
- site2.domain = nil
- site2.should be_valid
- site2.save.should be_true
- site2.short_name.should start_with( @site.short_name)
- site2.short_name.should_not == @site.short_name
end
-
-
-
- it "should not be valid" do
+
+ it "named 'ABC' should not be valid" do
@site.name = 'ABC'
@site.short_name = nil
- @site.valid?.should be_false
-
+ @site.valid?.should be_falsy
+ end
+
+ it "generate 'da-lian-and-bai-jiu' from name '大连&白酒!'" do
@site.name = '大连&白酒!'
@site.short_name = nil
- @site.valid?.should be_true
+ @site.valid?.should be_truthy
@site.short_name.should eq "da-lian-and-bai-jiu"
- @site.save.should be_true
- end
-
- it "should create site and user" do
- user_attributes = {"email"=>"test@abc.com", "password"=>"a12345z", "password_confirmation"=>"a12345z"}
- @site.users<< Spree::User.new(user_attributes)
- @site.save
- @site.should_not be_new_record
- @site.users.first.email.should eq(user_attributes['email'])
+ @site.save.should be_truthy
end
-
- it "shold load samples" do
+
+ it "should create site with store, user and shipping_category" do
+ #user_attributes = {"email"=>"test@abc.com", "password"=>"a12345z", "password_confirmation"=>"a12345z"}
+ #@site.users<< Spree::User.new(user_attributes)
@site.save!
- @site.load_sample
- @site.shipping_categories.should be_present
+ @site.should be_persisted
+ Spree::Site.current = @site
+ @site.users.should be_present
+ @site.stores.should be_present
end
-
- it "should has associations" do
- @site.users.build.should be_present
- @site.products.build.should be_present
- @site.zones.build.should be_present
-
- end
-
+
+ # raise error ./app/models/spree/site.rb:56:in `current'
+ #it "should create site and admin user" do
+ # site_params = { "name"=>"test", "short_name"=>"test",
+ # "users_attributes"=>{"0"=>{"email"=>"test@example.com", "password"=>"123456", "password_confirmation"=>"123456"}}
+ # }
+ # site = Spree::Site.new(site_params)
+ # site.save
+ # site.should_not be_new_record
+ #end
+
+ #it "shold load samples" do
+ # @site.save!
+ # @site.load_sample
+ # @site.shipping_categories.should be_present
+ # @site.users.first.should be_persisted
+ # @site.users.first.should be_admin
+ #end
+
it "shold remove samples" do
-
@site.save!
- @site.load_sample(false)
+ @site.unload_sample
Spree::Site.current = @site
Spree::Product.count.should eq(0)
- Spree::Variant.count.should eq(0)
Spree::Zone.count.should eq(0)
- Spree::ZoneMember.count.should eq(0)
Spree::StateChange.count.should eq(0)
#product variants
#taxonomy, taxon
#zone,zone_member
#state_changes
end
-
+
it "shold create two site and load samples for them" do
- @site1 = Spree::Site.create!(:name=>'Site1',:domain=>'www.site1.net',:short_name=>'site1')
- @site2 = Spree::Site.create!(:name=>'Site1',:domain=>'www.site2.net',:short_name=>'site2')
- @site1.load_sample
- @site2.load_sample
+ #@site1 = Spree::Site.create!(:name=>'Site1',:domain=>'www.site1.net',:short_name=>'site1', :email=>'site1@example.com', :password=>'123456')
+ #@site2 = Spree::Site.create!(:name=>'Site1',:domain=>'www.site2.net',:short_name=>'site2', :email=>'site2@example.com', :password=>'123456')
+ #@site1.load_sample
+ #@site2.load_sample
#product image copied and in right folder.
end
-
+
end
diff --git a/spree_multi_site/spec/models/taxon_spec.rb b/spree_multi_site/spec/models/taxon_spec.rb
deleted file mode 100644
index 02f2773f..00000000
--- a/spree_multi_site/spec/models/taxon_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#encoding: utf-8
-require 'spec_helper'
-describe Spree::Taxon do
- before(:each) do
- Spree::Site.current = Spree::Site.create!(:name=>'ABCD',:domain=>'www.abc.net')
- @taxon = Spree::Taxon.new(:name=>'ABCD')
- end
- it "should create taxon with valid site!" do
- new_taxon = Spree::Taxon.create!({ taxonomy_id: 0, name: 'name' })
- new_taxon.site.should eq Spree::Site.current
- end
-end
diff --git a/spree_multi_site/spec/spec_helper.rb b/spree_multi_site/spec/spec_helper.rb
index 453981c7..a44f3eab 100644
--- a/spree_multi_site/spec/spec_helper.rb
+++ b/spree_multi_site/spec/spec_helper.rb
@@ -15,6 +15,7 @@
require File.expand_path('../dummy/config/environment.rb', __FILE__)
require 'rspec/rails'
+require 'database_cleaner'
require 'ffaker'
# Requires supporting ruby files with custom matchers and macros, etc,
@@ -28,6 +29,9 @@
require 'spree/testing_support/factories'
require 'spree/testing_support/url_helpers'
+# Requires factories defined in lib/spree_multi_site/factories.rb
+require 'spree_multi_site/testing_support/factories'
+
RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
@@ -42,6 +46,12 @@
# current_path.should eql(spree.products_path)
config.include Spree::TestingSupport::UrlHelpers
+ # == Requests support
+ #
+ # Adds convenient methods to request Spree's controllers
+ # spree_get :index
+ config.include Spree::TestingSupport::ControllerRequests, type: :controller
+
# == Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -55,6 +65,7 @@
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
# Capybara javascript drivers require transactional fixtures set to false, and we use DatabaseCleaner
# to cleanup after each test instead. Without transactional fixtures set to false the records created
# to setup a test will be unavailable to the browser, which runs under a separate server instance.
@@ -63,7 +74,7 @@
# Ensure Suite is set to use transactions for speed.
config.before :suite do
DatabaseCleaner.strategy = :transaction
- DatabaseCleaner.clean_with :truncation
+ #DatabaseCleaner.clean_with :truncation
end
# Before each spec check if it is a Javascript test and switch between using database transactions or not where necessary.
diff --git a/spree_multi_site/spree_multi_site.gemspec b/spree_multi_site/spree_multi_site.gemspec
index e76c1d99..aee0a51e 100644
--- a/spree_multi_site/spree_multi_site.gemspec
+++ b/spree_multi_site/spree_multi_site.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'spree_multi_site'
- s.version = '2.4.0'
+ s.version = '3.1.0'
s.summary = 'spree extension for multi-site'
s.description = 'spree extension for multi-site'
- s.required_ruby_version = '>= 1.9.3'
+ s.required_ruby_version = '>= 2.0.0'
s.author = 'qinghe'
s.email = 'areq22@gmail.com'
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'
- s.add_dependency 'spree_core', '~> 2.4.0'
+ s.add_dependency 'spree_core'
s.add_development_dependency 'capybara', '~> 2.4'
s.add_development_dependency 'coffee-rails'
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'factory_girl', '~> 4.5'
s.add_development_dependency 'ffaker'
s.add_development_dependency 'rspec-rails', '~> 3.1'
- s.add_development_dependency 'sass-rails', '~> 4.0.2'
+ s.add_development_dependency 'sass-rails', '~> 5.0.0.beta1'
s.add_development_dependency 'selenium-webdriver'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'sqlite3'
diff --git a/spree_omniauth/.gitignore b/spree_omniauth/.gitignore
new file mode 100644
index 00000000..e8a3f9c2
--- /dev/null
+++ b/spree_omniauth/.gitignore
@@ -0,0 +1,14 @@
+\#*
+*~
+.#*
+.DS_Store
+.idea
+.project
+.sass-cache
+coverage
+Gemfile.lock
+tmp
+nbproject
+pkg
+*.swp
+spec/dummy
diff --git a/spree_omniauth/.rspec b/spree_omniauth/.rspec
new file mode 100644
index 00000000..5052887a
--- /dev/null
+++ b/spree_omniauth/.rspec
@@ -0,0 +1 @@
+--color
\ No newline at end of file
diff --git a/spree_omniauth/Gemfile b/spree_omniauth/Gemfile
new file mode 100644
index 00000000..8527d16f
--- /dev/null
+++ b/spree_omniauth/Gemfile
@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+gem 'spree', github: 'spree/spree', branch: '3-1-stable'
+# Provides basic authentication functionality for testing parts of your engine
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-1-stable'
+
+gem 'omniauth-open_wechat'
+
+gem 'wechat'
+
+group :development do
+ gem "spring"
+ gem 'pry-rails'
+ gem 'byebug'
+end
+
+
+gemspec
diff --git a/spree_omniauth/LICENSE b/spree_omniauth/LICENSE
new file mode 100644
index 00000000..27b85d72
--- /dev/null
+++ b/spree_omniauth/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2015 [name of plugin creator]
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name Spree nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/spree_omniauth/README.md b/spree_omniauth/README.md
new file mode 100644
index 00000000..65462d17
--- /dev/null
+++ b/spree_omniauth/README.md
@@ -0,0 +1,46 @@
+SpreeOmniauth
+=============
+
+Integrate spree with wechat.
+
+Installation
+------------
+
+Add spree_omniauth to your Gemfile:
+
+https://github.com/plataformatec/devise/wiki/OmniAuth-with-multiple-models
+
+
+```ruby
+gem 'spree_omniauth'
+```
+
+Bundle your dependencies and run the installation generator:
+
+```shell
+bundle
+bundle exec rails g spree_omniauth:install
+```
+List of Strategies
+------------------
+https://github.com/free1/omniauth-open_wechat
+
+
+Testing
+-------
+
+First bundle your dependencies, then run `rake`. `rake` will default to building the dummy app if it does not exist, then it will run specs. The dummy app can be regenerated by using `rake test_app`.
+
+```shell
+bundle
+bundle exec rake
+```
+
+When testing your applications integration with this extension you may use it's factories.
+Simply add this require statement to your spec_helper:
+
+```ruby
+require 'spree_omniauth/factories'
+```
+
+Copyright (c) 2015 [name of extension creator], released under the New BSD License
diff --git a/spree_omniauth/Rakefile b/spree_omniauth/Rakefile
new file mode 100644
index 00000000..7fe78862
--- /dev/null
+++ b/spree_omniauth/Rakefile
@@ -0,0 +1,21 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+require 'spree/testing_support/extension_rake'
+
+RSpec::Core::RakeTask.new
+
+task :default do
+ if Dir["spec/dummy"].empty?
+ Rake::Task[:test_app].invoke
+ Dir.chdir("../../")
+ end
+ Rake::Task[:spec].invoke
+end
+
+desc 'Generates a dummy app for testing'
+task :test_app do
+ ENV['LIB_NAME'] = 'spree_omniauth'
+ Rake::Task['common:test_app'].invoke("Spree::User")
+end
diff --git a/spree_omniauth/app/assets/images/aol_128.png b/spree_omniauth/app/assets/images/aol_128.png
new file mode 100644
index 00000000..391d32fa
Binary files /dev/null and b/spree_omniauth/app/assets/images/aol_128.png differ
diff --git a/spree_omniauth/app/assets/images/aol_256.png b/spree_omniauth/app/assets/images/aol_256.png
new file mode 100644
index 00000000..be9bb7c3
Binary files /dev/null and b/spree_omniauth/app/assets/images/aol_256.png differ
diff --git a/spree_omniauth/app/assets/images/aol_32.png b/spree_omniauth/app/assets/images/aol_32.png
new file mode 100644
index 00000000..f50ebb56
Binary files /dev/null and b/spree_omniauth/app/assets/images/aol_32.png differ
diff --git a/spree_omniauth/app/assets/images/aol_64.png b/spree_omniauth/app/assets/images/aol_64.png
new file mode 100644
index 00000000..64d6e5d9
Binary files /dev/null and b/spree_omniauth/app/assets/images/aol_64.png differ
diff --git a/spree_omniauth/app/assets/images/basecamp_128.png b/spree_omniauth/app/assets/images/basecamp_128.png
new file mode 100644
index 00000000..20f4a349
Binary files /dev/null and b/spree_omniauth/app/assets/images/basecamp_128.png differ
diff --git a/spree_omniauth/app/assets/images/basecamp_256.png b/spree_omniauth/app/assets/images/basecamp_256.png
new file mode 100644
index 00000000..a5d9c9fd
Binary files /dev/null and b/spree_omniauth/app/assets/images/basecamp_256.png differ
diff --git a/spree_omniauth/app/assets/images/basecamp_32.png b/spree_omniauth/app/assets/images/basecamp_32.png
new file mode 100644
index 00000000..d6ec05a7
Binary files /dev/null and b/spree_omniauth/app/assets/images/basecamp_32.png differ
diff --git a/spree_omniauth/app/assets/images/basecamp_64.png b/spree_omniauth/app/assets/images/basecamp_64.png
new file mode 100644
index 00000000..30257784
Binary files /dev/null and b/spree_omniauth/app/assets/images/basecamp_64.png differ
diff --git a/spree_omniauth/app/assets/images/campfire_128.png b/spree_omniauth/app/assets/images/campfire_128.png
new file mode 100644
index 00000000..826b7adb
Binary files /dev/null and b/spree_omniauth/app/assets/images/campfire_128.png differ
diff --git a/spree_omniauth/app/assets/images/campfire_256.png b/spree_omniauth/app/assets/images/campfire_256.png
new file mode 100644
index 00000000..317309d9
Binary files /dev/null and b/spree_omniauth/app/assets/images/campfire_256.png differ
diff --git a/spree_omniauth/app/assets/images/campfire_32.png b/spree_omniauth/app/assets/images/campfire_32.png
new file mode 100644
index 00000000..e9cd71ef
Binary files /dev/null and b/spree_omniauth/app/assets/images/campfire_32.png differ
diff --git a/spree_omniauth/app/assets/images/campfire_64.png b/spree_omniauth/app/assets/images/campfire_64.png
new file mode 100644
index 00000000..5dd69f52
Binary files /dev/null and b/spree_omniauth/app/assets/images/campfire_64.png differ
diff --git a/spree_omniauth/app/assets/images/facebook_128.png b/spree_omniauth/app/assets/images/facebook_128.png
new file mode 100644
index 00000000..3a04a89c
Binary files /dev/null and b/spree_omniauth/app/assets/images/facebook_128.png differ
diff --git a/spree_omniauth/app/assets/images/facebook_256.png b/spree_omniauth/app/assets/images/facebook_256.png
new file mode 100644
index 00000000..aac1cc0a
Binary files /dev/null and b/spree_omniauth/app/assets/images/facebook_256.png differ
diff --git a/spree_omniauth/app/assets/images/facebook_32.png b/spree_omniauth/app/assets/images/facebook_32.png
new file mode 100644
index 00000000..e8bca65f
Binary files /dev/null and b/spree_omniauth/app/assets/images/facebook_32.png differ
diff --git a/spree_omniauth/app/assets/images/facebook_64.png b/spree_omniauth/app/assets/images/facebook_64.png
new file mode 100644
index 00000000..c7a9d833
Binary files /dev/null and b/spree_omniauth/app/assets/images/facebook_64.png differ
diff --git a/spree_omniauth/app/assets/images/github_128.png b/spree_omniauth/app/assets/images/github_128.png
new file mode 100644
index 00000000..15e02097
Binary files /dev/null and b/spree_omniauth/app/assets/images/github_128.png differ
diff --git a/spree_omniauth/app/assets/images/github_256.png b/spree_omniauth/app/assets/images/github_256.png
new file mode 100644
index 00000000..b9136387
Binary files /dev/null and b/spree_omniauth/app/assets/images/github_256.png differ
diff --git a/spree_omniauth/app/assets/images/github_32.png b/spree_omniauth/app/assets/images/github_32.png
new file mode 100644
index 00000000..247e52a5
Binary files /dev/null and b/spree_omniauth/app/assets/images/github_32.png differ
diff --git a/spree_omniauth/app/assets/images/github_64.png b/spree_omniauth/app/assets/images/github_64.png
new file mode 100644
index 00000000..fca7bf44
Binary files /dev/null and b/spree_omniauth/app/assets/images/github_64.png differ
diff --git a/spree_omniauth/app/assets/images/google_128.png b/spree_omniauth/app/assets/images/google_128.png
new file mode 100644
index 00000000..401000a1
Binary files /dev/null and b/spree_omniauth/app/assets/images/google_128.png differ
diff --git a/spree_omniauth/app/assets/images/google_256.png b/spree_omniauth/app/assets/images/google_256.png
new file mode 100644
index 00000000..3f66b25f
Binary files /dev/null and b/spree_omniauth/app/assets/images/google_256.png differ
diff --git a/spree_omniauth/app/assets/images/google_32.png b/spree_omniauth/app/assets/images/google_32.png
new file mode 100644
index 00000000..3909e9de
Binary files /dev/null and b/spree_omniauth/app/assets/images/google_32.png differ
diff --git a/spree_omniauth/app/assets/images/google_64.png b/spree_omniauth/app/assets/images/google_64.png
new file mode 100644
index 00000000..e55f34f1
Binary files /dev/null and b/spree_omniauth/app/assets/images/google_64.png differ
diff --git a/spree_omniauth/app/assets/images/linkedin_128.png b/spree_omniauth/app/assets/images/linkedin_128.png
new file mode 100644
index 00000000..bbc9f1ab
Binary files /dev/null and b/spree_omniauth/app/assets/images/linkedin_128.png differ
diff --git a/spree_omniauth/app/assets/images/linkedin_256.png b/spree_omniauth/app/assets/images/linkedin_256.png
new file mode 100644
index 00000000..2f14416b
Binary files /dev/null and b/spree_omniauth/app/assets/images/linkedin_256.png differ
diff --git a/spree_omniauth/app/assets/images/linkedin_32.png b/spree_omniauth/app/assets/images/linkedin_32.png
new file mode 100644
index 00000000..265828c9
Binary files /dev/null and b/spree_omniauth/app/assets/images/linkedin_32.png differ
diff --git a/spree_omniauth/app/assets/images/linkedin_64.png b/spree_omniauth/app/assets/images/linkedin_64.png
new file mode 100644
index 00000000..a0163669
Binary files /dev/null and b/spree_omniauth/app/assets/images/linkedin_64.png differ
diff --git a/spree_omniauth/app/assets/images/myspace_128.png b/spree_omniauth/app/assets/images/myspace_128.png
new file mode 100644
index 00000000..477c16b7
Binary files /dev/null and b/spree_omniauth/app/assets/images/myspace_128.png differ
diff --git a/spree_omniauth/app/assets/images/myspace_256.png b/spree_omniauth/app/assets/images/myspace_256.png
new file mode 100644
index 00000000..e8f31cd8
Binary files /dev/null and b/spree_omniauth/app/assets/images/myspace_256.png differ
diff --git a/spree_omniauth/app/assets/images/myspace_32.png b/spree_omniauth/app/assets/images/myspace_32.png
new file mode 100644
index 00000000..79b32f71
Binary files /dev/null and b/spree_omniauth/app/assets/images/myspace_32.png differ
diff --git a/spree_omniauth/app/assets/images/myspace_64.png b/spree_omniauth/app/assets/images/myspace_64.png
new file mode 100644
index 00000000..88050fdd
Binary files /dev/null and b/spree_omniauth/app/assets/images/myspace_64.png differ
diff --git a/spree_omniauth/app/assets/images/openid_128.png b/spree_omniauth/app/assets/images/openid_128.png
new file mode 100644
index 00000000..26b9318b
Binary files /dev/null and b/spree_omniauth/app/assets/images/openid_128.png differ
diff --git a/spree_omniauth/app/assets/images/openid_256.png b/spree_omniauth/app/assets/images/openid_256.png
new file mode 100644
index 00000000..dbe72330
Binary files /dev/null and b/spree_omniauth/app/assets/images/openid_256.png differ
diff --git a/spree_omniauth/app/assets/images/openid_32.png b/spree_omniauth/app/assets/images/openid_32.png
new file mode 100644
index 00000000..94ef7779
Binary files /dev/null and b/spree_omniauth/app/assets/images/openid_32.png differ
diff --git a/spree_omniauth/app/assets/images/openid_64.png b/spree_omniauth/app/assets/images/openid_64.png
new file mode 100644
index 00000000..21e2819a
Binary files /dev/null and b/spree_omniauth/app/assets/images/openid_64.png differ
diff --git a/spree_omniauth/app/assets/images/presently_128.png b/spree_omniauth/app/assets/images/presently_128.png
new file mode 100644
index 00000000..f4acb7c2
Binary files /dev/null and b/spree_omniauth/app/assets/images/presently_128.png differ
diff --git a/spree_omniauth/app/assets/images/presently_256.png b/spree_omniauth/app/assets/images/presently_256.png
new file mode 100644
index 00000000..a3193d73
Binary files /dev/null and b/spree_omniauth/app/assets/images/presently_256.png differ
diff --git a/spree_omniauth/app/assets/images/presently_32.png b/spree_omniauth/app/assets/images/presently_32.png
new file mode 100644
index 00000000..a5c74456
Binary files /dev/null and b/spree_omniauth/app/assets/images/presently_32.png differ
diff --git a/spree_omniauth/app/assets/images/presently_64.png b/spree_omniauth/app/assets/images/presently_64.png
new file mode 100644
index 00000000..d7cf8163
Binary files /dev/null and b/spree_omniauth/app/assets/images/presently_64.png differ
diff --git a/spree_omniauth/app/assets/images/twitter_128.png b/spree_omniauth/app/assets/images/twitter_128.png
new file mode 100644
index 00000000..6403a67e
Binary files /dev/null and b/spree_omniauth/app/assets/images/twitter_128.png differ
diff --git a/spree_omniauth/app/assets/images/twitter_256.png b/spree_omniauth/app/assets/images/twitter_256.png
new file mode 100644
index 00000000..b7ce4483
Binary files /dev/null and b/spree_omniauth/app/assets/images/twitter_256.png differ
diff --git a/spree_omniauth/app/assets/images/twitter_32.png b/spree_omniauth/app/assets/images/twitter_32.png
new file mode 100644
index 00000000..daadcffd
Binary files /dev/null and b/spree_omniauth/app/assets/images/twitter_32.png differ
diff --git a/spree_omniauth/app/assets/images/twitter_64.png b/spree_omniauth/app/assets/images/twitter_64.png
new file mode 100644
index 00000000..68b74530
Binary files /dev/null and b/spree_omniauth/app/assets/images/twitter_64.png differ
diff --git a/spree_omniauth/app/assets/images/vkontakte.png b/spree_omniauth/app/assets/images/vkontakte.png
new file mode 100644
index 00000000..b484d09e
Binary files /dev/null and b/spree_omniauth/app/assets/images/vkontakte.png differ
diff --git a/spree_omniauth/app/assets/images/yahoo_128.png b/spree_omniauth/app/assets/images/yahoo_128.png
new file mode 100644
index 00000000..c9adc814
Binary files /dev/null and b/spree_omniauth/app/assets/images/yahoo_128.png differ
diff --git a/spree_omniauth/app/assets/images/yahoo_256.png b/spree_omniauth/app/assets/images/yahoo_256.png
new file mode 100644
index 00000000..2688585b
Binary files /dev/null and b/spree_omniauth/app/assets/images/yahoo_256.png differ
diff --git a/spree_omniauth/app/assets/images/yahoo_32.png b/spree_omniauth/app/assets/images/yahoo_32.png
new file mode 100644
index 00000000..7879a31e
Binary files /dev/null and b/spree_omniauth/app/assets/images/yahoo_32.png differ
diff --git a/spree_omniauth/app/assets/images/yahoo_64.png b/spree_omniauth/app/assets/images/yahoo_64.png
new file mode 100644
index 00000000..64a703f1
Binary files /dev/null and b/spree_omniauth/app/assets/images/yahoo_64.png differ
diff --git a/spree_omniauth/app/assets/javascripts/spree/backend/spree_omniauth.js b/spree_omniauth/app/assets/javascripts/spree/backend/spree_omniauth.js
new file mode 100644
index 00000000..8aa3b014
--- /dev/null
+++ b/spree_omniauth/app/assets/javascripts/spree/backend/spree_omniauth.js
@@ -0,0 +1,2 @@
+// Placeholder manifest file.
+// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js'
\ No newline at end of file
diff --git a/spree_omniauth/app/assets/javascripts/spree/frontend/spree_omniauth.js b/spree_omniauth/app/assets/javascripts/spree/frontend/spree_omniauth.js
new file mode 100644
index 00000000..a79f2e94
--- /dev/null
+++ b/spree_omniauth/app/assets/javascripts/spree/frontend/spree_omniauth.js
@@ -0,0 +1,2 @@
+// Placeholder manifest file.
+// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js'
\ No newline at end of file
diff --git a/spree_omniauth/app/assets/stylesheets/spree/backend/spree_omniauth.css b/spree_omniauth/app/assets/stylesheets/spree/backend/spree_omniauth.css
new file mode 100644
index 00000000..e3c23662
--- /dev/null
+++ b/spree_omniauth/app/assets/stylesheets/spree/backend/spree_omniauth.css
@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/backend/all.css'
+*/
diff --git a/spree_omniauth/app/assets/stylesheets/spree/frontend/spree_omniauth.css b/spree_omniauth/app/assets/stylesheets/spree/frontend/spree_omniauth.css
new file mode 100644
index 00000000..da236237
--- /dev/null
+++ b/spree_omniauth/app/assets/stylesheets/spree/frontend/spree_omniauth.css
@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/frontend/all.css'
+*/
diff --git a/spree_omniauth/app/controllers/omniauth_callbacks_controller.rb b/spree_omniauth/app/controllers/omniauth_callbacks_controller.rb
new file mode 100644
index 00000000..b312c9dd
--- /dev/null
+++ b/spree_omniauth/app/controllers/omniauth_callbacks_controller.rb
@@ -0,0 +1,37 @@
+class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+
+ def facebook
+ # You need to implement the method below in your model (e.g. app/models/user.rb)
+ @user = User.from_omniauth(request.env["omniauth.auth"])
+
+ if @user.persisted?
+ sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
+ set_flash_message(:notice, :success, :kind => "Facebook") if is_navigational_format?
+ else
+ session["devise.facebook_data"] = request.env["omniauth.auth"]
+ redirect_to new_user_registration_url
+ end
+ end
+
+ def failure
+ redirect_to root_path
+ end
+
+ def callback
+ # 1. 寻找用户 uid + provider
+ # 2. 如果他没有那么创造和记录用户在O _码数据
+ # 3. 为用户创造 session
+ auth = request.env['rack.auth']
+ user = Spree::User.find_by_provider_and_uid(auth['provider'],auth['uid'])
+ if user.nil?
+ user = Spree::User.create_by_auth(auth)
+ end
+ @user_session = UserSession.new(user)
+ puts @user_session.save!
+ if @user_session
+ redirect_to '/', :notice => "Welcome, #{auth['user_info']['name']}"
+ else
+ redirect_to '/login', :alert => "Error login"
+ end
+ end
+end
diff --git a/spree_omniauth/app/controllers/spree/open/wechats_controller.rb b/spree_omniauth/app/controllers/spree/open/wechats_controller.rb
new file mode 100644
index 00000000..99cf710a
--- /dev/null
+++ b/spree_omniauth/app/controllers/spree/open/wechats_controller.rb
@@ -0,0 +1,37 @@
+module Spree::Open
+ class WechatsController < ActionController::Base
+ # For details on the DSL available within this file, see https://github.com/Eric-Guo/wechat#rails-responder-controller-dsl
+ wechat_responder
+ prepend_before_action :initialize_account
+ helper_method :wechat_oauth2
+ #include Wechat::Responder
+ #self.wechat_cfg_account = opts[:account].present? ? opts[:account].to_sym : :default
+ #self.wechat_api_client = load_controller_wechat(wechat_cfg_account, opts)
+
+ on :text do |request, content|
+ request.reply.text "echo: #{content}" # Just echo
+ end
+
+
+ def callback
+ # 1. 寻找用户 uid + provider
+ # 2. 如果他没有那么创造和记录用户在O _码数据
+ # You need to implement the method below in your model (e.g. app/models/user.rb)
+ @user = Spree::User.from_omniauth(request.env["omniauth.auth"]||{})
+
+ if @user
+ sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
+ set_flash_message(:notice, :success, :kind => "Facebook") if is_navigational_format?
+ else
+ session["devise.wechat_data"] = request.env["omniauth.auth"]
+ redirect_to spree.signup_path
+ end
+ end
+
+ private
+ def initialize_account
+ #self.wechat_api_client = load_controller_wechat(wechat_cfg_account, opts)
+ end
+ end
+
+end
diff --git a/spree_omniauth/app/models/spree/decorators/user_decorator.rb b/spree_omniauth/app/models/spree/decorators/user_decorator.rb
new file mode 100644
index 00000000..9f4dbe09
--- /dev/null
+++ b/spree_omniauth/app/models/spree/decorators/user_decorator.rb
@@ -0,0 +1,34 @@
+# each user can use different socialnetwork for same account
+Spree::User.class_eval do
+ has_many :oauth_accounts
+
+ #https://github.com/plataformatec/devise/wiki/OmniAuth%3A-Overview
+ def self.from_omniauth(auth)
+ return nil unless auth.present?
+ find_by_auth( auth ) || create_by_auth( auth )
+ end
+
+
+ # search user by provider and data
+ # in migration exist index
+ def self.find_by_auth( auth )
+ self.joins(:oauth_accounts).where(:spree_oauth_accounts => {:provider => auth['provider'],:uid => auth['uid'] }).limit(1).first
+ end
+
+ #
+ def self.create_by_auth( auth )
+
+ user = self.new
+ user.login = auth['user_info']['nickname']
+ user.password = Devise.friendly_token[0,20]
+
+ user.build_oauth_account(
+ :provider => auth['provider'],
+ :uid => auth['uid'],
+ :user_info => auth['user_info'],
+ :name => auth['user_info']['name']
+ )
+ user.save ? user : nil
+
+ end
+end
diff --git a/spree_omniauth/app/models/spree/oauth_account.rb b/spree_omniauth/app/models/spree/oauth_account.rb
new file mode 100644
index 00000000..0d4339c3
--- /dev/null
+++ b/spree_omniauth/app/models/spree/oauth_account.rb
@@ -0,0 +1,5 @@
+module Spree
+ class OauthAccount < ActiveRecord::Base
+ serialize :info, JSON
+ end
+end
diff --git a/spree_omniauth/app/overrides/social_auth.rb b/spree_omniauth/app/overrides/social_auth.rb
new file mode 100644
index 00000000..00464a28
--- /dev/null
+++ b/spree_omniauth/app/overrides/social_auth.rb
@@ -0,0 +1,11 @@
+Deface::Override.new(:virtual_path => "spree/user_registerations/new",
+ :name => "insert social auth",
+ :insert_top => "[data-hook='login_extras']",
+ :partial => "shared/social_auth",
+ :original => '9545f08a85b960009d04d0d3d598ae331641077f')
+
+Deface::Override.new(:virtual_path => "spree/user_sessions/new",
+ :name => "insert social auth",
+ :insert_top => "[data-hook='login_extras']",
+ :partial => "shared/social_auth",
+ :original => '9545f08a85b960009d04d0d3d598ae331641077f')
diff --git a/spree_omniauth/app/views/shared/_social_auth.html.erb b/spree_omniauth/app/views/shared/_social_auth.html.erb
new file mode 100644
index 00000000..b499bc4a
--- /dev/null
+++ b/spree_omniauth/app/views/shared/_social_auth.html.erb
@@ -0,0 +1,3 @@
+
+ <%= link_to image_tag('github_32.png'), wechat_oauth2_url %>
+
diff --git a/spree_omniauth/bin/rails b/spree_omniauth/bin/rails
new file mode 100644
index 00000000..60a29738
--- /dev/null
+++ b/spree_omniauth/bin/rails
@@ -0,0 +1,7 @@
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree_omniauth/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
diff --git a/spree_omniauth/config/locales/en.yml b/spree_omniauth/config/locales/en.yml
new file mode 100644
index 00000000..179c14ca
--- /dev/null
+++ b/spree_omniauth/config/locales/en.yml
@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+ hello: "Hello world"
diff --git a/spree_omniauth/config/omniauth.rb b/spree_omniauth/config/omniauth.rb
new file mode 100644
index 00000000..58c669a5
--- /dev/null
+++ b/spree_omniauth/config/omniauth.rb
@@ -0,0 +1,7 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+ #provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
+ provider :open_wechat, ENV['OPEN_WECHAT_KEY'], ENV['OPEN_WECHAT_SECRET'], :scope => 'snsapi_login'
+
+ on_failure { |env| AuthenticationsController.action(:failure).call(env) }
+
+end
diff --git a/spree_omniauth/config/routes.rb b/spree_omniauth/config/routes.rb
new file mode 100644
index 00000000..11bf7361
--- /dev/null
+++ b/spree_omniauth/config/routes.rb
@@ -0,0 +1,13 @@
+Spree::Core::Engine.routes.draw do
+ namespace :open do
+ resource :wechat, only: [:show, :create] do
+ get "callback"
+ end
+ end
+
+ # Add your extension routes here
+ # get "/auth/:provider/callback" => "sessions#create"
+
+ get "/open/wechat/callback" => "wechats#callback"
+
+end
diff --git a/spree_omniauth/config/wechat.yml b/spree_omniauth/config/wechat.yml
new file mode 100644
index 00000000..9b3d2610
--- /dev/null
+++ b/spree_omniauth/config/wechat.yml
@@ -0,0 +1,72 @@
+default: &default
+# corpid: "corpid"
+# corpsecret: "corpsecret"
+# agentid: 1
+# Or if using public account, only need above two line
+ appid: "wxe1e41bc95e1ffc98"
+ secret: "5ed88d0faa88ba705a31e650791c5d85"
+ token: "my_token"
+ #access_token: "tmp/wechat_access_token"
+ #encrypt_mode: false # if true must fill encoding_aes_key
+ #encoding_aes_key: "my_encoding_aes_key"
+ #jsapi_ticket: "tmp/wechat_jsapi_ticket"
+
+production:
+ corpid: <%= ENV['WECHAT_CORPID'] %>
+ corpsecret: <%= ENV['WECHAT_CORPSECRET'] %>
+ agentid: <%= ENV['WECHAT_AGENTID'] %>
+# Or if using public account, only need above two line
+# appid:
+# secret:
+ token: <%= ENV['WECHAT_TOKEN'] %>
+ timeout: 30,
+ skip_verify_ssl: true
+ access_token: <%= ENV['WECHAT_ACCESS_TOKEN'] %>
+ encrypt_mode: false # if true must fill encoding_aes_key
+ encoding_aes_key: <%= ENV['WECHAT_ENCODING_AES_KEY'] %>
+ jsapi_ticket: <%= ENV['WECHAT_JSAPI_TICKET'] %>
+ oauth2_cookie_duration: <%= ENV['WECHAT_OAUTH2_COOKIE_DURATION'] %> # seconds
+
+development:
+ <<: *default
+ trusted_domain_fullname: ""
+
+test:
+ <<: *default
+
+# Multiple Accounts
+#
+# wx2_development:
+# <<: *default
+# appid: "my_appid"
+# secret: "my_secret"
+# access_token: "tmp/wechat_access_token2"
+# jsapi_ticket: "tmp/wechat_jsapi_ticket2"
+#
+# wx2_test:
+# <<: *default
+# appid: "my_appid"
+# secret: "my_secret"
+#
+# wx2_production:
+# <<: *default
+# appid: "my_appid"
+# secret: "my_secret"
+#
+# wx3_development:
+# <<: *default
+# appid: "my_appid"
+# secret: "my_secret"
+# access_token: "tmp/wechat_access_token3"
+# jsapi_ticket: "tmp/wechat_jsapi_ticket3"
+#
+# wx3_test:
+# <<: *default
+# appid: "my_appid"
+# secret: "my_secret"
+#
+# wx3_production:
+# <<: *default
+# appid: "my_appid"
+# secret: "my_secret"
+#
diff --git a/spree_omniauth/db/migrate/20151229135000_create_oauths.rb b/spree_omniauth/db/migrate/20151229135000_create_oauths.rb
new file mode 100644
index 00000000..aeab6725
--- /dev/null
+++ b/spree_omniauth/db/migrate/20151229135000_create_oauths.rb
@@ -0,0 +1,18 @@
+class CreateOauths < ActiveRecord::Migration
+ def self.up
+ create_table :spree_oauth_accounts do |t|
+ t.string :provider, :nil => false
+ t.integer :uid, :nil => false
+ t.text :info
+ t.string :name
+ t.integer :user_id, null: false
+ t.timestamps null: false
+ end
+ add_index :spree_oauth_accounts, [:uid,:provider], :unique => true
+ add_index :spree_oauth_accounts, :user_id
+ end
+
+ def self.down
+ drop_table :spree_oauth_accounts
+ end
+end
diff --git a/spree_omniauth/db/migrate/20160217045742_add_store_wx.rb b/spree_omniauth/db/migrate/20160217045742_add_store_wx.rb
new file mode 100644
index 00000000..84f3bdde
--- /dev/null
+++ b/spree_omniauth/db/migrate/20160217045742_add_store_wx.rb
@@ -0,0 +1,9 @@
+class AddStoreWx < ActiveRecord::Migration
+ # add feature store disignable
+ def change
+ add_column :spree_stores, :wx_appid, :string
+ add_column :spree_stores, :wx_secret, :string
+ add_column :spree_stores, :wx_token, :string
+ #add_column :spree_stores, :wx_corpid, :string
+ end
+end
diff --git a/spree_omniauth/lib/assets/images/aol_128.png b/spree_omniauth/lib/assets/images/aol_128.png
new file mode 100644
index 00000000..391d32fa
Binary files /dev/null and b/spree_omniauth/lib/assets/images/aol_128.png differ
diff --git a/spree_omniauth/lib/assets/images/aol_256.png b/spree_omniauth/lib/assets/images/aol_256.png
new file mode 100644
index 00000000..be9bb7c3
Binary files /dev/null and b/spree_omniauth/lib/assets/images/aol_256.png differ
diff --git a/spree_omniauth/lib/assets/images/aol_32.png b/spree_omniauth/lib/assets/images/aol_32.png
new file mode 100644
index 00000000..f50ebb56
Binary files /dev/null and b/spree_omniauth/lib/assets/images/aol_32.png differ
diff --git a/spree_omniauth/lib/assets/images/aol_64.png b/spree_omniauth/lib/assets/images/aol_64.png
new file mode 100644
index 00000000..64d6e5d9
Binary files /dev/null and b/spree_omniauth/lib/assets/images/aol_64.png differ
diff --git a/spree_omniauth/lib/assets/images/basecamp_128.png b/spree_omniauth/lib/assets/images/basecamp_128.png
new file mode 100644
index 00000000..20f4a349
Binary files /dev/null and b/spree_omniauth/lib/assets/images/basecamp_128.png differ
diff --git a/spree_omniauth/lib/assets/images/basecamp_256.png b/spree_omniauth/lib/assets/images/basecamp_256.png
new file mode 100644
index 00000000..a5d9c9fd
Binary files /dev/null and b/spree_omniauth/lib/assets/images/basecamp_256.png differ
diff --git a/spree_omniauth/lib/assets/images/basecamp_32.png b/spree_omniauth/lib/assets/images/basecamp_32.png
new file mode 100644
index 00000000..d6ec05a7
Binary files /dev/null and b/spree_omniauth/lib/assets/images/basecamp_32.png differ
diff --git a/spree_omniauth/lib/assets/images/basecamp_64.png b/spree_omniauth/lib/assets/images/basecamp_64.png
new file mode 100644
index 00000000..30257784
Binary files /dev/null and b/spree_omniauth/lib/assets/images/basecamp_64.png differ
diff --git a/spree_omniauth/lib/assets/images/campfire_128.png b/spree_omniauth/lib/assets/images/campfire_128.png
new file mode 100644
index 00000000..826b7adb
Binary files /dev/null and b/spree_omniauth/lib/assets/images/campfire_128.png differ
diff --git a/spree_omniauth/lib/assets/images/campfire_256.png b/spree_omniauth/lib/assets/images/campfire_256.png
new file mode 100644
index 00000000..317309d9
Binary files /dev/null and b/spree_omniauth/lib/assets/images/campfire_256.png differ
diff --git a/spree_omniauth/lib/assets/images/campfire_32.png b/spree_omniauth/lib/assets/images/campfire_32.png
new file mode 100644
index 00000000..e9cd71ef
Binary files /dev/null and b/spree_omniauth/lib/assets/images/campfire_32.png differ
diff --git a/spree_omniauth/lib/assets/images/campfire_64.png b/spree_omniauth/lib/assets/images/campfire_64.png
new file mode 100644
index 00000000..5dd69f52
Binary files /dev/null and b/spree_omniauth/lib/assets/images/campfire_64.png differ
diff --git a/spree_omniauth/lib/assets/images/facebook_128.png b/spree_omniauth/lib/assets/images/facebook_128.png
new file mode 100644
index 00000000..3a04a89c
Binary files /dev/null and b/spree_omniauth/lib/assets/images/facebook_128.png differ
diff --git a/spree_omniauth/lib/assets/images/facebook_256.png b/spree_omniauth/lib/assets/images/facebook_256.png
new file mode 100644
index 00000000..aac1cc0a
Binary files /dev/null and b/spree_omniauth/lib/assets/images/facebook_256.png differ
diff --git a/spree_omniauth/lib/assets/images/facebook_32.png b/spree_omniauth/lib/assets/images/facebook_32.png
new file mode 100644
index 00000000..e8bca65f
Binary files /dev/null and b/spree_omniauth/lib/assets/images/facebook_32.png differ
diff --git a/spree_omniauth/lib/assets/images/facebook_64.png b/spree_omniauth/lib/assets/images/facebook_64.png
new file mode 100644
index 00000000..c7a9d833
Binary files /dev/null and b/spree_omniauth/lib/assets/images/facebook_64.png differ
diff --git a/spree_omniauth/lib/assets/images/github_128.png b/spree_omniauth/lib/assets/images/github_128.png
new file mode 100644
index 00000000..15e02097
Binary files /dev/null and b/spree_omniauth/lib/assets/images/github_128.png differ
diff --git a/spree_omniauth/lib/assets/images/github_256.png b/spree_omniauth/lib/assets/images/github_256.png
new file mode 100644
index 00000000..b9136387
Binary files /dev/null and b/spree_omniauth/lib/assets/images/github_256.png differ
diff --git a/spree_omniauth/lib/assets/images/github_32.png b/spree_omniauth/lib/assets/images/github_32.png
new file mode 100644
index 00000000..247e52a5
Binary files /dev/null and b/spree_omniauth/lib/assets/images/github_32.png differ
diff --git a/spree_omniauth/lib/assets/images/github_64.png b/spree_omniauth/lib/assets/images/github_64.png
new file mode 100644
index 00000000..fca7bf44
Binary files /dev/null and b/spree_omniauth/lib/assets/images/github_64.png differ
diff --git a/spree_omniauth/lib/assets/images/google_128.png b/spree_omniauth/lib/assets/images/google_128.png
new file mode 100644
index 00000000..401000a1
Binary files /dev/null and b/spree_omniauth/lib/assets/images/google_128.png differ
diff --git a/spree_omniauth/lib/assets/images/google_256.png b/spree_omniauth/lib/assets/images/google_256.png
new file mode 100644
index 00000000..3f66b25f
Binary files /dev/null and b/spree_omniauth/lib/assets/images/google_256.png differ
diff --git a/spree_omniauth/lib/assets/images/google_32.png b/spree_omniauth/lib/assets/images/google_32.png
new file mode 100644
index 00000000..3909e9de
Binary files /dev/null and b/spree_omniauth/lib/assets/images/google_32.png differ
diff --git a/spree_omniauth/lib/assets/images/google_64.png b/spree_omniauth/lib/assets/images/google_64.png
new file mode 100644
index 00000000..e55f34f1
Binary files /dev/null and b/spree_omniauth/lib/assets/images/google_64.png differ
diff --git a/spree_omniauth/lib/assets/images/linkedin_128.png b/spree_omniauth/lib/assets/images/linkedin_128.png
new file mode 100644
index 00000000..bbc9f1ab
Binary files /dev/null and b/spree_omniauth/lib/assets/images/linkedin_128.png differ
diff --git a/spree_omniauth/lib/assets/images/linkedin_256.png b/spree_omniauth/lib/assets/images/linkedin_256.png
new file mode 100644
index 00000000..2f14416b
Binary files /dev/null and b/spree_omniauth/lib/assets/images/linkedin_256.png differ
diff --git a/spree_omniauth/lib/assets/images/linkedin_32.png b/spree_omniauth/lib/assets/images/linkedin_32.png
new file mode 100644
index 00000000..265828c9
Binary files /dev/null and b/spree_omniauth/lib/assets/images/linkedin_32.png differ
diff --git a/spree_omniauth/lib/assets/images/linkedin_64.png b/spree_omniauth/lib/assets/images/linkedin_64.png
new file mode 100644
index 00000000..a0163669
Binary files /dev/null and b/spree_omniauth/lib/assets/images/linkedin_64.png differ
diff --git a/spree_omniauth/lib/assets/images/myspace_128.png b/spree_omniauth/lib/assets/images/myspace_128.png
new file mode 100644
index 00000000..477c16b7
Binary files /dev/null and b/spree_omniauth/lib/assets/images/myspace_128.png differ
diff --git a/spree_omniauth/lib/assets/images/myspace_256.png b/spree_omniauth/lib/assets/images/myspace_256.png
new file mode 100644
index 00000000..e8f31cd8
Binary files /dev/null and b/spree_omniauth/lib/assets/images/myspace_256.png differ
diff --git a/spree_omniauth/lib/assets/images/myspace_32.png b/spree_omniauth/lib/assets/images/myspace_32.png
new file mode 100644
index 00000000..79b32f71
Binary files /dev/null and b/spree_omniauth/lib/assets/images/myspace_32.png differ
diff --git a/spree_omniauth/lib/assets/images/myspace_64.png b/spree_omniauth/lib/assets/images/myspace_64.png
new file mode 100644
index 00000000..88050fdd
Binary files /dev/null and b/spree_omniauth/lib/assets/images/myspace_64.png differ
diff --git a/spree_omniauth/lib/assets/images/openid_128.png b/spree_omniauth/lib/assets/images/openid_128.png
new file mode 100644
index 00000000..26b9318b
Binary files /dev/null and b/spree_omniauth/lib/assets/images/openid_128.png differ
diff --git a/spree_omniauth/lib/assets/images/openid_256.png b/spree_omniauth/lib/assets/images/openid_256.png
new file mode 100644
index 00000000..dbe72330
Binary files /dev/null and b/spree_omniauth/lib/assets/images/openid_256.png differ
diff --git a/spree_omniauth/lib/assets/images/openid_32.png b/spree_omniauth/lib/assets/images/openid_32.png
new file mode 100644
index 00000000..94ef7779
Binary files /dev/null and b/spree_omniauth/lib/assets/images/openid_32.png differ
diff --git a/spree_omniauth/lib/assets/images/openid_64.png b/spree_omniauth/lib/assets/images/openid_64.png
new file mode 100644
index 00000000..21e2819a
Binary files /dev/null and b/spree_omniauth/lib/assets/images/openid_64.png differ
diff --git a/spree_omniauth/lib/assets/images/presently_128.png b/spree_omniauth/lib/assets/images/presently_128.png
new file mode 100644
index 00000000..f4acb7c2
Binary files /dev/null and b/spree_omniauth/lib/assets/images/presently_128.png differ
diff --git a/spree_omniauth/lib/assets/images/presently_256.png b/spree_omniauth/lib/assets/images/presently_256.png
new file mode 100644
index 00000000..a3193d73
Binary files /dev/null and b/spree_omniauth/lib/assets/images/presently_256.png differ
diff --git a/spree_omniauth/lib/assets/images/presently_32.png b/spree_omniauth/lib/assets/images/presently_32.png
new file mode 100644
index 00000000..a5c74456
Binary files /dev/null and b/spree_omniauth/lib/assets/images/presently_32.png differ
diff --git a/spree_omniauth/lib/assets/images/presently_64.png b/spree_omniauth/lib/assets/images/presently_64.png
new file mode 100644
index 00000000..d7cf8163
Binary files /dev/null and b/spree_omniauth/lib/assets/images/presently_64.png differ
diff --git a/spree_omniauth/lib/assets/images/twitter_128.png b/spree_omniauth/lib/assets/images/twitter_128.png
new file mode 100644
index 00000000..6403a67e
Binary files /dev/null and b/spree_omniauth/lib/assets/images/twitter_128.png differ
diff --git a/spree_omniauth/lib/assets/images/twitter_256.png b/spree_omniauth/lib/assets/images/twitter_256.png
new file mode 100644
index 00000000..b7ce4483
Binary files /dev/null and b/spree_omniauth/lib/assets/images/twitter_256.png differ
diff --git a/spree_omniauth/lib/assets/images/twitter_32.png b/spree_omniauth/lib/assets/images/twitter_32.png
new file mode 100644
index 00000000..daadcffd
Binary files /dev/null and b/spree_omniauth/lib/assets/images/twitter_32.png differ
diff --git a/spree_omniauth/lib/assets/images/twitter_64.png b/spree_omniauth/lib/assets/images/twitter_64.png
new file mode 100644
index 00000000..68b74530
Binary files /dev/null and b/spree_omniauth/lib/assets/images/twitter_64.png differ
diff --git a/spree_omniauth/lib/assets/images/vkontakte.png b/spree_omniauth/lib/assets/images/vkontakte.png
new file mode 100644
index 00000000..b484d09e
Binary files /dev/null and b/spree_omniauth/lib/assets/images/vkontakte.png differ
diff --git a/spree_omniauth/lib/assets/images/yahoo_128.png b/spree_omniauth/lib/assets/images/yahoo_128.png
new file mode 100644
index 00000000..c9adc814
Binary files /dev/null and b/spree_omniauth/lib/assets/images/yahoo_128.png differ
diff --git a/spree_omniauth/lib/assets/images/yahoo_256.png b/spree_omniauth/lib/assets/images/yahoo_256.png
new file mode 100644
index 00000000..2688585b
Binary files /dev/null and b/spree_omniauth/lib/assets/images/yahoo_256.png differ
diff --git a/spree_omniauth/lib/assets/images/yahoo_32.png b/spree_omniauth/lib/assets/images/yahoo_32.png
new file mode 100644
index 00000000..7879a31e
Binary files /dev/null and b/spree_omniauth/lib/assets/images/yahoo_32.png differ
diff --git a/spree_omniauth/lib/assets/images/yahoo_64.png b/spree_omniauth/lib/assets/images/yahoo_64.png
new file mode 100644
index 00000000..64a703f1
Binary files /dev/null and b/spree_omniauth/lib/assets/images/yahoo_64.png differ
diff --git a/spree_omniauth/lib/generators/spree_omniauth/install/install_generator.rb b/spree_omniauth/lib/generators/spree_omniauth/install/install_generator.rb
new file mode 100644
index 00000000..d1c484a4
--- /dev/null
+++ b/spree_omniauth/lib/generators/spree_omniauth/install/install_generator.rb
@@ -0,0 +1,32 @@
+module SpreeOmniauth
+ module Generators
+ class InstallGenerator < Rails::Generators::Base
+
+ class_option :auto_run_migrations, :type => :boolean, :default => false
+
+ def add_javascripts
+ append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_omniauth\n"
+ append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_omniauth\n"
+ end
+
+ def add_stylesheets
+ inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_omniauth\n", :before => /\*\//, :verbose => true
+ inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_omniauth\n", :before => /\*\//, :verbose => true
+ end
+
+ def add_migrations
+ run 'bundle exec rake railties:install:migrations FROM=spree_omniauth'
+ end
+
+ def run_migrations
+ run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+ if run_migrations
+ run 'bundle exec rake db:migrate'
+ else
+ puts 'Skipping rake db:migrate, don\'t forget to run it!'
+ end
+ end
+
+ end
+ end
+end
diff --git a/spree_omniauth/lib/generators/spree_omniauth/templates/spree_omniauth.rb b/spree_omniauth/lib/generators/spree_omniauth/templates/spree_omniauth.rb
new file mode 100644
index 00000000..24117725
--- /dev/null
+++ b/spree_omniauth/lib/generators/spree_omniauth/templates/spree_omniauth.rb
@@ -0,0 +1,6 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+ provider :developer unless Rails.env.production?
+ #provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
+end
+
+OmniAuth.config.logger = Rails.logger
diff --git a/spree_omniauth/lib/spree_omniauth.rb b/spree_omniauth/lib/spree_omniauth.rb
new file mode 100644
index 00000000..18641b49
--- /dev/null
+++ b/spree_omniauth/lib/spree_omniauth.rb
@@ -0,0 +1,3 @@
+require 'spree_core'
+require 'spree_omniauth/engine'
+require 'spree_omniauth/system'
diff --git a/spree_omniauth/lib/spree_omniauth/engine.rb b/spree_omniauth/lib/spree_omniauth/engine.rb
new file mode 100644
index 00000000..1482f0b8
--- /dev/null
+++ b/spree_omniauth/lib/spree_omniauth/engine.rb
@@ -0,0 +1,25 @@
+module SpreeOmniauth
+ class Engine < Rails::Engine
+ require 'spree/core'
+ isolate_namespace Spree
+ engine_name 'spree_omniauth'
+
+ # use rspec for tests
+ config.generators do |g|
+ g.test_framework :rspec
+ end
+
+ def self.activate
+ Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+ Rails.configuration.cache_classes ? require(c) : load(c)
+ end
+ end
+
+ initializer "spree.assets.precompile", :group => :all do |app|
+ app.config.assets.precompile += %w(
+ github_32.png
+ )
+ end
+ config.to_prepare &method(:activate).to_proc
+ end
+end
diff --git a/spree_omniauth/lib/spree_omniauth/factories.rb b/spree_omniauth/lib/spree_omniauth/factories.rb
new file mode 100644
index 00000000..a7604a7a
--- /dev/null
+++ b/spree_omniauth/lib/spree_omniauth/factories.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+ # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
+ #
+ # Example adding this to your spec_helper will load these Factories for use:
+ # require 'spree_omniauth/factories'
+end
diff --git a/spree_omniauth/lib/spree_omniauth/system.rb b/spree_omniauth/lib/spree_omniauth/system.rb
new file mode 100644
index 00000000..a9f3aa41
--- /dev/null
+++ b/spree_omniauth/lib/spree_omniauth/system.rb
@@ -0,0 +1,34 @@
+require 'spree/core/controller_helpers/common'
+# spree/api/base>action_base, spree/base>application
+# both included controller_helper/store
+class << Spree::Core::ControllerHelpers::Common
+ def included_with_omniauth_support(receiver)
+ included_without_omniauth_support(receiver)
+ receiver.send :include, SpreeOmniauth::System
+ receiver.send :wechat_api
+ receiver.send :prepend_before_action, :initialize_wechat_account
+ receiver.send :helper_method, :wechat_oauth2_url
+
+ end
+ alias_method_chain :included, :omniauth_support
+end
+
+module SpreeOmniauth
+ module System
+ def wechat_oauth2_url
+ oauth2_params = {
+ appid: Spree::Store.current.wx_appid,
+ redirect_uri: spree.open_wechat_callback_path,
+ scope: 'snsapi_login',
+ response_type: 'code'
+ }
+ generate_oauth2_url(oauth2_params)
+ end
+
+ private
+ def initialize_wechat_account
+ Rails.logger.debug "initialize_wechat_account"
+ #self.wechat_api_client = load_controller_wechat(wechat_cfg_account, opts)
+ end
+ end
+end
diff --git a/spree_omniauth/spec/requests/echo_spec.rb b/spree_omniauth/spec/requests/echo_spec.rb
new file mode 100644
index 00000000..0002a224
--- /dev/null
+++ b/spree_omniauth/spec/requests/echo_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "Wechat", :type => :request do
+
+ let( :wechat_config ) {
+ {
+ appid: "wxe1e41bc95e1ffc98",
+ secret: "5ed88d0faa88ba705a31e650791c5d85",
+ token: "my_token"
+ }
+ }
+
+
+ context "bind service" do
+ it "bind successfully" do
+ get '/open/wechat/callback', auth:{ provider: 'wechat', uid: 7, user_info:{ nickname: 'david', name: 'ZZ'}}
+ #Spree::Payment.last.should be_complete
+ end
+ end
+
+
+end
diff --git a/spree_omniauth/spec/spec_helper.rb b/spree_omniauth/spec/spec_helper.rb
new file mode 100644
index 00000000..63537f6d
--- /dev/null
+++ b/spree_omniauth/spec/spec_helper.rb
@@ -0,0 +1,93 @@
+# Run Coverage report
+require 'simplecov'
+SimpleCov.start do
+ add_filter 'spec/dummy'
+ add_group 'Controllers', 'app/controllers'
+ add_group 'Helpers', 'app/helpers'
+ add_group 'Mailers', 'app/mailers'
+ add_group 'Models', 'app/models'
+ add_group 'Views', 'app/views'
+ add_group 'Libraries', 'lib'
+end
+
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
+
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
+
+require 'rspec/rails'
+require 'database_cleaner'
+require 'ffaker'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+# Requires factories and other useful helpers defined in spree_core.
+require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/capybara_ext'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/url_helpers'
+
+# Requires factories defined in lib/spree_omniauth/factories.rb
+require 'spree_omniauth/factories'
+
+RSpec.configure do |config|
+ config.include FactoryGirl::Syntax::Methods
+
+ # Infer an example group's spec type from the file location.
+ config.infer_spec_type_from_file_location!
+
+ # == URL Helpers
+ #
+ # Allows access to Spree's routes in specs:
+ #
+ # visit spree.admin_path
+ # current_path.should eql(spree.products_path)
+ config.include Spree::TestingSupport::UrlHelpers
+
+ # == Requests support
+ #
+ # Adds convenient methods to request Spree's controllers
+ # spree_get :index
+ config.include Spree::TestingSupport::ControllerRequests, type: :controller
+
+ # == Mock Framework
+ #
+ # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+ #
+ # config.mock_with :mocha
+ # config.mock_with :flexmock
+ # config.mock_with :rr
+ config.mock_with :rspec
+ config.color = true
+
+ # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+ config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+ # Capybara javascript drivers require transactional fixtures set to false, and we use DatabaseCleaner
+ # to cleanup after each test instead. Without transactional fixtures set to false the records created
+ # to setup a test will be unavailable to the browser, which runs under a separate server instance.
+ config.use_transactional_fixtures = false
+
+ # Ensure Suite is set to use transactions for speed.
+ config.before :suite do
+ DatabaseCleaner.strategy = :transaction
+ DatabaseCleaner.clean_with :truncation
+ end
+
+ # Before each spec check if it is a Javascript test and switch between using database transactions or not where necessary.
+ config.before :each do
+ DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
+ DatabaseCleaner.start
+ end
+
+ # After each spec clean the database.
+ config.after :each do
+ DatabaseCleaner.clean
+ end
+
+ config.fail_fast = ENV['FAIL_FAST'] || false
+ config.order = "random"
+end
diff --git a/spree_omniauth/spree_omniauth.gemspec b/spree_omniauth/spree_omniauth.gemspec
new file mode 100644
index 00000000..9d77de70
--- /dev/null
+++ b/spree_omniauth/spree_omniauth.gemspec
@@ -0,0 +1,32 @@
+# encoding: UTF-8
+Gem::Specification.new do |s|
+ s.platform = Gem::Platform::RUBY
+ s.name = 'spree_omniauth'
+ s.version = '3.1.0'
+ s.summary = 'spree auth by social networks'
+ s.description = 'spree auth by social networks. ex. wechat'
+ s.required_ruby_version = '>= 2.0.0'
+
+ s.author = 'David'
+ s.email = 'david@getstore.cn'
+ s.homepage = 'http://www.spreecommerce.com'
+
+ #s.files = `git ls-files`.split("\n")
+ #s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.require_path = 'lib'
+ s.requirements << 'none'
+
+ s.add_dependency 'spree_core'
+ s.add_dependency 'wechat'
+
+ s.add_development_dependency 'capybara'
+ s.add_development_dependency 'coffee-rails'
+ s.add_development_dependency 'database_cleaner'
+ s.add_development_dependency 'factory_girl'
+ s.add_development_dependency 'ffaker'
+ s.add_development_dependency 'rspec-rails'
+ s.add_development_dependency 'sass-rails'
+ s.add_development_dependency 'selenium-webdriver'
+ s.add_development_dependency 'simplecov'
+ s.add_development_dependency 'sqlite3'
+end
diff --git a/spree_pingpp/.gitignore b/spree_pingpp/.gitignore
new file mode 100644
index 00000000..a3fc71a1
--- /dev/null
+++ b/spree_pingpp/.gitignore
@@ -0,0 +1,36 @@
+*.rbc
+capybara-*.html
+.rspec
+/log
+/tmp
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/public/system
+/coverage/
+/spec/tmp
+/spec/dummy
+**.orig
+rerun.txt
+pickle-email-*.html
+
+# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
+config/initializers/secret_token.rb
+config/secrets.yml
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+/vendor/assets/bower_components
+*.bowerrc
+bower.json
+
+# Ignore pow environment settings
+.powenv
diff --git a/spree_pingpp/Gemfile b/spree_pingpp/Gemfile
new file mode 100644
index 00000000..4e3f60fb
--- /dev/null
+++ b/spree_pingpp/Gemfile
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+
+gem 'pingpp', '~> 2.0.8'
+
+
+gemspec
diff --git a/spree_pingpp/LICENSE b/spree_pingpp/LICENSE
new file mode 100644
index 00000000..84112151
--- /dev/null
+++ b/spree_pingpp/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 RuanShan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/spree_pingpp/README.md b/spree_pingpp/README.md
new file mode 100644
index 00000000..43421dbc
--- /dev/null
+++ b/spree_pingpp/README.md
@@ -0,0 +1,51 @@
+SpreePingppHtml5
+================
+
+Integrate pingpp-html5 into spree,
+It is working in progress...
+
+Installation
+------------
+
+Add spree_pingpp to your Gemfile:
+
+```ruby
+gem 'spree_pingpp'
+```
+
+Bundle your dependencies and run the installation generator:
+
+```shell
+bundle
+bundle exec rails g spree_pingpp:install
+```
+
+Testing
+-------
+
+First bundle your dependencies, then run `rake`. `rake` will default to building the dummy app if it does not exist, then it will run specs. The dummy app can be regenerated by using `rake test_app`.
+
+```shell
+bundle
+bundle exec rake
+```
+
+When testing your applications integration with this extension you may use it's factories.
+Simply add this require statement to your spec_helper:
+
+```ruby
+require 'spree_pingpp/factories'
+```
+
+Related project
+---------------
+
+Spree https://github.com/spree/spree
+PingPlusPlus https://github.com/PingPlusPlus
+
+Copyright (c) 2015 [name of extension creator], released under the New BSD License
+
+
+
+
+
diff --git a/spree_pingpp/Rakefile b/spree_pingpp/Rakefile
new file mode 100644
index 00000000..e42ff482
--- /dev/null
+++ b/spree_pingpp/Rakefile
@@ -0,0 +1,21 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+require 'spree/testing_support/extension_rake'
+
+RSpec::Core::RakeTask.new
+
+task :default do
+ if Dir["spec/dummy"].empty?
+ Rake::Task[:test_app].invoke
+ Dir.chdir("../../")
+ end
+ Rake::Task[:spec].invoke
+end
+
+desc 'Generates a dummy app for testing'
+task :test_app do
+ ENV['LIB_NAME'] = 'spree_pingpp'
+ Rake::Task['extension:test_app'].invoke
+end
diff --git a/spree_pingpp/app/assets/images/billing_integrations/pingpp/alipay_pc_direct.jpg b/spree_pingpp/app/assets/images/billing_integrations/pingpp/alipay_pc_direct.jpg
new file mode 100644
index 00000000..e34d5d82
Binary files /dev/null and b/spree_pingpp/app/assets/images/billing_integrations/pingpp/alipay_pc_direct.jpg differ
diff --git a/spree_pingpp/app/assets/images/billing_integrations/pingpp/alipay_wap.jpg b/spree_pingpp/app/assets/images/billing_integrations/pingpp/alipay_wap.jpg
new file mode 100644
index 00000000..e34d5d82
Binary files /dev/null and b/spree_pingpp/app/assets/images/billing_integrations/pingpp/alipay_wap.jpg differ
diff --git a/spree_pingpp/app/assets/images/billing_integrations/pingpp/upacp_pc.jpg b/spree_pingpp/app/assets/images/billing_integrations/pingpp/upacp_pc.jpg
new file mode 100644
index 00000000..1254869a
Binary files /dev/null and b/spree_pingpp/app/assets/images/billing_integrations/pingpp/upacp_pc.jpg differ
diff --git a/spree_pingpp/app/assets/javascripts/pingpp-pc.js b/spree_pingpp/app/assets/javascripts/pingpp-pc.js
new file mode 100644
index 00000000..98e08393
--- /dev/null
+++ b/spree_pingpp/app/assets/javascripts/pingpp-pc.js
@@ -0,0 +1,171 @@
+(function(){
+var
+ version = "2.0.7",
+ hasOwn = {}.hasOwnProperty,
+ PingppSDK = function(){},
+ cfg = {
+ PINGPP_NOTIFY_URL: 'https://api.pingxx.com/notify/charges/',
+ PINGPP_MOCK_URL: 'http://sissi.pingxx.com/mock.php',
+ ALIPAY_PC_DIRECT_URL: 'https://mapi.alipay.com/gateway.do',
+ UPACP_PC_URL: 'https://gateway.95516.com/gateway/api/frontTransReq.do'
+ },
+ channels = {
+ alipay_pc_direct: 'alipay_pc_direct',
+ upacp_pc: 'upacp_pc'
+ };
+
+PingppSDK.prototype = {
+
+ version: version,
+
+ _resultCallback: undefined,
+
+ _debug: false,
+
+ createPayment: function(charge_json, callback, debug) {
+ if (typeof callback == "function") {
+ this._resultCallback = callback;
+ }
+ if (typeof debug == "boolean") {
+ this._debug = debug;
+ }
+ var charge;
+ if(typeof charge_json == "string"){
+ try{
+ charge = JSON.parse(charge_json);
+ }catch(err){
+ this._innerCallback("fail", this._error("json_decode_fail"));
+ return;
+ }
+ }else{
+ charge = charge_json;
+ }
+ if(typeof charge == "undefined"){
+ this._innerCallback("fail", this._error("json_decode_fail"));
+ return;
+ }
+ if(!hasOwn.call(charge, 'id')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_charge_id"));
+ return;
+ }
+ if(!hasOwn.call(charge, 'channel')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_channel"));
+ return;
+ }
+ var channel = charge['channel'];
+ if(!hasOwn.call(charge, 'credential')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_credential"));
+ return;
+ }
+ if (!charge['credential']) {
+ this._innerCallback("fail", this._error("invalid_credential", "credential_is_undefined"));
+ return;
+ }
+ if (!hasOwn.call(channels, channel)) {
+ this._innerCallback("fail", this._error("invalid_charge", "no_such_channel:" + channel));
+ return;
+ }
+ if (!hasOwn.call(charge['credential'], channel)) {
+ this._innerCallback("fail", this._error("invalid_credential", "no_valid_channel_credential"));
+ return;
+ }
+ if(!hasOwn.call(charge, 'livemode')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_livemode"));
+ return;
+ }
+ if (charge['livemode'] == false) {
+ this._testModeNotify(charge);
+ return;
+ }
+ var credential = charge['credential'][channel];
+ if (channel == channels.upacp_pc) {
+ form_submit(cfg.UPACP_PC_URL, 'post', credential);
+ } else if (channel == channels.alipay_pc_direct) {
+ if (!hasOwn.call(credential, "_input_charset")) {
+ credential["_input_charset"] = 'utf-8';
+ }
+ var query = stringify_data(credential, channel, true);
+ window.location.href = cfg.ALIPAY_PC_DIRECT_URL + "?" + query;
+ }
+ },
+
+ _error: function(msg, extra) {
+ msg = (typeof msg == "undefined") ? "" : msg;
+ extra = (typeof extra == "undefined") ? "" : extra;
+ return {
+ msg:msg,
+ extra:extra
+ };
+ },
+
+ _innerCallback: function(result, err) {
+ if (typeof this._resultCallback == "function") {
+ if (typeof err == "undefined") {
+ err = this._error();
+ }
+ this._resultCallback(result, err);
+ }
+ },
+
+ _testModeNotify: function(charge) {
+ var params = {
+ 'ch_id': charge['id'],
+ 'scheme': 'http',
+ 'channel': charge['channel']
+ };
+ if (hasOwn.call(charge, 'order_no')) {
+ params['order_no'] = charge['order_no'];
+ } else if (hasOwn.call(charge, 'orderNo')) {
+ params['order_no'] = charge['orderNo'];
+ }
+ if (hasOwn.call(charge, 'time_expire')) {
+ params['time_expire'] = charge['time_expire'];
+ } else if (hasOwn.call(charge, 'timeExpire')) {
+ params['time_expire'] = charge['timeExpire'];
+ }
+ if (hasOwn.call(charge, 'extra')) {
+ params['extra'] = encodeURIComponent(JSON.stringify(charge['extra']));
+ }
+ location.href = cfg.PINGPP_MOCK_URL+'?'+stringify_data(params);
+ }
+};
+
+function form_submit(url, method, params) {
+ var form = document.createElement("form");
+ form.setAttribute("method", method);
+ form.setAttribute("action", url);
+
+ for (var key in params) {
+ if (hasOwn.call(params, key)) {
+ var hiddenField = document.createElement("input");
+ hiddenField.setAttribute("type", "hidden");
+ hiddenField.setAttribute("name", key);
+ hiddenField.setAttribute("value", params[key]);
+ form.appendChild(hiddenField);
+ }
+ }
+
+ document.body.appendChild(form);
+ form.submit();
+}
+
+function stringify_data(data, channel, urlencode) {
+ if (typeof urlencode == "undefined") {
+ urlencode = false;
+ }
+ var output = [];
+ for (var i in data) {
+ if (channel == "bfb_wap" && i == "url") {
+ continue;
+ }
+ if (channel == "yeepay_wap" && i == "mode") {
+ continue;
+ }
+ output.push(i + '=' + (urlencode ? encodeURIComponent(data[i]) : data[i]));
+ }
+ return output.join('&');
+}
+
+PingppSDK.prototype.payment = PingppSDK.prototype.createPayment;
+window.pingppPc = new PingppSDK();
+})();
diff --git a/spree_pingpp/app/assets/javascripts/pingpp.js b/spree_pingpp/app/assets/javascripts/pingpp.js
new file mode 100644
index 00000000..48ab1ac6
--- /dev/null
+++ b/spree_pingpp/app/assets/javascripts/pingpp.js
@@ -0,0 +1,322 @@
+(function(){
+var
+ version = "2.0.7",
+ hasOwn = {}.hasOwnProperty,
+ PingppSDK = function(){},
+ cfg = {
+ PINGPP_NOTIFY_URL: 'https://api.pingxx.com/notify/charges/',
+ UPACP_WAP_URL: 'https://gateway.95516.com/gateway/api/frontTransReq.do',
+ ALIPAY_WAP_URL: 'http://wappaygw.alipay.com/service/rest.htm',
+ UPMP_WAP_URL: 'uppay://uppayservice/?style=token&paydata=',
+ JDPAY_WAP_URL: 'https://m.jdpay.com/wepay/web/pay',
+ YEEPAY_WAP_URL: 'https://ok.yeepay.com/paymobile/api/pay/request',
+ YEEPAY_WAP_TEST_URL: 'http://mobiletest.yeepay.com/paymobile/api/pay/request',
+ PINGPP_MOCK_URL: 'http://sissi.pingxx.com/mock.php'
+ },
+ channels = {
+ alipay_wap: 'alipay_wap',
+ upmp_wap: 'upmp_wap',
+ upacp_wap: 'upacp_wap',
+ bfb_wap: 'bfb_wap',
+ wx_pub: 'wx_pub',
+ yeepay_wap: 'yeepay_wap',
+ jdpay_wap: 'jdpay_wap'
+ };
+
+PingppSDK.prototype = {
+
+ version: version,
+
+ _resultCallback: undefined,
+
+ _jsApiParameters: {},
+
+ _debug: false,
+
+ _signature: undefined,
+
+ createPayment: function(charge_json, callback, signature, debug) {
+ if (typeof callback == "function") {
+ this._resultCallback = callback;
+ }
+ if (typeof signature != "undefined") {
+ this._signature = signature;
+ }
+ if (typeof debug == "boolean") {
+ this._debug = debug;
+ }
+ var charge;
+ if(typeof charge_json == "string"){
+ try{
+ charge = JSON.parse(charge_json);
+ }catch(err){
+ this._innerCallback("fail", this._error("json_decode_fail"));
+ return;
+ }
+ }else{
+ charge = charge_json;
+ }
+ if(typeof charge == "undefined"){
+ this._innerCallback("fail", this._error("json_decode_fail"));
+ return;
+ }
+ if(!hasOwn.call(charge, 'id')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_charge_id"));
+ return;
+ }
+ if(!hasOwn.call(charge, 'channel')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_channel"));
+ return;
+ }
+ var channel = charge['channel'];
+ if(!hasOwn.call(charge, 'credential')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_credential"));
+ return;
+ }
+ if (!charge['credential']) {
+ this._innerCallback("fail", this._error("invalid_credential", "credential_is_undefined"));
+ return;
+ }
+ if (!hasOwn.call(channels, channel)) {
+ this._innerCallback("fail", this._error("invalid_charge", "no_such_channel:" + channel));
+ return;
+ }
+ if (!hasOwn.call(charge['credential'], channel)) {
+ this._innerCallback("fail", this._error("invalid_credential", "no_valid_channel_credential"));
+ return;
+ }
+ if(!hasOwn.call(charge, 'livemode')){
+ this._innerCallback("fail", this._error("invalid_charge", "no_livemode"));
+ return;
+ }
+ if (charge['livemode'] == false) {
+ this._testModeNotify(charge);
+ return;
+ }
+ var credential = charge['credential'][channel];
+ if (channel == channels.upmp_wap) { // 调起银联支付控件，客户端需要安装银联支付控件才能调起
+ location.href = cfg.UPMP_WAP_URL + credential['paydata'];
+ } else if (channel == channels.upacp_wap) {
+ form_submit(cfg.UPACP_WAP_URL, 'post', credential);
+ } else if (channel == channels.alipay_wap) { // 调起支付宝手机网页支付
+ credential['_input_charset'] = 'utf-8';
+ if (typeof _AP != "undefined") {
+ var query = stringify_data(credential, channel, true);
+ _AP.pay(cfg.ALIPAY_WAP_URL + "?" + query);
+ } else {
+ form_submit(cfg.ALIPAY_WAP_URL, 'get', credential);
+ }
+ } else if (channel == channels.bfb_wap) {
+ if (!hasOwn.call(credential, 'url')) {
+ this._innerCallback("fail", this._error("invalid_credential", "missing_field:url"));
+ return;
+ }
+ location.href = credential['url'] + '?' + stringify_data(credential, channel);
+ } else if (channel == channels.yeepay_wap) {
+ var fields = ["merchantaccount", "encryptkey", "data"];
+ for (var k = 0; k < fields.length; k++) {
+ if(!hasOwn.call(credential, fields[k])){
+ this._innerCallback("fail", this._error("invalid_credential", "missing_field_"+fields[k]));
+ return;
+ }
+ }
+ if (hasOwn.call(credential, "mode") && credential["mode"] == "test") {
+ location.href = cfg.YEEPAY_WAP_TEST_URL + '?' + stringify_data(credential, channel, true);
+ } else {
+ location.href = cfg.YEEPAY_WAP_URL + '?' + stringify_data(credential, channel, true);
+ }
+ } else if (channel == channels.wx_pub) {
+ var fields = ["appId", "timeStamp", "nonceStr", "package", "signType", "paySign"];
+ for (var k = 0; k < fields.length; k++) {
+ if (!hasOwn.call(credential, fields[k])) {
+ this._innerCallback("fail", this._error("invalid_credential", "missing_field_"+fields[k]));
+ return;
+ }
+ }
+ this._jsApiParameters = credential;
+ this._callpay();
+ } else if (channel == channels.jdpay_wap) {
+ form_submit(cfg.JDPAY_WAP_URL, 'post', credential);
+ }
+ },
+
+ _jsApiCall: function(){
+ var self = this;
+ if(self._jsApiParameters != {}){
+ WeixinJSBridge.invoke(
+ 'getBrandWCPayRequest',
+ self._jsApiParameters,
+ function(res){
+ if(res.err_msg == 'get_brand_wcpay_request:ok'){
+ self._innerCallback("success");
+ }else if(res.err_msg == 'get_brand_wcpay_request:cancel'){
+ self._innerCallback("cancel");
+ }else{
+ self._innerCallback("fail", self._error("wx_result_fail", res.err_msg));
+ }
+ }
+ );
+ }
+ },
+
+ _callpay: function(){
+ var self = this;
+ if (typeof wx != "undefined" && typeof self._signature != "undefined") {
+ var wxConfigFailed = false;
+ wx.config({
+ debug: self._debug,
+ appId: self._jsApiParameters["appId"],
+ timestamp: self._jsApiParameters["timeStamp"],
+ nonceStr: self._jsApiParameters["nonceStr"],
+ signature: self._signature,
+ jsApiList: ['chooseWXPay']
+ });
+ wx.ready(function(){
+ if (wxConfigFailed) {
+ return;
+ }
+ wx.chooseWXPay({
+ timestamp: self._jsApiParameters["timeStamp"],
+ nonceStr: self._jsApiParameters["nonceStr"],
+ "package": self._jsApiParameters["package"],
+ signType: self._jsApiParameters["signType"],
+ paySign: self._jsApiParameters["paySign"],
+ success: function(res) {
+ if (res.errMsg == "chooseWXPay:ok") {
+ self._innerCallback("success");
+ } else {
+ self._innerCallback("fail", self._error("wx_result_fail", res.errMsg));
+ }
+ },
+ cancel: function(res) {
+ self._innerCallback("cancel");
+ },
+ fail: function(res) {
+ self._innerCallback("fail", self._error("wx_result_fail", res.errMsg));
+ }
+ });
+ });
+ wx.error(function(res){
+ wxConfigFailed = true;
+ self._innerCallback("fail", self._error("wx_config_error", res.errMsg));
+ });
+ } else if (typeof WeixinJSBridge == "undefined") {
+ function eventCallback(){
+ self._jsApiCall();
+ }
+ if (document.addEventListener) {
+ document.addEventListener('WeixinJSBridgeReady', eventCallback, false);
+ } else if(document.attachEvent) {
+ document.attachEvent('WeixinJSBridgeReady', eventCallback);
+ document.attachEvent('onWeixinJSBridgeReady', eventCallback);
+ }
+ }else{
+ this._jsApiCall();
+ }
+ },
+
+ _error: function(msg, extra) {
+ msg = (typeof msg == "undefined") ? "" : msg;
+ extra = (typeof extra == "undefined") ? "" : extra;
+ return {
+ msg:msg,
+ extra:extra
+ };
+ },
+
+ _innerCallback: function(result, err) {
+ if (typeof this._resultCallback == "function") {
+ if (typeof err == "undefined") {
+ err = this._error();
+ }
+ this._resultCallback(result, err);
+ }
+ },
+
+ _testModeNotify: function(charge) {
+ var self = this;
+ if (charge['channel'] == channels.wx_pub) {
+ var dopay = confirm("模拟付款？");
+ if (dopay) {
+ var request = new XMLHttpRequest();
+ request.open('GET', cfg.PINGPP_NOTIFY_URL+charge['id']+'?livemode=false', true);
+ request.onload = function() {
+ if (request.status >= 200 && request.status < 400 && request.responseText == "success"){
+ self._innerCallback("success");
+ } else {
+ var extra = 'http_code:'+request.status+';response:'+request.responseText;
+ self._innerCallback("fail", self._error("testmode_notify_fail", extra));
+ }
+ };
+ request.onerror = function() {
+ self._innerCallback("fail", self._error("network_err"));
+ };
+ request.send();
+ } else {
+ self._innerCallback("cancel");
+ }
+ } else {
+ var params = {
+ 'ch_id': charge['id'],
+ 'scheme': 'http',
+ 'channel': charge['channel']
+ };
+ if (hasOwn.call(charge, 'order_no')) {
+ params['order_no'] = charge['order_no'];
+ } else if (hasOwn.call(charge, 'orderNo')) {
+ params['order_no'] = charge['orderNo'];
+ }
+ if (hasOwn.call(charge, 'time_expire')) {
+ params['time_expire'] = charge['time_expire'];
+ } else if (hasOwn.call(charge, 'timeExpire')) {
+ params['time_expire'] = charge['timeExpire'];
+ }
+ if (hasOwn.call(charge, 'extra')) {
+ params['extra'] = encodeURIComponent(JSON.stringify(charge['extra']));
+ }
+ location.href = cfg.PINGPP_MOCK_URL+'?'+stringify_data(params);
+ }
+ }
+};
+
+function form_submit(url, method, params) {
+ var form = document.createElement("form");
+ form.setAttribute("method", method);
+ form.setAttribute("action", url);
+
+ for (var key in params) {
+ if (hasOwn.call(params, key)) {
+ var hiddenField = document.createElement("input");
+ hiddenField.setAttribute("type", "hidden");
+ hiddenField.setAttribute("name", key);
+ hiddenField.setAttribute("value", params[key]);
+ form.appendChild(hiddenField);
+ }
+ }
+
+ document.body.appendChild(form);
+ form.submit();
+}
+
+function stringify_data(data, channel, urlencode) {
+ if (typeof urlencode == "undefined") {
+ urlencode = false;
+ }
+ var output = [];
+ for (var i in data) {
+ if (channel == "bfb_wap" && i == "url") {
+ continue;
+ }
+ if (channel == "yeepay_wap" && i == "mode") {
+ continue;
+ }
+ output.push(i + '=' + (urlencode ? encodeURIComponent(data[i]) : data[i]));
+ }
+ return output.join('&');
+}
+
+PingppSDK.prototype.payment = PingppSDK.prototype.createPayment;
+window.pingpp = new PingppSDK();
+// aliases
+window.PINGPP_PAY_SDK = window.PINGPP_WX_PUB = window.pingpp;
+})();
diff --git a/spree_pingpp/app/assets/javascripts/spree/backend/spree_pingpp.js b/spree_pingpp/app/assets/javascripts/spree/backend/spree_pingpp.js
new file mode 100644
index 00000000..8aa3b014
--- /dev/null
+++ b/spree_pingpp/app/assets/javascripts/spree/backend/spree_pingpp.js
@@ -0,0 +1,2 @@
+// Placeholder manifest file.
+// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js'
\ No newline at end of file
diff --git a/spree_pingpp/app/assets/javascripts/spree/frontend/spree_pingpp.js b/spree_pingpp/app/assets/javascripts/spree/frontend/spree_pingpp.js
new file mode 100644
index 00000000..f116f26c
--- /dev/null
+++ b/spree_pingpp/app/assets/javascripts/spree/frontend/spree_pingpp.js
@@ -0,0 +1,2 @@
+//= require 'pingpp-pc'
+//= require 'pingpp'
diff --git a/spree_pingpp/app/assets/stylesheets/spree/backend/spree_pingpp.css b/spree_pingpp/app/assets/stylesheets/spree/backend/spree_pingpp.css
new file mode 100644
index 00000000..e3c23662
--- /dev/null
+++ b/spree_pingpp/app/assets/stylesheets/spree/backend/spree_pingpp.css
@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/backend/all.css'
+*/
diff --git a/spree_pingpp/app/assets/stylesheets/spree/frontend/spree_pingpp.css b/spree_pingpp/app/assets/stylesheets/spree/frontend/spree_pingpp.css
new file mode 100644
index 00000000..da236237
--- /dev/null
+++ b/spree_pingpp/app/assets/stylesheets/spree/frontend/spree_pingpp.css
@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/frontend/all.css'
+*/
diff --git a/spree_pingpp/app/controllers/spree/checkout_controller_decorator.rb b/spree_pingpp/app/controllers/spree/checkout_controller_decorator.rb
new file mode 100644
index 00000000..3661eec1
--- /dev/null
+++ b/spree_pingpp/app/controllers/spree/checkout_controller_decorator.rb
@@ -0,0 +1,49 @@
+#encoding: utf-8
+module Spree
+ CheckoutController.class_eval do
+ before_action :payment_pingpp_hook
+ skip_before_action :payment_pingpp_hook, except: [:update]
+
+ def payment_pingpp_hook
+ @pingpp_base_class = Spree::Gateway::PingppBase
+ return unless @order.next_step_complete?
+ #in confirm step, only param is {"state"=>"confirm"}
+ payment_method = get_payment_method_by_params( )
+ if payment_method.kind_of?( @pingpp_base_class )
+ handle_pingpp( payment_method ) and return
+ end
+ end
+
+ # handle all supported billing_integration
+ def handle_pingpp( payment_method )
+ if @order.update_from_params( params, permitted_checkout_attributes, request.headers.env )
+ pingpp_channel = params['payment_pingpp'][payment_method.id.to_s]
+ #more flow detail
+ #https://pingxx.com/guidance/products/sdk
+ payment_provider = payment_method.provider
+ #test with host 127.0.0.1 instead localhost, or get invalid url http://localhost:3000/...
+ #order_path( order, :only_path => false )
+ begin
+ @charge = payment_provider.create_charge( @order, pingpp_channel, spree.pingpp_charge_done_url )
+ #redirect_to payment_provider.get_payment_url( charge )
+ #render json: charge
+ # since compiled template_theme is method, :yield do not work any more.
+ render :payment_pingpp_dispatch, layout: 'layout_for_pingpp'
+ rescue Pingpp::PingppError => error
+ Rails.logger.error error
+ redirect_to checkout_state_path( @order.state )
+ end
+ else
+ render( :edit )
+ end
+ end
+
+ private
+
+ def get_payment_method_by_params
+ payment_method_id = params[:order].try(:[],:payments_attributes).try(:first).try(:[],:payment_method_id).to_i
+ Spree::PaymentMethod.find_by_id(payment_method_id)
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/controllers/spree/pingpp_status_controller.rb b/spree_pingpp/app/controllers/spree/pingpp_status_controller.rb
new file mode 100644
index 00000000..a0701c44
--- /dev/null
+++ b/spree_pingpp/app/controllers/spree/pingpp_status_controller.rb
@@ -0,0 +1,61 @@
+#inspired by https://github.com/spree-contrib/spree_skrill
+module Spree
+ class PingppStatusController < StoreController
+ include Gateway::PingppHelper
+
+ #fixes Action::Controller::InvalidAuthenticityToken error on alipay_notify
+ skip_before_action :verify_authenticity_token
+
+ # success url
+ def charge_done
+ #alipay, get, "result"=>"success", "out_trade_no"=>"R677576938"
+ #upacp_pc, post, "orderId"=>"R677576938", "respMsg"=>"success"
+ order = retrieve_order
+ # get charge from server, notify message may be delay
+ unless order.complete?
+ payment_method = order.payments.last.payment_method
+ if payment_method.kind_of? Gateway::PingppBase
+ charge = payment_method.provider.retrieve_charge( order )
+ if charge['paid']
+ order.reload
+ end
+ end
+ end
+ if order.complete?
+ redirect_to spree.order_path( order )
+ else
+ redirect_to checkout_state_path(order.state)
+ end
+ end
+
+ def charge_notify
+ begin
+ event = JSON.parse( request.raw_post )
+ response_status, response_body = Gateway::PingppEventHandler.new( event ).perform
+ rescue JSON::ParserError
+ response_body = 'JSON 解析失败'
+ end
+ render plain: response_body, status: response_status, content_type: 'text/plain; charset=utf-8'
+ end
+
+ def test_charge_notify
+ begin
+ event = JSON.parse( request.raw_post )
+ response_status, response_body = Gateway::PingppEventHandler.new( event ).perform
+ rescue JSON::ParserError
+ response_body = 'JSON 解析失败'
+ end
+ render plain: response_body, status: response_status, content_type: 'text/plain; charset=utf-8'
+ end
+
+
+ private
+
+ def retrieve_order()
+ order_number = ( params["orderId"] || params["out_trade_no"] )
+ # channel alipay_wap cannel_url is charge_done, order_number maybe nil in that case.
+ Spree::Order.find_by_number(order_number) || current_order
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_base.rb b/spree_pingpp/app/models/spree/gateway/pingpp_base.rb
new file mode 100644
index 00000000..20c813b0
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_base.rb
@@ -0,0 +1,29 @@
+require "pingpp"
+module Spree
+ class Gateway::PingppBase < PaymentMethod
+ preference :api_key, :string
+ preference :app_key, :string
+ preference :channels, :string
+ #Pingpp.api_key = "YOUR-KEY"
+
+ delegate :purchase, to: :provider
+
+ def provider_class
+ Gateway::PingppProvider
+ end
+
+ def provider
+ provider_class.new( self )
+ end
+
+ # it is required to make payment completed.
+ def source_required?
+ true
+ end
+
+ def available_channels
+ self.preferred_channels.try(:split, ',') || []
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_event_handler.rb b/spree_pingpp/app/models/spree/gateway/pingpp_event_handler.rb
new file mode 100644
index 00000000..52ac8713
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_event_handler.rb
@@ -0,0 +1,39 @@
+require "pingpp"
+module Spree
+ class Gateway::PingppEventHandler
+ include Gateway::PingppHelper
+
+ attr_accessor :event, :response_body, :status
+ def initialize( event )
+ self.event = event
+ status = 400
+ response_body = '' # 可自定义
+ end
+
+ def perform
+ if event['type'].nil?
+ response_body = 'missing Event type'
+ elsif event['type'] == 'charge.succeeded'
+ charge_succeeded
+ elsif event['object'] == 'refund.succeeded'
+ # 开发者在此处加入对退款异步通知的处理代码
+ status = 200
+ response_body = 'OK'
+ else
+ response_body = 'unkonwn Event type'
+ end
+ return status, response_body
+ end
+
+ def charge_succeeded
+ charge = event['data']['object']
+ order = get_order_by_charge charge
+ if order
+ complete_order order
+ end
+ self.status = 200
+ self.response_body = 'OK'
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_helper.rb b/spree_pingpp/app/models/spree/gateway/pingpp_helper.rb
new file mode 100644
index 00000000..ba9664dc
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_helper.rb
@@ -0,0 +1,22 @@
+module Spree
+ # helpers
+ module Gateway::PingppHelper
+
+ def get_order_by_charge( charge )
+ Spree::Order.find_by_number( charge['order_no'] )
+ end
+
+ def get_payment_by_order( order )
+ order.payments.last
+ end
+
+ def complete_order( order )
+ order.next
+ end
+
+ def get_order_by_gateway_options( gateway_options )
+ gateway_order_id = gateway_options[:order_id]
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_mobile.rb b/spree_pingpp/app/models/spree/gateway/pingpp_mobile.rb
new file mode 100644
index 00000000..f65f641b
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_mobile.rb
@@ -0,0 +1,10 @@
+require "pingpp"
+module Spree
+ class Gateway::PingppMobile < Gateway::PingppBase
+
+ def auto_capture?
+ true
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_pc.rb b/spree_pingpp/app/models/spree/gateway/pingpp_pc.rb
new file mode 100644
index 00000000..068db929
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_pc.rb
@@ -0,0 +1,11 @@
+require "pingpp"
+module Spree
+ class Gateway::PingppPc < Gateway::PingppBase
+
+ def auto_capture?
+ true
+ end
+
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_provider.rb b/spree_pingpp/app/models/spree/gateway/pingpp_provider.rb
new file mode 100644
index 00000000..b60d546d
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_provider.rb
@@ -0,0 +1,132 @@
+require "pingpp"
+module Spree
+ class Gateway::PingppProvider
+ include Gateway::PingppHelper
+ #PINGPP_NOTIFY_URL = 'https://api.pingxx.com/notify/charges/',
+ #PINGPP_MOCK_URL = 'http://sissi.pingxx.com/mock.php',
+ #ALIPAY_PC_DIRECT_URL = 'https://mapi.alipay.com/gateway.do',
+ #UPACP_PC_URL = 'https://gateway.95516.com/gateway/api/frontTransReq.do'
+
+ PingppPcChannelEnum = Struct.new( :alipay_pc_direct, :upacp_pc )[ 'alipay_pc_direct', 'upacp_pc' ]
+ PingppWapChannelEnum = Struct.new( :alipay_wap, :upacp_wap )[ 'alipay_wap', 'upacp_wap']
+ attr_accessor :payment_method
+
+ def initialize( payment_method )
+ self.payment_method = payment_method
+ setup_api_key( payment_method.preferred_api_key )
+ end
+
+ def setup_api_key( key )
+ Pingpp.api_key = key
+ end
+
+ def create_charge( order, channel, success_url )
+ channel ||= PingppPcChannelEnum.alipay_pc_direct
+ product_names = order.products.pluck(:name)
+
+ params = {
+ :order_no => order.number,
+ :amount => (order.total * 100).to_i, # in cent
+ :subject => product_names.join(',').truncate(128),
+ :body => product_names.join(',').truncate(500), #String(400)
+ :channel => channel,
+ :currency => "cny",
+ :client_ip=> order.last_ip_address,
+ :app => { :id => payment_method.preferred_app_key },
+ }
+ extra_alipay_params= {
+ :extra => {
+ # alipay
+ :success_url => success_url #
+ }
+ }
+ extra_alipay_wap_params= {
+ :extra => {
+ # alipay
+ :cancel_url => success_url,
+ :success_url => success_url #
+ }
+ }
+ extra_upacp_params= {
+ :extra => {
+ # upacp
+ :result_url => success_url #
+ }
+ }
+
+ case channel
+ when PingppPcChannelEnum.alipay_pc_direct
+ params.merge! extra_alipay_params
+ when PingppPcChannelEnum.upacp_pc
+ params.merge! extra_upacp_params
+ when PingppWapChannelEnum.alipay_wap
+ params.merge! extra_alipay_wap_params
+ when PingppWapChannelEnum.upacp_wap
+ params.merge! extra_upacp_params
+ end
+ charge = Pingpp::Charge.create( params )
+ # store charge "id": "ch_Hm5uTSifDOuTy9iLeLPSurrD",
+ payment = get_payment_by_order( order )
+ payment.update_attribute( :response_code, charge['id'] )
+
+ charge
+ end
+
+ def retrieve_charge( order )
+ payment = get_payment_by_order( order )
+ charge = Pingpp::Charge.retrieve( payment.response_code )
+ end
+
+ #def get_payment_url( charge )
+ # channel = charge['channel'];
+ # raise "no_such_channel: #{channel}" unless PingppPcChannelEnum.values.include? channel
+ # raise "no_credential" unless charge['credential'].present?
+ # raise "no_valid_channel_credential" unless charge['credential'][channel].present?
+ # if charge['livemode'] == false
+ # return test_mode_notify_url(charge);
+ # end
+ # credential = charge['credential'][channel];
+ # if channel == PingppPcChannelEnum.upacp_pc
+ # form_submit(cfg.UPACP_PC_URL, 'post', credential);
+ # elsif channel == PingppPcChannelEnum.alipay_pc_direct
+ # credential["_input_charset"] = 'utf-8';
+ # ALIPAY_PC_DIRECT_URL + "?" + credential.to_param;
+ # end
+ #end
+
+ #def test_mode_notify_url(charge)
+ # params = { ch_id: charge['id'], scheme: 'http', channel: charge['channel'] }
+ # if charge['order_no']
+ # params['order_no'] = charge['order_no']
+ # elsif charge['orderNo']
+ # params['order_no'] = charge['orderNo']
+ # end
+ # if charge['time_expire']
+ # params['time_expire'] = charge['time_expire']
+ # elsif charge['timeExpire']
+ # params['time_expire'] = charge['timeExpire']
+ # end
+ # if charge['extra']
+ # params['extra'] = charge['extra'].to_json
+ # end
+ # PINGPP_MOCK_URL+'?'+ params.to_param
+ #end
+
+
+ def cancel( order )
+ Pingpp::Charge.retrieve("CHARGE_ID").refunds.create(:description => "Refund Description")
+ end
+
+ # * description - before order transition to: :complete
+ # * call spree/payment#gateway_action
+ # * params
+ # * options - gateway_options
+ # * return - pingpp_response
+ def purchase(money, credit_card, options = {})
+ # since pingpp is offsite payment, this method is placehodler only.
+ # in this way, we could go through spree payment process.
+ return Gateway::PingppResponse.new
+ end
+
+ end
+end
diff --git a/spree_pingpp/app/models/spree/gateway/pingpp_response.rb b/spree_pingpp/app/models/spree/gateway/pingpp_response.rb
new file mode 100644
index 00000000..71cc49a0
--- /dev/null
+++ b/spree_pingpp/app/models/spree/gateway/pingpp_response.rb
@@ -0,0 +1,9 @@
+module Spree
+ class Gateway::PingppResponse
+ attr_accessor :authorization
+
+ def success?
+ true
+ end
+ end
+end
diff --git a/spree_pingpp/app/models/spree/order_decorator.rb b/spree_pingpp/app/models/spree/order_decorator.rb
new file mode 100644
index 00000000..ac455af4
--- /dev/null
+++ b/spree_pingpp/app/models/spree/order_decorator.rb
@@ -0,0 +1,8 @@
+Spree::Order.class_eval do
+
+ def next_step_complete?
+ available_steps = checkout_steps
+ available_steps[ available_steps.index( self.state ).succ ] == 'complete'
+ end
+
+end
diff --git a/spree_pingpp/app/models/spree/payment_decorator.rb b/spree_pingpp/app/models/spree/payment_decorator.rb
new file mode 100644
index 00000000..7c1bccd9
--- /dev/null
+++ b/spree_pingpp/app/models/spree/payment_decorator.rb
@@ -0,0 +1,26 @@
+Spree::Payment.class_eval do
+ # order/payments, payment/processing
+ # order.process_payments! => payment.process! => handle_payment_preconditions { process_purchase }
+ def handle_payment_preconditions(&block)
+ unless block_given?
+ raise ArgumentError.new("handle_payment_preconditions must be called with a block")
+ end
+
+ if payment_method && payment_method.source_required?
+ if source
+ if !processing?
+ if payment_method.supports?(source) || token_based?
+ yield
+ else
+ invalidate!
+ raise Core::GatewayError.new(Spree.t(:payment_method_not_supported))
+ end
+ end
+ elsif payment_method.kind_of? Spree::Gateway::PingppBase
+ yield
+ else
+ raise Core::GatewayError.new(Spree.t(:payment_processing_failed))
+ end
+ end
+ end
+end
diff --git a/spree_pingpp/app/views/layouts/layout_for_pingpp.html.erb b/spree_pingpp/app/views/layouts/layout_for_pingpp.html.erb
new file mode 100644
index 00000000..396cc0aa
--- /dev/null
+++ b/spree_pingpp/app/views/layouts/layout_for_pingpp.html.erb
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+ <%= javascript_include_tag 'spree/frontend/spree_pingpp' %>
+
+
+
+
+
diff --git a/spree_pingpp/app/views/spree/checkout/payment/_pingppmobile.html.erb b/spree_pingpp/app/views/spree/checkout/payment/_pingppmobile.html.erb
new file mode 100644
index 00000000..61a6fdfc
--- /dev/null
+++ b/spree_pingpp/app/views/spree/checkout/payment/_pingppmobile.html.erb
@@ -0,0 +1,5 @@
+
+<% payment_method.available_channels.each_with_index{|channel, i| %>
+ <%= hidden_field_tag "payment_pingpp[#{payment_method.id}]", channel %>
+ <%= image_tag "billing_integrations/pingpp/#{channel}.jpg", alt: Spree.t( "pingpp_channel.#{channel}") %>
+<% } %>
diff --git a/spree_pingpp/app/views/spree/checkout/payment/_pingpppc.html.erb b/spree_pingpp/app/views/spree/checkout/payment/_pingpppc.html.erb
new file mode 100644
index 00000000..61a6fdfc
--- /dev/null
+++ b/spree_pingpp/app/views/spree/checkout/payment/_pingpppc.html.erb
@@ -0,0 +1,5 @@
+
+<% payment_method.available_channels.each_with_index{|channel, i| %>
+ <%= hidden_field_tag "payment_pingpp[#{payment_method.id}]", channel %>
+ <%= image_tag "billing_integrations/pingpp/#{channel}.jpg", alt: Spree.t( "pingpp_channel.#{channel}") %>
+<% } %>
diff --git a/spree_pingpp/app/views/spree/checkout/payment_pingpp_dispatch.html.erb b/spree_pingpp/app/views/spree/checkout/payment_pingpp_dispatch.html.erb
new file mode 100644
index 00000000..10b10cd6
--- /dev/null
+++ b/spree_pingpp/app/views/spree/checkout/payment_pingpp_dispatch.html.erb
@@ -0,0 +1,20 @@
+
+<%
+pingpp_object_name = ( Spree::Gateway::PingppProvider::PingppPcChannelEnum.values.include?( @charge['channel'] ) ? 'pingppPc' : 'pingpp' )
+%>
+
+
+ Payment page loading
+
+<%= javascript_tag defer: 'defer' do -%>
+<%= pingpp_object_name%>.createPayment( <%== @charge.to_json %>, function(result, err){
+ if( result == "success" ){
+
+ }else if(result == "fail" ){
+ alert(err)
+ }else if( result == "cancel" ){
+ alert(err)
+ }
+
+} )
+<% end %>
diff --git a/spree_pingpp/bin/rails b/spree_pingpp/bin/rails
new file mode 100644
index 00000000..e5539d0f
--- /dev/null
+++ b/spree_pingpp/bin/rails
@@ -0,0 +1,7 @@
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree_pingpp/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
diff --git a/spree_pingpp/config/locales/en.yml b/spree_pingpp/config/locales/en.yml
new file mode 100644
index 00000000..36a26416
--- /dev/null
+++ b/spree_pingpp/config/locales/en.yml
@@ -0,0 +1,10 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+ spree:
+ pingpp_channel:
+ alipay_pc_direct: Alipay PC direct
+ alipay_wap: Alipay Phone
+ upacp_pc: UnionPay PC
+ upacp_wap: UnionPay Phone
diff --git a/spree_pingpp/config/locales/zh-CN.yml b/spree_pingpp/config/locales/zh-CN.yml
new file mode 100644
index 00000000..aae0c0d4
--- /dev/null
+++ b/spree_pingpp/config/locales/zh-CN.yml
@@ -0,0 +1,10 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+zh-CN:
+ spree:
+ pingpp_channel:
+ alipay_pc_direct: 支付宝
+ alipay_wap: Alipay Phone
+ upacp_pc: 银联
+ upacp_wap: UnionPay Phone
diff --git a/spree_pingpp/config/routes.rb b/spree_pingpp/config/routes.rb
new file mode 100644
index 00000000..63d357b2
--- /dev/null
+++ b/spree_pingpp/config/routes.rb
@@ -0,0 +1,11 @@
+Spree::Core::Engine.add_routes do
+ # Add your extension routes here
+ patch '/checkout/handle_pingpp', :to => 'checkout#handle_pingpp', as: :handle_pingpp, format: :json
+
+ # called by pingpp webhook
+ post '/pingpp/charge_notify', :to=> 'pingpp_status#charge_notify'
+ post '/pingpp/test_charge_notify', :to=> 'pingpp_status#test_charge_notify'
+ # alipay get, upacp_pc post
+ match '/pingpp/charge_done', :to=> 'pingpp_status#charge_done', as: :pingpp_charge_done, via: [:get, :post]
+
+end
diff --git a/spree_pingpp/lib/generators/spree_pingpp/install/install_generator.rb b/spree_pingpp/lib/generators/spree_pingpp/install/install_generator.rb
new file mode 100644
index 00000000..c672ab7a
--- /dev/null
+++ b/spree_pingpp/lib/generators/spree_pingpp/install/install_generator.rb
@@ -0,0 +1,31 @@
+module SpreePingpp
+ module Generators
+ class InstallGenerator < Rails::Generators::Base
+
+ class_option :auto_run_migrations, :type => :boolean, :default => false
+
+ def add_javascripts
+ append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_pingpp\n"
+ append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_pingpp\n"
+ end
+
+ def add_stylesheets
+ inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_pingpp\n", :before => /\*\//, :verbose => true
+ inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_pingpp\n", :before => /\*\//, :verbose => true
+ end
+
+ def add_migrations
+ run 'bundle exec rake railties:install:migrations FROM=spree_pingpp'
+ end
+
+ def run_migrations
+ run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+ if run_migrations
+ run 'bundle exec rake db:migrate'
+ else
+ puts 'Skipping rake db:migrate, don\'t forget to run it!'
+ end
+ end
+ end
+ end
+end
diff --git a/spree_pingpp/lib/spree_pingpp.rb b/spree_pingpp/lib/spree_pingpp.rb
new file mode 100644
index 00000000..df7f44aa
--- /dev/null
+++ b/spree_pingpp/lib/spree_pingpp.rb
@@ -0,0 +1,3 @@
+require 'spree_core'
+require 'spree_pingpp/engine'
+require 'sass/rails'
diff --git a/spree_pingpp/lib/spree_pingpp/engine.rb b/spree_pingpp/lib/spree_pingpp/engine.rb
new file mode 100644
index 00000000..c5914bc0
--- /dev/null
+++ b/spree_pingpp/lib/spree_pingpp/engine.rb
@@ -0,0 +1,36 @@
+module SpreePingpp
+ class Engine < Rails::Engine
+ require 'spree/core'
+ isolate_namespace Spree
+ engine_name 'spree_pingpp'
+
+ # use rspec for tests
+ config.generators do |g|
+ g.test_framework :rspec
+ end
+
+ def self.activate
+ Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+ Rails.configuration.cache_classes ? require(c) : load(c)
+ end
+ end
+
+ initializer "spree.assets.precompile", :group => :all do |app|
+ app.config.assets.precompile += %w[
+ spree/frontend/spree_pingpp.js
+ billing_integrations/pingpp/alipay_pc_direct.jpg
+ billing_integrations/pingpp/alipay_wap.jpg
+ ]
+ end
+
+ config.to_prepare &method(:activate).to_proc
+
+
+ config.after_initialize do |app|
+ app.config.spree.payment_methods += [
+ Spree::Gateway::PingppPc,
+ Spree::Gateway::PingppMobile
+ ]
+ end
+ end
+end
diff --git a/spree_pingpp/lib/spree_pingpp/factories.rb b/spree_pingpp/lib/spree_pingpp/factories.rb
new file mode 100644
index 00000000..08019404
--- /dev/null
+++ b/spree_pingpp/lib/spree_pingpp/factories.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+ # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
+ #
+ # Example adding this to your spec_helper will load these Factories for use:
+ # require 'spree_pingpp/factories'
+end
diff --git a/spree_pingpp/spec/features/pingpp_pc_spec.rb b/spree_pingpp/spec/features/pingpp_pc_spec.rb
new file mode 100644
index 00000000..0c51794b
--- /dev/null
+++ b/spree_pingpp/spec/features/pingpp_pc_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+#copy from https://raw.github.com/radar/better_spree_paypal_express/master/spec/features/paypal_spec.rb
+#http://sandbox.alipaydev.com/index.htm
+#sandbox_areq22@aliyun.com
+#http://openapi.alipaydev.com/gateway.do
+describe "Alipay", :js => true, :type => :feature do
+ let!(:product) { FactoryGirl.create(:product, :name => 'iPad') }
+
+ before do
+ @gateway = Spree::Gateway::PingppPc.create!({
+ name: "PingppPcAlipay",
+ active: true,
+ preferences: {
+ channels: 'alipay_pc_direct',
+ app_key: 'app_S8qPKGyH8SKSvfLq',
+ api_key: 'sk_test_W9azX94mLu1O4SCibPHCCyHG'
+ }
+ })
+ FactoryGirl.create(:shipping_method)
+ end
+
+
+ it "pays for an order successfully" do
+
+ payment_method_css = "#order_payments_attributes__payment_method_id_#{@gateway.id}"
+
+
+ visit spree.root_path
+ click_link product.name
+ click_button 'Add To Cart'
+ click_button 'Checkout'
+
+ #within("#guest_checkout") do
+ # fill_in "Email", :with => "test@example.com"
+ # click_button 'Continue'
+ #end
+
+ fill_in_billing
+ click_button "Save and Continue"
+ # Delivery step doesn't require any action
+ click_button "Save and Continue"
+
+ choose payment_method_css
+ click_button "Save and Continue"
+ # should redirect to pingpp mock page
+ find("#btn_pay").click
+ #page.should have_content("Your order has been processed successfully")
+ #Spree::Payment.last.should be_complete
+ end
+
+ def fill_in_billing
+ fill_in "order_email", :with => "test@example.com"
+
+ within("#billing") do
+ fill_in "First Name", :with => "Test"
+ fill_in "Last Name", :with => "User"
+ fill_in "Street Address", :with => "1 User Lane"
+ # City, State and ZIP must all match for PayPal to be happy
+ fill_in "City", :with => "Adamsville"
+ select "United States of America", :from => "order_bill_address_attributes_country_id"
+ select "Alabama", :from => "order_bill_address_attributes_state_id"
+ fill_in "Zip", :with => "35005"
+ fill_in "Phone", :with => "555-AME-RICA"
+ end
+ end
+
+ def switch_to_paypal_login
+ # If you go through a payment once in the sandbox, it remembers your preferred setting.
+ # It defaults to the *wrong* setting for the first time, so we need to have this method.
+ unless page.has_selector?("#login_email")
+ find("#loadLogin").click
+ end
+ end
+
+end
diff --git a/spree_pingpp/spec/spec_helper.rb b/spree_pingpp/spec/spec_helper.rb
new file mode 100644
index 00000000..424257cf
--- /dev/null
+++ b/spree_pingpp/spec/spec_helper.rb
@@ -0,0 +1,87 @@
+# Run Coverage report
+require 'simplecov'
+SimpleCov.start do
+ add_filter 'spec/dummy'
+ add_group 'Controllers', 'app/controllers'
+ add_group 'Helpers', 'app/helpers'
+ add_group 'Mailers', 'app/mailers'
+ add_group 'Models', 'app/models'
+ add_group 'Views', 'app/views'
+ add_group 'Libraries', 'lib'
+end
+
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
+
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
+
+require 'rspec/rails'
+require 'database_cleaner'
+require 'ffaker'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+# Requires factories and other useful helpers defined in spree_core.
+require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/capybara_ext'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/url_helpers'
+
+# Requires factories defined in lib/spree_pingpp/factories.rb
+require 'spree_pingpp/factories'
+
+RSpec.configure do |config|
+ config.include FactoryGirl::Syntax::Methods
+
+ # Infer an example group's spec type from the file location.
+ config.infer_spec_type_from_file_location!
+
+ # == URL Helpers
+ #
+ # Allows access to Spree's routes in specs:
+ #
+ # visit spree.admin_path
+ # current_path.should eql(spree.products_path)
+ config.include Spree::TestingSupport::UrlHelpers
+
+ # == Mock Framework
+ #
+ # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+ #
+ # config.mock_with :mocha
+ # config.mock_with :flexmock
+ # config.mock_with :rr
+ config.mock_with :rspec
+ config.color = true
+
+ # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+ config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+ # Capybara javascript drivers require transactional fixtures set to false, and we use DatabaseCleaner
+ # to cleanup after each test instead. Without transactional fixtures set to false the records created
+ # to setup a test will be unavailable to the browser, which runs under a separate server instance.
+ config.use_transactional_fixtures = false
+
+ # Ensure Suite is set to use transactions for speed.
+ config.before :suite do
+ DatabaseCleaner.strategy = :transaction
+ DatabaseCleaner.clean_with :truncation
+ end
+
+ # Before each spec check if it is a Javascript test and switch between using database transactions or not where necessary.
+ config.before :each do
+ DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
+ DatabaseCleaner.start
+ end
+
+ # After each spec clean the database.
+ config.after :each do
+ DatabaseCleaner.clean
+ end
+
+ config.fail_fast = ENV['FAIL_FAST'] || false
+ config.order = "random"
+end
diff --git a/spree_pingpp/spree_pingpp.gemspec b/spree_pingpp/spree_pingpp.gemspec
new file mode 100644
index 00000000..22f7b813
--- /dev/null
+++ b/spree_pingpp/spree_pingpp.gemspec
@@ -0,0 +1,32 @@
+# encoding: UTF-8
+Gem::Specification.new do |s|
+ s.platform = Gem::Platform::RUBY
+ s.name = 'spree_pingpp'
+ s.version = '2.4.10'
+ s.summary = 'spree pingpp'
+ s.description = 'spree extension payment pingpp'
+ s.required_ruby_version = '>= 1.9.3'
+
+ s.author = 'David'
+ s.email = 'areq22@gmail.com'
+ s.homepage = 'http://www.getstore.cn'
+
+ #s.files = `git ls-files`.split("\n")
+ #s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.require_path = 'lib'
+ s.requirements << 'none'
+
+ s.add_dependency 'spree_core'
+ s.add_dependency 'pingpp', '~> 2.0.8'
+
+ s.add_development_dependency 'capybara', '~> 2.4'
+ s.add_development_dependency 'coffee-rails'
+ s.add_development_dependency 'database_cleaner'
+ s.add_development_dependency 'factory_girl', '~> 4.5'
+ s.add_development_dependency 'ffaker'
+ s.add_development_dependency 'rspec-rails', '~> 3.1'
+ s.add_development_dependency 'sass-rails', '~> 4.0.2'
+ s.add_development_dependency 'selenium-webdriver'
+ s.add_development_dependency 'simplecov'
+ s.add_development_dependency 'sqlite3'
+end
diff --git a/spree_theme/Gemfile b/spree_theme/Gemfile
index 583b777d..5376cd6e 100644
--- a/spree_theme/Gemfile
+++ b/spree_theme/Gemfile
@@ -1,37 +1,41 @@
-source 'http://rubygems.org'
+#source 'http://gems.ruby-china.org'
+source 'https://rubygems.org/'
+eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
-
-gem 'spree', :github => "spree/spree", :branch => "2-0-stable"
+#https://www.cnblogs.com/Sophiawow/p/4523026.html
+gem 'tzinfo-data', platforms: [:x64_mingw, :mingw, :mswin]
group :test,:development do
- gem 'ruby-graphviz' #print checkout flow
- gem 'simplecov' #rspec using it.
+ #gem 'ruby-graphviz' #print checkout flow
+ #gem 'simplecov' #rspec using it.
#using backend required
- gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '2-0-stable'
+ gem 'sass-rails', '~> 5.0.0'
gem "mysql2"
- gem 'thin'
end
-#group :test do
-# gem 'ffaker'
-#end
+group :test do
+ gem 'ffaker'
+ gem 'shoulda-matchers', '~> 3.1'
+end
gem "acts_as_list"
gem "acts_as_tree"
gem "awesome_nested_set"
+gem 'acts_as_commentable'
+gem 'acts-as-taggable-on'
-#use paperclip instead of dragonfly, dragonfly have no way to configure image path
-#gem "paperclip", "2.8.0" # spree require it.
-gem "responds_to_parent"
# spree already contain
#gem 'jquery-rails'
-#gem 'jquery-ui-rails'
+gem 'useragent'
gem "friendly_id"
-group :assets do
- gem 'sass'
- gem 'coffee-rails'
-end
-#gem 'ssl_requirement'
+gem 'erubis'
+gem 'turbolinks', '~> 5.0.0'
+gem 'sitemap_generator'
+
+gem 'bootstrap-sass'
+gem 'font-awesome-rails'
+gem 'wechat' #微信分享功能
+
gemspec
diff --git a/spree_theme/Gemfile.lock b/spree_theme/Gemfile.lock
new file mode 100644
index 00000000..55953cc2
--- /dev/null
+++ b/spree_theme/Gemfile.lock
@@ -0,0 +1,429 @@
+PATH
+ remote: .
+ specs:
+ spree_theme (3.1.0)
+ acts-as-taggable-on
+ acts_as_commentable
+ font-awesome-rails (~> 4.7.0)
+ friendly_id
+ sitemap_generator
+ useragent
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actioncable (5.1.4)
+ actionpack (= 5.1.4)
+ nio4r (~> 2.0)
+ websocket-driver (~> 0.6.1)
+ actionmailer (5.1.4)
+ actionpack (= 5.1.4)
+ actionview (= 5.1.4)
+ activejob (= 5.1.4)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 2.0)
+ actionpack (5.1.4)
+ actionview (= 5.1.4)
+ activesupport (= 5.1.4)
+ rack (~> 2.0)
+ rack-test (>= 0.6.3)
+ rails-dom-testing (~> 2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (5.1.4)
+ activesupport (= 5.1.4)
+ builder (~> 3.1)
+ erubi (~> 1.4)
+ rails-dom-testing (~> 2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activejob (5.1.4)
+ activesupport (= 5.1.4)
+ globalid (>= 0.3.6)
+ activemerchant (1.75.0)
+ activesupport (>= 3.2.14, < 6.x)
+ builder (>= 2.1.2, < 4.0.0)
+ i18n (>= 0.6.9)
+ nokogiri (~> 1.4)
+ activemodel (5.1.4)
+ activesupport (= 5.1.4)
+ activerecord (5.1.4)
+ activemodel (= 5.1.4)
+ activesupport (= 5.1.4)
+ arel (~> 8.0)
+ activesupport (5.1.4)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (~> 0.7)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ acts-as-taggable-on (5.0.0)
+ activerecord (>= 4.2.8)
+ acts_as_commentable (4.0.2)
+ acts_as_list (0.9.10)
+ activerecord (>= 3.0)
+ acts_as_tree (2.7.0)
+ activerecord (>= 3.0.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ arel (8.0.0)
+ autoprefixer-rails (7.2.3)
+ execjs
+ awesome_nested_set (3.1.3)
+ activerecord (>= 4.0.0, < 5.2)
+ bcrypt (3.1.11)
+ bcrypt (3.1.11-x86-mingw32)
+ bootstrap-sass (3.3.7)
+ autoprefixer-rails (>= 5.2.1)
+ sass (>= 3.3.4)
+ builder (3.2.3)
+ camertron-eprun (1.1.1)
+ cancancan (2.1.2)
+ canonical-rails (0.2.1)
+ rails (>= 4.1, < 5.2)
+ capybara (2.16.1)
+ addressable
+ mini_mime (>= 0.1.3)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ xpath (~> 2.0)
+ carmen (1.0.2)
+ activesupport (>= 3.0.0)
+ childprocess (0.8.0)
+ ffi (~> 1.0, >= 1.0.11)
+ cldr-plurals-runtime-rb (1.0.1)
+ climate_control (0.2.0)
+ cocaine (0.5.8)
+ climate_control (>= 0.0.3, < 1.0)
+ coffee-rails (4.2.2)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.12.2)
+ concurrent-ruby (1.0.5)
+ crass (1.0.3)
+ css_parser (1.6.0)
+ addressable
+ database_cleaner (1.6.2)
+ deface (1.3.0)
+ nokogiri (~> 1.6)
+ polyglot
+ rails (>= 4.1)
+ rainbow (>= 2.1.0)
+ devise (4.3.0)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 4.1.0, < 5.2)
+ responders
+ warden (~> 1.2.3)
+ devise-encryptable (0.2.0)
+ devise (>= 2.1.0)
+ diff-lcs (1.3)
+ docile (1.1.5)
+ erubi (1.7.0)
+ execjs (2.7.0)
+ factory_girl (4.9.0)
+ activesupport (>= 3.0.0)
+ ffaker (2.7.0)
+ ffi (1.9.18)
+ ffi (1.9.18-x86-mingw32)
+ font-awesome-rails (4.7.0.2)
+ railties (>= 3.2, < 5.2)
+ friendly_id (5.2.3)
+ activerecord (>= 4.0.0)
+ globalid (0.4.1)
+ activesupport (>= 4.2.0)
+ highline (1.6.21)
+ htmlentities (4.3.4)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
+ jquery-rails (4.3.1)
+ rails-dom-testing (>= 1, < 3)
+ railties (>= 4.2.0)
+ thor (>= 0.14, < 2.0)
+ jquery-turbolinks (2.1.0)
+ railties (>= 3.1.0)
+ turbolinks
+ jquery-ui-rails (6.0.1)
+ railties (>= 3.2.16)
+ json (2.1.0)
+ kaminari (1.0.1)
+ activesupport (>= 4.1.0)
+ kaminari-actionview (= 1.0.1)
+ kaminari-activerecord (= 1.0.1)
+ kaminari-core (= 1.0.1)
+ kaminari-actionview (1.0.1)
+ actionview
+ kaminari-core (= 1.0.1)
+ kaminari-activerecord (1.0.1)
+ activerecord
+ kaminari-core (= 1.0.1)
+ kaminari-core (1.0.1)
+ loofah (2.1.1)
+ crass (~> 1.0.2)
+ nokogiri (>= 1.5.9)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
+ method_source (0.9.0)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mimemagic (0.3.2)
+ mini_mime (1.0.0)
+ mini_portile2 (2.3.0)
+ minitest (5.10.3)
+ monetize (1.7.0)
+ money (~> 6.9)
+ money (6.10.0)
+ i18n (>= 0.6.4, < 1.0)
+ mysql2 (0.4.10)
+ mysql2 (0.4.10-x86-mingw32)
+ nio4r (2.1.0)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-x86-mingw32)
+ mini_portile2 (~> 2.3.0)
+ orm_adapter (0.5.0)
+ paperclip (5.1.0)
+ activemodel (>= 4.2.0)
+ activesupport (>= 4.2.0)
+ cocaine (~> 0.5.5)
+ mime-types
+ mimemagic (~> 0.3.0)
+ paranoia (2.3.1)
+ activerecord (>= 4.0, < 5.2)
+ polyamorous (1.3.1)
+ activerecord (>= 3.0)
+ polyglot (0.3.5)
+ premailer (1.11.1)
+ addressable
+ css_parser (>= 1.6.0)
+ htmlentities (>= 4.0.0)
+ premailer-rails (1.10.1)
+ actionmailer (>= 3, < 6)
+ premailer (~> 1.7, >= 1.7.9)
+ public_suffix (3.0.1)
+ rabl (0.13.1)
+ activesupport (>= 2.3.14)
+ rack (2.0.3)
+ rack-test (0.8.2)
+ rack (>= 1.0, < 3)
+ rails (5.1.4)
+ actioncable (= 5.1.4)
+ actionmailer (= 5.1.4)
+ actionpack (= 5.1.4)
+ actionview (= 5.1.4)
+ activejob (= 5.1.4)
+ activemodel (= 5.1.4)
+ activerecord (= 5.1.4)
+ activesupport (= 5.1.4)
+ bundler (>= 1.3.0)
+ railties (= 5.1.4)
+ sprockets-rails (>= 2.0.0)
+ rails-dom-testing (2.0.3)
+ activesupport (>= 4.2.0)
+ nokogiri (>= 1.6)
+ rails-html-sanitizer (1.0.3)
+ loofah (~> 2.0)
+ railties (5.1.4)
+ actionpack (= 5.1.4)
+ activesupport (= 5.1.4)
+ method_source
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rainbow (3.0.0)
+ rake (12.3.0)
+ ransack (1.8.4)
+ actionpack (>= 3.0)
+ activerecord (>= 3.0)
+ activesupport (>= 3.0)
+ i18n
+ polyamorous (~> 1.3)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ responders (2.4.0)
+ actionpack (>= 4.2.0, < 5.3)
+ railties (>= 4.2.0, < 5.3)
+ rspec-core (3.7.0)
+ rspec-support (~> 3.7.0)
+ rspec-expectations (3.7.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.7.0)
+ rspec-mocks (3.7.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.7.0)
+ rspec-rails (3.7.2)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (~> 3.7.0)
+ rspec-expectations (~> 3.7.0)
+ rspec-mocks (~> 3.7.0)
+ rspec-support (~> 3.7.0)
+ rspec-support (3.7.0)
+ rubyzip (1.2.1)
+ sass (3.5.3)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sass-rails (5.0.7)
+ railties (>= 4.0.0, < 6)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ select2-rails (3.5.9.1)
+ thor (~> 0.14)
+ selenium-webdriver (3.8.0)
+ childprocess (~> 0.5)
+ rubyzip (~> 1.0)
+ shoulda-matchers (3.1.2)
+ activesupport (>= 4.0.0)
+ simplecov (0.15.1)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.2)
+ sitemap_generator (6.0.0)
+ builder (~> 3.0)
+ spree (3.3.4)
+ spree_api (= 3.3.4)
+ spree_backend (= 3.3.4)
+ spree_cmd (= 3.3.4)
+ spree_core (= 3.3.4)
+ spree_frontend (= 3.3.4)
+ spree_sample (= 3.3.4)
+ spree_api (3.3.4)
+ rabl (~> 0.13.1)
+ spree_core (= 3.3.4)
+ versioncake (~> 3.3.0)
+ spree_auth_devise (3.3.1)
+ devise (~> 4.3.0)
+ devise-encryptable (= 0.2.0)
+ spree_core (>= 3.1.0, < 4.0)
+ spree_extension
+ spree_backend (3.3.4)
+ bootstrap-sass (~> 3.3)
+ jquery-rails (~> 4.3)
+ jquery-ui-rails (~> 6.0.1)
+ select2-rails (= 3.5.9.1)
+ spree_api (= 3.3.4)
+ spree_core (= 3.3.4)
+ spree_cmd (3.3.4)
+ thor (~> 0.14)
+ spree_core (3.3.4)
+ activemerchant (~> 1.67)
+ acts-as-taggable-on (~> 5.0)
+ acts_as_list (~> 0.8)
+ awesome_nested_set (~> 3.1.3)
+ cancancan (~> 2.0)
+ carmen (~> 1.0.0)
+ deface (~> 1.0)
+ ffaker (~> 2.2)
+ friendly_id (~> 5.2.1)
+ highline (~> 1.6.18)
+ kaminari (~> 1.0.1)
+ monetize (~> 1.1)
+ paperclip (~> 5.1.0)
+ paranoia (~> 2.3.0)
+ premailer-rails
+ rails (~> 5.1.4)
+ ransack (~> 1.8.0)
+ responders
+ sprockets-rails
+ state_machines-activerecord (~> 0.5)
+ stringex
+ twitter_cldr (~> 4.3)
+ spree_extension (0.0.5)
+ activerecord (>= 4.2)
+ spree_frontend (3.3.4)
+ bootstrap-sass (>= 3.3.5.1, < 3.4)
+ canonical-rails (~> 0.2.0)
+ jquery-rails (~> 4.3)
+ spree_api (= 3.3.4)
+ spree_core (= 3.3.4)
+ spree_sample (3.3.4)
+ spree_core (= 3.3.4)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.2.1)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
+ sqlite3 (1.3.13)
+ sqlite3 (1.3.13-x86-mingw32)
+ state_machines (0.5.0)
+ state_machines-activemodel (0.5.0)
+ activemodel (>= 4.1, < 5.2)
+ state_machines (>= 0.5.0)
+ state_machines-activerecord (0.5.0)
+ activerecord (>= 4.1, < 5.2)
+ state_machines-activemodel (>= 0.5.0)
+ stringex (2.8.1)
+ thor (0.20.0)
+ thread_safe (0.3.6)
+ tilt (2.0.8)
+ turbolinks (5.0.1)
+ turbolinks-source (~> 5)
+ turbolinks-source (5.0.3)
+ twitter_cldr (4.4.2)
+ camertron-eprun
+ cldr-plurals-runtime-rb (~> 1.0)
+ tzinfo
+ tzinfo (1.2.4)
+ thread_safe (~> 0.1)
+ tzinfo-data (1.2017.3)
+ tzinfo (>= 1.0.0)
+ useragent (0.16.8)
+ versioncake (3.3.0)
+ actionpack (>= 3.2)
+ activesupport (>= 3.2)
+ railties (>= 3.2)
+ tzinfo
+ warden (1.2.7)
+ rack (>= 1.0)
+ websocket-driver (0.6.5)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.3)
+ xpath (2.1.0)
+ nokogiri (~> 1.3)
+
+PLATFORMS
+ ruby
+ x86-mingw32
+
+DEPENDENCIES
+ acts-as-taggable-on
+ acts_as_commentable
+ acts_as_list
+ acts_as_tree
+ awesome_nested_set
+ bootstrap-sass
+ capybara (~> 2.6)
+ coffee-rails
+ database_cleaner
+ factory_girl (~> 4.5)
+ ffaker
+ font-awesome-rails
+ friendly_id
+ jquery-turbolinks
+ mysql2
+ rspec-rails (~> 3.4)
+ sass-rails (~> 5.0.0)
+ selenium-webdriver
+ shoulda-matchers (~> 3.1)
+ simplecov
+ sitemap_generator
+ spree (~> 3.3.0)
+ spree_auth_devise (~> 3.3.0)
+ spree_theme!
+ sqlite3
+ turbolinks
+ tzinfo-data
+ useragent
+
+BUNDLED WITH
+ 1.16.0
diff --git a/spree_theme/README.md b/spree_theme/README.md
index bde58218..dfb7576f 100644
--- a/spree_theme/README.md
+++ b/spree_theme/README.md
@@ -1,101 +1,56 @@
-SpreeTheme
-==========
-
-New frontend of spree, user could easy modify theme or add new theme. It is not working now!
-It is just for spree_abc, not common use, cause it override some cart/checkout views.
-
-how it work
------------
- roles: designer, user, customer
- sites: design site, shopping site
- a design/shopping site must have a released theme, or redirect to under_contruction.
- released theme contains layout, js, css. each release has own folder.
- a designer could login and design new theme.
-
-
- designer
- 0. new theme
- 1. design theme
- 2. release completed theme. generate themeN/versionN.html.erb
- 3. theme is viewable by public. shops/themes/themeN/
- designs.dalianshops.com?theme_id=N
-
- backend
+#SpreeTheme
+
+New frontend of spree, user could easy modify theme or add new theme.
+__It is just for spree_abc, not common use.__
+
+####terms and conditions
+Each site want their own theme, site could have more than one themes.
+Theme should be configurable, site could assigned their own data to it.
+Each site could select preferred theme from all available list.
+Designer could design theme and release it.
+
+Shops
+* design shop: product is theme, designer produce theme on line.
+* other shop: use released theme as frentend, sell product on line.
+
+Roles
+* user: on line shop user, have full permission to manage shop.
+* customer: shopping on line.
+* designer: login design site, design template on line.
+
+Themes
+* theme: a theme of site, contains html, js, css.
+
+
+####How it work
+designer produce theme
+ 0. in design shop, create new theme.
+ 1. design theme vie editor.
+ 2. release completed theme, generate theme files themeX/html, css, js
+ 3. theme is public now. user could import, config and publish.
+
+user apply theme to site
1. user browse available themes, snapshot or live demo.
- 2. import preferred theme
- *3. preview it. Do not support it now, find a clean way support tld/admin/add_to_cart first.
- 4. apply it to frontend
-
-requirement
- admin.sometld/... is for user preview, ex. admin.somtld/some_taxon
- www.sometld/... is for customer, ex. www.sometld/some_taxon
-
-how roles get layout?
----------------------
- designer: get current editing template
- customer: get layout from current site
-
-path
-----
- 1. designer design product list page
- www.tld/tid
- 2. designer design product detail page
- www.tld/tid/pid
- 2. designer release design
- www.tld/admin/template_theme
- 3. customer view product list
- www.tld/tid -> /var/www/shops/n/
- 4. customer view product detail
- www.tld/tid/pid
- 5. admin manage site
- www.tld/admin/...
- 6. user login
- www.tld/admin/
- 7. customer view live template demo
- templates.dalianshops.com -> /var/www/shops/1
- 8. customer browse published template list
- www.tld/admin/template_themes/
- 9. shop folders
- template folder
- t(current template id)-> /var/www/shops/1/t(original template id)
- theme image folder:
- tx/images
- generated layout
- tx/tx.html.erb
- theme css, js
- tx/cssx.css
- tx/jsx.js
- page_layout image folder: images belongs to shop, like logo
- lx
-
-configure
----------
- website theme_id, index_page should greater than 0.
- website index_page could equal to 0.
-
-extra feature for theme
------------------------
- option value has image, please look at https://github.com/citrus/spree_variant_options for detail
-
-Installation
-============
+ 2. import preferred theme,
+ 3. configure it with site data.
+ 4. apply it as frontend
+####Installation(tbd...)
rake spree_theme:install:migrations
rake db:migrate
rails r "SpreeeTheme::Engine.load_seed"
in config/spree.rb
- SpreeTheme.website_class = 'Spree::FakeWebsite'
- SpreeTheme.taxon_class = 'Spree::Taxon'
-
+SpreeTheme.website_class = 'Spree::FakeWebsite'
+SpreeTheme.taxon_class = 'Spree::Taxon'
Load sample
------------
+
rake spree_theme:load_samples
rake spree_theme:import_theme
-Testing
--------
+####Testing(tbd...)
rake test_app
+
change db from sqlite to mysql, fix id setting, rails sqlite adapter ignore id setting
rake db:seed RAILS_ENV=test
rake spree_theme:import_theme RAILS_ENV=test SEED_PATH=1 THEME_ID=2
diff --git a/spree_theme/Rakefile b/spree_theme/Rakefile
index 9bb1d6ec..c605a5f7 100644
--- a/spree_theme/Rakefile
+++ b/spree_theme/Rakefile
@@ -2,14 +2,20 @@ require 'bundler'
Bundler::GemHelper.install_tasks
require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
RSpec::Core::RakeTask.new
-task :default => [:spec]
+task :default do
+ if Dir["spec/dummy"].empty?
+ Rake::Task[:test_app].invoke
+ Dir.chdir("../../")
+ end
+ Rake::Task[:spec].invoke
+end
desc 'Generates a dummy app for testing'
task :test_app do
ENV['LIB_NAME'] = 'spree_theme'
- Rake::Task['common:test_app'].invoke
-end
\ No newline at end of file
+ Rake::Task['extension:test_app'].invoke
+end
diff --git a/spree_theme/app/assets/images/blog/rss.png b/spree_theme/app/assets/images/blog/rss.png
new file mode 100644
index 00000000..afa1ff4e
Binary files /dev/null and b/spree_theme/app/assets/images/blog/rss.png differ
diff --git a/spree_theme/app/assets/images/logo.png b/spree_theme/app/assets/images/logo.png
new file mode 100644
index 00000000..010bd60a
Binary files /dev/null and b/spree_theme/app/assets/images/logo.png differ
diff --git a/spree_theme/app/assets/images/missing/wxshare.png b/spree_theme/app/assets/images/missing/wxshare.png
new file mode 100644
index 00000000..010bd60a
Binary files /dev/null and b/spree_theme/app/assets/images/missing/wxshare.png differ
diff --git a/spree_theme/app/assets/javascripts/admin/page_layouts.js.coffee.unused b/spree_theme/app/assets/javascripts/admin/page_layouts.js.coffee.unused
new file mode 100644
index 00000000..d208e15b
--- /dev/null
+++ b/spree_theme/app/assets/javascripts/admin/page_layouts.js.coffee.unused
@@ -0,0 +1,65 @@
+handle_ajax_error = (XMLHttpRequest, textStatus, errorThrown) ->
+ $.jstree.rollback(last_rollback)
+ $("#ajax_error").show().html("" + server_error + "
" + template_theme_tree_error)
+
+handle_rename = (e, data) ->
+ last_rollback = data.rlbk
+ node = data.rslt.obj
+ name = data.rslt.new_name
+
+ url = Spree.url(base_url).clone()
+ url.setPath(url.path() + '/' + node.prop("id"))
+
+ $.ajax
+ type: "POST",
+ dataType: "json",
+ url: url.toString(),
+ data: {
+ _method: "put",
+ "page_layout[title]": name,
+ token: Spree.api_key
+ },
+ error: handle_ajax_error
+
+root = exports ? this
+root.setup_template_theme_tree = (template_theme_id, action) ->
+ $template_theme_tree = $("#template_theme_tree")
+ if template_theme_id != undefined
+ # this is defined within admin/taxonomies/edit
+ # /api/template_themes/:template_theme_id/page_layouts
+ root.base_url = Spree.url(Spree.routes.template_theme_page_layouts_path)
+
+ $.ajax
+ url: Spree.url(base_url.path().replace("/page_layouts", "/jstree")).toString(),
+ data:
+ token: Spree.api_key
+ success: (template_theme) ->
+ last_rollback = null
+
+ conf =
+ json_data:
+ data: template_theme,
+ ajax:
+ url: (e) ->
+ # /api/template_themes/:template_theme_id/page_layouts/
+ Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString()
+ themes:
+ theme: "spree",
+ url: Spree.url(Spree.routes.jstree_theme_path)
+ strings:
+ loading: Spree.translations.loading + "..."
+ plugins: ["themes", "json_data", "dnd", "crrm"]
+
+ $template_theme_tree.jstree(conf)
+ .bind("rename.jstree", handle_rename)
+ .bind("select_node.jstree", handle_select)
+ .bind "loaded.jstree", ->
+ $(this).jstree("core").toggle_node($('.jstree-icon').first())
+
+ $template_theme_tree.on "dblclick", "a", (e) ->
+ $template_theme_tree.jstree("rename", this)
+
+ # surpress form submit on enter/return
+ $(document).keypress (e) ->
+ if e.keyCode == 13
+ e.preventDefault()
diff --git a/spree_theme/app/assets/javascripts/admin/resource_autocomplete.js.erb b/spree_theme/app/assets/javascripts/admin/resource_autocomplete.js.erb
index e69de29b..00903778 100644
--- a/spree_theme/app/assets/javascripts/admin/resource_autocomplete.js.erb
+++ b/spree_theme/app/assets/javascripts/admin/resource_autocomplete.js.erb
@@ -0,0 +1,55 @@
+// copy from spree/backend/assets/javascripts/admin/taxon_autocomlete.js.erb
+// locals {:dom_id, :multiple, :search_url} # Spree.routes.taxons_api or Spree.routes.global_taxons_api
+'use strict';
+
+var set_resource_taxon_select = function(dom_id, multiple, search_url){
+ function formatTaxon(taxon) {
+ return Select2.util.escapeMarkup(taxon.pretty_name);
+ }
+
+ if ($('#'+dom_id).length > 0) {
+ $('#'+dom_id).select2({
+ placeholder: Spree.translations.taxon_placeholder,
+ multiple: multiple,
+ allowClear: true,
+ initSelection: function (element, callback) {
+ var url = Spree.url(Spree.routes.taxons_api, {
+ ids: element.val(),
+ without_children: true,
+ token: Spree.api_key
+ });
+ return $.getJSON(url, null, function (data) {
+ if(multiple){
+ return callback(data['taxons']);
+ } else {
+ return callback(data['taxons'].pop());
+ }
+ });
+ },
+ ajax: {
+ url: search_url,
+ datatype: 'json',
+ data: function (term, page) {
+ return {
+ per_page: 50,
+ page: page,
+ without_children: true,
+ q: {
+ name_cont: term
+ },
+ token: Spree.api_key
+ };
+ },
+ results: function (data, page) {
+ var more = page < data.pages;
+ return {
+ results: data['taxons'],
+ more: more
+ };
+ }
+ },
+ formatResult: formatTaxon,
+ formatSelection: formatTaxon
+ });
+ }
+}
diff --git a/spree_theme/app/assets/javascripts/admin/spree_essential_blog.js b/spree_theme/app/assets/javascripts/admin/spree_essential_blog.js
new file mode 100644
index 00000000..399d411c
--- /dev/null
+++ b/spree_theme/app/assets/javascripts/admin/spree_essential_blog.js
@@ -0,0 +1 @@
+//= require admin/taxon_autocomplete_for_blog
diff --git a/spree_theme/app/assets/javascripts/admin/spree_theme.js b/spree_theme/app/assets/javascripts/admin/spree_theme.js
index e154ca94..344d7ba2 100644
--- a/spree_theme/app/assets/javascripts/admin/spree_theme.js
+++ b/spree_theme/app/assets/javascripts/admin/spree_theme.js
@@ -2,31 +2,35 @@
//= require jquery.ajax
//= require jquery.jeditable
//= require admin/resource_autocomplete
+//= require admin/spree_essential_blog
+//= require admin/template_themes
+//= require store/spree_theme.routes
+
+
jQuery(function ($) {
- $('#page_layout_tree_inner').bind('select_node.jstree', function (e, data) {
- var selected_node = data.rslt.obj
- var url = [Spree.routes.admin_template_themes, selected_node.data('tid'), 'page_layout',selected_node.data('lid'), selected_node.data('action') ].join('/')
- $.ajax({ url: url, type: 'GET', dataType: "script"})
- }).bind('deselect_all.jstree', function (e, data) {
- //$(this).find('select').hide()
- })
- .jstree(
- { themes:{ theme: "apple", url: "/assets/jquery.jstree/themes/apple/style.css" },
- // plugins: ["themes"]
- core : { multiple: false, animation: 0 }
- }
- );
- //$('#page_layout_tree_inner select.select22').select2();
-
-
+// $('#template_theme_tree').bind('select_node.jstree', function (e, data) {
+// var selected_node = data.rslt.obj
+// var url = [Spree.routes.admin_page_layouts( selected_node.data('tid')),selected_node.data('lid'), selected_node.data('action') ].join('/')
+// $.ajax({ url: url, type: 'GET', dataType: "script"})
+// }).bind('deselect_all.jstree', function (e, data) {
+// //$(this).find('select').hide()
+// })
+// .jstree(
+// { themes:{ theme: "apple", url: "/assets/jquery.jstree/themes/apple/style.css" },
+// // plugins: ["themes"]
+// core : { multiple: false, animation: 0 }
+// }
+// );
+
+
$('#listing_template_themes .editable').editable(function(value, settings) {
var jquery_element = $(this)
var url = Spree.routes.admin_template_themes+'/'+jquery_element.data('id')
var submitdata = {};
submitdata[settings.name] = value;
- $.ajax({ dataType: 'json', url: url, type: 'put', data : submitdata });
+ $.ajax({ dataType: 'json', url: url, type: 'put', data : submitdata });
return(value);
- },
+ },
{ //since dblclick would trigger click, for a link, we should not click,dblclick together
event : "dblclick",
name : "template_theme[title]",
diff --git a/spree_theme/app/assets/javascripts/admin/taxon_autocomplete_for_blog.js.erb b/spree_theme/app/assets/javascripts/admin/taxon_autocomplete_for_blog.js.erb
new file mode 100644
index 00000000..1b241b17
--- /dev/null
+++ b/spree_theme/app/assets/javascripts/admin/taxon_autocomplete_for_blog.js.erb
@@ -0,0 +1,5 @@
+window.Spree.ready(function() {
+ 'use strict';
+ set_taxon_select('#post_taxon_ids')
+
+});
diff --git a/spree_theme/app/assets/javascripts/admin/template_themes.js.coffee b/spree_theme/app/assets/javascripts/admin/template_themes.js.coffee
new file mode 100644
index 00000000..cfc73329
--- /dev/null
+++ b/spree_theme/app/assets/javascripts/admin/template_themes.js.coffee
@@ -0,0 +1,23 @@
+
+handle_select = (e, data) ->
+ selected_node = data.rslt.obj
+ url = [Spree.routes.admin_page_layouts( selected_node.data('tid')),selected_node.data('lid'), selected_node.data('action') ].join('/')
+ $.ajax({ url: url, type: 'GET', dataType: "script"})
+
+root = exports ? this
+root.setup_template_theme_tree = (template_theme_id) ->
+ $template_theme_tree = $("#template_theme_tree")
+ if template_theme_id != undefined
+ conf =
+ core:
+ multiple: false,
+ animation: 0
+ themes:
+ theme: "spree2",
+ url: Spree.url(Spree.routes.jstree_theme_path)
+ #strings:
+ # loading: Spree.translations.loading + "..."
+ #plugins: ["themes"]
+
+ $template_theme_tree.jstree( conf )
+ .bind("select_node.jstree", handle_select)
diff --git a/spree_theme/app/assets/javascripts/hoverIntent.js b/spree_theme/app/assets/javascripts/hoverIntent.js
new file mode 100644
index 00000000..cbe3ae71
--- /dev/null
+++ b/spree_theme/app/assets/javascripts/hoverIntent.js
@@ -0,0 +1,114 @@
+/**
+ * hoverIntent is similar to jQuery's built-in "hover" method except that
+ * instead of firing the handlerIn function immediately, hoverIntent checks
+ * to see if the user's mouse has slowed down (beneath the sensitivity
+ * threshold) before firing the event. The handlerOut function is only
+ * called after a matching handlerIn.
+ *
+ * hoverIntent r7 // 2013.03.11 // jQuery 1.9.1+
+ * http://cherne.net/brian/resources/jquery.hoverIntent.html
+ *
+ * You may use hoverIntent under the terms of the MIT license. Basically that
+ * means you are free to use hoverIntent as long as this header is left intact.
+ * Copyright 2007, 2013 Brian Cherne
+ *
+ * // basic usage ... just like .hover()
+ * .hoverIntent( handlerIn, handlerOut )
+ * .hoverIntent( handlerInOut )
+ *
+ * // basic usage ... with event delegation!
+ * .hoverIntent( handlerIn, handlerOut, selector )
+ * .hoverIntent( handlerInOut, selector )
+ *
+ * // using a basic configuration object
+ * .hoverIntent( config )
+ *
+ * @param handlerIn function OR configuration object
+ * @param handlerOut function OR selector for delegation OR undefined
+ * @param selector selector OR undefined
+ * @author Brian Cherne
+ **/
+(function($) {
+ $.fn.hoverIntent = function(handlerIn,handlerOut,selector) {
+
+ // default configuration values
+ var cfg = {
+ interval: 100,
+ sensitivity: 7,
+ timeout: 0
+ };
+
+ if ( typeof handlerIn === "object" ) {
+ cfg = $.extend(cfg, handlerIn );
+ } else if ($.isFunction(handlerOut)) {
+ cfg = $.extend(cfg, { over: handlerIn, out: handlerOut, selector: selector } );
+ } else {
+ cfg = $.extend(cfg, { over: handlerIn, out: handlerIn, selector: handlerOut } );
+ }
+
+ // instantiate variables
+ // cX, cY = current X and Y position of mouse, updated by mousemove event
+ // pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
+ var cX, cY, pX, pY;
+
+ // A private function for getting mouse position
+ var track = function(ev) {
+ cX = ev.pageX;
+ cY = ev.pageY;
+ };
+
+ // A private function for comparing current and previous mouse position
+ var compare = function(ev,ob) {
+ ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+ // compare mouse positions to see if they've crossed the threshold
+ if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
+ $(ob).off("mousemove.hoverIntent",track);
+ // set hoverIntent state to true (so mouseOut can be called)
+ ob.hoverIntent_s = 1;
+ return cfg.over.apply(ob,[ev]);
+ } else {
+ // set previous coordinates for next time
+ pX = cX; pY = cY;
+ // use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
+ ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
+ }
+ };
+
+ // A private function for delaying the mouseOut function
+ var delay = function(ev,ob) {
+ ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+ ob.hoverIntent_s = 0;
+ return cfg.out.apply(ob,[ev]);
+ };
+
+ // A private function for handling mouse 'hovering'
+ var handleHover = function(e) {
+ // copy objects to be passed into t (required for event object to be passed in IE)
+ var ev = jQuery.extend({},e);
+ var ob = this;
+
+ // cancel hoverIntent timer if it exists
+ if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
+
+ // if e.type == "mouseenter"
+ if (e.type == "mouseenter") {
+ // set "previous" X and Y position based on initial entry point
+ pX = ev.pageX; pY = ev.pageY;
+ // update "current" X and Y position based on mousemove
+ $(ob).on("mousemove.hoverIntent",track);
+ // start polling interval (self-calling timeout) to compare mouse coordinates over time
+ if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
+
+ // else e.type == "mouseleave"
+ } else {
+ // unbind expensive mousemove event
+ $(ob).off("mousemove.hoverIntent",track);
+ // if hoverIntent state is true, then call the mouseOut function after the specified delay
+ if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
+ }
+ };
+
+ // listen for mouseenter and mouseleave
+ return this.on({'mouseenter.hoverIntent':handleHover,'mouseleave.hoverIntent':handleHover}, cfg.selector);
+ };
+})(jQuery);
\ No newline at end of file
diff --git a/spree_theme/app/assets/javascripts/image_zoom.js b/spree_theme/app/assets/javascripts/image_zoom.js
new file mode 100644
index 00000000..bed8e877
--- /dev/null
+++ b/spree_theme/app/assets/javascripts/image_zoom.js
@@ -0,0 +1,398 @@
+/*
+ * The image zoom plugin references the jQzoom plugin, and remove the features not be used.
+ * Make the code be simple.
+ *
+ * Colin Ju
+ *
+ * jQzoom Evolution Library v2.3 - Javascript Image magnifier
+ * http://www.mind-projects.it
+ *
+ * Copyright 2011, Engineer Marco Renzi
+ * Licensed under the BSD license.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the organization nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * Date: 03 May 2011 22:16:00
+ */
+(function($) {
+ var _config = {
+ thumbConfig: {
+ containerSelector: '',
+ unitSelector: 'a',
+ eventName: 'click',
+ attr: 'rel',
+ activeClassName: 'thumb-active'
+ },
+ zoomPadConfig: {
+ containerSelector: ''
+ },
+ zoomViewerConfig: {
+ width: 300,
+ height: 300
+ },
+ largeImageContainerSelector: ''
+ };
+
+ var isIE6 = (!$.support.opacity && !$.support.style && window.XMLHttpRequest==undefined),
+ doc = document,
+ win = window,
+ jWin = $(win),
+ min = Math.min;
+
+ /***
+ * Define custom event
+ */
+ var CustomEvent = {
+ eventObj: $({}),
+ bind: function() {
+ this.eventObj.bind.apply(this.eventObj, arguments);
+ },
+ trigger: function() {
+ this.eventObj.trigger.apply(this.eventObj, arguments);
+ },
+ unbind: function() {
+ this.eventObj.unbind.apply(this.eventObj, arguments);
+ }
+ };
+ /**
+ * add image zoom to jquery plugin
+ */
+ $.fn.imageZoom = function(config) {
+ return this.each(function () {
+ new ImageZoom(this, config);
+ });
+ };
+
+ /**
+ * The image zoom component entry.
+ */
+ var ImageZoom = function(container, config) {
+ var jContainer = $(container);
+ if (jContainer.data('inited') === 'y') {//Init image zoom only one time.
+ return;
+ }
+ this.jContainer = jContainer;
+ this.config = $.extend(true, _config, config || {}); //Deep copy.
+ this._init();
+ jContainer.data('inited', 'y');
+ };
+
+ $.extend(ImageZoom.prototype, {
+ constructor: ImageZoom,
+ _init: function() {
+ //Init the zoom pad component
+ var config = this.config,
+ zoomPadConfig = config.zoomPadConfig;
+
+ new ZoomPad(this.jContainer.find(zoomPadConfig.containerSelector), zoomPadConfig, config.zoomViewerConfig);
+
+ var thumbConfig = config.thumbConfig;
+ //if there is thumb list, init it.
+ if (thumbConfig && thumbConfig.containerSelector) {
+ var jThumbContainer = this.jContainer.find(thumbConfig.containerSelector);
+
+ if (jThumbContainer.length) {
+ new ThumbList(jThumbContainer, thumbConfig);
+ }
+ }
+ }
+ });
+
+ /**
+ * The thumbnail list component
+ */
+ var ThumbList = function(jContainer, config) {
+ this.jContainer = jContainer;
+ this.config = config;
+ this._init();
+ };
+
+ $.extend(ThumbList.prototype, {
+ constructor: ThumbList,
+ _init: function() {
+ this.dActiveUnit = this.jContainer.find(this.config.unitSelector).get(0);
+ this._bindEvent();
+ },
+ _bindEvent: function() {
+ var _this = this,
+ config = this.config;
+
+ this.jContainer.delegate(config.unitSelector, config.eventName, function(event) {
+ var jThis = $(this),
+ activeClassName,
+ oImagesSrc = eval('(' + $.trim(jThis.attr(config.attr)) + ')');
+
+ if (_this.dActiveUnit !== this) {
+ activeClassName = config.activeClassName;
+ $(_this.dActiveUnit).removeClass(activeClassName);
+ jThis.addClass(activeClassName);
+ _this.dActiveUnit = this;
+ CustomEvent.trigger('thumb-unit-active', oImagesSrc);
+ }
+ });
+ }
+ });
+
+ /**
+ * The zoom pad component
+ */
+ var ZoomPad = function(jContainer, zoomPadConfig, zoomViewerConfig) {
+ this.jBody = $(doc.body) // get body in function, body may not ready when loading this file
+ this.jContainer = jContainer;
+ this.zoomPadConfig = zoomPadConfig;
+ this.zoomViewerConfig = zoomViewerConfig;
+ this._init();
+ };
+
+ $.extend(ZoomPad.prototype, {
+ constructor: ZoomPad,
+ _init: function() {
+ this.largeImageLoading = false;
+ this.largeImageLoaded = false;
+ this.smallImageData = null;
+ this.largeImageData = null;
+ this.jZoomLens = null;
+ this.jZoomViewer = null;
+ this.jIframe = null;
+ this.jSmallImage = this.jContainer.find('img');
+ this.jSmallImageParent = this.jSmallImage.parent();
+ this.jLargeImage = this._createLargeImage();
+ this.jLoading = null;
+ this.eventPos = null;
+ this.isHover = false;
+ this.lensL = 0;
+ this.lensT = 0;
+ this._bindEvent();
+ if (this.jSmallImage[0].complete) {//sometimes the image is loaded and the onload will not be fired.
+ this.smallImageLoaded = true;
+ this._fetchSmallImageData();
+ }
+ },
+ _bindEvent: function() {
+ var _this = this;
+
+ this.jSmallImage.load(function() {
+ _this._fetchSmallImageData();
+ }).error(function() {
+ //TODO
+ }).hover(function(e) {
+ _this.isHover = true;
+ if (!_this.largeImageLoaded && !_this.largeImageLoading) {
+ _this._showLoading(true);
+ //_this._loadLargeImage(_this.jSmallImageParent.attr('href'));
+ _this._loadLargeImage(_this.jSmallImage.data('big-image'));
+ }
+ _this.eventPos = {
+ pageX: e.pageX,
+ pageY: e.pageY
+ };
+ }, function() {
+ _this.isHover = false;
+ });
+
+ this.jSmallImageParent.hover(function() {
+ //TODO
+ }, function() {
+ _this._hideMoveZoomLens();
+ }).click(function(e) {
+ return false;
+ }).mousemove(function(e) {
+ _this.eventPos = {
+ pageX: e.pageX,
+ pageY: e.pageY
+ };
+
+ if (_this.largeImageLoaded) {
+ var oScale = _this._getScale();
+ if (oScale.x > 1 || oScale.y > 1) {
+ _this._moveZoomLens(_this._countLensSizeAndPos());
+ }
+ }
+ });
+ this.jLargeImage.load(function() {
+ _this.largeImageLoaded = true;
+ _this.largeImageLoading = false;
+ _this._showLoading(false);
+ _this._fetchLargeImageData();
+
+ var oScale = _this._getScale();
+ if (_this.isHover && (oScale.x > 1 || oScale.y > 1)) {
+ _this._moveZoomLens(_this._countLensSizeAndPos());
+ }
+ }).error(function() {
+ _this.largeImageLoading = false;
+ _this._showLoading(false);
+ });
+ CustomEvent.bind('thumb-unit-active', function(event, oImagesSrc) {
+ _this.smallImageData = null;
+ _this.largeImageData = null;
+ _this.oScale = null;
+ _this.largeImageLoaded = false;
+ _this.largeImageLoading = false;
+ _this.jSmallImage.attr('src', oImagesSrc.smallimage).parent().attr('href', oImagesSrc.largeimage);
+ });
+ },
+ _createLargeImage: function() {
+ var jLargeImage = $(new Image());
+
+ jLargeImage.hide().appendTo(this.jBody);
+ return jLargeImage;
+ },
+ _loadLargeImage: function(src) {
+ this.largeImageLoaded = false;
+ this.largeImageLoading = true;
+ this.jLargeImage.attr('src', src);
+ },
+ _fetchSmallImageData: function() {
+ var jSmallImage = this.jSmallImage,
+ offset = jSmallImage.offset();
+
+ this.smallImageData = {
+ w: jSmallImage.width(),
+ h: jSmallImage.height(),
+ t: offset.top,
+ l: offset.left,
+ borderT: parseInt(jSmallImage.css('border-top-width').replace('px', '')),
+ borderL: parseInt(jSmallImage.css('border-left-width').replace('px', '')),
+ borderR: parseInt(jSmallImage.css('border-right-width').replace('px', ''))
+ };
+ },
+ _fetchLargeImageData: function() {
+ this.largeImageData = {
+ w: this.jLargeImage.width(),
+ h: this.jLargeImage.height()
+ }
+ },
+ _getScale: function() {
+ return {
+ x: this.largeImageData.w/this.smallImageData.w,
+ y: this.largeImageData.h/this.smallImageData.h
+ };
+ },
+ _countLensSizeAndPos: function() {
+ //the lens's position is relatived to image's parent.
+ var zoomViewerConfig = this.zoomViewerConfig,
+ oScale = this._getScale(),
+ smallImageData = this.smallImageData,
+ w = min(parseInt(zoomViewerConfig.width / oScale.x), smallImageData.w),
+ h = min(parseInt(zoomViewerConfig.height / oScale.y), smallImageData.h),
+ eventPos = this.eventPos,
+ pageX = eventPos.pageX,
+ pageY = eventPos.pageY,
+ x = pageX - smallImageData.l - smallImageData.borderL,
+ y = pageY - smallImageData.t - smallImageData.borderT,
+ lensL = pageX - smallImageData.l - w/2,
+ lensT = pageY - smallImageData.t - h/2;
+
+ if (x - w/2 <= 0) {
+ lensL = smallImageData.borderL;
+ } else if (x + w/2 >= smallImageData.w) {
+ lensL = smallImageData.w - w + smallImageData.borderL;
+ }
+ if (y - h/2 <= 0) {
+ lensT = smallImageData.borderT;
+ } else if (y + h/2 >= smallImageData.h) {
+ lensT = smallImageData.h - h + smallImageData.borderT;
+ }
+ this.lensL = lensL;
+ this.lensT = lensT;
+ return {
+ width: w,
+ height: h,
+ top: lensT,
+ left: lensL
+ };
+ },
+ _showLoading: function(isShow) {
+ var smallImageData = this.smallImageData;
+
+ this.jLoading = this.jSmallImageParent.find('div.zoom-loading');
+ if (this.jLoading.length === 0) {
+ this.jLoading = $('').appendTo(this.jSmallImageParent);
+ }
+ if (isShow) {//show loading
+ this.jLoading.css({
+ left: (this.jSmallImageParent.width() - this.jLoading.width())/2,
+ top: (this.jSmallImageParent.height() - this.jLoading.height())/2
+ }).show();
+ } else {//hide loading
+ this.jLoading.hide();
+ }
+ },
+ _moveZoomLens: function(oSizeAndPos) {
+ this.jZoomLens = this.jSmallImageParent.find('div.zoom-lens');
+ if (this.jZoomLens.length === 0) {
+ this.jZoomLens = $('').appendTo(this.jSmallImageParent);
+ }
+ this.jZoomLens.css(oSizeAndPos).show();
+ this._showZoomViewer();
+ },
+ _hideMoveZoomLens: function() {
+ if (this.jZoomLens) {
+ this.jZoomLens.hide();
+ }
+ this._hideZoomViewer();
+ },
+ _isInImageArea: function() {
+ var smallImageData = this.smallImageData,
+ eventPos = this.eventPos,
+ pageX = eventPos.pageX,
+ pageY = eventPos.pageY;
+
+ return (pageX >= smallImageData.l + smallImageData.borderL &&
+ pageX <= smallImageData.l + smallImageData.borderL + smallImageData.w &&
+ pageY >= smallImageData.t + smallImageData.borderT &&
+ pageY <= smallImageData.t + smallImageData.borderT + smallImageData.h
+ ) ? true : false;
+ },
+ _showZoomViewer: function() {
+ var smallImageData = this.smallImageData,
+ oScale = this._getScale(),
+ jImage,
+ imageSrc = this.jSmallImage.data('big-image');
+ //imageSrc = this.jSmallImageParent.attr('href');
+
+ this.jZoomViewer = this.jBody.find('div.zoom-viewer');
+ if (this.jZoomViewer.length === 0) {
+ this.jZoomViewer = $('').css(this.zoomViewerConfig).appendTo(this.jBody);
+ }
+ if (isIE6) {
+ this.jIframe = this.jBody.find('iframe.zoom-iframe');
+ if (this.jIframe.length === 0) {
+ this.jIframe = $('').css(this.zoomViewerConfig).appendTo(this.jBody);
+ }
+ this.jIframe.show();
+ }
+
+ this.jZoomViewer.css({
+ left: smallImageData.l + smallImageData.borderL + smallImageData.w + smallImageData.borderR + 10,
+ top: smallImageData.t
+ }).show();
+ jImage = this.jZoomViewer.find('img');
+ if (this.jZoomViewer.find('img').attr('src') !== imageSrc) {
+ jImage.attr('src', imageSrc);
+ }
+ jImage.css({
+ left: -((this.lensL - smallImageData.borderL) * oScale.x),
+ top: -((this.lensT - smallImageData.borderT)* oScale.y)
+ });
+ },
+ _hideZoomViewer: function() {
+ if (this.jZoomViewer) {
+ this.jZoomViewer.hide();
+ }
+ if (this.jIframe) {
+ this.jIframe.hide();
+ }
+ }
+ });
+})(jQuery);
\ No newline at end of file
diff --git a/spree_theme/app/assets/javascripts/interface.js b/spree_theme/app/assets/javascripts/interface.js
index c02c6021..d71a901b 100644
--- a/spree_theme/app/assets/javascripts/interface.js
+++ b/spree_theme/app/assets/javascripts/interface.js
@@ -10,7 +10,7 @@ function SelectorGadget() {
this.sg_div = null;
this.unbound = false;
//this.prediction_helper = new DomPredictionHelper();
- this.restricted_elements = jQuery.map(['html', 'body', 'head', 'base'], function(selector) { return jQuery(selector).get(0) });
+ this.restricted_elements = jQuery.map(['html', 'body', 'head', 'base'], function(selector) { return jQuery(selector).get(0); });
// david added at 04/28/2012 10:00
this.cover = null; // cover on the selected element
this.covers = [];
@@ -21,7 +21,7 @@ SelectorGadget.prototype = new Object();
SelectorGadget.prototype.makeBorders = function(orig_elem, makeRed) {
//this.removeBorders();
- this.cover = this.get_available_cover()
+ this.cover = this.get_available_cover();
if (this.cover==null)
{
this.setupBorders();//set cover
@@ -36,8 +36,8 @@ SelectorGadget.prototype.makeBorders = function(orig_elem, makeRed) {
var top = p.top;
var left = p.left;
- var width = elem.outerWidth()
- var height = elem.outerHeight()
+ var width = elem.outerWidth();
+ var height = elem.outerHeight();
// david added at 04/28/2012 10:00
this.cover.css('width', this.px(width)).css('height', this.px(height)).css('top', this.px(top )).css('left', this.px(left));
@@ -72,13 +72,13 @@ SelectorGadget.prototype.removeBorders = function() {
this.covers[i].hide();
}
}
-}
+};
SelectorGadget.prototype.setupBorders = function() {
if (!this.cover) {
var width = this.border_width + 'px';
// david added at 04/28/2012 10:00
- this.cover = jQuery(' |